[Scummvm-cvs-logs] SF.net SVN: scummvm: [33044] scummvm/branches/gsoc2008-rtl/engines/sword2
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Mon Jul 14 00:00:40 CEST 2008
Revision: 33044
http://scummvm.svn.sourceforge.net/scummvm/?rev=33044&view=rev
Author: cpage88
Date: 2008-07-13 15:00:39 -0700 (Sun, 13 Jul 2008)
Log Message:
-----------
SWORD2 works with the new GMM implementation
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/sword2/animation.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/controls.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/function.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/palette.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/resman.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/screen.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.cpp
scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.h
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/animation.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/animation.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/animation.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -358,7 +358,6 @@
handleScreenChanged();
break;
case Common::EVENT_QUIT:
- _vm->closeGame();
terminate = true;
break;
case Common::EVENT_KEYDOWN:
@@ -379,7 +378,7 @@
bool startNextText = false;
// This happens if the user quits during the "eye" cutscene.
- if (_vm->_quit)
+ if (_vm->quit())
return;
_numSpeechLines = numLines;
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/controls.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/controls.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/controls.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -396,7 +396,7 @@
_vm->_system->delayMillis(20);
- if (_vm->_quit)
+ if (_vm->quit())
setResult(0);
}
@@ -842,7 +842,7 @@
if (startDialog.runModal())
return 1;
- if (_vm->_quit)
+ if (_vm->quit())
return 0;
RestoreDialog restoreDialog(_vm);
@@ -850,7 +850,7 @@
if (restoreDialog.runModal())
return 0;
- if (_vm->_quit)
+ if (_vm->quit())
return 0;
}
@@ -882,7 +882,7 @@
int result = MiniDialog::runModal();
if (result)
- _vm->closeGame();
+ _vm->quitGame();
return result;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/function.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/function.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/function.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -2388,7 +2388,7 @@
// params: none
if (readVar(DEMO)) {
- _vm->closeGame();
+ _vm->quitGame();
return IR_STOP;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/palette.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/palette.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/palette.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -212,7 +212,7 @@
}
void Screen::waitForFade() {
- while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK && !_vm->_quit) {
+ while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK && !_vm->quit()) {
updateDisplay();
_vm->_system->delayMillis(20);
}
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/resman.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/resman.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/resman.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -413,7 +413,7 @@
// quit while the game is asking for the user to insert a CD.
// But recovering from this situation gracefully is just too
// much trouble, so quit now.
- if (_vm->_quit)
+ if (_vm->quit())
g_system->quit();
// If the file is supposed to be on hard disk, or we're
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/screen.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/screen.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/screen.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -389,7 +389,7 @@
uint32 targetTime = _vm->getMillis() + (time * 1000);
_vm->sleepUntil(targetTime);
} else {
- while (!_vm->_quit) {
+ while (!_vm->quit()) {
MouseEvent *me = _vm->mouseEvent();
if (me && (me->buttons & (RD_LEFTBUTTONDOWN | RD_RIGHTBUTTONDOWN)))
break;
@@ -1035,7 +1035,7 @@
uint32 musicLength = MAX((int32)(1000 * (_vm->_sound->musicTimeRemaining() - 3)), 25 * (int32)scrollSteps);
- while (scrollPos < scrollSteps && !_vm->_quit) {
+ while (scrollPos < scrollSteps && !_vm->quit()) {
clearScene();
for (i = startLine; i < lineCount; i++) {
@@ -1123,13 +1123,13 @@
// The music should either have stopped or be about to stop, so
// wait for it to really happen.
- while (_vm->_sound->musicTimeRemaining() && !_vm->_quit) {
+ while (_vm->_sound->musicTimeRemaining() && !_vm->quit()) {
updateDisplay(false);
_vm->_system->delayMillis(100);
}
}
- if (_vm->_quit)
+ if (_vm->quit())
return;
waitForFade();
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.cpp 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.cpp 2008-07-13 22:00:39 UTC (rev 33044)
@@ -370,7 +370,7 @@
// player will kill the music for us. Otherwise, the restore
// will either have killed the music, or done a crossfade.
- if (_quit)
+ if (quit())
return 0;
if (result)
@@ -442,7 +442,7 @@
// because we want the break to happen before updating the
// screen again.
- if (_quit)
+ if (quit())
break;
// creates the debug text blocks
@@ -459,13 +459,9 @@
#endif
}
- return _rtl;
+ return _eventMan->shouldRTL();
}
-void Sword2Engine::closeGame() {
- _quit = true;
-}
-
void Sword2Engine::restartGame() {
ScreenInfo *screenInfo = _screen->getScreenInfo();
uint32 temp_demo_flag;
@@ -609,9 +605,6 @@
_mouseEvent.buttons = RD_WHEELDOWN;
}
break;
- case Common::EVENT_QUIT:
- closeGame();
- break;
default:
break;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.h 2008-07-13 21:54:23 UTC (rev 33043)
+++ scummvm/branches/gsoc2008-rtl/engines/sword2/sword2.h 2008-07-13 22:00:39 UTC (rev 33044)
@@ -208,7 +208,6 @@
void startGame();
void gameCycle();
- void closeGame();
void restartGame();
void sleepUntil(uint32 time);
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