[Scummvm-cvs-logs] scummvm master -> f782ca1c10b3e74fecedf0e6b3178529cad88ed0
Strangerke
Strangerke at scummvm.org
Sun Mar 24 12:32:54 CET 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
91255b56ae HOPKINS: set _clearAnimation private, add functions to access it
b91c952729 HOPKINS: reorder one statement for consistency
f782ca1c10 HOPKINS: Move inventory dialog display to DialogsManager, set _inventWin1 as private
Commit: 91255b56aed3c216185c82127ef084671caee726
https://github.com/scummvm/scummvm/commit/91255b56aed3c216185c82127ef084671caee726
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T02:56:58-07:00
Commit Message:
HOPKINS: set _clearAnimation private, add functions to access it
Changed paths:
engines/hopkins/anim.h
engines/hopkins/hopkins.cpp
engines/hopkins/objects.cpp
diff --git a/engines/hopkins/anim.h b/engines/hopkins/anim.h
index 93c8339..39727fe 100644
--- a/engines/hopkins/anim.h
+++ b/engines/hopkins/anim.h
@@ -34,14 +34,14 @@ class HopkinsEngine;
class AnimationManager {
private:
+ bool _clearAnimationFl;
+
HopkinsEngine *_vm;
int loadSpriteBank(int idx, const Common::String &filename);
void searchAnim(const byte *data, int animIndex, int count);
public:
- bool _clearAnimationFl;
-
AnimationManager(HopkinsEngine *vm);
void loadAnim(const Common::String &animName);
@@ -50,6 +50,9 @@ public:
void playAnim2(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3);
void playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipEscFl, bool skipSeqFl, bool noColFl = false);
void playSequence2(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipSeqFl = false);
+
+ void setClearAnimFlag() { _clearAnimationFl = true; }
+ void unsetClearAnimFlag() { _clearAnimationFl = false; }
};
} // End of namespace Hopkins
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 0b57405..ecf9529 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -1622,7 +1622,7 @@ void HopkinsEngine::playIntro() {
_globals->iRegul = 1;
_eventsManager->refreshScreenAndEvents();
_soundManager->playSound(16);
- _animationManager->_clearAnimationFl = true;
+ _animationManager->setClearAnimFlag();
_animationManager->playAnim("J1.anm", 12, 12, 50);
if (shouldQuit() || _eventsManager->_escKeyFl)
return;
@@ -1804,7 +1804,7 @@ void HopkinsEngine::playIntro() {
_graphicsManager->fadeOutLong();
_graphicsManager->endDisplayBob();
- _animationManager->_clearAnimationFl = true;
+ _animationManager->setClearAnimFlag();
_soundManager->playSound(3);
_soundManager->_specialSoundNum = 1;
_animationManager->playAnim("INTRO1.anm", 10, 24, 18);
@@ -1820,8 +1820,8 @@ void HopkinsEngine::playIntro() {
if (shouldQuit() || _eventsManager->_escKeyFl)
return;
- _animationManager->_clearAnimationFl = false;
_graphicsManager->FADE_LINUX = 2;
+ _animationManager->unsetClearAnimFlag();
_animationManager->playAnim("J4.anm", 12, 12, 1000);
break;
}
@@ -1990,8 +1990,8 @@ void HopkinsEngine::playSubmarineCutscene() {
_graphicsManager->clearScreen();
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _animationManager->_clearAnimationFl = true;
_soundManager->playSound(25);
+ _animationManager->setClearAnimFlag();
_animationManager->playAnim("base00a.anm", 10, 18, 18);
if (!_eventsManager->_escKeyFl)
_animationManager->playAnim("base05a.anm", 10, 18, 18);
@@ -2020,7 +2020,7 @@ void HopkinsEngine::playSubmarineCutscene() {
}
_eventsManager->_escKeyFl = false;
- _animationManager->_clearAnimationFl = false;
+ _animationManager->unsetClearAnimFlag();
_globals->_exitId = 85;
}
@@ -2216,7 +2216,7 @@ void HopkinsEngine::playPlaneCutscene() {
_graphicsManager->unlockScreen();
_graphicsManager->clearPalette();
- _animationManager->_clearAnimationFl = false;
+ _animationManager->unsetClearAnimFlag();
_animationManager->playAnim("aerop00a.anm", 10, 18, 18);
if (!_eventsManager->_escKeyFl)
_animationManager->playAnim("serop10a.anm", 10, 18, 18);
@@ -2250,7 +2250,7 @@ void HopkinsEngine::playPlaneCutscene() {
}
_eventsManager->_escKeyFl = false;
- _animationManager->_clearAnimationFl = false;
+ _animationManager->unsetClearAnimFlag();
}
void HopkinsEngine::loadBaseMap() {
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 44d1bc5..df4a6b0 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -2587,7 +2587,7 @@ void ObjectsManager::handleSpecialGames() {
_vm->_graphicsManager->NB_SCREEN(true);
_vm->_soundManager->_specialSoundNum = 198;
PERSO_ON = true;
- _vm->_animationManager->_clearAnimationFl = false;
+ _vm->_animationManager->unsetClearAnimFlag();
_vm->_animationManager->playAnim("otage.ANM", 1, 24, 500, true);
_vm->_soundManager->_specialSoundNum = 0;
_vm->_graphicsManager->NB_SCREEN(false);
Commit: b91c9527296208bbeff695744d27a94cdebbfd08
https://github.com/scummvm/scummvm/commit/b91c9527296208bbeff695744d27a94cdebbfd08
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T03:00:22-07:00
Commit Message:
HOPKINS: reorder one statement for consistency
Changed paths:
engines/hopkins/anim.h
engines/hopkins/hopkins.cpp
diff --git a/engines/hopkins/anim.h b/engines/hopkins/anim.h
index 39727fe..93256f9 100644
--- a/engines/hopkins/anim.h
+++ b/engines/hopkins/anim.h
@@ -51,7 +51,7 @@ public:
void playSequence(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipEscFl, bool skipSeqFl, bool noColFl = false);
void playSequence2(const Common::String &file, uint32 rate1, uint32 rate2, uint32 rate3, bool skipSeqFl = false);
- void setClearAnimFlag() { _clearAnimationFl = true; }
+ void setClearAnimFlag() { _clearAnimationFl = true; }
void unsetClearAnimFlag() { _clearAnimationFl = false; }
};
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index ecf9529..0c1f628 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -1804,9 +1804,9 @@ void HopkinsEngine::playIntro() {
_graphicsManager->fadeOutLong();
_graphicsManager->endDisplayBob();
- _animationManager->setClearAnimFlag();
_soundManager->playSound(3);
_soundManager->_specialSoundNum = 1;
+ _animationManager->setClearAnimFlag();
_animationManager->playAnim("INTRO1.anm", 10, 24, 18);
_soundManager->_specialSoundNum = 0;
if (shouldQuit() || _eventsManager->_escKeyFl)
Commit: f782ca1c10b3e74fecedf0e6b3178529cad88ed0
https://github.com/scummvm/scummvm/commit/f782ca1c10b3e74fecedf0e6b3178529cad88ed0
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-03-24T04:31:28-07:00
Commit Message:
HOPKINS: Move inventory dialog display to DialogsManager, set _inventWin1 as private
Changed paths:
engines/hopkins/computer.h
engines/hopkins/dialogs.cpp
engines/hopkins/dialogs.h
engines/hopkins/globals.cpp
engines/hopkins/objects.cpp
diff --git a/engines/hopkins/computer.h b/engines/hopkins/computer.h
index 1549216..e5c0ae2 100644
--- a/engines/hopkins/computer.h
+++ b/engines/hopkins/computer.h
@@ -84,18 +84,16 @@ private:
void displayLives();
void displayBricks();
void displayGamesSubMenu();
- void displayScore();
int displayHiscores();
void displayHiscoreLine(byte *objectData, int x, int y, int curChar);
+ void displayMessage(int xp, int yp, int textIdx);
+ void displayScore();
+ void displayScoreChar(int charPos, int charDisp);
+ void getScoreName();
void playBreakout();
+ int moveBall();
void saveScore();
- int moveBall();
void checkBallCollisions();
- void getScoreName();
-
- void displayMessage(int xp, int yp, int textIdx);
-
- void displayScoreChar(int charPos, int charDisp);
public:
ComputerManager(HopkinsEngine *vm);
diff --git a/engines/hopkins/dialogs.cpp b/engines/hopkins/dialogs.cpp
index 869207d..e0f544d 100644
--- a/engines/hopkins/dialogs.cpp
+++ b/engines/hopkins/dialogs.cpp
@@ -51,9 +51,23 @@ DialogsManager::DialogsManager(HopkinsEngine *vm) {
DialogsManager::~DialogsManager() {
_vm->_globals->freeMemory(_inventWin1);
+ _vm->_globals->freeMemory(_inventBuf2);
_vm->_globals->freeMemory(_inventoryIcons);
}
+void DialogsManager::clearAll() {
+ _inventWin1 = g_PTRNUL;
+ _inventBuf2 = g_PTRNUL;
+}
+
+void DialogsManager::drawInvent(Common::Point oldBorder, int oldBorderSpriteIndex, Common::Point newBorder, int newBorderSpriteIndex) {
+ _vm->_graphicsManager->restoreSurfaceRect(_vm->_graphicsManager->_vesaBuffer, _inventWin1, _inventX, _inventY, _inventWidth, _inventHeight);
+ if (oldBorder.x && oldBorder.y)
+ _vm->_graphicsManager->Sprite_Vesa(_vm->_graphicsManager->_vesaBuffer, _vm->_dialogsManager->_inventBuf2, oldBorder.x + 300, oldBorder.y + 300, oldBorderSpriteIndex + 1);
+ if (newBorder.x && newBorder.y)
+ _vm->_graphicsManager->Sprite_Vesa(_vm->_graphicsManager->_vesaBuffer, _vm->_dialogsManager->_inventBuf2, newBorder.x + 300, newBorder.y + 300, newBorderSpriteIndex);
+ _vm->_graphicsManager->addDirtyRect(_vm->_dialogsManager->_inventX, _vm->_dialogsManager->_inventY, _vm->_dialogsManager->_inventX + _vm->_dialogsManager->_inventWidth, _vm->_dialogsManager->_inventY + _vm->_dialogsManager->_inventHeight);
+}
void DialogsManager::showOptionsDialog() {
_vm->_eventsManager->changeMouseCursor(0);
_vm->_eventsManager->refreshScreenAndEvents();
diff --git a/engines/hopkins/dialogs.h b/engines/hopkins/dialogs.h
index fe6c3bc..73b4bb4 100644
--- a/engines/hopkins/dialogs.h
+++ b/engines/hopkins/dialogs.h
@@ -26,6 +26,7 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "common/error.h"
+#include "common/rect.h"
namespace Hopkins {
@@ -38,12 +39,13 @@ enum SaveLoadMode { MODE_SAVE = 1, MODE_LOAD = 2 };
*/
class DialogsManager {
private:
+ byte *_inventWin1;
+
HopkinsEngine *_vm;
void showSaveLoad(SaveLoadMode mode);
int searchSavegames();
public:
- byte *_inventWin1;
byte *_inventBuf2;
bool _removeInventFl;
bool _inventDisplayedFl;
@@ -60,6 +62,9 @@ public:
void showSaveGame();
void showOptionsDialog();
void testDialogOpening();
+ void clearAll();
+
+ void drawInvent(Common::Point oldBorder, int oldBorderSpriteIndex, Common::Point newBorder, int newBorderSpriteIndex);
};
} // End of namespace Hopkins
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 6cf7251..6d48599 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -239,8 +239,7 @@ void Globals::clearAll() {
_objectDataBuf = g_PTRNUL;
_curObjectFileNum = 0;
_vm->_eventsManager->_objectBuf = g_PTRNUL;
- _vm->_dialogsManager->_inventWin1 = g_PTRNUL;
- _vm->_dialogsManager->_inventBuf2 = g_PTRNUL;
+ _vm->_dialogsManager->clearAll();
_answerBuffer = g_PTRNUL;
SPRITE_ECRAN = g_PTRNUL;
_saveData = (Savegame *)g_PTRNUL;
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index df4a6b0..d753d57 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -409,12 +409,7 @@ void ObjectsManager::displaySprite() {
_vm->_globals->_sortedDisplayCount = 0;
if (_vm->_dialogsManager->_inventDisplayedFl) {
- _vm->_graphicsManager->restoreSurfaceRect(_vm->_graphicsManager->_vesaBuffer, _vm->_dialogsManager->_inventWin1, _vm->_dialogsManager->_inventX, _vm->_dialogsManager->_inventY, _vm->_dialogsManager->_inventWidth, _vm->_dialogsManager->_inventHeight);
- if (_oldBorderPos.x && _oldBorderPos.y)
- _vm->_graphicsManager->Sprite_Vesa(_vm->_graphicsManager->_vesaBuffer, _vm->_dialogsManager->_inventBuf2, _oldBorderPos.x + 300, _oldBorderPos.y + 300, _oldBorderSpriteIndex + 1);
- if (_borderPos.x && _borderPos.y)
- _vm->_graphicsManager->Sprite_Vesa(_vm->_graphicsManager->_vesaBuffer, _vm->_dialogsManager->_inventBuf2, _borderPos.x + 300, _borderPos.y + 300, _borderSpriteIndex);
- _vm->_graphicsManager->addDirtyRect(_vm->_dialogsManager->_inventX, _vm->_dialogsManager->_inventY, _vm->_dialogsManager->_inventX + _vm->_dialogsManager->_inventWidth, _vm->_dialogsManager->_inventY + _vm->_dialogsManager->_inventHeight);
+ _vm->_dialogsManager->drawInvent(_oldBorderPos, _oldBorderSpriteIndex, _borderPos, _borderSpriteIndex);
}
if (_saveLoadFl) {
More information about the Scummvm-git-logs
mailing list