libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-31 07:53:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASYLUM: Fix compilation on AmigaOS 4

Browse Source
This commit is contained in:
Cameron Cawley 2021-05-17 19:56:18 +01:00
parent 05ea3ce436
commit 57dc4a08d1
6 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
engines/asylum/console.cpp
View File

@ -296,7 +296,7 @@ bool Console::cmdListFiles(int argc, const char **argv) {
return true;
}
bool Console::cmdListActions(int32 argc, const char **argv) {
bool Console::cmdListActions(int argc, const char **argv) {
if (argc != 1 && argc != 2) {
debugPrintf("Syntax: %s <index> (use nothing for all)\n", argv[0]);
return true;
@ -326,7 +326,7 @@ bool Console::cmdListActions(int32 argc, const char **argv) {
return true;
}
bool Console::cmdListActors(int32 argc, const char **argv) {
bool Console::cmdListActors(int argc, const char **argv) {
if (argc != 1 && argc != 2 && argc != 4) {
debugPrintf("Syntax: %s <index> (use nothing for all) (<x>, <y>)\n", argv[0]);
return true;
@ -367,7 +367,7 @@ bool Console::cmdListActors(int32 argc, const char **argv) {
return true;
}
bool Console::cmdListFlags(int32 argc, const char **argv) {
bool Console::cmdListFlags(int argc, const char **argv) {
if (argc != 1 && argc != 2) {
debugPrintf("Syntax: %s <type> (nothing: all - 1: show set flags - 0: show unset flags)\n", argv[0]);
return true;
@ -407,7 +407,7 @@ bool Console::cmdListFlags(int32 argc, const char **argv) {
return true;
}
bool Console::cmdShowWorldStats(int32, const char **) {
bool Console::cmdShowWorldStats(int, const char **) {
debugPrintf("WorldStats\n");
debugPrintf("----------\n");
debugPrintf("%s", getWorld()->toString().c_str());
@ -415,7 +415,7 @@ bool Console::cmdShowWorldStats(int32, const char **) {
return true;
}
bool Console::cmdShowObject(int32 argc, const char **argv) {
bool Console::cmdShowObject(int argc, const char **argv) {
if (argc != 3) {
debugPrintf("Syntax: %s [id|idx] <target>\n", argv[0]);
return true;
@ -448,7 +448,7 @@ bool Console::cmdShowObject(int32 argc, const char **argv) {
return true;
}
bool Console::cmdShowAction(int32 argc, const char **argv) {
bool Console::cmdShowAction(int argc, const char **argv) {
if (argc != 3) {
debugPrintf("Syntax: %s [id|idx] <target>\n", argv[0]);
return true;
@ -481,7 +481,7 @@ bool Console::cmdShowAction(int32 argc, const char **argv) {
return true;
}
bool Console::cmdListObjects(int32 argc, const char **argv) {
bool Console::cmdListObjects(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s [onscreen|*]\n", argv[0]);
return true;
@ -514,7 +514,7 @@ bool Console::cmdListObjects(int32 argc, const char **argv) {
//////////////////////////////////////////////////////////////////////////
// Video / Scene / Script commands
//////////////////////////////////////////////////////////////////////////
bool Console::cmdPlayVideo(int32 argc, const char **argv) {
bool Console::cmdPlayVideo(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <video number>\n", argv[0]);
return true;
@ -535,7 +535,7 @@ bool Console::cmdPlayVideo(int32 argc, const char **argv) {
return false;
}
bool Console::cmdGetStatus(int32 argc, const char **argv) {
bool Console::cmdGetStatus(int argc, const char **argv) {
Actor *actor;
if (argc == 1) {
@ -558,7 +558,7 @@ bool Console::cmdGetStatus(int32 argc, const char **argv) {
return true;
}
bool Console::cmdSetStatus(int32 argc, const char **argv) {
bool Console::cmdSetStatus(int argc, const char **argv) {
Actor *actor;
int32 status;
@ -589,7 +589,7 @@ bool Console::cmdSetStatus(int32 argc, const char **argv) {
return false;
}
bool Console::cmdShowScript(int32 argc, const char **argv) {
bool Console::cmdShowScript(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <script index>\n", argv[0]);
return true;
@ -616,7 +616,7 @@ bool Console::cmdShowScript(int32 argc, const char **argv) {
return true;
}
bool Console::cmdRunScript(int32 argc, const char **argv) {
bool Console::cmdRunScript(int argc, const char **argv) {
if (argc != 3) {
debugPrintf("Syntax: %s <script index> <actor index>\n", argv[0]);
return true;
@ -640,7 +640,7 @@ bool Console::cmdRunScript(int32 argc, const char **argv) {
return false;
}
bool Console::cmdKillScript(int32 argc, const char **argv) {
bool Console::cmdKillScript(int argc, const char **argv) {
if (argc == 1) {
debugPrintf("Scripts running:\n");
for (uint32 i = 0; i < ARRAYSIZE(getScript()->_queue.entries); i++)
@ -658,7 +658,7 @@ bool Console::cmdKillScript(int32 argc, const char **argv) {
return false;
}
bool Console::cmdChangeScene(int32 argc, const char **argv) {
bool Console::cmdChangeScene(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <scene number>\n", argv[0]);
return true;
@ -680,7 +680,7 @@ bool Console::cmdChangeScene(int32 argc, const char **argv) {
return false;
}
bool Console::cmdRunEncounter(int32 argc, const char **argv) {
bool Console::cmdRunEncounter(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <encounter index>\n", argv[0]);
return true;
@ -719,7 +719,7 @@ bool Console::cmdRunEncounter(int32 argc, const char **argv) {
return false;
}
bool Console::cmdShowEncounter(int32 argc, const char **argv) {
bool Console::cmdShowEncounter(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <encounter index>\n", argv[0]);
return true;
@ -745,7 +745,7 @@ bool Console::cmdShowEncounter(int32 argc, const char **argv) {
return true;
}
bool Console::cmdRunPuzzle(int32 argc, const char **argv) {
bool Console::cmdRunPuzzle(int argc, const char **argv) {
if (argc != 2) {
debugPrintf("Syntax: %s <puzzle index>\n", argv[0]);
debugPrintf(" 0 VCR\n");
@ -797,7 +797,7 @@ bool Console::cmdRunPuzzle(int32 argc, const char **argv) {
return false;
}
bool Console::cmdListItems(int32 argc, const char **argv) {
bool Console::cmdListItems(int argc, const char **argv) {
ChapterIndex chapter = getWorld()->chapter;
uint32 maxIndex;
for (maxIndex = 0; maxIndex < 16; maxIndex++) {
@ -826,7 +826,7 @@ bool Console::cmdListItems(int32 argc, const char **argv) {
return true;
}
bool Console::cmdAddToInventory(int32 argc, const char **argv) {
bool Console::cmdAddToInventory(int argc, const char **argv) {
if (argc != 2 && argc != 3) {
debugPrintf("Syntax: %s <item index> (<count>)\n", argv[0]);
return true;
@ -849,7 +849,7 @@ bool Console::cmdAddToInventory(int32 argc, const char **argv) {
return true;
}
bool Console::cmdRemoveFromInventory(int32 argc, const char **argv) {
bool Console::cmdRemoveFromInventory(int argc, const char **argv) {
if (argc != 2 && argc != 3) {
debugPrintf("Syntax: %s <item index> (<count>)\n", argv[0]);
return true;
@ -872,7 +872,7 @@ bool Console::cmdRemoveFromInventory(int32 argc, const char **argv) {
return true;
}
bool Console::cmdSetPalette(int32 argc, const char **argv) {
bool Console::cmdSetPalette(int argc, const char **argv) {
if (argc != 3) {
debugPrintf("Syntax: %s <pack> <index>\n", argv[0]);
return true;
@ -907,7 +907,7 @@ bool Console::cmdSetPalette(int32 argc, const char **argv) {
return true;
}
bool Console::cmdDrawResource(int32 argc, const char **argv) {
bool Console::cmdDrawResource(int argc, const char **argv) {
if (argc != 3 && argc != 4) {
debugPrintf("Syntax: %s <pack> <index> (<frame>)\n", argv[0]);
return true;
@ -967,7 +967,7 @@ bool Console::cmdDrawResource(int32 argc, const char **argv) {
//////////////////////////////////////////////////////////////////////////
// Flags commands
//////////////////////////////////////////////////////////////////////////
bool Console::cmdToggleFlag(int32 argc, const char **argv) {
bool Console::cmdToggleFlag(int argc, const char **argv) {
if (argc != 2 || atoi(argv[1]) > 1512 || atoi(argv[1]) < 0) {
debugPrintf("Syntax: <value> between 0 and 1512\n");
return true;

46
engines/asylum/console.h
View File

@ -62,35 +62,35 @@ private:
bool cmdListFiles(int argc, const char **argv);
bool cmdListActions(int32 argc, const char **argv);
bool cmdListActors(int32 argc, const char **argv);
bool cmdListFlags(int32 argc, const char **argv);
bool cmdShowObject(int32 argc, const char **argv);
bool cmdShowAction(int32 argc, const char **argv);
bool cmdListObjects(int32 argc, const char **argv);
bool cmdShowWorldStats(int32 argc, const char **argv);
bool cmdListActions(int argc, const char **argv);
bool cmdListActors(int argc, const char **argv);
bool cmdListFlags(int argc, const char **argv);
bool cmdShowObject(int argc, const char **argv);
bool cmdShowAction(int argc, const char **argv);
bool cmdListObjects(int argc, const char **argv);
bool cmdShowWorldStats(int argc, const char **argv);
bool cmdPlayVideo(int32 argc, const char **argv);
bool cmdShowScript(int32 argc, const char **argv);
bool cmdRunScript(int32 argc, const char **argv);
bool cmdKillScript(int32 argc, const char **argv);
bool cmdChangeScene(int32 argc, const char **argv);
bool cmdRunPuzzle(int32 argc, const char **argv);
bool cmdPlayVideo(int argc, const char **argv);
bool cmdShowScript(int argc, const char **argv);
bool cmdRunScript(int argc, const char **argv);
bool cmdKillScript(int argc, const char **argv);
bool cmdChangeScene(int argc, const char **argv);
bool cmdRunPuzzle(int argc, const char **argv);
bool cmdGetStatus(int32 argc, const char **argv);
bool cmdSetStatus(int32 argc, const char **argv);
bool cmdGetStatus(int argc, const char **argv);
bool cmdSetStatus(int argc, const char **argv);
bool cmdRunEncounter(int32 argc, const char **argv);
bool cmdShowEncounter(int32 argc, const char **argv);
bool cmdRunEncounter(int argc, const char **argv);
bool cmdShowEncounter(int argc, const char **argv);
bool cmdListItems(int32 argc, const char **argv);
bool cmdAddToInventory(int32 argc, const char **argv);
bool cmdRemoveFromInventory(int32 argc, const char **argv);
bool cmdListItems(int argc, const char **argv);
bool cmdAddToInventory(int argc, const char **argv);
bool cmdRemoveFromInventory(int argc, const char **argv);
bool cmdSetPalette(int32 argc, const char **argv);
bool cmdDrawResource(int32 argc, const char **argv);
bool cmdSetPalette(int argc, const char **argv);
bool cmdDrawResource(int argc, const char **argv);
bool cmdToggleFlag(int32 argc, const char **argv);
bool cmdToggleFlag(int argc, const char **argv);
};
} // End of namespace Asylum

2
engines/asylum/resources/object.cpp
View File

@ -401,7 +401,7 @@ void Object::update() {
getSpecial()->run(this, -1);
}
void Object::setNextFrame(int32 targetFlags) {
void Object::setNextFrame(uint32 targetFlags) {
flags |= targetFlags | kObjectFlagEnabled;
if (flags & kObjectFlag10000)

2
engines/asylum/resources/object.h
View File

@ -131,7 +131,7 @@ public:
*
* @param flags The flags.
*/
void setNextFrame(int flags);
void setNextFrame(uint32 flags);
/////////////////////////////////////////////////////////////////////////
// Misc

4
engines/asylum/system/config.h
View File

@ -51,8 +51,8 @@ public:
// Engine options
bool showEncounterSubtitles;
int gammaLevel;
int ambientVolume;
int movieVolume;
int32 ambientVolume;
int32 movieVolume;
bool musicStatus; // On or Off
bool reverseStereo;
int performance; ///< performance only affects sound: perf > 0 ? 22050hz/16bit : 11025hz/8bit

4
engines/asylum/system/sound.cpp
View File

@ -353,7 +353,7 @@ void Sound::convertVolumeFrom(int32 &vol) {
// affecting the right speaker. Thus -10,000 means the left speaker is
// silent.
int32 v = CLIP(vol, -10000, 0);
int32 v = CLIP<int32>(vol, -10000, 0);
if (v) {
vol = (int)((double)Audio::Mixer::kMaxChannelVolume * pow(10.0, (double)v / 2000.0) + 0.5);
} else {
@ -378,7 +378,7 @@ void Sound::convertPan(int32 &pan) {
// affecting the right speaker. Thus -10,000 means the left speaker is
// silent.
int32 p = CLIP(pan, -10000, 10000);
int32 p = CLIP<int32>(pan, -10000, 10000);
if (p < 0) {
pan = (int)(255.0 * pow(10.0, (double)p / 2000.0) + 127.5);
} else if (p > 0) {