[Scummvm-cvs-logs] SF.net SVN: scummvm:[43837] scummvm/trunk/engines
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Sun Aug 30 22:50:23 CEST 2009
Revision: 43837
http://scummvm.svn.sourceforge.net/scummvm/?rev=43837&view=rev
Author: jvprat
Date: 2009-08-30 20:50:23 +0000 (Sun, 30 Aug 2009)
Log Message:
-----------
Fix indentation
Modified Paths:
--------------
scummvm/trunk/engines/lure/game.cpp
scummvm/trunk/engines/queen/sound.cpp
scummvm/trunk/engines/sky/control.h
scummvm/trunk/engines/sword1/animation.cpp
scummvm/trunk/engines/sword1/staticres.cpp
Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp 2009-08-30 20:41:17 UTC (rev 43836)
+++ scummvm/trunk/engines/lure/game.cpp 2009-08-30 20:50:23 UTC (rev 43837)
@@ -687,7 +687,7 @@
switch (paramIndex) {
case 0:
- // Prompt for selection of action to perform
+ // Prompt for selection of action to perform
action = PopupMenu::Show(0x6A07FD);
if (action == NONE) {
// Move backwards to prior specified action
Modified: scummvm/trunk/engines/queen/sound.cpp
===================================================================
--- scummvm/trunk/engines/queen/sound.cpp 2009-08-30 20:41:17 UTC (rev 43836)
+++ scummvm/trunk/engines/queen/sound.cpp 2009-08-30 20:50:23 UTC (rev 43837)
@@ -575,7 +575,7 @@
// song not available in the amiga version
return;
}
- _lastOverride = song;
+ _lastOverride = song;
}
void AmigaSound::stopSfx() {
Modified: scummvm/trunk/engines/sky/control.h
===================================================================
--- scummvm/trunk/engines/sky/control.h 2009-08-30 20:41:17 UTC (rev 43836)
+++ scummvm/trunk/engines/sky/control.h 2009-08-30 20:50:23 UTC (rev 43837)
@@ -207,7 +207,7 @@
void delay(unsigned int amount);
- void animClick(ConResource *pButton);
+ void animClick(ConResource *pButton);
bool getYesNo(char *text);
void buttonControl(ConResource *pButton);
uint16 handleClick(ConResource *pButton);
Modified: scummvm/trunk/engines/sword1/animation.cpp
===================================================================
--- scummvm/trunk/engines/sword1/animation.cpp 2009-08-30 20:41:17 UTC (rev 43836)
+++ scummvm/trunk/engines/sword1/animation.cpp 2009-08-30 20:50:23 UTC (rev 43837)
@@ -43,26 +43,26 @@
namespace Sword1 {
static const char *sequenceList[20] = {
- "ferrari", // 0 CD2 ferrari running down fitz in sc19
- "ladder", // 1 CD2 george walking down ladder to dig sc24->sc$
- "steps", // 2 CD2 george walking down steps sc23->sc24
- "sewer", // 3 CD1 george entering sewer sc2->sc6
- "intro", // 4 CD1 intro sequence ->sc1
- "river", // 5 CD1 george being thrown into river by flap & g$
- "truck", // 6 CD2 truck arriving at bull's head sc45->sc53/4
- "grave", // 7 BOTH george's grave in scotland, from sc73 + from sc38 $
- "montfcon", // 8 CD2 monfaucon clue in ireland dig, sc25
- "tapestry", // 9 CD2 tapestry room beyond spain well, sc61
- "ireland", // 10 CD2 ireland establishing shot europe_map->sc19
- "finale", // 11 CD2 grand finale at very end, from sc73
- "history", // 12 CD1 George's history lesson from Nico, in sc10
- "spanish", // 13 CD2 establishing shot for 1st visit to Spain, europe_m$
- "well", // 14 CD2 first time being lowered down well in Spai$
- "candle", // 15 CD2 Candle burning down in Spain mausoleum sc59
- "geodrop", // 16 CD2 from sc54, George jumping down onto truck
- "vulture", // 17 CD2 from sc54, vultures circling George's dead body
- "enddemo", // 18 --- for end of single CD demo
- "credits", // 19 CD2 credits, to follow "finale" sequence
+ "ferrari", // 0 CD2 ferrari running down fitz in sc19
+ "ladder", // 1 CD2 george walking down ladder to dig sc24->sc$
+ "steps", // 2 CD2 george walking down steps sc23->sc24
+ "sewer", // 3 CD1 george entering sewer sc2->sc6
+ "intro", // 4 CD1 intro sequence ->sc1
+ "river", // 5 CD1 george being thrown into river by flap & g$
+ "truck", // 6 CD2 truck arriving at bull's head sc45->sc53/4
+ "grave", // 7 BOTH george's grave in scotland, from sc73 + from sc38 $
+ "montfcon", // 8 CD2 monfaucon clue in ireland dig, sc25
+ "tapestry", // 9 CD2 tapestry room beyond spain well, sc61
+ "ireland", // 10 CD2 ireland establishing shot europe_map->sc19
+ "finale", // 11 CD2 grand finale at very end, from sc73
+ "history", // 12 CD1 George's history lesson from Nico, in sc10
+ "spanish", // 13 CD2 establishing shot for 1st visit to Spain, europe_m$
+ "well", // 14 CD2 first time being lowered down well in Spai$
+ "candle", // 15 CD2 Candle burning down in Spain mausoleum sc59
+ "geodrop", // 16 CD2 from sc54, George jumping down onto truck
+ "vulture", // 17 CD2 from sc54, vultures circling George's dead body
+ "enddemo", // 18 --- for end of single CD demo
+ "credits", // 19 CD2 credits, to follow "finale" sequence
};
///////////////////////////////////////////////////////////////////////////////
Modified: scummvm/trunk/engines/sword1/staticres.cpp
===================================================================
--- scummvm/trunk/engines/sword1/staticres.cpp 2009-08-30 20:41:17 UTC (rev 43836)
+++ scummvm/trunk/engines/sword1/staticres.cpp 2009-08-30 20:50:23 UTC (rev 43837)
@@ -6582,7 +6582,7 @@
#define LOGIC_CALL_FN(FN_ID, PARAM) \
opcCallFn, ENCODE8(FN_ID), ENCODE8(PARAM)
#define LOGIC_CALL_FN_LONG(FN_ID, PARAM1, PARAM2, PARAM3) \
- opcCallFnLong, ENCODE8(FN_ID), ENCODE32(PARAM1), ENCODE32(PARAM2), ENCODE32(PARAM3)
+ opcCallFnLong, ENCODE8(FN_ID), ENCODE32(PARAM1), ENCODE32(PARAM2), ENCODE32(PARAM3)
#define LOGIC_SET_VAR8(VAR_ID, VAL) \
opcSetVar8, ENCODE16(VAR_ID), ENCODE8(VAL)
#define LOGIC_SET_VAR16(VAR_ID, VAL) \
@@ -6682,7 +6682,7 @@
};
const uint8 g_startPos18[] = { // gendarmerie
- GEORGE_POS(446, 408, DOWN_LEFT, FLOOR_18),
+ GEORGE_POS(446, 408, DOWN_LEFT, FLOOR_18),
LOGIC_SET_VAR8(PARIS_FLAG, 5),
INIT_SEQ_END
};
@@ -6857,7 +6857,7 @@
};
const uint8 g_startPos55[] = { // bull secret
- GEORGE_POS(825, 373, DOWN_LEFT, FLOOR_55),
+ GEORGE_POS(825, 373, DOWN_LEFT, FLOOR_55),
RUN_HELPER_SCRIPT(HELP_SYRIA)
};
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