[Scummvm-cvs-logs] SF.net SVN: scummvm: [29057] scummvm/trunk/engines/lure

eriktorbjorn at users.sourceforge.net eriktorbjorn at users.sourceforge.net
Sun Sep 23 18:48:33 CEST 2007


Revision: 29057
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29057&view=rev
Author:   eriktorbjorn
Date:     2007-09-23 09:48:33 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
Indentation.

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/intro.cpp
    scummvm/trunk/engines/lure/menu.cpp

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-09-23 16:43:43 UTC (rev 29056)
+++ scummvm/trunk/engines/lure/game.cpp	2007-09-23 16:48:33 UTC (rev 29057)
@@ -188,51 +188,51 @@
 					// Handle special keys
 					bool handled = true;
 					switch (events.event().kbd.keycode) {
-						case Common::KEYCODE_F5:
-							SaveRestoreDialog::show(true);
-							break;
+					case Common::KEYCODE_F5:
+						SaveRestoreDialog::show(true);
+						break;
 
-						case Common::KEYCODE_F7:
-							SaveRestoreDialog::show(false);
-							break;
+					case Common::KEYCODE_F7:
+						SaveRestoreDialog::show(false);
+						break;
 
-						case Common::KEYCODE_F9:
-							doRestart();
-							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;
+					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;
+						room.leaveRoom();
+						room.setRoomNumber(roomNum);
+						break;
 
-						case Common::KEYCODE_KP_MINUS:
-							if (roomNum == 1) roomNum = 55;
-							while (res.getRoom(--roomNum) == NULL) ;
+					case Common::KEYCODE_KP_MINUS:
+						if (roomNum == 1) roomNum = 55;
+						while (res.getRoom(--roomNum) == NULL) ;
 
-							room.leaveRoom();
-							room.setRoomNumber(roomNum);
-							break;
+						room.leaveRoom();
+						room.setRoomNumber(roomNum);
+						break;
 
-						case Common::KEYCODE_KP_MULTIPLY:
-							res.getActiveHotspot(PLAYER_ID)->setRoomNumber(
-								room.roomNumber());
-							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_KP_DIVIDE:
+					case Common::KEYCODE_SLASH:
+						room.setShowInfo(!room.showInfo());
+						break;
 
-						case Common::KEYCODE_ESCAPE:
-							doQuit();
-							break;
+					case Common::KEYCODE_ESCAPE:
+						doQuit();
+						break;
 
-						default:
-							handled = false;
+					default:
+						handled = false;
 					}
 					if (handled)
 						continue;

Modified: scummvm/trunk/engines/lure/intro.cpp
===================================================================
--- scummvm/trunk/engines/lure/intro.cpp	2007-09-23 16:43:43 UTC (rev 29056)
+++ scummvm/trunk/engines/lure/intro.cpp	2007-09-23 16:48:33 UTC (rev 29057)
@@ -108,18 +108,18 @@
 
 		result = false;
 		switch (anim->show()) {
-			case ABORT_NONE:
-				if (curr_anim->endingPause != 0) {
-					result = events.interruptableDelay(curr_anim->endingPause * 1000 / 50);
-				}
-				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_END_INTRO:
+			result = true;
+			break;
 
-			case ABORT_NEXT_SCENE:
-				break;
+		case ABORT_NEXT_SCENE:
+			break;
 		}
 		delete anim;
 

Modified: scummvm/trunk/engines/lure/menu.cpp
===================================================================
--- scummvm/trunk/engines/lure/menu.cpp	2007-09-23 16:43:43 UTC (rev 29056)
+++ scummvm/trunk/engines/lure/menu.cpp	2007-09-23 16:48:33 UTC (rev 29057)
@@ -158,18 +158,25 @@
 	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;


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