thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More warnings with MorphOS GCC fixed, removed unneccessary define

Browse source 
svn-id: r6117
This commit is contained in:
Ruediger Hanke 2002-12-25 11:47:16 +00:00
parent 6e9e7ced8f
commit eb6dbed750
2 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/morphos/morphos.cpp
View file

@ -44,9 +44,7 @@
#include <proto/intuition.h> #include <proto/intuition.h>
#include <proto/keymap.h> #include <proto/keymap.h>
#include <proto/timer.h> #include <proto/timer.h>
#define USE_INLINE_STDARG
#include <proto/cdda.h> #include <proto/cdda.h>
#undef USE_INLINE_STDARG
#include <proto/cybergraphics.h> #include <proto/cybergraphics.h>
#include <time.h> #include <time.h>

44
backends/morphos/morphos_start.cpp
View file

@ -141,7 +141,8 @@ static void ReadToolTypes(WBArg *OfFile)
if (dobj == NULL) if (dobj == NULL)
return; return;
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "STORY")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "STORY");
if (ToolValue)
{ {
if (ScummStory) if (ScummStory)
FreeVec(ScummStory); FreeVec(ScummStory);
@ -149,7 +150,8 @@ static void ReadToolTypes(WBArg *OfFile)
strcpy(ScummStory, ToolValue); strcpy(ScummStory, ToolValue);
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "DATAPATH")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "DATAPATH");
if (ToolValue)
{ {
if (ScummPath) if (ScummPath)
FreeVec(ScummPath); FreeVec(ScummPath);
@ -158,7 +160,8 @@ static void ReadToolTypes(WBArg *OfFile)
strcat(ScummPath, ToolValue); strcat(ScummPath, ToolValue);
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WINDOW")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WINDOW");
if (ToolValue)
{ {
if (MatchToolValue(ToolValue, "YES")) if (MatchToolValue(ToolValue, "YES"))
args[USG_WINDOW] = TRUE; args[USG_WINDOW] = TRUE;
@ -166,7 +169,8 @@ static void ReadToolTypes(WBArg *OfFile)
args[USG_WINDOW] = FALSE; args[USG_WINDOW] = FALSE;
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SCALER")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SCALER");
if (ToolValue)
{ {
if ((ScummGfxScaler = MorphOSScaler::FindByName(ToolValue)) == ST_INVALID) if ((ScummGfxScaler = MorphOSScaler::FindByName(ToolValue)) == ST_INVALID)
{ {
@ -175,7 +179,8 @@ static void ReadToolTypes(WBArg *OfFile)
} }
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSIC")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSIC");
if (ToolValue)
{ {
if (!(ScummMusicDriver = FindMusicDriver(ToolValue))) if (!(ScummMusicDriver = FindMusicDriver(ToolValue)))
{ {
@ -185,10 +190,12 @@ static void ReadToolTypes(WBArg *OfFile)
args[USG_MUSIC] = (ULONG) &ScummMusicDriver; args[USG_MUSIC] = (ULONG) &ScummMusicDriver;
} }
if( ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MIDIUNIT")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MIDIUNIT");
if (ToolValue)
ScummMidiUnit = atoi(ToolValue); ScummMidiUnit = atoi(ToolValue);
if( ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSICVOL")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSICVOL");
if (ToolValue)
{ {
int vol = atoi(ToolValue); int vol = atoi(ToolValue);
if (vol >= 0 && vol <= 100) if (vol >= 0 && vol <= 100)
@ -198,7 +205,8 @@ static void ReadToolTypes(WBArg *OfFile)
} }
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SFXVOL")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SFXVOL");
if (ToolValue)
{ {
int vol = atoi(ToolValue); int vol = atoi(ToolValue);
if (vol >= 0 && vol <= 255) if (vol >= 0 && vol <= 255)
@ -208,19 +216,22 @@ static void ReadToolTypes(WBArg *OfFile)
} }
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TEMPO")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TEMPO");
if (ToolValue)
{ {
ScummMidiTempo = atoi(ToolValue); ScummMidiTempo = atoi(ToolValue);
args[USG_TEMPO] = (ULONG) &ScummMidiTempo; args[USG_TEMPO] = (ULONG) &ScummMidiTempo;
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TALKSPEED")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TALKSPEED");
if (ToolValue)
{ {
ScummTalkSpeed = atoi(ToolValue); ScummTalkSpeed = atoi(ToolValue);
args[USG_TALKSPEED] = (ULONG) &ScummMidiTempo; args[USG_TALKSPEED] = (ULONG) &ScummMidiTempo;
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SUBTITLES")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SUBTITLES");
if (ToolValue)
{ {
if (MatchToolValue(ToolValue, "YES")) if (MatchToolValue(ToolValue, "YES"))
args[USG_NOSUBTITLES] = FALSE; args[USG_NOSUBTITLES] = FALSE;
@ -228,7 +239,8 @@ static void ReadToolTypes(WBArg *OfFile)
args[USG_NOSUBTITLES] = TRUE; args[USG_NOSUBTITLES] = TRUE;
} }
if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "AMIGA")) ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "AMIGA");
if (ToolValue)
{ {
if (MatchToolValue(ToolValue, "YES")) if (MatchToolValue(ToolValue, "YES"))
args[USG_AMIGA] = FALSE; args[USG_AMIGA] = FALSE;
@ -243,8 +255,6 @@ static void ReadToolTypes(WBArg *OfFile)
int main() int main()
{ {
int delta;
int last_time, new_time;
char *argv[20]; char *argv[20];
char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14]; char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14];
int argc = 0; int argc = 0;
@ -338,12 +348,12 @@ int main()
argv[argc++] = "-gsuper2xsai"; argv[argc++] = "-gsuper2xsai";
if (args[USG_MUSICVOL] && ScummMidiVolume >= 0 && ScummMidiVolume <= 100) if (args[USG_MUSICVOL] && ScummMidiVolume >= 0 && ScummMidiVolume <= 100)
{ {
sprintf(musicvol, "-m%d", ScummMidiVolume); sprintf(musicvol, "-m%ld", ScummMidiVolume);
argv[argc++] = musicvol; argv[argc++] = musicvol;
} }
if (args[USG_SFXVOL] && ScummSfxVolume >= 0 && ScummSfxVolume <= 255) if (args[USG_SFXVOL] && ScummSfxVolume >= 0 && ScummSfxVolume <= 255)
{ {
sprintf(sfxvol, "-s%d", ScummSfxVolume); sprintf(sfxvol, "-s%ld", ScummSfxVolume);
argv[argc++] = sfxvol; argv[argc++] = sfxvol;
} }
if (args[USG_TEMPO] && ScummMidiTempo > 0) if (args[USG_TEMPO] && ScummMidiTempo > 0)
@ -353,7 +363,7 @@ int main()
} }
if (args[USG_TALKSPEED] && ScummTalkSpeed >= 0 && ScummTalkSpeed <= 255) if (args[USG_TALKSPEED] && ScummTalkSpeed >= 0 && ScummTalkSpeed <= 255)
{ {
sprintf(talkspeed, "-y%d", ScummTalkSpeed); sprintf(talkspeed, "-y%ld", ScummTalkSpeed);
argv[argc++] = talkspeed; argv[argc++] = talkspeed;
} }
if (ScummStory) if (ScummStory)