aboutsummaryrefslogtreecommitdiff
path: root/backends/morphos
diff options
context:
space:
mode:
authorRuediger Hanke2002-12-25 21:44:59 +0000
committerRuediger Hanke2002-12-25 21:44:59 +0000
commite1045c16a81529163eac159a00321a30355e8aa6 (patch)
tree39694a57bf14e116aa82c954d66c9a4ba6aab785 /backends/morphos
parent748ac8fe378e8abdde3d42fabda36c414e2d1362 (diff)
downloadscummvm-rg350-e1045c16a81529163eac159a00321a30355e8aa6.tar.gz
scummvm-rg350-e1045c16a81529163eac159a00321a30355e8aa6.tar.bz2
scummvm-rg350-e1045c16a81529163eac159a00321a30355e8aa6.zip
Fix compiler warning and possible hit
svn-id: r6150
Diffstat (limited to 'backends/morphos')
-rw-r--r--backends/morphos/morphos_sound.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/backends/morphos/morphos_sound.cpp b/backends/morphos/morphos_sound.cpp
index 73f7bea3ae..8ba967c0c6 100644
--- a/backends/morphos/morphos_sound.cpp
+++ b/backends/morphos/morphos_sound.cpp
@@ -72,7 +72,8 @@ bool init_morphos_music(ULONG MidiUnit, ULONG DevFlags)
ScummMidiRequest = NULL;
ScummMidiPort = NULL;
}
- EtudeBase = ScummMidiRequest->emr_Std.io_Device;
+ else
+ EtudeBase = ScummMidiRequest->emr_Std.io_Device;
}
else
{
@@ -139,7 +140,7 @@ static bool init_morphos_sound()
ahiBuf[1] = &ahiBuf[0][AHI_BUF_SIZE];
ahiReq[0]->ahir_Version = 4;
- if (ahiDevice = OpenDevice(AHINAME, 0, (IORequest *) ahiReq[0], 0))
+ if ((ahiDevice = OpenDevice(AHINAME, 0, (IORequest *) ahiReq[0], 0)))
{
FreeVec(ahiBuf[0]);
FreeVec(ahiReq[1]);