Skip to content

Commit

Permalink
ACCESS: Beginnings of inventory dragging for combining items
Browse files Browse the repository at this point in the history
  • Loading branch information
@dreammaster
dreammaster committed Dec 13, 2014
1 parent b8c95e6 commit 6ceda06
Show file tree
Hide file tree
Showing 8 changed files with 218 additions and 27 deletions.
88 changes: 88 additions & 0 deletions engines/access/amazon/amazon_resources.cpp
View file
Expand Up @@ -1352,6 +1352,94 @@ const int CHAPTER_JUMP[14] = {
0, 12, 10, 15, 19, 25, 31, 36, 45, 46, 29, 55, 61, 0
};

const int COMBO_TABLE[85][4] = {
{ -1, -1, -1, -1 },
{ 12, 3, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 24, 25, -1, -1 },
{ 10, 24, -1, -1 },
{ -1, -1, -1, -1 },
{ 8, 24, -1, -1 },
{ -1, -1, -1, -1 },
{ 1, 3, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 7, 25, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 80, 81, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 41, 42, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 39, 40, -1, -1 },
{ 38, 40, -1, -1 },
{ -1, -1, -1, -1 },
{ 32, 42, 77, 78 },
{ -1, -1, -1, -1 },
{ 60, 61, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 73, 72, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 64, 67, -1, -1 },
{ -1, -1, -1, -1 },
{ 59, 60, -1, -1 },
{ 58, 60, -1, -1 },
{ 43, 61, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 56, 67, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 50, 72, -1, -1 },
{ 75, 77, -1, -1 },
{ 74, 77, -1, -1 },
{ -1, -1, -1, -1 },
{ 41, 78, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ 29, 81, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 }
};

} // End of namespace Amazon

} // End of namespace Access
2 changes: 2 additions & 0 deletions engines/access/amazon/amazon_resources.h
View file
Expand Up @@ -64,6 +64,8 @@ extern const int CHAPTER_TABLE[14][5];

extern const int CHAPTER_JUMP[14];

extern const int COMBO_TABLE[85][4];

} // End of namespace Amazon

} // End of namespace Access
Expand Down
13 changes: 13 additions & 0 deletions engines/access/events.cpp
View file
Expand Up @@ -250,5 +250,18 @@ Common::Point EventsManager::calcRawMouse() {
return pt;
}

int EventsManager::checkMouseBox1(Common::Array<Common::Rect> &rects) {
int i = 0;
for (i = 0;; i++) {
if (rects[i].left == -1)
return -1;

if ((_mousePos.x > rects[i].left) && (_mousePos.x < rects[i].right)
&& (_mousePos.y > rects[i].top) && (_mousePos.y < rects[i].bottom))
return i;
}
}



} // End of namespace Access
2 changes: 2 additions & 0 deletions engines/access/events.h
View file
Expand Up @@ -121,6 +121,8 @@ class EventsManager {
Common::Point &getMousePos() { return _mousePos; }

Common::Point calcRawMouse();

int checkMouseBox1(Common::Array<Common::Rect> &rects);
};

} // End of namespace Access
Expand Down
100 changes: 93 additions & 7 deletions engines/access/inventory.cpp
View file
Expand Up @@ -28,6 +28,26 @@

namespace Access {

void InventoryEntry::load(const Common::String &name, const int *data) {
_value = 0;
_name = name;
_otherItem1 = *data++;
_newItem1 = *data++;
_otherItem2 = *data++;
_newItem2 = *data;
}

int InventoryEntry::checkItem(int itemId) {
if (_otherItem1 == itemId)
return _newItem1;
else if (_otherItem2 == itemId)
return _newItem2;
else
return -1;
}

/*------------------------------------------------------------------------*/

InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
_startInvItem = 0;
_startInvBox = 0;
Expand All @@ -39,9 +59,12 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
_iconDisplayFlag = true;

const char *const *names;
const int *combineP;

switch (vm->getGameID()) {
case GType_Amazon:
names = Amazon::INVENTORY_NAMES;
combineP = &Amazon::COMBO_TABLE[0][0];
_inv.resize(85);
break;
case GType_MartianMemorandum:
Expand All @@ -52,8 +75,9 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
error("Unknown game");
}

for (uint i = 0; i < _inv.size(); ++i)
_names.push_back(names[i]);
for (uint i = 0; i < _inv.size(); ++i, combineP += 4) {
_inv[i].load(names[i], combineP);
}

for (uint i = 0; i < 26; ++i) {
const int *r = INVCOORDS[i];
Expand All @@ -62,7 +86,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
}

int &InventoryManager::operator[](int idx) {
return _inv[idx];
return _inv[idx]._value;
}

int InventoryManager::useItem() {
Expand Down Expand Up @@ -255,9 +279,9 @@ void InventoryManager::getList() {
_tempLOff.clear();

for (uint i = 0; i < _inv.size(); ++i) {
if (_inv[i] == 1) {
if (_inv[i]._value == 1) {
_items.push_back(i);
_tempLOff.push_back(_names[i]);
_tempLOff.push_back(_inv[i]._name);
}
}
}
Expand Down Expand Up @@ -351,7 +375,69 @@ void InventoryManager::outlineIcon(int itemIndex) {
}

void InventoryManager::combineItems() {
warning("TODO: combineItems");
Screen &screen = *_vm->_screen;
EventsManager &events = *_vm->_events;
screen._leftSkip = screen._rightSkip = 0;
screen._topSkip = screen._bottomSkip = 0;
screen._screenYOff = 0;

Common::Point tempMouse = events._mousePos;
Common::Point lastMouse = events._mousePos;

Common::Rect &inv = _invCoords[_boxNum];
Common::Rect r(inv.left, inv.top, inv.left + 46, inv.top + 35);
Common::Point tempBox(inv.left, inv.top);
Common::Point lastBox(inv.left, inv.top);

_vm->_buffer2.copyBlock(&_vm->_buffer1, r);
SpriteResource *sprites = _vm->_objectsTable[99];
int invItem = _items[_boxNum];
events.pollEvents();

// Item drag handling loop
while (!_vm->shouldQuit() && events._leftButton) {
// Poll for events
events.pollEvents();
g_system->delayMillis(10);

// Check positioning
if (lastMouse == events._mousePos)
continue;

lastMouse = events._mousePos;
Common::Rect lastRect(lastBox.x, lastBox.y, lastBox.x + 46, lastBox.y + 35);
screen.copyBlock(&_vm->_buffer2, lastRect);

int xp = MAX(events._mousePos.x - tempMouse.x + tempBox.x, 0);
int yp = MAX(events._mousePos.y - tempMouse.y + tempBox.y, 0);
screen.plotImage(sprites, invItem, Common::Point(xp, yp));
}

int destBox = events.checkMouseBox1(_invCoords);
if (destBox >= 0 && destBox != _boxNum && destBox < _items.size()
&& _items[destBox] != -1) {
int itemA = invItem;
int itemB = _items[destBox];

// Check whether the items can be combined
int combinedItem = _inv[itemA].checkItem(itemB);
if (combinedItem != -1) {
_inv[combinedItem]._value = 1;
_inv[itemA]._value = 2;
_inv[itemB]._value = 2;
_items[_boxNum] = -1;
_items[destBox] = combinedItem;
_tempLOff[destBox] = _inv[combinedItem]._name;

// TODO: zoomIcon calls?

_boxNum = destBox;
return;
}
}

_iconDisplayFlag = true;
putInvIcon(_boxNum, invItem);
}

void InventoryManager::synchronize(Common::Serializer &s) {
Expand All @@ -362,7 +448,7 @@ void InventoryManager::synchronize(Common::Serializer &s) {
_inv.resize(count);

for (int i = 0; i < count; ++i)
s.syncAsUint16LE((*this)[i]);
s.syncAsUint16LE(_inv[i]._value);
}

} // End of namespace Access
18 changes: 16 additions & 2 deletions engines/access/inventory.h
View file
Expand Up @@ -32,6 +32,21 @@

namespace Access {

class InventoryEntry {
public:
Common::String _name;
int _value;

int _otherItem1;
int _newItem1;
int _otherItem2;
int _newItem2;

void load(const Common::String &name, const int *data);

int checkItem(int itemId);
};

class InventoryManager : public Manager {
struct SavedFields {
int _vWindowHeight;
Expand All @@ -58,7 +73,6 @@ class InventoryManager : public Manager {
ASurface _savedScreen;
SavedFields _fields;
bool _iconDisplayFlag;
Common::StringArray _names;
Common::Array<int> _tempLPtr;
Common::StringArray _tempLOff;
int _boxNum;
Expand Down Expand Up @@ -89,7 +103,7 @@ class InventoryManager : public Manager {

void combineItems();
public:
Common::Array<int> _inv;
Common::Array<InventoryEntry> _inv;
int _startInvItem;
int _startInvBox;
bool _invChangeFlag;
Expand Down
20 changes: 4 additions & 16 deletions engines/access/scripts.cpp
View file
Expand Up @@ -554,18 +554,6 @@ void Scripts::cmdTexSpeak() {
findNull();
}

int Scripts::checkMouseBox1(Common::Rect *rectArr) {
int i = 0;
for (i = 0; ; i++){
if (rectArr[i].left == -1)
return -1;

if ((_vm->_events->_mousePos.x > rectArr[i].left) && (_vm->_events->_mousePos.x < rectArr[i].right)
&& (_vm->_events->_mousePos.y > rectArr[i].top) && (_vm->_events->_mousePos.y < rectArr[i].bottom))
return i;
}
}

void Scripts::cmdTexChoice() {
static Common::Point cMouse[7] = {
Common::Point(0, 76), Common::Point(77, 154), Common::Point(155, 232),
Expand Down Expand Up @@ -595,9 +583,9 @@ void Scripts::cmdTexChoice() {
_vm->_bubbleBox->calcBubble(tmpStr);
_vm->_bubbleBox->printBubble(tmpStr);

Common::Rect responseCoords[2];
responseCoords[0] = _vm->_bubbleBox->_bounds;
responseCoords[1] = Common::Rect(0, 0, 0, 0);
Common::Array<Common::Rect> responseCoords;
responseCoords.push_back(_vm->_bubbleBox->_bounds);
responseCoords.push_back(Common::Rect(0, 0, 0, 0));
_vm->_screen->_printOrg.y = _vm->_bubbleBox->_bounds.bottom + 11;

findNull();
Expand Down Expand Up @@ -655,7 +643,7 @@ void Scripts::cmdTexChoice() {
}
} else {
_vm->_events->debounceLeft();
choice = checkMouseBox1(responseCoords);
choice = _vm->_events->checkMouseBox1(responseCoords);
}
}
} while ((choice == -1) || ((choice == 2) && choice3Fl));
Expand Down
2 changes: 0 additions & 2 deletions engines/access/scripts.h
View file
Expand Up @@ -44,8 +44,6 @@ class Scripts: public Manager {
virtual void executeSpecial(int commandIndex, int param1, int param2) = 0;
virtual void executeCommand(int commandIndex);

int checkMouseBox1(Common::Rect *rectArr);

/**
* Print a given message to the screen in a bubble box
*/
Expand Down

0 comments on commit 6ceda06

Please sign in to comment.