[Scummvm-cvs-logs] CVS: scummvm object.cpp,1.43,1.44 resource.cpp,1.54,1.55 scumm.h,1.86,1.87 scummsys.h,1.23,1.24 scummvm.cpp,1.84,1.85 sound.h,1.7,1.8
James Brown
ender at users.sourceforge.net
Sat Mar 16 10:59:03 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv8083
Modified Files:
object.cpp resource.cpp scumm.h scummsys.h scummvm.cpp sound.h
Log Message:
MorphOS port (sdl version) + endian fixes for big endian machines.
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** object.cpp 16 Mar 2002 05:33:25 -0000 1.43
--- object.cpp 16 Mar 2002 18:58:51 -0000 1.44
***************
*** 566,574 ****
imhd = (ImageHeader*)findResourceData(MKID('IMHD'), room + od->offs_obim_to_room);
! od->x_pos = imhd->v7.x_pos;
! od->y_pos = imhd->v7.y_pos;
! od->width = imhd->v7.width;
! od->height = imhd->v7.height;
! od->actordir = imhd->v7.actordir;
}
--- 566,574 ----
imhd = (ImageHeader*)findResourceData(MKID('IMHD'), room + od->offs_obim_to_room);
! od->x_pos = READ_LE_UINT16(&imhd->v7.x_pos);
! od->y_pos = READ_LE_UINT16(&imhd->v7.y_pos);
! od->width = READ_LE_UINT16(&imhd->v7.width);
! od->height = READ_LE_UINT16(&imhd->v7.height);
! od->actordir = READ_LE_UINT16(&imhd->v7.actordir);
}
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** resource.cpp 16 Mar 2002 18:03:28 -0000 1.54
--- resource.cpp 16 Mar 2002 18:58:51 -0000 1.55
***************
*** 273,281 ****
fileRead(_fileHandle, _classData, num * sizeof(uint32));
! #if defined(SCUMM_BIG_ENDIAN)
for (i=0; i<num; i++) {
_classData[i] = FROM_LE_32(_classData[i]);
}
! #endif
break;
--- 273,282 ----
fileRead(_fileHandle, _classData, num * sizeof(uint32));
! /* #if defined(SCUMM_BIG_ENDIAN)
for (i=0; i<num; i++) {
_classData[i] = FROM_LE_32(_classData[i]);
}
! #endif */ // ?? FIXME Remove according to Morphos diff.
!
break;
***************
*** 545,559 ****
_charsetData[no][i+1] = ptr[i+14];
}
- printf("byte *font[] = {");
- while(*ptr) {
- line++;
- printf("%d,", ptr[i]);
- if (line > 80) {
- printf("\n");
- line = 0;
- }
- ptr++;
- }
- printf("};\n");
}
--- 546,549 ----
***************
*** 670,674 ****
pos = 0;
! basetag = fileReadDwordLE();
total_size = fileReadDwordBE();
--- 660,664 ----
pos = 0;
! basetag = fileReadDword();
total_size = fileReadDwordBE();
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** scumm.h 16 Mar 2002 18:03:28 -0000 1.86
--- scumm.h 16 Mar 2002 18:58:51 -0000 1.87
***************
*** 60,64 ****
MIDI_TIMIDITY = 2,
MIDI_SEQ = 3,
! MIDI_QTMUSIC = 4,
};
--- 60,65 ----
MIDI_TIMIDITY = 2,
MIDI_SEQ = 3,
! MIDI_QTMUSIC = 4,
! MIDI_AMIDI = 5
};
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummsys.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** scummsys.h 10 Mar 2002 17:33:03 -0000 1.23
--- scummsys.h 16 Mar 2002 18:58:51 -0000 1.24
***************
*** 167,171 ****
--- 167,200 ----
#define NORETURN
#define NEED_STRDUP
+ #elif defined(__MORPHOS__)
+ #define scumm_stricmp stricmp
+ #define CHECK_HEAP
+
+ #define SCUMM_BIG_ENDIAN
+ #define SCUMM_NEED_ALIGNMENT
+ #define FORCEINLINE inline
+ #define CDECL
+
+ typedef unsigned char byte;
+ typedef unsigned char uint8;
+ typedef unsigned short uint16;
+ typedef unsigned long uint32;
+ typedef unsigned int uint;
+ typedef signed char int8;
+ typedef signed short int16;
+ typedef signed long int32;
+
+ #if defined(__GNUC__)
+ #define START_PACK_STRUCTS
+ #define END_PACK_STRUCTS
+ #define GCC_PACK __attribute__((packed))
+ #define NORETURN __attribute__((__noreturn__))
+ #else
+ #define START_PACK_STRUCTS pack (1)
+ #define END_PACK_STRUCTS pack ()
+ #define GCC_PACK
+ #define NORETURN
+ #endif
#elif defined(__DC__)
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** scummvm.cpp 16 Mar 2002 18:07:57 -0000 1.84
--- scummvm.cpp 16 Mar 2002 18:58:51 -0000 1.85
***************
*** 211,214 ****
--- 211,222 ----
#endif
parseCommandLine(argc, argv);
+
+ #ifdef __MORPHOS__
+ // I need to know the game name in initGraphics()
+ if (!detectGame()) {
+ warning("Game detection failed. Using default settings");
+ _features = GF_DEFAULT;
+ }
+ #endif
/* Init graphics and create a primary virtual screen */
***************
*** 217,220 ****
--- 225,229 ----
initVirtScreen(0, 0, 200, false, false);
+ #ifndef __MORPHOS__
if (_exe_name==NULL)
//error("Specify the name of the game to start on the command line");
***************
*** 225,228 ****
--- 234,238 ----
_features = GF_DEFAULT;
}
+ #endif
if (!_gameDataPath) {
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sound.h 14 Mar 2002 08:20:38 -0000 1.7
--- sound.h 16 Mar 2002 18:58:51 -0000 1.8
***************
*** 18,21 ****
--- 18,24 ----
* Change Log:
* $Log$
+ * Revision 1.8 2002/03/16 18:58:51 ender
+ * MorphOS port (sdl version) + endian fixes for big endian machines.
+ *
* Revision 1.7 2002/03/14 08:20:38 ender
* Fix compile error when using USE_ADLIB
***************
*** 429,432 ****
--- 432,436 ----
void MidiOutWindows(void *a, int b);
void MidiOutQuicktime(void *a, int b);
+ void MidiOutMorphOS(void *a, int b);
int connect_to_timidity(int port);
More information about the Scummvm-git-logs
mailing list