aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2007-09-23 16:48:33 +0000
committerTorbjörn Andersson2007-09-23 16:48:33 +0000
commitf4507e71d39545f82e4cd8ce061c852ab11c10d7 (patch)
tree5af3dd3266db7b912adb38b37037155f6b217730 /engines
parent38d8105e4e7c29f0794dee87f908081e77aa0962 (diff)
downloadscummvm-rg350-f4507e71d39545f82e4cd8ce061c852ab11c10d7.tar.gz
scummvm-rg350-f4507e71d39545f82e4cd8ce061c852ab11c10d7.tar.bz2
scummvm-rg350-f4507e71d39545f82e4cd8ce061c852ab11c10d7.zip
Indentation.
svn-id: r29057
Diffstat (limited to 'engines')
-rw-r--r--engines/lure/game.cpp90
-rw-r--r--engines/lure/intro.cpp24
-rw-r--r--engines/lure/menu.cpp21
3 files changed, 71 insertions, 64 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index e4aeef2253..725c1f129d 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.cpp
@@ -188,51 +188,51 @@ if (bootParam == 1) _state = GS_RESTORE_RESTART; //******DEBUG******
// Handle special keys
bool handled = true;
switch (events.event().kbd.keycode) {
- case Common::KEYCODE_F5:
- SaveRestoreDialog::show(true);
- break;
-
- case Common::KEYCODE_F7:
- SaveRestoreDialog::show(false);
- break;
-
- case Common::KEYCODE_F9:
- doRestart();
- break;
-
- case Common::KEYCODE_KP_PLUS:
- while (++roomNum <= 51)
- if (res.getRoom(roomNum) != NULL) break;
- if (roomNum == 52) roomNum = 1;
-
- room.leaveRoom();
- room.setRoomNumber(roomNum);
- break;
-
- case Common::KEYCODE_KP_MINUS:
- if (roomNum == 1) roomNum = 55;
- while (res.getRoom(--roomNum) == NULL) ;
-
- room.leaveRoom();
- room.setRoomNumber(roomNum);
- break;
-
- case Common::KEYCODE_KP_MULTIPLY:
- res.getActiveHotspot(PLAYER_ID)->setRoomNumber(
- room.roomNumber());
- break;
-
- case Common::KEYCODE_KP_DIVIDE:
- case Common::KEYCODE_SLASH:
- room.setShowInfo(!room.showInfo());
- break;
-
- case Common::KEYCODE_ESCAPE:
- doQuit();
- break;
-
- default:
- handled = false;
+ case Common::KEYCODE_F5:
+ SaveRestoreDialog::show(true);
+ break;
+
+ case Common::KEYCODE_F7:
+ SaveRestoreDialog::show(false);
+ break;
+
+ case Common::KEYCODE_F9:
+ doRestart();
+ break;
+
+ case Common::KEYCODE_KP_PLUS:
+ while (++roomNum <= 51)
+ if (res.getRoom(roomNum) != NULL) break;
+ if (roomNum == 52) roomNum = 1;
+
+ room.leaveRoom();
+ room.setRoomNumber(roomNum);
+ break;
+
+ case Common::KEYCODE_KP_MINUS:
+ if (roomNum == 1) roomNum = 55;
+ while (res.getRoom(--roomNum) == NULL) ;
+
+ room.leaveRoom();
+ room.setRoomNumber(roomNum);
+ break;
+
+ case Common::KEYCODE_KP_MULTIPLY:
+ res.getActiveHotspot(PLAYER_ID)->setRoomNumber(
+ room.roomNumber());
+ break;
+
+ case Common::KEYCODE_KP_DIVIDE:
+ case Common::KEYCODE_SLASH:
+ room.setShowInfo(!room.showInfo());
+ break;
+
+ case Common::KEYCODE_ESCAPE:
+ doQuit();
+ break;
+
+ default:
+ handled = false;
}
if (handled)
continue;
diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp
index ae4199051e..f1ca06d90e 100644
--- a/engines/lure/intro.cpp
+++ b/engines/lure/intro.cpp
@@ -108,18 +108,18 @@ bool Introduction::show() {
result = false;
switch (anim->show()) {
- case ABORT_NONE:
- if (curr_anim->endingPause != 0) {
- result = events.interruptableDelay(curr_anim->endingPause * 1000 / 50);
- }
- break;
-
- case ABORT_END_INTRO:
- result = true;
- break;
-
- case ABORT_NEXT_SCENE:
- break;
+ case ABORT_NONE:
+ if (curr_anim->endingPause != 0) {
+ result = events.interruptableDelay(curr_anim->endingPause * 1000 / 50);
+ }
+ break;
+
+ case ABORT_END_INTRO:
+ result = true;
+ break;
+
+ case ABORT_NEXT_SCENE:
+ break;
}
delete anim;
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index 7dfb6e2a57..5856056e5c 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.cpp
@@ -158,18 +158,25 @@ uint8 Menu::execute() {
screen.update();
if ((_selectedMenu == NULL) || (_selectedIndex == 0)) return MENUITEM_NONE;
- else if (_selectedMenu == _menus[0]) return MENUITEM_CREDITS;
+ else if (_selectedMenu == _menus[0])
+ return MENUITEM_CREDITS;
else if (_selectedMenu == _menus[1]) {
switch (_selectedIndex) {
- case 1: return MENUITEM_RESTART_GAME;
- case 2: return MENUITEM_SAVE_GAME;
- case 3: return MENUITEM_RESTORE_GAME;
+ case 1:
+ return MENUITEM_RESTART_GAME;
+ case 2:
+ return MENUITEM_SAVE_GAME;
+ case 3:
+ return MENUITEM_RESTORE_GAME;
}
} else {
switch (_selectedIndex) {
- case 1: return MENUITEM_QUIT;
- case 2: return MENUITEM_TEXT_SPEED;
- case 3: return MENUITEM_SOUND;
+ case 1:
+ return MENUITEM_QUIT;
+ case 2:
+ return MENUITEM_TEXT_SPEED;
+ case 3:
+ return MENUITEM_SOUND;
}
}
return MENUITEM_NONE;