[Scummvm-cvs-logs] scummvm master -> 0d77dbc1e102bc2a035148114f475fb00c1e02e2
Strangerke
Strangerke at scummvm.org
Wed May 25 06:59:01 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0d77dbc1e1 GNAP: Initialize some more variables
Commit: 0d77dbc1e102bc2a035148114f475fb00c1e02e2
https://github.com/scummvm/scummvm/commit/0d77dbc1e102bc2a035148114f475fb00c1e02e2
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-05-25T06:49:26+02:00
Commit Message:
GNAP: Initialize some more variables
Changed paths:
engines/gnap/gnap.cpp
engines/gnap/scenes/group1.cpp
engines/gnap/scenes/group2.cpp
diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index 7523cd4..0df38df 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -108,6 +108,36 @@ GnapEngine::GnapEngine(OSystem *syst, const ADGameDescription *gd) :
_mousePos = Common::Point(0, 0);
_currGrabCursorX = _currGrabCursorY = 0;
+
+ _idleTimerIndex = -1;
+ _menuStatus = 0;
+ _menuSpritesIndex = -1;
+ _menuDone = false;
+ _menuBackgroundSurface = nullptr;
+ _menuQuitQuerySprite = nullptr;
+ _largeSprite = nullptr;
+ _menuSaveLoadSprite = nullptr;
+ _menuSprite2 = nullptr;
+ _menuSprite1 = nullptr;
+ _spriteHandle = nullptr;
+ _cursorSprite = nullptr;
+ _savegameIndex = -1;
+ _gridMinX = 0;
+ _gridMinY = 0;
+ _gridMaxX = 0;
+ _gridMaxY = 0;
+ _toyUfoNextSequenceId = -1;
+ _toyUfoSequenceId = -1;
+ _toyUfoId = -1;
+ _toyUfoActionStatus = -1;
+ _toyUfoX = 0;
+ _toyUfoY = 0;
+ _s18GarbageCanPos = 0;
+
+ for (int i = 0; i < 7; i++)
+ _savegameSprites[i] = nullptr;
+ for (int i = 0; i < 30; i++)
+ _menuInventorySprites[30] = nullptr ;
}
GnapEngine::~GnapEngine() {
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 7ae6062..bd152c7 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -2315,6 +2315,8 @@ Scene17::Scene17(GnapEngine *vm) : Scene(vm) {
_platPhoneCtr = 0;
_nextPhoneSequenceId = -1;
_currPhoneSequenceId = -1;
+ _currWrenchSequenceId = -1;
+ _currCarWindowSequenceId = -1;
}
int Scene17::init() {
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 020b3d1..522a3f4 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -31,6 +31,10 @@ Scene20::Scene20(GnapEngine *vm) : Scene(vm) {
_stonerGuyCtr = 3;
_stonerGuyShowingJoint = false;
_groceryStoreGuyCtr = 0;
+ _currStonerGuySequenceId = -1;
+ _nextStonerGuySequenceId = -1;
+ _currGroceryStoreGuySequenceId = -1;
+ _nextGroceryStoreGuySequenceId = -1;
}
int Scene20::init() {
@@ -1016,6 +1020,7 @@ void Scene21::updateAnimations() {
Scene22::Scene22(GnapEngine *vm) : Scene(vm) {
_caughtBefore = false;
_cashierCtr = 3;
+ _nextCashierSequenceId = -1;
}
int Scene22::init() {
More information about the Scummvm-git-logs
mailing list