diff options
| author | Strangerke | 2013-01-27 14:58:47 +0100 |
|---|---|---|
| committer | Strangerke | 2013-01-27 14:58:47 +0100 |
| commit | 8de1b1b9963604b9d7b4e9aff6a64df6a14062be (patch) | |
| tree | f56784d6eb9aa31f4afc4152f66b005760f419da /engines/hopkins/globals.cpp | |
| parent | 68f5da137569bb954321bf28b1f2b48f7a870534 (diff) | |
| download | scummvm-rg350-8de1b1b9963604b9d7b4e9aff6a64df6a14062be.tar.gz scummvm-rg350-8de1b1b9963604b9d7b4e9aff6a64df6a14062be.tar.bz2 scummvm-rg350-8de1b1b9963604b9d7b4e9aff6a64df6a14062be.zip | |
HOPKINS: Move some more variables from Globals to LinesManager
Diffstat (limited to 'engines/hopkins/globals.cpp')
| -rw-r--r-- | engines/hopkins/globals.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index 37ff08a7e5..f3988f2bdf 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -99,8 +99,6 @@ Globals::Globals() { } for (int i = 0; i < 500; ++i) _spriteSize[i] = 0; - for (int i = 0; i < 32002; ++i) - super_parcours[i] = 0; for (int i = 0; i < 70; ++i) Common::fill((byte *)&Hopkins[i], (byte *)&Hopkins[i] + sizeof(HopkinsItem), 0); @@ -176,9 +174,6 @@ Globals::Globals() { SPRITE_ECRAN = NULL; _saveData = NULL; BUFFERTAPE = NULL; - essai0 = NULL; - essai1 = NULL; - essai2 = NULL; inventaire2 = NULL; GESTE = NULL; _inventoryObject = NULL; @@ -311,9 +306,9 @@ void Globals::clearAll() { ZONEP[idx]._spriteIndex = 0; } - essai0 = (int16 *)g_PTRNUL; - essai1 = (int16 *)g_PTRNUL; - essai2 = (int16 *)g_PTRNUL; + _vm->_linesManager.essai0 = (int16 *)g_PTRNUL; + _vm->_linesManager.essai1 = (int16 *)g_PTRNUL; + _vm->_linesManager.essai2 = (int16 *)g_PTRNUL; BufLig = (int16 *)g_PTRNUL; _route = (int16 *)g_PTRNUL; @@ -339,9 +334,9 @@ void Globals::clearAll() { _saveData = (Sauvegarde *)malloc(sizeof(Sauvegarde)); memset(_saveData, 0, sizeof(Sauvegarde)); - essai0 = (int16 *)BUFFERTAPE; - essai1 = (int16 *)(BUFFERTAPE + 25000); - essai2 = (int16 *)(BUFFERTAPE + 50000); + _vm->_linesManager.essai0 = (int16 *)BUFFERTAPE; + _vm->_linesManager.essai1 = (int16 *)(BUFFERTAPE + 25000); + _vm->_linesManager.essai2 = (int16 *)(BUFFERTAPE + 50000); BufLig = (int16 *)(BUFFERTAPE + 75000); _boxWidth = 240; |