diff options
| author | Strangerke | 2014-11-10 01:12:39 +0100 |
|---|---|---|
| committer | Paul Gilbert | 2014-12-12 22:27:40 -0500 |
| commit | dd2bfdd47fb111259f94fbd985513d56c263305d (patch) | |
| tree | ae3e0f7725667e58d9ecc8ef162f14410f3ebcdd /engines/access | |
| parent | 304db8ee6f963a4f647488623fd30ccb70472962 (diff) | |
| download | scummvm-rg350-dd2bfdd47fb111259f94fbd985513d56c263305d.tar.gz scummvm-rg350-dd2bfdd47fb111259f94fbd985513d56c263305d.tar.bz2 scummvm-rg350-dd2bfdd47fb111259f94fbd985513d56c263305d.zip | |
ACCESS: Fix compilation warning by adding a dummy inventory combo array for Martian
Diffstat (limited to 'engines/access')
| -rw-r--r-- | engines/access/inventory.cpp | 1 | ||||
| -rw-r--r-- | engines/access/martian/martian_resources.cpp | 58 | ||||
| -rw-r--r-- | engines/access/martian/martian_resources.h | 2 |
3 files changed, 61 insertions, 0 deletions
diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp index f2c87b2604..34470ace1e 100644 --- a/engines/access/inventory.cpp +++ b/engines/access/inventory.cpp @@ -69,6 +69,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) { break; case GType_MartianMemorandum: names = Martian::INVENTORY_NAMES; + combineP = &Martian::COMBO_TABLE[0][0]; _inv.resize(54); break; default: diff --git a/engines/access/martian/martian_resources.cpp b/engines/access/martian/martian_resources.cpp index 5dfb766885..ae63f66c7c 100644 --- a/engines/access/martian/martian_resources.cpp +++ b/engines/access/martian/martian_resources.cpp @@ -659,6 +659,64 @@ const byte *CHAR_TABLE[] = { CHAR_TABLE26, CHAR_TABLE27 }; +// TODO: Fix that array +const int COMBO_TABLE[54][4] = { + { -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, -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 }, + { -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, -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 }, + { -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 } +}; + } // End of namespace Martian } // End of namespace Access diff --git a/engines/access/martian/martian_resources.h b/engines/access/martian/martian_resources.h index ab8dfb4d1a..b9584ba2dd 100644 --- a/engines/access/martian/martian_resources.h +++ b/engines/access/martian/martian_resources.h @@ -43,6 +43,8 @@ extern const int ROOM_NUMB; extern const byte *CHAR_TABLE[]; +extern const int COMBO_TABLE[54][4]; + } // End of namespace Martian } // End of namespace Access |