libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-27 19:30:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AVALANCHE: Rename _seeScroll to _runAnimations and swap it's meaning.

Browse Source
This commit is contained in:
uruk 2014-04-12 19:19:10 +02:00
parent 2e7ef9d789
commit c04c59a03d
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/avalanche/animation.cpp
View File

@ -1205,8 +1205,9 @@ void Animation::drawSprites() {
* @remarks Originally called 'trippancy_link'
*/
void Animation::animLink() {
if (_vm->_dropdown->isActive() || _vm->_seeScroll)
if (_vm->_dropdown->isActive() || !_vm->_animationsEnabled)
return;
for (int16 i = 0; i < kSpriteNumbMax; i++) {
AnimationType *curSpr = _sprites[i];
if (curSpr->_quick && curSpr->_visible)

8
engines/avalanche/avalanche.cpp
View File

@ -142,7 +142,7 @@ void AvalancheEngine::initVariables() {
_letMeOut = false;
_thinks = 2;
_thinkThing = true;
_seeScroll = false;
_animationsEnabled = true;
_currentMouse = 177;
_holdLeftMouse = false;
@ -337,7 +337,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
}
bool AvalancheEngine::canSaveGameStateCurrently() { // TODO: Refine these!!!
return (!_seeScroll && _alive);
return (_animationsEnabled && _alive);
}
Common::Error AvalancheEngine::saveGameState(int slot, const Common::String &desc) {
@ -382,7 +382,7 @@ Common::String AvalancheEngine::getSaveFileName(const int slot) {
}
bool AvalancheEngine::canLoadGameStateCurrently() { // TODO: Refine these!!!
return (!_seeScroll);
return (_animationsEnabled);
}
Common::Error AvalancheEngine::loadGameState(int slot) {
@ -432,7 +432,7 @@ bool AvalancheEngine::loadGame(const int16 slot) {
_isLoaded = true;
_seeScroll = true; // This prevents display of the new sprites before the new picture is loaded.
_animationsEnabled = false;
if (_holdTheDawn) {
_holdTheDawn = false;

2
engines/avalanche/avalanche.h
View File

@ -210,7 +210,7 @@ public:
bool _letMeOut;
byte _thinks;
bool _thinkThing;
bool _seeScroll; // TODO: maybe this means we're interacting with the toolbar / a scroll?
bool _animationsEnabled; // If set to TRUE, it stops the animation system working. This prevents display of the new sprites before the new picture is loaded or during the display of a scroll. Original name: seescroll.
char _objectList[10];
// Called .free() for them in ~Gyro().

10
engines/avalanche/avalot.cpp
View File

@ -464,7 +464,7 @@ void AvalancheEngine::findPeople(byte room) {
void AvalancheEngine::exitRoom(byte x) {
_sound->stopSound();
_background->release();
_seeScroll = true; // This stops the trippancy system working over the length of this procedure.
_animationsEnabled = false;
switch (x) {
case kRoomSpludwicks:
@ -487,7 +487,7 @@ void AvalancheEngine::exitRoom(byte x) {
}
_interrogation = 0; // Leaving the room cancels all the questions automatically.
_seeScroll = false; // Now it can work again!
_animationsEnabled = true;
_lastRoom = _room;
if (_room != kRoomMap)
@ -538,7 +538,7 @@ void AvalancheEngine::putGeidaAt(byte whichPed, byte ped) {
}
void AvalancheEngine::enterRoom(Room roomId, byte ped) {
_seeScroll = true; // This stops the trippancy system working over the length of this procedure.
_animationsEnabled = false;
findPeople(roomId);
_room = roomId;
@ -922,7 +922,7 @@ void AvalancheEngine::enterRoom(Room roomId, byte ped) {
break;
}
_seeScroll = false; // Now it can work again!
_animationsEnabled = true;
}
void AvalancheEngine::thinkAbout(byte object, bool type) {
@ -1442,7 +1442,7 @@ void AvalancheEngine::newGame() {
_thinkThing = true;
_thinks = 2;
refreshObjectList();
_seeScroll = false;
_animationsEnabled = true;
avvy->appear(300, 117, kDirRight); // Needed to initialize Avalot.
//for (gd = 0; gd <= 30; gd++) for (gm = 0; gm <= 1; gm++) also[gd][gm] = nil;

10
engines/avalanche/dialogs.cpp
View File

@ -157,7 +157,7 @@ void Dialogs::scrollModeNormal() {
Common::String e = "(c) 1994";
setReadyLight(3);
_vm->_seeScroll = true;
_vm->_animationsEnabled = false;
_vm->_graphics->loadMouse(kCurFletch);
_vm->_graphics->saveScreen();
@ -216,7 +216,7 @@ void Dialogs::scrollModeNormal() {
#endif
setReadyLight(0);
_vm->_seeScroll = false;
_vm->_animationsEnabled = true;
_vm->_holdLeftMouse = false; // Used in Lucerna::checkclick().
warning("STUB: Scrolls::scrollModeNormal()");
@ -290,7 +290,7 @@ bool Dialogs::theyMatch(TuneType &played) {
*/
void Dialogs::scrollModeMusic() {
setReadyLight(3);
_vm->_seeScroll = true;
_vm->_animationsEnabled = false;
CursorMan.showMouse(false);
_vm->_graphics->loadMouse(kCurFletch);
@ -299,7 +299,7 @@ void Dialogs::scrollModeMusic() {
played[i] = kPitchInvalid;
int8 lastOne = -1, thisOne = -1; // Invalid values.
_vm->_seeScroll = true;
_vm->_animationsEnabled = false;
_vm->_graphics->saveScreen();
_vm->_graphics->showScroll();
@ -393,7 +393,7 @@ void Dialogs::scrollModeMusic() {
_vm->_graphics->restoreScreen();
_vm->_graphics->removeBackup();
_vm->_seeScroll = false;
_vm->_animationsEnabled = true;
CursorMan.showMouse(true);
}