diff --git a/engines/chewy/dialogs/inventory.cpp b/engines/chewy/dialogs/inventory.cpp index d529ec6c20a..1d437192e90 100644 --- a/engines/chewy/dialogs/inventory.cpp +++ b/engines/chewy/dialogs/inventory.cpp @@ -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 } }; +static const int16 ANI_INVENT_END[3] = { 7, 16, 24 }; + + int16 Inventory::inv_rand_x; int16 Inventory::inv_rand_y; int Inventory::keyVal; diff --git a/engines/chewy/global.cpp b/engines/chewy/global.cpp index 45ee1254da5..ae2c3cf640b 100644 --- a/engines/chewy/global.cpp +++ b/engines/chewy/global.cpp @@ -42,80 +42,6 @@ namespace Chewy { 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; diff --git a/engines/chewy/global.h b/engines/chewy/global.h index 23a86955e1a..879cf4aba46 100644 --- a/engines/chewy/global.h +++ b/engines/chewy/global.h @@ -43,8 +43,6 @@ namespace Chewy { #define R45_MAX_PERSON 9 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 Cursor; diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp index 3b03fb45b11..4becc78a740 100644 --- a/engines/chewy/sprite.cpp +++ b/engines/chewy/sprite.cpp @@ -34,6 +34,79 @@ namespace Chewy { #define ZOBJ_HOWARD 7 #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() { int16 zmin; int16 min_zeiger = 0;