Changeset 45606

Timestamp:

11/01/09 23:20:46 (2 months ago)

Author:

spalek

Message:

Commented the rest of the loop() logic

Location:

scummvm/trunk/engines/draci

Files:

• game.cpp (modified) (2 diffs)
• game.h (modified) (1 diff)

scummvm/trunk/engines/draci/game.cpp

@@ -243 +243 @@
 void Game::loop() {
         // Can run both as an outer and inner loop.  In both mode it updates
-        // the screen according to the timer.  It the outer mode it also reacts
-        // to user events.  In the inner mode, the loop runs until its stopping
+        // the screen according to the timer.  It the outer mode
+        // (kSubstatusOrdinary) it also reacts to user events.  In the inner
+        // mode (all other kSubstatus* enums), the loop runs until its stopping
         // condition, possibly stopping earlier if the user interrupts it,
         // however no other user intervention is allowed.
@@ -304 +305 @@
                         updateTitle();
 
+                        // During the normal game-play, in particular not when
+                        // running the init-scripts, enable interactivity.
                         if (_loopStatus == kStatusOrdinary && _loopSubstatus == kSubstatusOrdinary) {
                                 if (_vm->_mouse->lButtonPressed()) {

scummvm/trunk/engines/draci/game.h

@@ -160 +160 @@
 
 enum LoopStatus {
-        kStatusOrdinary,
-        kStatusGate,
-        kStatusInventory,
-        kStatusDialogue
+        kStatusOrdinary,        // normal game-play: everything allowed
+        kStatusGate,            // during running init-scripts when entering a room: disable interactivity
+        kStatusInventory,       // inventory is open: cannot change the room or go to map
+        kStatusDialogue         // during a dialogue: cannot change the room, go to inventory
 };
 
 enum LoopSubstatus {
-        kSubstatusOrdinary,
-        kSubstatusTalk,
-        kSubstatusFade,
-        kSubstatusStrange
+        kSubstatusOrdinary,     // outer loop: everything is allowed
+        kSubstatusTalk,         // playing a voice: inner loop will exit afterwards
+        kSubstatusFade,         // fading a palette: inner loop will exit when done
+        kSubstatusStrange       // other inner loop: either immediately exiting or waiting for an animation to end (whose callback ends the loop)
 };