diff options
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/eobcommon.h | 6 | ||||
| -rw-r--r-- | engines/kyra/kyra_rpg.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/saveload_rpg.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/screen.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h index 4e2e1c5298..dff2427ddb 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/eobcommon.h @@ -945,11 +945,11 @@ protected: void printNoEffectWarning(); void spellCallback_start_empty() {} - bool spellCallback_end_empty(void*) { return true; } + bool spellCallback_end_empty(void *) { return true; } void spellCallback_start_armor(); void spellCallback_start_burningHands(); void spellCallback_start_detectMagic(); - bool spellCallback_end_detectMagic(void*); + bool spellCallback_end_detectMagic(void *); void spellCallback_start_magicMissile(); bool spellCallback_end_magicMissile(void *obj); void spellCallback_start_shockingGrasp(); @@ -981,7 +981,7 @@ protected: void spellCallback_start_fleshToStone(); void spellCallback_start_stoneToFlesh(); void spellCallback_start_trueSeeing(); - bool spellCallback_end_trueSeeing(void*); + bool spellCallback_end_trueSeeing(void *); void spellCallback_start_slayLiving(); void spellCallback_start_powerWordStun(); void spellCallback_start_causeLightWounds(); diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp index b8d56b3ecb..b28292562a 100644 --- a/engines/kyra/kyra_rpg.cpp +++ b/engines/kyra/kyra_rpg.cpp @@ -148,7 +148,7 @@ Common::Error KyraRpgEngine::init() { _levelDecorationProperties = new LevelDecorationProperty[100]; memset(_levelDecorationProperties, 0, 100 * sizeof(LevelDecorationProperty)); _levelDecorationShapes = new uint8*[400]; - memset(_levelDecorationShapes, 0, 400 * sizeof(uint8*)); + memset(_levelDecorationShapes, 0, 400 * sizeof(uint8 *)); _levelBlockProperties = new LevelBlockProperty[1025]; memset(_levelBlockProperties, 0, 1025 * sizeof(LevelBlockProperty)); @@ -178,7 +178,7 @@ Common::Error KyraRpgEngine::init() { _vcnExpTable[i] = i & 0x0f; _doorShapes = new uint8*[6]; - memset(_doorShapes, 0, 6 * sizeof(uint8*)); + memset(_doorShapes, 0, 6 * sizeof(uint8 *)); initStaticResource(); diff --git a/engines/kyra/saveload_rpg.cpp b/engines/kyra/saveload_rpg.cpp index 2e9f0228cf..f3eef0d811 100644 --- a/engines/kyra/saveload_rpg.cpp +++ b/engines/kyra/saveload_rpg.cpp @@ -118,7 +118,7 @@ void KyraRpgEngine::restoreFlyingObjectTempData(LevelTempData *tmp) { } void KyraRpgEngine::releaseFlyingObjectTempData(LevelTempData *tmp) { - EoBFlyingObject *p = (EoBFlyingObject*)tmp->flyingObjects; + EoBFlyingObject *p = (EoBFlyingObject *)tmp->flyingObjects; delete[] p; } diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index 2b701e3b81..6a76cfd0d5 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -3200,7 +3200,7 @@ void Screen::crossFadeRegion(int x1, int y1, int x2, int y2, int w, int h, int s hideMouse(); - uint16 *wB = (uint16*)_pagePtrs[14]; + uint16 *wB = (uint16 *)_pagePtrs[14]; uint8 *hB = _pagePtrs[14] + 640; for (int i = 0; i < w; i++) |