[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.1,1.2
James Brown
ender at users.sourceforge.net
Fri Apr 12 21:40:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.83,1.84
- Next message: [Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.8,1.9 gui.cpp,1.28,1.29 gui.h,1.14,1.15 resource.cpp,1.65,1.66 scummvm.dsp,1.34,1.35 sdl.cpp,1.84,1.85
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv29006/simon
Modified Files:
midi.cpp
Log Message:
Fix various warnings, and things preventing non-win32 platforms from compiling.
Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midi.cpp 12 Apr 2002 21:26:35 -0000 1.1
--- midi.cpp 13 Apr 2002 04:39:04 -0000 1.2
***************
*** 26,30 ****
#include "simon.h"
-
void MidiPlayer::read_from_file(void *dst, uint size) {
if (fread(dst, size, 1, _input) != 1)
--- 26,29 ----
***************
*** 189,192 ****
--- 188,192 ----
void MidiPlayer::initialize() {
+ #ifdef WIN32
uint i;
MyMidiHdr *mmh;
***************
*** 237,240 ****
--- 237,241 ----
_midi_var9 = true;
+ #endif
}
***************
*** 295,298 ****
--- 296,300 ----
int MidiPlayer::fill_helper(NoteRec *nr, MyMidiHdr *mmh) {
+ #ifdef WIN32
byte *lpdata;
uint b;
***************
*** 339,343 ****
mmh->b += 12;
}
!
return 0;
}
--- 341,345 ----
mmh->b += 12;
}
! #endif
return 0;
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.83,1.84
- Next message: [Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.8,1.9 gui.cpp,1.28,1.29 gui.h,1.14,1.15 resource.cpp,1.65,1.66 scummvm.dsp,1.34,1.35 sdl.cpp,1.84,1.85
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list