libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: More arrays to become statics

Browse Source
This commit is contained in:
Paul Gilbert 2022-02-13 10:26:03 -08:00
parent babff2b11f
commit 4cb351eeb4
4 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/chewy/dialogs/inventory.cpp
View File

@ -41,6 +41,9 @@ static const int16 INVENTORY_HOTSPOTS[INVENTORY_HOTSPOTS_COUNT][4] = {
{ WIN_INF_X + 242, WIN_INF_Y + 156, WIN_INF_X + 292, WIN_INF_Y + 156 + 14 } { WIN_INF_X + 242, WIN_INF_Y + 156, WIN_INF_X + 292, WIN_INF_Y + 156 + 14 }
}; };
static const int16 ANI_INVENT_END[3] = { 7, 16, 24 };
int16 Inventory::inv_rand_x; int16 Inventory::inv_rand_x;
int16 Inventory::inv_rand_y; int16 Inventory::inv_rand_y;
int Inventory::keyVal; int Inventory::keyVal;

74
engines/chewy/global.cpp
View File

@ -42,80 +42,6 @@ namespace Chewy {
const uint8 RAND_NO_USE[MAX_RAND_NO_USE] = {0, 1, 3, 4, 5, 6}; const uint8 RAND_NO_USE[MAX_RAND_NO_USE] = {0, 1, 3, 4, 5, 6};
const int16 ANI_INVENT_END[3] = { 7, 16, 24 };
const int16 SPZ_ANI_PH[][2] = {
{ 0, 12 },
{ 12, 6 },
{ 18, 6 },
{ 24, 6 },
{ 30, 6 },
{ 36, 6 },
{ 42, 6 },
{ 48, 5 },
{ 53, 3 },
{ 56, 14 },
{ 70, 7 },
{ 77, 6 },
{ 83, 5 },
{ 88, 8 },
{ 96, 5 },
{ 5, 7 },
{ 24, 12 },
{ 101, 19 },
{ 120, 8 },
{ 128, 3 },
{ 128, 8 },
{ 136, 8 },
{ 465, 8 },
{ 473, 3 },
{ 473, 8 },
{ 481, 8 },
{ 144, 6 },
{ 150, 5 },
{ 155, 9 },
{ 155, 3 },
{ 164, 3 },
{ 167, 8 },
{ 175, 7 },
{ 182, 10 },
{ 192, 15 },
{ 214, 8 },
{ 207, 3 },
{ 210, 4 },
{ 214, 8 },
{ 559, 8 },
{ 552, 3 },
{ 555, 4 },
{ 559, 8 },
{ 222, 7 },
{ 229, 4 },
{ 233, 9 },
{ 242, 4 },
{ 270, 8 },
{ 246, 8 },
{ 297, 3 },
{ 297, 8 },
{ 262, 8 },
{ 591, 8 },
{ 642, 3 },
{ 642, 8 },
{ 254, 8 },
{ 288, 3 },
{ 288, 9 },
{ 607, 8 },
{ 599, 8 },
{ 633, 3 },
{ 633, 9 },
{ 305, 18 },
{ 278, 10 },
{ 323, 2 },
{ 325, 6 },
{ 331, 2 },
{ 333, 8 },
{ 341, 4 }
};
Globals *g_globals = nullptr; Globals *g_globals = nullptr;

2
engines/chewy/global.h
View File

@ -43,8 +43,6 @@ namespace Chewy {
#define R45_MAX_PERSON 9 #define R45_MAX_PERSON 9
extern const uint8 RAND_NO_USE[MAX_RAND_NO_USE]; extern const uint8 RAND_NO_USE[MAX_RAND_NO_USE];
extern const int16 ANI_INVENT_END[3];
extern const int16 SPZ_ANI_PH[][2];
class ChewyFont; class ChewyFont;
class Cursor; class Cursor;

73
engines/chewy/sprite.cpp
View File

@ -34,6 +34,79 @@ namespace Chewy {
#define ZOBJ_HOWARD 7 #define ZOBJ_HOWARD 7
#define ZOBJ_NICHELLE 8 #define ZOBJ_NICHELLE 8
static const int16 SPZ_ANI_PH[][2] = {
{ 0, 12 },
{ 12, 6 },
{ 18, 6 },
{ 24, 6 },
{ 30, 6 },
{ 36, 6 },
{ 42, 6 },
{ 48, 5 },
{ 53, 3 },
{ 56, 14 },
{ 70, 7 },
{ 77, 6 },
{ 83, 5 },
{ 88, 8 },
{ 96, 5 },
{ 5, 7 },
{ 24, 12 },
{ 101, 19 },
{ 120, 8 },
{ 128, 3 },
{ 128, 8 },
{ 136, 8 },
{ 465, 8 },
{ 473, 3 },
{ 473, 8 },
{ 481, 8 },
{ 144, 6 },
{ 150, 5 },
{ 155, 9 },
{ 155, 3 },
{ 164, 3 },
{ 167, 8 },
{ 175, 7 },
{ 182, 10 },
{ 192, 15 },
{ 214, 8 },
{ 207, 3 },
{ 210, 4 },
{ 214, 8 },
{ 559, 8 },
{ 552, 3 },
{ 555, 4 },
{ 559, 8 },
{ 222, 7 },
{ 229, 4 },
{ 233, 9 },
{ 242, 4 },
{ 270, 8 },
{ 246, 8 },
{ 297, 3 },
{ 297, 8 },
{ 262, 8 },
{ 591, 8 },
{ 642, 3 },
{ 642, 8 },
{ 254, 8 },
{ 288, 3 },
{ 288, 9 },
{ 607, 8 },
{ 599, 8 },
{ 633, 3 },
{ 633, 9 },
{ 305, 18 },
{ 278, 10 },
{ 323, 2 },
{ 325, 6 },
{ 331, 2 },
{ 333, 8 },
{ 341, 4 }
};
void sprite_engine() { void sprite_engine() {
int16 zmin; int16 zmin;
int16 min_zeiger = 0; int16 min_zeiger = 0;