[Scummvm-cvs-logs] SF.net SVN: scummvm: [30798] scummvm/trunk/engines/parallaction
peres001 at users.sourceforge.net
peres001 at users.sourceforge.net
Tue Feb 5 11:24:23 CET 2008
Revision: 30798
http://scummvm.svn.sourceforge.net/scummvm/?rev=30798&view=rev
Author: peres001
Date: 2008-02-05 02:24:22 -0800 (Tue, 05 Feb 2008)
Log Message:
-----------
Changed main loop to allow BRA to return to menu after intro.
Modified Paths:
--------------
scummvm/trunk/engines/parallaction/exec_br.cpp
scummvm/trunk/engines/parallaction/gui_br.cpp
scummvm/trunk/engines/parallaction/parallaction.cpp
scummvm/trunk/engines/parallaction/parallaction.h
scummvm/trunk/engines/parallaction/parallaction_br.cpp
scummvm/trunk/engines/parallaction/parallaction_ns.cpp
Modified: scummvm/trunk/engines/parallaction/exec_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/exec_br.cpp 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/exec_br.cpp 2008-02-05 10:24:22 UTC (rev 30798)
@@ -279,7 +279,7 @@
DECLARE_COMMAND_OPCODE(ret) {
- warning("Parallaction_br::cmdOp_ret not yet implemented");
+ _engineFlags |= kEngineReturn;
}
Modified: scummvm/trunk/engines/parallaction/gui_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/gui_br.cpp 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/gui_br.cpp 2008-02-05 10:24:22 UTC (rev 30798)
@@ -41,8 +41,6 @@
void Parallaction_br::guiStart() {
- guiSplash("dyna");
- guiSplash("core");
// TODO: load progress value from special save game
_progress = 3;
Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp 2008-02-05 10:24:22 UTC (rev 30798)
@@ -245,27 +245,22 @@
void Parallaction::runGame() {
- _inputMode = kInputModeGame;
+ updateInput();
- while ((_engineFlags & kEngineQuit) == 0) {
- updateInput();
+ runPendingZones();
- runPendingZones();
+ if (_engineFlags & kEngineChangeLocation) {
+ changeLocation(_location._name);
+ }
- if (_engineFlags & kEngineChangeLocation) {
- changeLocation(_location._name);
- }
-
- if (_inputMode == kInputModeGame) {
- runScripts();
- walk();
- drawAnimations();
- }
-
- updateView();
-
+ if (_inputMode == kInputModeGame) {
+ runScripts();
+ walk();
+ drawAnimations();
}
+ updateView();
+
}
void Parallaction::updateView() {
Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/parallaction.h 2008-02-05 10:24:22 UTC (rev 30798)
@@ -111,7 +111,10 @@
kEngineChangeLocation = (1 << 4),
kEngineBlockInput = (1 << 5),
kEngineDragging = (1 << 6),
- kEngineTransformedDonna = (1 << 7)
+ kEngineTransformedDonna = (1 << 7),
+
+ // BRA specific
+ kEngineReturn = (1 << 10)
};
enum {
Modified: scummvm/trunk/engines/parallaction/parallaction_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_br.cpp 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/parallaction_br.cpp 2008-02-05 10:24:22 UTC (rev 30798)
@@ -96,16 +96,22 @@
int Parallaction_br::go() {
+ guiSplash("dyna");
+ guiSplash("core");
+
while ((_engineFlags & kEngineQuit) == 0) {
guiStart();
// initCharacter();
- runGame();
+ _inputMode = kInputModeGame;
+ while ((_engineFlags & (kEngineReturn | kEngineQuit)) == 0) {
+ runGame();
+ }
+ _engineFlags &= ~kEngineReturn;
freePart();
-// freeLocation();
// freeCharacter();
}
Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-02-05 09:55:17 UTC (rev 30797)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp 2008-02-05 10:24:22 UTC (rev 30798)
@@ -240,7 +240,10 @@
changeLocation(_location._name);
- runGame();
+ _inputMode = kInputModeGame;
+ while ((_engineFlags & kEngineQuit) == 0) {
+ runGame();
+ }
return 0;
}
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