[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.15,1.16 morphos_start.cpp,1.10,1.11
Ruediger Hanke
tomjoad at users.sourceforge.net
Wed Dec 25 03:48:02 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/morphos build.rules,1.5,1.6 morphos.cpp,1.14,1.15 morphos.h,1.7,1.8 morphos_scaler.cpp,1.3,1.4 morphos_scaler.h,1.1.1.1,1.2 morphos_timer.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/morphos
In directory sc8-pr-cvs1:/tmp/cvs-serv1787
Modified Files:
morphos.cpp morphos_start.cpp
Log Message:
More warnings with MorphOS GCC fixed, removed unneccessary define
Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- morphos.cpp 25 Dec 2002 11:38:21 -0000 1.15
+++ morphos.cpp 25 Dec 2002 11:47:16 -0000 1.16
@@ -44,9 +44,7 @@
#include <proto/intuition.h>
#include <proto/keymap.h>
#include <proto/timer.h>
-#define USE_INLINE_STDARG
#include <proto/cdda.h>
-#undef USE_INLINE_STDARG
#include <proto/cybergraphics.h>
#include <time.h>
Index: morphos_start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos_start.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- morphos_start.cpp 2 Dec 2002 19:03:07 -0000 1.10
+++ morphos_start.cpp 25 Dec 2002 11:47:16 -0000 1.11
@@ -141,7 +141,8 @@
if (dobj == NULL)
return;
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "STORY"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "STORY");
+ if (ToolValue)
{
if (ScummStory)
FreeVec(ScummStory);
@@ -149,7 +150,8 @@
strcpy(ScummStory, ToolValue);
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "DATAPATH"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "DATAPATH");
+ if (ToolValue)
{
if (ScummPath)
FreeVec(ScummPath);
@@ -158,7 +160,8 @@
strcat(ScummPath, ToolValue);
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WINDOW"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "WINDOW");
+ if (ToolValue)
{
if (MatchToolValue(ToolValue, "YES"))
args[USG_WINDOW] = TRUE;
@@ -166,7 +169,8 @@
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)
{
@@ -175,7 +179,8 @@
}
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSIC"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSIC");
+ if (ToolValue)
{
if (!(ScummMusicDriver = FindMusicDriver(ToolValue)))
{
@@ -185,10 +190,12 @@
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);
- if( ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSICVOL"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "MUSICVOL");
+ if (ToolValue)
{
int vol = atoi(ToolValue);
if (vol >= 0 && vol <= 100)
@@ -198,7 +205,8 @@
}
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SFXVOL"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "SFXVOL");
+ if (ToolValue)
{
int vol = atoi(ToolValue);
if (vol >= 0 && vol <= 255)
@@ -208,19 +216,22 @@
}
}
- if (ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TEMPO"))
+ ToolValue = (char *) FindToolType(dobj->do_ToolTypes, "TEMPO");
+ if (ToolValue)
{
ScummMidiTempo = atoi(ToolValue);
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);
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"))
args[USG_NOSUBTITLES] = FALSE;
@@ -228,7 +239,8 @@
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"))
args[USG_AMIGA] = FALSE;
@@ -243,8 +255,6 @@
int main()
{
- int delta;
- int last_time, new_time;
char *argv[20];
char musicvol[6], sfxvol[6], talkspeed[12], tempo[12], scaler[14];
int argc = 0;
@@ -338,12 +348,12 @@
argv[argc++] = "-gsuper2xsai";
if (args[USG_MUSICVOL] && ScummMidiVolume >= 0 && ScummMidiVolume <= 100)
{
- sprintf(musicvol, "-m%d", ScummMidiVolume);
+ sprintf(musicvol, "-m%ld", ScummMidiVolume);
argv[argc++] = musicvol;
}
if (args[USG_SFXVOL] && ScummSfxVolume >= 0 && ScummSfxVolume <= 255)
{
- sprintf(sfxvol, "-s%d", ScummSfxVolume);
+ sprintf(sfxvol, "-s%ld", ScummSfxVolume);
argv[argc++] = sfxvol;
}
if (args[USG_TEMPO] && ScummMidiTempo > 0)
@@ -353,7 +363,7 @@
}
if (args[USG_TALKSPEED] && ScummTalkSpeed >= 0 && ScummTalkSpeed <= 255)
{
- sprintf(talkspeed, "-y%d", ScummTalkSpeed);
+ sprintf(talkspeed, "-y%ld", ScummTalkSpeed);
argv[argc++] = talkspeed;
}
if (ScummStory)
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/morphos build.rules,1.5,1.6 morphos.cpp,1.14,1.15 morphos.h,1.7,1.8 morphos_scaler.cpp,1.3,1.4 morphos_scaler.h,1.1.1.1,1.2 morphos_timer.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.29,1.30
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list