[Scummvm-cvs-logs] SF.net SVN: scummvm:[40994] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Fri May 29 15:09:26 CEST 2009
Revision: 40994
http://scummvm.svn.sourceforge.net/scummvm/?rev=40994&view=rev
Author: lordhoto
Date: 2009-05-29 13:09:26 +0000 (Fri, 29 May 2009)
Log Message:
-----------
More formatting.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_hof.cpp
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/gui_v2.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/scene_hof.cpp
scummvm/trunk/engines/kyra/scene_lok.cpp
scummvm/trunk/engines/kyra/scene_mr.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/script.cpp
scummvm/trunk/engines/kyra/script_lok.cpp
scummvm/trunk/engines/kyra/script_tim.cpp
scummvm/trunk/engines/kyra/seqplayer.cpp
scummvm/trunk/engines/kyra/sequences_hof.cpp
scummvm/trunk/engines/kyra/sequences_lok.cpp
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/kyra/sequences_mr.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/sprites.cpp
scummvm/trunk/engines/kyra/sprites_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/engines/kyra/text_lol.cpp
scummvm/trunk/engines/kyra/timer_lol.cpp
scummvm/trunk/engines/kyra/vqa.cpp
Modified: scummvm/trunk/engines/kyra/gui_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_hof.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/gui_hof.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -78,7 +78,6 @@
default:
_inventoryButtons[0].data0ShapePtr = _buttonShapes[6];
_inventoryButtons[0].data1ShapePtr = _inventoryButtons[0].data2ShapePtr = _buttonShapes[7];
- break;
}
}
@@ -437,7 +436,6 @@
default:
warning("loadBookBkgd unsupported language");
filename[1] = 'E';
- break;
}
} else {
if (!_bookCurPage)
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -884,7 +884,6 @@
break;
default:
menu.item[2].itemString = "ERROR";
- break;
}
int textControl = 3;
@@ -913,7 +912,6 @@
break;
default:
menu.item[3].itemString = "ERROR";
- break;
}
} else {
menu.item[4].enabled = 0;
@@ -935,7 +933,6 @@
break;
default:
menu.item[textControl].itemString = "ERROR";
- break;
}
initMenuLayout(menu);
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -2111,7 +2111,6 @@
buttonList->flags2 |= 2;
}
_specialProcessButton = buttonList;
- break;
}
}
}
Modified: scummvm/trunk/engines/kyra/gui_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_v2.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/gui_v2.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -327,7 +327,6 @@
buttonList->flags2 |= 2;
}
_specialProcessButton = buttonList;
- break;
}
}
}
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -1987,7 +1987,6 @@
case 0:
default:
_flags.lang = Common::EN_ANY;
- break;
}
if (_flags.lang == _flags.replacedLang && _flags.fanLang != Common::UNK_LANG)
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -940,7 +940,6 @@
break;
default: // Clickable
talkspeed = 0;
- break;
}
ConfMan.setInt("talkspeed", talkspeed);
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -317,7 +317,6 @@
uninitMainMenu();
quitGame();
running = false;
- break;
}
}
@@ -1496,7 +1495,6 @@
case 0:
default:
_flags.lang = Common::EN_ANY;
- break;
}
if (_flags.lang == _flags.replacedLang && _flags.fanLang != Common::UNK_LANG)
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -330,7 +330,6 @@
break;
default:
keys = 0;
- break;
}
// When we got an keypress, which we might need to handle,
@@ -557,7 +556,6 @@
default: // Voice & Text
speechMute = false;
subtitles = true;
- break;
}
if (_sound) {
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -100,7 +100,6 @@
default:
warning("unsupported language, switching back to English");
_lang = 0;
- break;
}
}
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -68,7 +68,6 @@
default:
warning("unsupported language, switching back to English");
_lang = 0;
- break;
}
_chargenFrameTable = _flags.isTalkie ? _chargenFrameTableTalkie : _chargenFrameTableFloppy;
Modified: scummvm/trunk/engines/kyra/scene_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_hof.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/scene_hof.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -175,7 +175,6 @@
default:
x2 = y2 = -1;
- break;
}
if (x2 >= 316)
@@ -380,7 +379,6 @@
default:
newScene = _mainCharacter.sceneId;
- break;
}
if (newScene == 0xFFFF)
Modified: scummvm/trunk/engines/kyra/scene_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -924,7 +924,6 @@
default:
++table;
forceContinue = true;
- break;
}
returnValue = changeScene(_currentCharacter->facing);
@@ -1084,7 +1083,6 @@
default:
sceneId = _roomTable[_currentCharacter->sceneId].westExit;
- break;
}
if (sceneId == 0xFFFF)
Modified: scummvm/trunk/engines/kyra/scene_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_mr.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/scene_mr.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -223,7 +223,6 @@
default:
x2 = y2 = -1;
- break;
}
if (x2 >= 316)
@@ -740,7 +739,6 @@
default:
newScene = _mainCharacter.sceneId;
- break;
}
if (newScene == 0xFFFF)
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/screen.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -2746,7 +2746,6 @@
break;
default:
error("Unhandled bitmap compression %d", compType);
- break;
}
if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
@@ -2983,7 +2982,6 @@
break;
default:
debug(4, "Invalid Char! f %x s %x base %x c %d p %d", f, s, base, c, p);
- return 0;
}
debug(6, "Kanji: %c%c f 0x%x s 0x%x base 0x%x c %d p %d chunk %d cr %d index %d", f, s, f, s, base, c, p, chunk, cr, ((chunk_f + chunk) * 32 + (s - base)) + cr);
Modified: scummvm/trunk/engines/kyra/script.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/script.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -109,7 +109,6 @@
default:
warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk->id), chunk->size, filename);
- break;
}
}
@@ -237,7 +236,6 @@
default:
script->ip = 0;
- break;
}
}
@@ -274,7 +272,6 @@
default:
script->ip = 0;
- break;
}
}
@@ -340,7 +337,6 @@
default:
warning("Unknown negation func: %d", _parameter);
script->ip = 0;
- break;
}
}
@@ -427,7 +423,6 @@
default:
warning("Unknown evaluate func: %d", _parameter);
error = true;
- break;
}
if (error)
Modified: scummvm/trunk/engines/kyra/script_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lok.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/script_lok.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -1042,7 +1042,6 @@
default:
++curPos;
forceContinue = true;
- break;
}
if (forceContinue || !running)
@@ -1236,7 +1235,6 @@
default:
palIndex = 8;
- break;
}
if (_brandonStatusBit & 2) {
if (_currentCharacter->sceneId != 133 && _currentCharacter->sceneId != 137 &&
Modified: scummvm/trunk/engines/kyra/script_tim.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_tim.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/script_tim.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -158,7 +158,6 @@
default:
warning("Unexpected chunk '%s' of size %d found in file '%s'", Common::ID2string(chunk->id), chunk->size, filename);
- break;
}
}
@@ -1124,42 +1123,41 @@
_vm->gui_notifyButtonListChanged();
switch (e) {
- case 43:
- case 61:
- _vm->snd_stopSpeech(true);
- //_dlgTimer = 0;
- res = _dialogueHighlightedButton + 1;
- break;
+ case 43:
+ case 61:
+ _vm->snd_stopSpeech(true);
+ //_dlgTimer = 0;
+ res = _dialogueHighlightedButton + 1;
+ break;
- case 92:
- case 97:
- if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
- _dialogueHighlightedButton--;
- break;
+ case 92:
+ case 97:
+ if (_dialogueNumButtons > 1 && _dialogueHighlightedButton > 0)
+ _dialogueHighlightedButton--;
+ break;
- case 96:
- case 102:
- if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
- _dialogueHighlightedButton++;
- break;
+ case 96:
+ case 102:
+ if (_dialogueNumButtons > 1 && _dialogueHighlightedButton < (_dialogueNumButtons - 1))
+ _dialogueHighlightedButton++;
+ break;
- case 200:
- case 202:
- x = _dialogueButtonPosX;
+ case 200:
+ case 202:
+ x = _dialogueButtonPosX;
- for (int i = 0; i < _dialogueNumButtons; i++) {
- if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, _dialogueButtonPosY, x + 74, _dialogueButtonPosY + 9)) {
- _dialogueHighlightedButton = i;
- res = _dialogueHighlightedButton + 1;
- break;
- }
- x += _dialogueButtonXoffs;
+ for (int i = 0; i < _dialogueNumButtons; i++) {
+ if (_vm->posWithinRect(_vm->_mouseX, _vm->_mouseY, x, _dialogueButtonPosY, x + 74, _dialogueButtonPosY + 9)) {
+ _dialogueHighlightedButton = i;
+ res = _dialogueHighlightedButton + 1;
+ break;
}
+ x += _dialogueButtonXoffs;
+ }
+ break;
- break;
-
- default:
- break;
+ default:
+ break;
}
}
Modified: scummvm/trunk/engines/kyra/seqplayer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/seqplayer.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/seqplayer.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -405,7 +405,6 @@
break;
default:
error("Invalid subopcode %d for s1_copyRegionSpecial", so);
- break;
}
}
Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -1811,22 +1811,22 @@
int KyraEngine_HoF::seq_lolDemoScene2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
switch (_seqFrameCounter - 17) {
- case 0:
- _seqFrameDelay = 8;
- break;
- case 3:
- case 6:
- case 9:
- seq_playTalkText(8);
- break;
- case 15:
- seq_playTalkText(9);
- break;
- case 18:
- seq_playTalkText(2);
- break;
- default:
- break;
+ case 0:
+ _seqFrameDelay = 8;
+ break;
+ case 3:
+ case 6:
+ case 9:
+ seq_playTalkText(8);
+ break;
+ case 15:
+ seq_playTalkText(9);
+ break;
+ case 18:
+ seq_playTalkText(2);
+ break;
+ default:
+ break;
}
_seqFrameCounter++;
return frm;
@@ -1844,32 +1844,32 @@
int KyraEngine_HoF::seq_lolDemoScene4(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
switch (_seqFrameCounter) {
- case 11:
- case 14:
- case 17:
- case 20:
- seq_playTalkText(8);
- break;
- case 22:
- seq_playTalkText(11);
- break;
- case 24:
- seq_playTalkText(8);
- break;
- case 30:
- seq_playTalkText(15);
- break;
- case 34:
- seq_playTalkText(14);
- break;
- case 38:
- seq_playTalkText(13);
- break;
- case 42:
- seq_playTalkText(12);
- break;
- default:
- break;
+ case 11:
+ case 14:
+ case 17:
+ case 20:
+ seq_playTalkText(8);
+ break;
+ case 22:
+ seq_playTalkText(11);
+ break;
+ case 24:
+ seq_playTalkText(8);
+ break;
+ case 30:
+ seq_playTalkText(15);
+ break;
+ case 34:
+ seq_playTalkText(14);
+ break;
+ case 38:
+ seq_playTalkText(13);
+ break;
+ case 42:
+ seq_playTalkText(12);
+ break;
+ default:
+ break;
}
_seqFrameCounter++;
@@ -1878,30 +1878,30 @@
int KyraEngine_HoF::seq_lolDemoScene5(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
switch (_seqFrameCounter++) {
- case 0:
- case 4:
- case 6:
- case 8:
- case 10:
- case 14:
- case 16:
- case 18:
- case 20:
- case 22:
- case 24:
- case 26:
- case 28:
- case 30:
- seq_playTalkText(15);
- break;
- case 32:
- seq_playTalkText(16);
- break;
- case 42:
- seq_playTalkText(6);
- break;
- default:
- break;
+ case 0:
+ case 4:
+ case 6:
+ case 8:
+ case 10:
+ case 14:
+ case 16:
+ case 18:
+ case 20:
+ case 22:
+ case 24:
+ case 26:
+ case 28:
+ case 30:
+ seq_playTalkText(15);
+ break;
+ case 32:
+ seq_playTalkText(16);
+ break;
+ case 42:
+ seq_playTalkText(6);
+ break;
+ default:
+ break;
}
return frm;
}
@@ -2054,28 +2054,28 @@
case 0:
memset(pal, 0, 0x300);
_screen->fadePalette(pal, 36);
- memcpy (_screen->getPalette(0), pal, 0x300);
- memcpy (_screen->getPalette(1), pal, 0x300);
+ memcpy(_screen->getPalette(0), pal, 0x300);
+ memcpy(_screen->getPalette(1), pal, 0x300);
break;
case 1:
memset(pal, 0x3F, 0x300);
seq_playTalkText(_rnd.getRandomBit());
_screen->fadePalette(pal, 16);
- memcpy (_screen->getPalette(0), pal, 0x300);
- memcpy (_screen->getPalette(1), pal, 0x300);
+ memcpy(_screen->getPalette(0), pal, 0x300);
+ memcpy(_screen->getPalette(1), pal, 0x300);
break;
case 3:
_screen->copyPage(2, 0);
_screen->fadePalette(_screen->getPalette(0), 16);
- memcpy (_screen->getPalette(1), _screen->getPalette(0), 0x300);
+ memcpy(_screen->getPalette(1), _screen->getPalette(0), 0x300);
break;
case 4:
_screen->copyPage(2, 0);
_screen->fadePalette(_screen->getPalette(0), 36);
- memcpy (_screen->getPalette(1), _screen->getPalette(0), 0x300);
+ memcpy(_screen->getPalette(1), _screen->getPalette(0), 0x300);
break;
case 5:
@@ -2095,8 +2095,8 @@
case 8:
memset(pal, 0, 0x300);
_screen->fadePalette(pal, 16);
- memcpy (_screen->getPalette(0), pal, 0x300);
- memcpy (_screen->getPalette(1), pal, 0x300);
+ memcpy(_screen->getPalette(0), pal, 0x300);
+ memcpy(_screen->getPalette(1), pal, 0x300);
delay(120 * _tickLength);
break;
@@ -2112,8 +2112,8 @@
//pal[3 * i] = pal[3 * i + 1] = pal[3 * i + 2] = 0x3f;
_screen->fadePalette(pal, 64);
- memcpy (_screen->getPalette(0), pal, 0x300);
- memcpy (_screen->getPalette(1), pal, 0x300);
+ memcpy(_screen->getPalette(0), pal, 0x300);
+ memcpy(_screen->getPalette(1), pal, 0x300);
break;
default:
@@ -2404,7 +2404,6 @@
default:
currentFrame = _activeWSA[wsaNum].endFrame - 1;
res = true;
- break;
}
}
@@ -2590,7 +2589,6 @@
break;
default:
textData[cnt + 1].x = (((d->w << 3) - _screen->getTextWidth(str)) >> 1) + 1;
- break;
}
if (textData[cnt].unk1 == 5)
Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -845,7 +845,6 @@
red = 33;
green = 66;
blue = 100;
- break;
}
red = (uint8)((double)red * 0.63);
green = (uint8)((double)green * 0.63);
@@ -1793,7 +1792,6 @@
default:
newDelay = 3600;
- break;
}
setGameFlag(0xF1);
Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -98,7 +98,6 @@
default:
quitGame();
updateInput();
- break;
}
}
Modified: scummvm/trunk/engines/kyra/sequences_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_mr.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sequences_mr.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -216,7 +216,6 @@
default:
resetGameFlag(0x171);
runAnimationScript("EELS00.EMC", 0, 0, 1, 1);
- break;
}
changeChapter(2, 29, 0, 4);
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -381,8 +381,8 @@
if (_voice->id[i] == *(pos[ii] + 8)) {
if (!_voice->_snd[i])
_voice->_snd[i] = new Voice::Snd;
- memset (_voice->_snd[i]->name, 0, 9);
- memcpy (_voice->_snd[i]->name, (const char *)pos[ii], 8);
+ memset(_voice->_snd[i]->name, 0, 9);
+ memcpy(_voice->_snd[i]->name, (const char *)pos[ii], 8);
_voice->_snd[i]->id = READ_LE_UINT32(pos[ii] + 8);
_voice->_snd[i]->numSamples = READ_LE_UINT32(pos[ii] + 12);
_voice->_snd[i]->loopStart = READ_LE_UINT32(pos[ii] + 16);
@@ -395,8 +395,8 @@
}
}
} else {
- memset (_voice->name, 0, 9);
- memcpy (_voice->name, (const char *)fmInst, 8);
+ memset(_voice->name, 0, 9);
+ memcpy(_voice->name, (const char *)fmInst, 8);
for (uint8 i = 0; i < 8; i++) {
_voice->split[i] = READ_LE_UINT16(fmInst + 16 + 2 * i);
@@ -3173,7 +3173,6 @@
default:
warning("TownsPC98_OpnDriver: UNKNOWN ADDRESS %d", regAddress);
- break;
}
}
Modified: scummvm/trunk/engines/kyra/sprites.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sprites.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -387,7 +387,6 @@
default:
warning("Unsupported anim command %X in script %i", READ_LE_UINT16(data), i);
data += 2;
- break;
}
if (update)
@@ -488,7 +487,6 @@
default:
warning("Unknown code in DAT file '%s' offset %d: %x", filename, int(data - _dat), READ_LE_UINT16(data));
data += 2;
- break;
}
}
} else {
Modified: scummvm/trunk/engines/kyra/sprites_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/sprites_lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -79,8 +79,8 @@
uint8 *tmpPal1 = new uint8[64];
uint8 *tmpPal2 = new uint8[256];
uint16 *tmpPal3 = new uint16[256];
- memset (tmpPal1, 0, 64);
- memset (tmpPal2, 0, 256);
+ memset(tmpPal1, 0, 64);
+ memset(tmpPal2, 0, 256);
for (int i = 0; i < 64; i++) {
tmpPal1[i] = *p;
@@ -92,7 +92,7 @@
for (int i = 0; i < 16; i++) {
int pos = (monsterIndex << 4) + i;
memcpy(tmpPal2, _monsterShapes[pos] + 10, 256);
- memset (tmpPal3, 0xff, 512);
+ memset(tmpPal3, 0xff, 512);
uint8 numCol = *tmpPal2;
for (int ii = 0; ii < numCol; ii++) {
@@ -960,7 +960,7 @@
r = CLIP(r, 0, 7);
ovl = _screen->getLevelOverlay(r);
} else {
- memset (tmpOvl + 1, tblValue, 15);
+ memset(tmpOvl + 1, tblValue, 15);
tmpOvl[0] = 0;
table = tmpOvl;
ovl = _screen->getLevelOverlay(7);
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -1887,7 +1887,7 @@
tmp = _staticres->loadRawData(lolMapCursorOvl, tmpSize);
_mapCursorOverlay = new uint8[tmpSize];
- memcpy (_mapCursorOverlay, tmp, tmpSize);
+ memcpy(_mapCursorOverlay, tmp, tmpSize);
_staticres->unloadId(lolMapCursorOvl);
_updateSpellBookCoords = _staticres->loadRawData(lolSpellbookCoords, _updateSpellBookCoordsSize);
Modified: scummvm/trunk/engines/kyra/text_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/text_lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -269,7 +269,6 @@
break;
default:
eos = true;
- break;
}
break;
case ' ':
@@ -434,8 +433,6 @@
if ((_textDimData[sdx].column + _lineWidth) > (sd->w << 3))
printLine(_currentLine);
-
- break;
}
c = parseCommand();
Modified: scummvm/trunk/engines/kyra/timer_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lol.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/timer_lol.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -123,60 +123,60 @@
}
switch (_characters[i].characterUpdateEvents[ii] - 1) {
- case 0:
- if (_characters[i].weaponHit) {
- _characters[i].weaponHit = 0;
- _characters[i].characterUpdateDelay[ii] = calcMonsterSkillLevel(i, 6);
- if (_characters[i].characterUpdateDelay[ii] > v)
- v = _characters[i].characterUpdateDelay[ii];
- } else {
- _characters[i].flags &= 0xfffb;
- }
+ case 0:
+ if (_characters[i].weaponHit) {
+ _characters[i].weaponHit = 0;
+ _characters[i].characterUpdateDelay[ii] = calcMonsterSkillLevel(i, 6);
+ if (_characters[i].characterUpdateDelay[ii] > v)
+ v = _characters[i].characterUpdateDelay[ii];
+ } else {
+ _characters[i].flags &= 0xfffb;
+ }
- gui_drawCharPortraitWithStats(i);
- break;
+ gui_drawCharPortraitWithStats(i);
+ break;
- case 1:
- _characters[i].damageSuffered = 0;
- gui_drawCharPortraitWithStats(i);
- break;
+ case 1:
+ _characters[i].damageSuffered = 0;
+ gui_drawCharPortraitWithStats(i);
+ break;
- case 2:
- _characters[i].flags &= 0xffbf;
- gui_drawCharPortraitWithStats(i);
- break;
+ case 2:
+ _characters[i].flags &= 0xffbf;
+ gui_drawCharPortraitWithStats(i);
+ break;
- case 3:
- v = _rnd.getRandomNumberRng(1, 2);
- if (inflictDamage(i, v, 0x8000, 0, 0x80)) {
- _txt->printMessage(2, getLangString(0x4022), _characters[i].name);
- _characters[i].characterUpdateDelay[ii] = 10;
- if (_characters[i].characterUpdateDelay[ii] > v)
- v = _characters[i].characterUpdateDelay[ii];
- }
- break;
+ case 3:
+ v = _rnd.getRandomNumberRng(1, 2);
+ if (inflictDamage(i, v, 0x8000, 0, 0x80)) {
+ _txt->printMessage(2, getLangString(0x4022), _characters[i].name);
+ _characters[i].characterUpdateDelay[ii] = 10;
+ if (_characters[i].characterUpdateDelay[ii] > v)
+ v = _characters[i].characterUpdateDelay[ii];
+ }
+ break;
- case 4:
- _characters[i].flags &= 0xfeff;
- _txt->printMessage(0, getLangString(0x4027), _characters[i].name);
- gui_drawCharPortraitWithStats(i);
- break;
+ case 4:
+ _characters[i].flags &= 0xfeff;
+ _txt->printMessage(0, getLangString(0x4027), _characters[i].name);
+ gui_drawCharPortraitWithStats(i);
+ break;
- case 5:
- setTemporaryFaceFrame(i, 0, 0, 1);
- break;
+ case 5:
+ setTemporaryFaceFrame(i, 0, 0, 1);
+ break;
- case 6:
- _characters[i].flags &= 0xefff;
- gui_drawCharPortraitWithStats(i);
- break;
+ case 6:
+ _characters[i].flags &= 0xefff;
+ gui_drawCharPortraitWithStats(i);
+ break;
- case 7:
- restoreSwampPalette();
- break;
+ case 7:
+ restoreSwampPalette();
+ break;
- default:
- break;
+ default:
+ break;
}
if (_characters[i].characterUpdateDelay[ii] <= 0)
Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp 2009-05-29 13:07:14 UTC (rev 40993)
+++ scummvm/trunk/engines/kyra/vqa.cpp 2009-05-29 13:09:26 UTC (rev 40994)
@@ -343,7 +343,6 @@
default:
warning("VQAMovie::open: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
_file->seek(size, SEEK_CUR);
- break;
}
}
@@ -507,7 +506,6 @@
default:
warning("VQAMovie::displayFrame: Unknown `VQFR' sub-tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
_file->seek(size, SEEK_CUR);
- break;
}
}
@@ -517,7 +515,6 @@
default:
warning("VQAMovie::displayFrame: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
_file->seek(size, SEEK_CUR);
- break;
}
}
@@ -636,7 +633,6 @@
default:
warning("VQAMovie::play: Unknown tag `%c%c%c%c'", char((tag >> 24) & 0xFF), char((tag >> 16) & 0xFF), char((tag >> 8) & 0xFF), char(tag & 0xFF));
_file->seek(size, SEEK_CUR);
- break;
}
}
}
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