diff options
| author | Gregory Montoir | 2003-11-17 09:19:36 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2003-11-17 09:19:36 +0000 |
| commit | f0f0b0143b2e2d5fc4ac24681534d153a33ab132 (patch) | |
| tree | 003acb0b6c1d42bce9fa8d182c8443b15a07fdfc /queen | |
| parent | a15a065cba1fcb421efa9983a076e6e2c6df6655 (diff) | |
| download | scummvm-rg350-f0f0b0143b2e2d5fc4ac24681534d153a33ab132.tar.gz scummvm-rg350-f0f0b0143b2e2d5fc4ac24681534d153a33ab132.tar.bz2 scummvm-rg350-f0f0b0143b2e2d5fc4ac24681534d153a33ab132.zip | |
fix 'chasing car disappearing for a frame' issue
svn-id: r11320
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/defs.h | 9 | ||||
| -rw-r--r-- | queen/graphics.cpp | 11 | ||||
| -rw-r--r-- | queen/graphics.h | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/queen/defs.h b/queen/defs.h index 6b35f12390..e47ae61aa4 100644 --- a/queen/defs.h +++ b/queen/defs.h @@ -240,10 +240,11 @@ enum { //! GameState vars enum { - VAR_DRESSING_MODE = 19, // 0=normal clothes, 1=underwear, 2=dress - VAR_ROOM73_CUTAWAY = 93, - VAR_INTRO_PLAYED = 117, - VAR_CAN_CHANGE_CLOTES = 202 + VAR_DRESSING_MODE = 19, // 0=normal clothes, 1=underwear, 2=dress + VAR_ROOM73_CUTAWAY = 93, + VAR_INTRO_PLAYED = 117, + VAR_CAN_CHANGE_CLOTHES = 202, + VAR_AZURA_IN_LOVE = 167 }; diff --git a/queen/graphics.cpp b/queen/graphics.cpp index 19b57aacde..630f0710c0 100644 --- a/queen/graphics.cpp +++ b/queen/graphics.cpp @@ -767,9 +767,13 @@ void Graphics::loadPanel() { void Graphics::initCarBamScene() { + debug(0, "Graphics::initCarBamScene()"); bobClear(5); + _bobs[5].active = true; bobClear(6); + _bobs[6].active = true; bobClear(7); + _bobs[7].active = true; _bam.enable = true; _bam.index = 0; } @@ -778,7 +782,7 @@ void Graphics::initCarBamScene() { void Graphics::updateCarBamScene() { if (_bam.enable) { - const CarBamData *cb = &CARBAM_DATA[_bam.index]; + const CarBamData *cb = &_carBamData[_bam.index]; BobSlot *pbob; // Truck @@ -803,7 +807,8 @@ void Graphics::updateCarBamScene() { else { ++_bam.index; } - // XXX if(bamsfx==2) // Play BKG SFX if(SFXTOGGLE) sfxplay(NULLstr); + // Play BKG SFX + // XXX if(bamsfx==2 && SFXTOGGLE) sfxplay(NULLstr); } } @@ -951,7 +956,7 @@ int Graphics::textCenterX(const char *text) const { -const CarBamData Graphics::CARBAM_DATA[] = { +const CarBamData Graphics::_carBamData[] = { { { 310, 105, 1 }, { 314, 106, 17 }, { 366, 101, 1 }, 0 }, { { 303, 105, 1 }, { 307, 106, 17 }, { 214, 0, 10 }, 0 }, { { 297, 104, 1 }, { 301, 105, 17 }, { 214, 0, 10 }, 0 }, diff --git a/queen/graphics.h b/queen/graphics.h index 3d18228160..b0e33199ec 100644 --- a/queen/graphics.h +++ b/queen/graphics.h @@ -235,7 +235,7 @@ private: Input *_input; Resource *_resource; - static const CarBamData CARBAM_DATA[]; + static const CarBamData _carBamData[]; }; |