[Scummvm-cvs-logs] scummvm master -> 08db6ea515df120c5a4bfb08027120e3cc79f4c1
Strangerke
Strangerke at scummvm.org
Wed Mar 27 08:11:53 CET 2013
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:
08db6ea515 HOPKINS: Rename a fading variable
Commit: 08db6ea515df120c5a4bfb08027120e3cc79f4c1
https://github.com/scummvm/scummvm/commit/08db6ea515df120c5a4bfb08027120e3cc79f4c1
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-27T00:10:40-07:00
Commit Message:
HOPKINS: Rename a fading variable
Changed paths:
engines/hopkins/anim.cpp
engines/hopkins/graphics.cpp
engines/hopkins/graphics.h
engines/hopkins/hopkins.cpp
engines/hopkins/objects.cpp
engines/hopkins/script.cpp
diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 7debc1f..7e843a0 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -188,7 +188,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
_vm->_soundManager->checkSoundEnd();
}
- if (_vm->_graphicsManager->FADE_LINUX == 2 && !hasScreenCopy) {
+ if (_vm->_graphicsManager->_fadingFl && !hasScreenCopy) {
screenCopy = _vm->_globals->allocMemory(307200);
f.seek(6);
@@ -217,12 +217,12 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
screenCopy = _vm->_globals->freeMemory(screenCopy);
}
if (hasScreenCopy) {
- if (_vm->_graphicsManager->FADE_LINUX == 2)
+ if (_vm->_graphicsManager->_fadingFl)
_vm->_graphicsManager->fadeOutDefaultLength(screenCopy);
screenCopy = _vm->_globals->freeMemory(screenCopy);
}
- _vm->_graphicsManager->FADE_LINUX = 0;
+ _vm->_graphicsManager->_fadingFl = false;
f.close();
_vm->_graphicsManager->_skipVideoLockFl = false;
@@ -356,7 +356,7 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
_vm->_graphicsManager->_skipVideoLockFl = false;
f.close();
- if (_vm->_graphicsManager->FADE_LINUX == 2 && !hasScreenCopy) {
+ if (_vm->_graphicsManager->_fadingFl && !hasScreenCopy) {
f.seek(6);
f.read(_vm->_graphicsManager->_palette, 800);
f.skip(4);
@@ -383,11 +383,11 @@ void AnimationManager::playAnim2(const Common::String &filename, uint32 rate1, u
ptra = _vm->_globals->freeMemory(ptra);
}
if (hasScreenCopy) {
- if (_vm->_graphicsManager->FADE_LINUX == 2)
+ if (_vm->_graphicsManager->_fadingFl)
_vm->_graphicsManager->fadeOutDefaultLength(screenCopy);
_vm->_globals->freeMemory(screenCopy);
}
- _vm->_graphicsManager->FADE_LINUX = 0;
+ _vm->_graphicsManager->_fadingFl = false;
_vm->_saveLoadManager->load("TEMP.SCR", _vm->_graphicsManager->_vesaScreen);
g_system->getSavefileManager()->removeSavefile("TEMP.SCR");
@@ -874,7 +874,7 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
_vm->_eventsManager->_rateCounter = 0;
- if (_vm->_graphicsManager->FADE_LINUX == 2 && !multiScreenFl) {
+ if (_vm->_graphicsManager->_fadingFl && !multiScreenFl) {
byte *ptra = _vm->_globals->allocMemory(307200);
f.seek(6);
@@ -902,11 +902,11 @@ void AnimationManager::playSequence2(const Common::String &file, uint32 rate1, u
ptra = _vm->_globals->freeMemory(ptra);
}
if (multiScreenFl) {
- if (_vm->_graphicsManager->FADE_LINUX == 2)
+ if (_vm->_graphicsManager->_fadingFl)
_vm->_graphicsManager->fadeOutDefaultLength(screenCopy);
_vm->_globals->freeMemory(screenCopy);
}
- _vm->_graphicsManager->FADE_LINUX = 0;
+ _vm->_graphicsManager->_fadingFl = false;
f.close();
_vm->_eventsManager->_mouseFl = true;
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 2098eee..f4ffa56 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -58,7 +58,7 @@ GraphicsManager::GraphicsManager(HopkinsEngine *vm) {
_enlargedX = _enlargedY = 0;
_enlargedXFl = _enlargedYFl = false;
_fadeDefaultSpeed = 15;
- FADE_LINUX = 0;
+ _fadingFl = false;
_skipVideoLockFl = false;
_scrollStatus = 0;
_minX = 0;
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index 1d02ce7..6f8e773 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -100,6 +100,7 @@ public:
int _minX, _minY;
int _maxX, _maxY;
bool _noFadingFl;
+ bool _fadingFl;
int _scrollStatus;
bool _skipVideoLockFl;
int _fadeDefaultSpeed;
@@ -115,7 +116,6 @@ public:
int WinScan;
byte *PAL_PIXELS;
- int FADE_LINUX;
public:
GraphicsManager(HopkinsEngine *vm);
~GraphicsManager();
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 95d16aa..72c59a7 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -526,7 +526,7 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager->clearScreen();
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
if (!_globals->_censorshipFl)
_animationManager->playAnim("BANQUE.ANM", 200, 28, 200);
@@ -712,7 +712,7 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager->clearScreen();
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR1A.anm", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -726,7 +726,7 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager->clearScreen();
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR3A.anm", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -740,7 +740,7 @@ bool HopkinsEngine::runLinuxDemo() {
_graphicsManager->clearScreen();
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR4A.anm", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -799,7 +799,7 @@ bool HopkinsEngine::runFull() {
_globals->_speed = 2;
_globals->iRegul = 1;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("MP.ANM", 10, 16, 200);
} else {
_animationManager->playAnim("MP.ANM", 10, 16, 200);
@@ -873,7 +873,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager->clearPalette();
if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows) {
if (getPlatform() == Common::kPlatformLinux)
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
if (!_globals->_censorshipFl)
_animationManager->playAnim("BANQUE.ANM", 200, 28, 200);
@@ -1009,7 +1009,7 @@ bool HopkinsEngine::runFull() {
_soundManager->stopSound();
if (getPlatform() == Common::kPlatformLinux) {
_soundManager->playSound(29);
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("PURG1A.ANM", 12, 18, 50);
} else if (getPlatform() == Common::kPlatformWindows) {
_soundManager->playSound(29);
@@ -1055,7 +1055,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager->clearPalette();
_soundManager->playSound(6);
if (getPlatform() == Common::kPlatformLinux)
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("PURG2A.ANM", 12, 18, 50);
if (getPlatform() != Common::kPlatformLinux)
_graphicsManager->fadeOutShort();
@@ -1499,7 +1499,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
if (getPlatform() == Common::kPlatformLinux)
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR1A.ANM", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -1513,7 +1513,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
if (getPlatform() == Common::kPlatformLinux)
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR3A.ANM", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -1527,7 +1527,7 @@ bool HopkinsEngine::runFull() {
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
if (getPlatform() == Common::kPlatformLinux)
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR4A.ANM", 12, 12, 2000);
_globals->iRegul = 0;
_globals->_exitId = 300;
@@ -1719,7 +1719,7 @@ void HopkinsEngine::playIntro() {
return;
_soundManager->_specialSoundNum = 5;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("ELEC.ANM", 10, 26, 200);
_soundManager->_specialSoundNum = 0;
@@ -1820,7 +1820,7 @@ void HopkinsEngine::playIntro() {
if (shouldQuit() || _eventsManager->_escKeyFl)
return;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->unsetClearAnimFlag();
_animationManager->playAnim("J4.anm", 12, 12, 1000);
break;
@@ -1882,7 +1882,7 @@ void HopkinsEngine::bombExplosion() {
_globals->iRegul = 1;
_soundManager->_specialSoundNum = 199;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("BOMBE2A.ANM", 50, 14, 500);
_soundManager->_specialSoundNum = 0;
_graphicsManager->loadImage("IM15");
@@ -2015,7 +2015,7 @@ void HopkinsEngine::playSubmarineCutscene() {
if (!_eventsManager->_escKeyFl)
_animationManager->playAnim("OC20a.anm", 10, 18, 18);
if (!_eventsManager->_escKeyFl) {
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("OC30a.anm", 10, 18, 18);
}
@@ -2032,7 +2032,7 @@ void HopkinsEngine::playUnderwaterBaseCutscene() {
_soundManager->playSound(26);
_globals->iRegul = 1;
_globals->_disableInventFl = true;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playSequence("abase.seq", 50, 15, 50, false, false, true);
_graphicsManager->loadImage("IM92");
_animationManager->loadAnim("ANIM92");
@@ -2139,7 +2139,7 @@ void HopkinsEngine::playEnding() {
if (_globals->_saveData->_data[svGameWonFl] == 1) {
_soundManager->_specialSoundNum = 200;
_soundManager->_skipRefreshFl = true;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("BERM.ANM", 100, 24, 300);
_graphicsManager->endDisplayBob();
_soundManager->removeSample(1);
@@ -2156,7 +2156,7 @@ void HopkinsEngine::playEnding() {
_graphicsManager->fadeOutLong();
_globals->iRegul = 1;
_soundManager->_specialSoundNum = 0;
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("JOUR2A.anm", 12, 12, 1000);
_soundManager->playSound(11);
_graphicsManager->lockScreen();
@@ -2247,7 +2247,7 @@ void HopkinsEngine::playPlaneCutscene() {
if (!_eventsManager->_escKeyFl)
_animationManager->playAnim("trans40a.anm", 10, 18, 18);
if (!_eventsManager->_escKeyFl) {
- _graphicsManager->FADE_LINUX = 2;
+ _graphicsManager->_fadingFl = true;
_animationManager->playAnim("PARA00a.anm", 9, 9, 9);
}
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index c4bb7b5..6cb2ca1 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -3713,7 +3713,7 @@ void ObjectsManager::handleForest(int screenId, int minX, int maxX, int minY, in
_vm->_globals->_saveData->_data[savegameIdx] = 3;
}
if (_vm->_globals->_saveData->_data[savegameIdx] == 3) {
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playAnim("CREVE2.ANM", 100, 24, 500);
_vm->_globals->_exitId = 150;
_vm->_graphicsManager->_noFadingFl = true;
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index d79ec52..61f6ea5 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -555,7 +555,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager->fadeOutLong();
} else {
_vm->_soundManager->playSoundFile("SOUND17.WAV");
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playSequence2("HELICO.SEQ", 10, 4, 10);
}
@@ -584,7 +584,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
// If uncensored, rip the throat of the hostage
if (!_vm->_globals->_censorshipFl) {
_vm->_soundManager->_specialSoundNum = 16;
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playAnim("EGORGE.ANM", 50, 28, 500);
_vm->_soundManager->_specialSoundNum = 0;
}
@@ -610,7 +610,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager->playSoundFile("SOUND17.WAV");
_vm->_soundManager->_specialSoundNum = 14;
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playSequence2("ASSOM.SEQ", 10, 4, 500);
_vm->_soundManager->_specialSoundNum = 0;
@@ -713,7 +713,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
break;
case 37:
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playSequence2("corde.SEQ", 32, 32, 100);
_vm->_graphicsManager->_noFadingFl = true;
break;
@@ -725,7 +725,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_soundManager->_specialSoundNum = 17;
_vm->_animationManager->playSequence("grenade.SEQ", 1, 32, 100, false, false);
_vm->_soundManager->_specialSoundNum = 0;
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playAnim("CREVE17.ANM", 24, 24, 200);
_vm->_soundManager->removeSample(1);
_vm->_soundManager->removeSample(2);
@@ -2336,7 +2336,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 600:
if (!_vm->getIsDemo()) {
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_graphicsManager->_fadeDefaultSpeed = 1;
_vm->_animationManager->playAnim("BOMBE1A.ANM", 100, 18, 100);
}
@@ -2363,7 +2363,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_graphicsManager->fastDisplay(_vm->_globals->_levelSpriteBuf, 513, 163, 7, false);
_vm->_objectsManager->OPTI_ONE(3, 0, 16, 4);
_vm->_soundManager->_specialSoundNum = 199;
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playAnim("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager->_specialSoundNum = 0;
memset(_vm->_graphicsManager->_vesaBuffer, 0, 614400);
@@ -2387,7 +2387,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_objectsManager->OPTI_ONE(5, 0, 16, 4);
_vm->_graphicsManager->fadeOutShort();
_vm->_soundManager->_specialSoundNum = 199;
- _vm->_graphicsManager->FADE_LINUX = 2;
+ _vm->_graphicsManager->_fadingFl = true;
_vm->_animationManager->playAnim("BOMBE2A.ANM", 50, 14, 500);
_vm->_soundManager->_specialSoundNum = 0;
_vm->_graphicsManager->_noFadingFl = true;
More information about the Scummvm-git-logs
mailing list