aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorAdrian Frühwirth2018-04-19 12:08:31 +0200
committerAdrian Frühwirth2018-04-19 12:08:31 +0200
commit9bee9e1ba66db0ca27f13a7a09f839521c1e8b3f (patch)
tree09b3dc96b604095304ed8b7dfa5fbe1fdc08e07a /engines/kyra
parent25aa60726ddbcd444043488e5c1756630637891a (diff)
downloadscummvm-rg350-9bee9e1ba66db0ca27f13a7a09f839521c1e8b3f.tar.gz
scummvm-rg350-9bee9e1ba66db0ca27f13a7a09f839521c1e8b3f.tar.bz2
scummvm-rg350-9bee9e1ba66db0ca27f13a7a09f839521c1e8b3f.zip
JANITORIAL: Fix whitespace
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/eobcommon.h2
-rw-r--r--engines/kyra/screen_eob.cpp4
-rw-r--r--engines/kyra/sequences_darkmoon.cpp2
-rw-r--r--engines/kyra/sequences_hof.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h
index 1401d59dae..d214da0944 100644
--- a/engines/kyra/eobcommon.h
+++ b/engines/kyra/eobcommon.h
@@ -885,7 +885,7 @@ protected:
void inflictMonsterDamage(EoBMonsterInPlay *m, int damage, bool giveExperience);
void calcAndInflictMonsterDamage(EoBMonsterInPlay *m, int times, int pips, int offs, int flags, int savingThrowType, int savingThrowEffect);
void calcAndInflictCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int savingThrowEffect);
- int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType) ;
+ int calcCharacterDamage(int charIndex, int times, int itemOrPips, int useStrModifierOrBase, int flags, int savingThrowType, int damageType);
void inflictCharacterDamage(int charIndex, int damage);
bool characterAttackHitTest(int charIndex, int monsterIndex, int item, int attackType);
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 6c1bd572e1..3a9a647fa5 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -499,7 +499,7 @@ void Screen_EoB::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
int16 dX = x - (_dsX1 << 3);
int16 dY = y;
int16 dW = _dsX2 - _dsX1;
- uint8 pixelsPerByte = *src++ ;
+ uint8 pixelsPerByte = *src++;
uint16 dH = *src++;
uint16 width = (*src++) << 3;
@@ -1211,7 +1211,7 @@ void Screen_EoB::createFadeTable(uint8 *palData, uint8 *dst, uint8 rootColor, ui
if (t <= v && (ii == rootColor || ii != i)) {
v = t;
- col = ii ;
+ col = ii;
}
}
*dst++ = col;
diff --git a/engines/kyra/sequences_darkmoon.cpp b/engines/kyra/sequences_darkmoon.cpp
index 53a30d0079..68d6f752e0 100644
--- a/engines/kyra/sequences_darkmoon.cpp
+++ b/engines/kyra/sequences_darkmoon.cpp
@@ -876,7 +876,7 @@ void DarkMoonEngine::seq_playCredits(DarkmoonSequenceHelper *sq, const uint8 *da
const uint8 *shp = sq->_shapes[(*++posOld) - 1];
items[i + 1].data = shp;
items[i + 1].size = shp[1];
- items[i + 1].x = (dm->w - shp[2]) << 2 ;
+ items[i + 1].x = (dm->w - shp[2]) << 2;
items[i + 1].dataType = 1;
delete[] items[i + 1].str;
items[i + 1].str = 0;
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index 942cf16502..7ee1ad7e4b 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -3378,7 +3378,7 @@ void KyraEngine_HoF::seq_showStarcraftLogo() {
int KyraEngine_HoF::seq_playIntro() {
bool startupSaveLoadable = saveFileLoadable(0);
- return SeqPlayer_HOF(this, _screen, _system, startupSaveLoadable).play(kSequenceVirgin, startupSaveLoadable? kSequenceTitle : kSequenceNoLooping);
+ return SeqPlayer_HOF(this, _screen, _system, startupSaveLoadable).play(kSequenceVirgin, startupSaveLoadable ? kSequenceTitle : kSequenceNoLooping);
}
int KyraEngine_HoF::seq_playOutro() {