[Scummvm-cvs-logs] SF.net SVN: scummvm:[40866] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun May 24 17:06:29 CEST 2009
Revision: 40866
http://scummvm.svn.sourceforge.net/scummvm/?rev=40866&view=rev
Author: lordhoto
Date: 2009-05-24 15:06:28 +0000 (Sun, 24 May 2009)
Log Message:
-----------
Strip trailing whitespaces.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/sound.h
scummvm/trunk/engines/kyra/sound_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -706,7 +706,7 @@
// set the "mainLoop" parameter to false for them.
int inputFlag = checkInput(_activeButtons, !(_updateFlags & 3), 0);
if (_preserveEvents)
- _preserveEvents = false;
+ _preserveEvents = false;
else
removeInputTop();
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -2170,20 +2170,20 @@
uint16 v = (s[i * 3] + s[i * 3 + 1] + s[i * 3 + 2]) / 3;
tpal[i * 3 + 1] = v;
tpal[i * 3 + 2] = v << 1;
-
+
if (tpal[i * 3 + 2] > 0x3f)
tpal[i * 3 + 2] = 0x3f;
}
generateBrightnessPalette(tpal, tpal, _brightness, _lampEffect);
generateBrightnessPalette(swampCol, swampCol, _brightness, _lampEffect);
swampCol[0] = swampCol[1] = swampCol[2] = tpal[0] = tpal[1] = tpal[2] = 0;
-
+
generateBrightnessPalette(_screen->_currentPalette, s, _brightness, _lampEffect);
int sX = 112;
int sY = 0;
WSAMovie_v2 *mov = new WSAMovie_v2(this, _screen);
-
+
if (spellLevel == 0) {
sX = 0;
} if (spellLevel == 1 || spellLevel == 2) {
@@ -2235,7 +2235,7 @@
if (m->hitPoints <= dmg) {
increaseExperience(charNum, 2, m->hitPoints);
o = m->nextAssignedObject;
-
+
if (m->flags & 0x20) {
m->mode = 0;
monsterDropItems(m);
@@ -2291,7 +2291,7 @@
int d = 1;
if (spellLevel == 0) {
- fbCnt = 4;
+ fbCnt = 4;
} else if (spellLevel == 1) {
fbCnt = 5;
} else if (spellLevel == 2) {
@@ -2373,7 +2373,7 @@
if (fb->finalize) {
_screen->drawShape(_screen->_curPage, shp, fX, fY, 0, 0x1004, _trueLightTable1, _trueLightTable2, sW, sH);
-
+
if (finShpIndex2[fb->finProgress] != -1) {
shp = _fireballShapes[finShpIndex2[fb->finProgress]];
fX = (((fb->progress * _fireBallCoords[fb->tblIndex & 0xff]) >> 16) + fb->destX) - ((fb->progress / 8 + shp[3] + fireBallWH) >> 1);
@@ -2386,7 +2386,7 @@
} else {
_screen->drawShape(_screen->_curPage, shp, fX, fY, 0, 0x1004, _trueLightTable1, _trueLightTable2, sW, sH);
}
-
+
if (fb->finalize) {
if (++fb->finProgress >= 6) {
fb->active = false;
@@ -2404,7 +2404,7 @@
fb->finalize = true;
} else {
fb->active = false;
- i++;
+ i++;
}
static const uint8 fireBallSfx[] = { 98, 167, 167, 168 };
@@ -2412,7 +2412,7 @@
} else {
fb->progress -= fb->step;
- }
+ }
}
}
@@ -2428,7 +2428,7 @@
for (i = 0; i < numFireBalls; i++)
delete[] fireballState[i];
-
+
_screen->setCurPage(cp);
_screen->copyPage(12, 0);
_screen->updateScreen();
@@ -2473,7 +2473,7 @@
static const uint8 lightningDamage[] = { 18, 35, 50, 72 };
inflictMagicalDamageForBlock(calcNewBlockPosition(_currentBlock, _currentDirection), charNum, lightningDamage[spellLevel], 5);
-
+
_sceneUpdateRequired = true;
gui_drawScene(0);
_screen->showMouse();
@@ -2860,7 +2860,7 @@
void LoLEngine::inflictMagicalDamageForBlock(int block, int attacker, int damage, int index) {
uint16 o = _levelBlockProperties[block].assignedObjects;
- while (o & 0x8000) {
+ while (o & 0x8000) {
inflictDamage(o, calcInflictableDamagePerItem(attacker, o, damage, index, 2), attacker, 2, index);
if ((_monsters[o & 0x7fff].flags & 0x20) && (_currentLevel != 22))
break;
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -817,7 +817,7 @@
bool Screen_LoL::fadePaletteStep(uint8 *pal1, uint8 *pal2, uint32 elapsedTime, uint32 targetTime) {
uint8 tpal[768];
- uint8 *p1 = _palettes[0];
+ uint8 *p1 = _palettes[0];
bool res = false;
for (int i = 0; i < 768; i++) {
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -201,9 +201,9 @@
int LoLEngine::olol_setGameFlag(EMCState *script) {
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_setGameFlag(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
-
+
assert((stackPos(0) >> 4) < 40);
-
+
if (stackPos(1))
_gameFlags[stackPos(0) >> 4] |= (1 << (stackPos(0) & 0x0f));
else
@@ -1873,7 +1873,7 @@
int i = 0;
for (; i < 48; i++) {
if (!_inventory[i])
- continue;
+ continue;
if (_itemsInPlay[_inventory[i]].itemPropertyIndex == itemType)
break;
}
Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/sound.h 2009-05-24 15:06:28 UTC (rev 40866)
@@ -194,7 +194,7 @@
* @return playtime of the voice file (-1 marks unknown playtime)
*/
virtual int32 voicePlay(const char *file, Audio::SoundHandle *handle = 0, uint8 volume = 255, bool isSfx = false);
-
+
Audio::AudioStream *getVoiceStream(const char *file);
bool playVoiceStream(Audio::AudioStream *stream, Audio::SoundHandle *handle = 0, uint8 volume = 255, bool isSfx = false);
Modified: scummvm/trunk/engines/kyra/sound_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_lol.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/sound_lol.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -48,7 +48,7 @@
_lastSpeechId = id;
_lastSpeaker = speaker;
_nextSpeechId = _nextSpeaker = -1;
-
+
char pattern1[8];
char pattern2[5];
char file1[13];
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-05-24 14:58:40 UTC (rev 40865)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-05-24 15:06:28 UTC (rev 40866)
@@ -1902,7 +1902,7 @@
_lightningProps[i].frameDiv = tmp[(i << 2) + 1];
_lightningProps[i].sfxId = READ_LE_UINT16(&tmp[(i << 2) + 2]);
}
- _staticres->unloadId(lolLightningDefs);
+ _staticres->unloadId(lolLightningDefs);
}
_fireBallCoords = (const int16*) _staticres->loadRawDataBe16(lolFireballCoords, _fireBallCoordsSize);
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