diff options
| -rw-r--r-- | engines/lure/game.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/sky/control.h | 2 | ||||
| -rw-r--r-- | engines/sword1/animation.cpp | 40 | ||||
| -rw-r--r-- | engines/sword1/staticres.cpp | 6 |
5 files changed, 26 insertions, 26 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 860c64be35..3dfc6a8478 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -687,7 +687,7 @@ bool Game::GetTellActions() { 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 diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index f37e835f12..a1061259c3 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -575,7 +575,7 @@ void AmigaSound::playSong(int16 song) { // song not available in the amiga version return; } - _lastOverride = song; + _lastOverride = song; } void AmigaSound::stopSfx() { diff --git a/engines/sky/control.h b/engines/sky/control.h index 04ed26fefe..c975e0d2e2 100644 --- a/engines/sky/control.h +++ b/engines/sky/control.h @@ -207,7 +207,7 @@ private: 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); diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp index 7ed50461af..014f5084eb 100644 --- a/engines/sword1/animation.cpp +++ b/engines/sword1/animation.cpp @@ -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 }; /////////////////////////////////////////////////////////////////////////////// diff --git a/engines/sword1/staticres.cpp b/engines/sword1/staticres.cpp index 4d213b6d32..84f1dc9d45 100644 --- a/engines/sword1/staticres.cpp +++ b/engines/sword1/staticres.cpp @@ -6582,7 +6582,7 @@ const uint16 Sound::_roomsFixedFx[TOTAL_ROOMS][TOTAL_FX_PER_ROOM] = #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_startPos17[] = { // hotel assassin }; 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_startPos54[] = { // bull's head }; 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) }; |