[Scummvm-cvs-logs] CVS: scummvm/simon intern.h,1.25,1.26

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv32520/simon

Modified Files:
	intern.h 
Log Message:

Might as well merge, not need for larger sizes.


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- intern.h	3 Dec 2003 05:52:21 -0000	1.25
+++ intern.h	21 Dec 2003 06:36:29 -0000	1.26
@@ -56,17 +56,17 @@
 	uint16 sibling;
 	int16 unk1;
 	int16 unk2;
-	int16 unk3;										/* signed int */
+	int16 unk3;								/* signed int */
 	uint16 unk4;
-	uint16 xxx_1;									/* unused? */
+	uint16 xxx_1;								/* unused? */
 	Child *children;
 	
 	Item() { memset(this, 0, sizeof(*this)); }
 };
 
 struct Subroutine {
-	uint16 id;										/* subroutine ID */
-	uint16 first;									/* offset from subroutine start to first subroutine line */
+	uint16 id;								/* subroutine ID */
+	uint16 first;								/* offset from subroutine start to first subroutine line */
 	Subroutine *next;							/* next subroutine in linked list */
 };
 
@@ -91,7 +91,7 @@
 	uint16 width, height;
 	uint16 textColumn, textRow;
 	uint8 textColumnOffset, textLength, textMaxLength;
-    uint8 fill_color, text_color, unk5;
+	uint8 fill_color, text_color, unk5;
 	FillOrCopyData *fcs_data;
 	FillOrCopyStruct() { memset(this, 0, sizeof(*this)); }
 };
@@ -119,15 +119,6 @@
 };
 
 struct GameSpecificSettings {
-#ifndef __PALM_OS__
-	const char *gme_filename;
-	const char *wav_filename;
-	const char *voc_filename;
-	const char *mp3_filename;
-	const char *voc_effects_filename;
-	const char *mp3_effects_filename;
- 	const char *gamepc_filename;
- #else
 	const char gme_filename[12];
 	const char wav_filename[12];
 	const char voc_filename[12];
@@ -135,7 +126,6 @@
 	const char voc_effects_filename[12];
 	const char mp3_effects_filename[12];
  	const char gamepc_filename[12]; 
- #endif
 };
 
 } // End of namespace Simon