[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.377,2.378 player_v2.cpp,2.27,2.28

Chris Apers chrilith at users.sourceforge.net
Mon Sep 8 19:18:07 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1282

Modified Files:
	scummvm.cpp player_v2.cpp 
Log Message:
Reduce PalmOS data segement

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.377
retrieving revision 2.378
diff -u -d -r2.377 -r2.378
--- scummvm.cpp	8 Sep 2003 01:42:24 -0000	2.377
+++ scummvm.cpp	8 Sep 2003 08:54:37 -0000	2.378
@@ -164,6 +164,7 @@
 	{"dig", "The Dig", GID_DIG, 7, MDT_NONE,
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE, 0},
 
+#ifndef __PALM_OS__ // these are SVGA games not supported under PalmOS
 	/* Scumm Version 8 */
 	{"comi", "The Curse of Monkey Island", GID_CMI, 8, MDT_NONE,
 	 GF_NEW_OPCODES | GF_NEW_COSTUMES | GF_NEW_CAMERA | GF_DIGI_IMUSE | GF_DEFAULT_TO_1X_SCALER, 0},
@@ -222,7 +223,8 @@
 	{"pj3-demo", "Pajama Sam 3: You Are What You Eat (Demo)", GID_PJSDEMO, 6, MDT_NONE,
 	 GF_NEW_OPCODES | GF_AFTER_HEV7 | GF_USE_KEY | GF_HUMONGOUS | GF_NEW_COSTUMES, 0},
 	// bunch of backyard sports games...
-	 
+
+#endif
 	{NULL, NULL, 0, 0, MDT_NONE, 0, NULL}
 };
 

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- player_v2.cpp	7 Sep 2003 19:28:45 -0000	2.27
+++ player_v2.cpp	8 Sep 2003 08:54:37 -0000	2.28
@@ -37,6 +37,16 @@
 #define FB_WNOISE 0x12000       /* feedback for white noise */
 #define FB_PNOISE 0x08000       /* feedback for periodic noise */
 
+#ifdef __PALM_OS__
+const uint8 *note_lengths;
+static const uint16 *hull_offsets;
+static const int16 *hulls;
+static const uint16 *freqmod_lengths;
+static const uint16 *freqmod_offsets;
+static const int8 *freqmod_table;
+static const uint16 *spk_freq_table;
+static const uint16 *pcjr_freq_table;
+#else
 const uint8 note_lengths[] = {
 	0,  
 	0,  0,  2,
@@ -310,6 +320,7 @@
    -90, 102,  83,  51,  11, -53, -95,  16
 };
 
+
 static const uint16  spk_freq_table[12] = {
 	36484, 34436, 32503, 30679, 28957, 27332, 
 	25798, 24350, 22983, 21693, 20476, 19326
@@ -319,7 +330,7 @@
 	65472, 61760, 58304, 55040, 52032, 49024, 
 	46272, 43648, 41216, 38912, 36736, 34624
 };
-
+#endif
 
 ////////////////////////////////////////
 //
@@ -962,3 +973,29 @@
 		lowPassFilter(data, len);
 }
 
+#ifdef __PALM_OS__
+#include "scumm_globals.h"
+
+_GINIT(PlayerV2)
+_GSETPTR(note_lengths, GBVARS_NOTELENGTHS_INDEX, uint8, GBVARS_SCUMM)
+_GSETPTR(hull_offsets, GBVARS_HULLOFFSETS_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(hulls, GBVARS_HULLS_INDEX, int16, GBVARS_SCUMM)
+_GSETPTR(freqmod_lengths, GBVARS_FREQMODLENGTHS_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(freqmod_offsets, GBVARS_FREQMODOFFSETS_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(freqmod_table, GBVARS_FREQMODTABLE_INDEX, int8, GBVARS_SCUMM)
+_GSETPTR(spk_freq_table, GBVARS_SPKFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(pcjr_freq_table, GBVARS_PCJRFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
+_GEND
+
+_GRELEASE(PlayerV2)
+_GRELEASEPTR(GBVARS_NOTELENGTHS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_HULLOFFSETS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_HULLS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODLENGTHS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODOFFSETS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODTABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_SPKFREQTABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_PCJRFREQTABLE_INDEX, GBVARS_SCUMM)
+_GEND
+
+#endif





More information about the Scummvm-git-logs mailing list