diff options
| author | Nicola Mettifogo | 2007-03-17 07:55:16 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-17 07:55:16 +0000 |
| commit | b515721ed84e7e6f14971d3d194769cf269a9ba2 (patch) | |
| tree | 7273d94ff674599317bd18f865d7202698d1320a /engines/parallaction/inventory.cpp | |
| parent | 1ef774b2ee7a74e2bbf12db7273771d0ea3b8a4c (diff) | |
| download | scummvm-rg350-b515721ed84e7e6f14971d3d194769cf269a9ba2.tar.gz scummvm-rg350-b515721ed84e7e6f14971d3d194769cf269a9ba2.tar.bz2 scummvm-rg350-b515721ed84e7e6f14971d3d194769cf269a9ba2.zip | |
some renaming to shorten lines
svn-id: r26159
Diffstat (limited to 'engines/parallaction/inventory.cpp')
| -rw-r--r-- | engines/parallaction/inventory.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp index d1c3ca1cc9..0308266101 100644 --- a/engines/parallaction/inventory.cpp +++ b/engines/parallaction/inventory.cpp @@ -187,8 +187,8 @@ void drawInventoryItem(uint16 pos, InventoryItem *item) { uint16 col = pos % INVENTORY_ITEMS_PER_LINE; // FIXME: this will end up in a general blit function - byte* s = _vm->_char._yourObjects._array[item->_index]; - byte* d = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._yourObjects._height * INVENTORY_WIDTH; + byte* s = _vm->_char._objs._array[item->_index]; + byte* d = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs._height * INVENTORY_WIDTH; for (uint32 i = 0; i < INVENTORYITEM_HEIGHT; i++) { memcpy(d, s, INVENTORYITEM_WIDTH); @@ -228,8 +228,8 @@ void highlightInventoryItem(int16 pos, byte color) { uint16 line = pos / INVENTORY_ITEMS_PER_LINE; uint16 col = pos % INVENTORY_ITEMS_PER_LINE; - Common::Rect r(INVENTORYITEM_WIDTH, _vm->_char._yourObjects._height); - r.moveTo(col * INVENTORYITEM_WIDTH, line * _vm->_char._yourObjects._height); + Common::Rect r(INVENTORYITEM_WIDTH, _vm->_char._objs._height); + r.moveTo(col * INVENTORYITEM_WIDTH, line * _vm->_char._objs._height); drawBorder(r, _buffer, color); @@ -247,7 +247,7 @@ void extractInventoryGraphics(int16 pos, byte *dst) { // FIXME: this will end up in a general blit function byte* d = dst; - byte* s = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._yourObjects._height * INVENTORY_WIDTH; + byte* s = _buffer + col * INVENTORYITEM_WIDTH + line * _vm->_char._objs._height * INVENTORY_WIDTH; for (uint32 i = 0; i < INVENTORYITEM_HEIGHT; i++) { memcpy(d, s, INVENTORYITEM_WIDTH); @@ -357,7 +357,7 @@ void redrawInventory() { void initInventory() { _buffer = (byte*)malloc(INVENTORY_WIDTH * INVENTORY_HEIGHT); // this buffer is also used by menu so it must stay this size - _vm->_char._yourObjects._count = 0; + _vm->_char._objs._count = 0; } void cleanInventory() { |