[Scummvm-cvs-logs] SF.net SVN: scummvm:[42127] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Jul 5 13:28:57 CEST 2009
Revision: 42127
http://scummvm.svn.sourceforge.net/scummvm/?rev=42127&view=rev
Author: drmccoy
Date: 2009-07-05 11:28:57 +0000 (Sun, 05 Jul 2009)
Log Message:
-----------
Merging Game_v1's and Game_v2's prepareStart()
Modified Paths:
--------------
scummvm/trunk/engines/gob/draw_v1.cpp
scummvm/trunk/engines/gob/game.cpp
scummvm/trunk/engines/gob/game.h
scummvm/trunk/engines/gob/game_v1.cpp
scummvm/trunk/engines/gob/game_v2.cpp
scummvm/trunk/engines/gob/game_v6.cpp
Modified: scummvm/trunk/engines/gob/draw_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v1.cpp 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/draw_v1.cpp 2009-07-05 11:28:57 UTC (rev 42127)
@@ -45,6 +45,12 @@
void Draw_v1::initScreen() {
_backSurface = _vm->_video->initSurfDesc(_vm->_global->_videoMode, 320, 200, 0);
+ _frontSurface = _vm->_global->_primarySurfDesc;
+
+ _cursorSprites =
+ _vm->_video->initSurfDesc(_vm->_global->_videoMode, 32, 16, 2);
+ _scummvmCursor =
+ _vm->_video->initSurfDesc(_vm->_global->_videoMode, 16, 16, SCUMMVM_CURSOR);
}
void Draw_v1::closeScreen() {
Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/game.cpp 2009-07-05 11:28:57 UTC (rev 42127)
@@ -205,6 +205,42 @@
delete _hotspots;
}
+void Game::prepareStart() {
+ _vm->_global->_pPaletteDesc->unused2 = _vm->_draw->_unusedPalette2;
+ _vm->_global->_pPaletteDesc->unused1 = _vm->_draw->_unusedPalette1;
+ _vm->_global->_pPaletteDesc->vgaPal = _vm->_draw->_vgaPalette;
+
+ _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
+
+ _vm->_draw->initScreen();
+ _vm->_video->fillRect(*_vm->_draw->_frontSurface, 0, 0,
+ _vm->_video->_surfWidth - 1, _vm->_video->_surfHeight - 1, 1);
+
+ _vm->_util->setMousePos(152, 92);
+ _vm->_draw->_cursorX = _vm->_global->_inter_mouseX = 152;
+ _vm->_draw->_cursorY = _vm->_global->_inter_mouseY = 92;
+
+ _vm->_draw->_invalidatedCount = 0;
+ _vm->_draw->_noInvalidated = true;
+ _vm->_draw->_applyPal = false;
+ _vm->_draw->_paletteCleared = false;
+ _vm->_draw->_cursorWidth = 16;
+ _vm->_draw->_cursorHeight = 16;
+ _vm->_draw->_transparentCursor = 1;
+
+ for (int i = 0; i < 40; i++) {
+ _vm->_draw->_cursorAnimLow[i] = -1;
+ _vm->_draw->_cursorAnimDelays[i] = 0;
+ _vm->_draw->_cursorAnimHigh[i] = 0;
+ }
+
+ _vm->_draw->_renderFlags = 0;
+ _vm->_draw->_backDeltaX = 0;
+ _vm->_draw->_backDeltaY = 0;
+
+ _startTimeKey = _vm->_util->getTimeKey();
+}
+
void Game::capturePush(int16 left, int16 top, int16 width, int16 height) {
int16 right;
Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/game.h 2009-07-05 11:28:57 UTC (rev 42127)
@@ -92,6 +92,8 @@
Game(GobEngine *vm);
virtual ~Game();
+ virtual void prepareStart();
+
void capturePush(int16 left, int16 top, int16 width, int16 height);
void capturePop(char doDraw);
@@ -108,8 +110,6 @@
virtual void playTot(int16 skipPlay) = 0;
- virtual void prepareStart(void) = 0;
-
protected:
uint32 _menuLevel;
@@ -135,8 +135,6 @@
virtual ~Game_v1() {}
virtual void playTot(int16 skipPlay);
-
- virtual void prepareStart(void);
};
class Game_v2 : public Game_v1 {
@@ -145,8 +143,6 @@
virtual ~Game_v2() {}
virtual void playTot(int16 skipPlay);
-
- virtual void prepareStart(void);
};
class Game_v6 : public Game_v2 {
Modified: scummvm/trunk/engines/gob/game_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v1.cpp 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/game_v1.cpp 2009-07-05 11:28:57 UTC (rev 42127)
@@ -160,46 +160,4 @@
_script->pop();
}
-void Game_v1::prepareStart(void) {
- _vm->_global->_pPaletteDesc->unused2 = _vm->_draw->_unusedPalette2;
- _vm->_global->_pPaletteDesc->unused1 = _vm->_draw->_unusedPalette1;
- _vm->_global->_pPaletteDesc->vgaPal = _vm->_draw->_vgaPalette;
-
- _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
-
- _vm->_draw->initScreen();
- _vm->_video->fillRect(*_vm->_draw->_backSurface, 0, 0, 319, 199, 1);
- _vm->_draw->_frontSurface = _vm->_global->_primarySurfDesc;
- _vm->_video->fillRect(*_vm->_draw->_frontSurface, 0, 0, 319, 199, 1);
-
- _vm->_util->setMousePos(152, 92);
- _vm->_draw->_cursorX = _vm->_global->_inter_mouseX = 152;
- _vm->_draw->_cursorY = _vm->_global->_inter_mouseY = 92;
-
- _vm->_draw->_invalidatedCount = 0;
- _vm->_draw->_noInvalidated = true;
- _vm->_draw->_applyPal = false;
- _vm->_draw->_paletteCleared = false;
- _vm->_draw->_cursorWidth = 16;
- _vm->_draw->_cursorHeight = 16;
- _vm->_draw->_transparentCursor = 1;
-
- for (int i = 0; i < 40; i++) {
- _vm->_draw->_cursorAnimLow[i] = -1;
- _vm->_draw->_cursorAnimDelays[i] = 0;
- _vm->_draw->_cursorAnimHigh[i] = 0;
- }
-
- _vm->_draw->_cursorAnimLow[1] = 0;
- _vm->_draw->_cursorSprites =
- _vm->_video->initSurfDesc(_vm->_global->_videoMode, 32, 16, 2);
- _vm->_draw->_scummvmCursor =
- _vm->_video->initSurfDesc(_vm->_global->_videoMode, 16, 16, SCUMMVM_CURSOR);
- _vm->_draw->_renderFlags = 0;
- _vm->_draw->_backDeltaX = 0;
- _vm->_draw->_backDeltaY = 0;
-
- _startTimeKey = _vm->_util->getTimeKey();
-}
-
} // End of namespace Gob
Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/game_v2.cpp 2009-07-05 11:28:57 UTC (rev 42127)
@@ -179,40 +179,4 @@
_script->pop();
}
-void Game_v2::prepareStart(void) {
- _vm->_global->_pPaletteDesc->unused2 = _vm->_draw->_unusedPalette2;
- _vm->_global->_pPaletteDesc->unused1 = _vm->_draw->_unusedPalette1;
- _vm->_global->_pPaletteDesc->vgaPal = _vm->_draw->_vgaPalette;
-
- _vm->_video->setFullPalette(_vm->_global->_pPaletteDesc);
-
- _vm->_draw->initScreen();
- _vm->_video->fillRect(*_vm->_draw->_frontSurface, 0, 0,
- _vm->_video->_surfWidth - 1, _vm->_video->_surfHeight - 1, 1);
-
- _vm->_util->setMousePos(152, 92);
- _vm->_draw->_cursorX = _vm->_global->_inter_mouseX = 152;
- _vm->_draw->_cursorY = _vm->_global->_inter_mouseY = 92;
-
- _vm->_draw->_invalidatedCount = 0;
- _vm->_draw->_noInvalidated = true;
- _vm->_draw->_applyPal = false;
- _vm->_draw->_paletteCleared = false;
- _vm->_draw->_cursorWidth = 16;
- _vm->_draw->_cursorHeight = 16;
- _vm->_draw->_transparentCursor = 1;
-
- for (int i = 0; i < 40; i++) {
- _vm->_draw->_cursorAnimLow[i] = -1;
- _vm->_draw->_cursorAnimDelays[i] = 0;
- _vm->_draw->_cursorAnimHigh[i] = 0;
- }
-
- _vm->_draw->_renderFlags = 0;
- _vm->_draw->_backDeltaX = 0;
- _vm->_draw->_backDeltaY = 0;
-
- _startTimeKey = _vm->_util->getTimeKey();
-}
-
} // End of namespace Gob
Modified: scummvm/trunk/engines/gob/game_v6.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v6.cpp 2009-07-05 11:28:38 UTC (rev 42126)
+++ scummvm/trunk/engines/gob/game_v6.cpp 2009-07-05 11:28:57 UTC (rev 42127)
@@ -107,7 +107,7 @@
_noCd = true;
}
- Game_v2::prepareStart();
+ Game::prepareStart();
}
} // End of namespace Gob
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list