[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.16,1.17 debug.cpp,1.21,1.22 debug.h,1.14,1.15 intern.h,1.20,1.21 items.cpp,1.92,1.93 midi.cpp,1.58,1.59 midi.h,1.22,1.23 midiparser_s1d.cpp,1.6,1.7 res.cpp,1.26,1.27 simon.cpp,1.305,1.306 simon.h,1.88,1.89 sound.cpp,1.46,1.47 sound.h,1.11,1.12 verb.cpp,1.20,1.21 vga.cpp,1.81,1.82 vga.h,1.3,1.4

[Max Horn]

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

Modified Files:
	charset.cpp debug.cpp debug.h intern.h items.cpp midi.cpp 
	midi.h midiparser_s1d.cpp res.cpp simon.cpp simon.h sound.cpp 
	sound.h verb.cpp vga.cpp vga.h 
Log Message:
Simon namespace

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- charset.cpp	26 Sep 2003 05:34:52 -0000	1.16
+++ charset.cpp	3 Oct 2003 19:42:27 -0000	1.17
@@ -23,6 +23,8 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
+namespace Simon {
+
 void SimonEngine::print_char_helper_1(const byte *src, uint len) {
 	uint ind;
 
@@ -931,4 +933,4 @@
 	_lock_word &= ~0x8000;
 }
 
-
+} // End of namespace Simon

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- debug.cpp	13 Jul 2003 16:22:16 -0000	1.21
+++ debug.cpp	3 Oct 2003 19:42:27 -0000	1.22
@@ -30,6 +30,8 @@
 #include <sys/stat.h>
 #endif
 
+namespace Simon {
+
 byte *SimonEngine::dumpOpcode(byte *p) {
 	byte opcode;
 	const char *s, *st;
@@ -455,3 +457,4 @@
 	dump_vga_script_always(ptr, res, sprite_id);
 }
 
+} // End of namespace Simon

Index: debug.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- debug.h	30 May 2003 09:39:20 -0000	1.14
+++ debug.h	3 Oct 2003 19:42:27 -0000	1.15
@@ -17,6 +17,11 @@
  *
  */
 
+#ifndef SIMON_DEBUG_H
+#define SIMON_DEBUG_H
+
+namespace Simon {
+
 static const char *const simon1dos_opcode_name_table[256] = {
 	/* 0 */
 	"|INV_COND",
@@ -1156,4 +1161,8 @@
 	"bb|SET_OP189_FLAG",
 	"bb|CLEAR_OP189_FLAG",
 };
+
+} // End of namespace Simon
+
+#endif
 

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- intern.h	24 Sep 2003 06:19:30 -0000	1.20
+++ intern.h	3 Oct 2003 19:42:27 -0000	1.21
@@ -22,6 +22,8 @@
 #ifndef SIMON_INTERN_H
 #define SIMON_INTERN_H
 
+namespace Simon {
+
 struct Child {
 	Child *next;
 	uint16 type;
@@ -133,6 +135,8 @@
 	const char *mp3_effects_filename;
  	const char *gamepc_filename;
 };
+
+} // End of namespace Simon
 
 enum {
 	GF_SIMON2 = 1 << 0,

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- items.cpp	26 Sep 2003 05:34:52 -0000	1.92
+++ items.cpp	3 Oct 2003 19:42:27 -0000	1.93
@@ -32,6 +32,8 @@
 
 #endif
 
+namespace Simon {
+
 int SimonEngine::runScript() {
 	byte opcode;
 	bool flag, condition;
@@ -1601,3 +1603,5 @@
 		showmessage_helper_3(_fcs_ptr_1->textLength, _fcs_ptr_1->textMaxLength);
 	}
 }
+
+} // End of namespace Simon

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- midi.cpp	24 Sep 2003 06:31:42 -0000	1.58
+++ midi.cpp	3 Oct 2003 19:42:27 -0000	1.59
@@ -27,13 +27,15 @@
 #include "sound/mixer.h"
 #include "simon/simon.h"
 
+namespace Simon {
+
+
 // MidiParser_S1D is not considered part of the standard
 // MidiParser suite, but we still try to mask its details
 // and just provide a factory function.
 extern MidiParser *MidiParser_createS1D();
 
 
-
 // Instrument mapping for MT32 tracks emulated under GM.
 static const byte mt32_to_gm[128] = {
 //    0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
@@ -555,3 +557,5 @@
 	p->parser = parser; // That plugs the power cord into the wall
 	_system->unlock_mutex(_mutex);
 }
+
+} // End of namespace Simon

Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- midi.h	11 Aug 2003 05:25:33 -0000	1.22
+++ midi.h	3 Oct 2003 19:42:27 -0000	1.23
@@ -28,6 +28,8 @@
 class File;
 class OSystem;
 
+namespace Simon {
+
 struct MusicInfo {
 	MidiParser *parser;
 	byte * data;
@@ -115,5 +117,7 @@
 	MidiChannel *allocateChannel() { return 0; }
 	MidiChannel *getPercussionChannel() { return 0; }
 };
+
+} // End of namespace Simon
 
 #endif

Index: midiparser_s1d.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midiparser_s1d.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- midiparser_s1d.cpp	24 Sep 2003 06:31:42 -0000	1.6
+++ midiparser_s1d.cpp	3 Oct 2003 19:42:27 -0000	1.7
@@ -26,6 +26,8 @@
 
 #include <stdio.h>
 
+namespace Simon {
+
 //////////////////////////////////////////////////
 //
 // Simon 1 Demo version of MidiParser
@@ -160,3 +162,5 @@
 }
 
 MidiParser *MidiParser_createS1D() { return new MidiParser_S1D; }
+
+} // End of namespace Simon

Index: res.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/res.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- res.cpp	25 Sep 2003 04:32:27 -0000	1.26
+++ res.cpp	3 Oct 2003 19:42:27 -0000	1.27
@@ -25,6 +25,8 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
+namespace Simon {
+
 // Script opcodes to load into memory
 static const char *const opcode_arg_table_simon1win[256] = {
 	" ", "I ", "I ", "I ", "I ", "I ", "I ", "II ", "II ", "II ", "II ", "B ", "B ", "BN ", "BN ",
@@ -343,3 +345,5 @@
 		}
 	}
 }
+
+} // End of namespace Simon

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- simon.cpp	1 Oct 2003 17:34:46 -0000	1.305
+++ simon.cpp	3 Oct 2003 19:42:27 -0000	1.306
@@ -67,11 +67,13 @@
 }
 
 Engine *Engine_SIMON_create(GameDetector *detector, OSystem *syst) {
-	return new SimonEngine(detector, syst);
+	return new Simon::SimonEngine(detector, syst);
 }
 
 REGISTER_PLUGIN("Simon the Sorcerer", Engine_SIMON_targetList, Engine_SIMON_create);
 
+namespace Simon {
+
 static const GameSpecificSettings simon1_settings = {
 	1,										// VGA_DELAY_BASE
 	1576 / 4,									// TABLE_INDEX_BASE
@@ -5064,3 +5066,5 @@
 byte SimonEngine::getByte() {
 	return *_code_ptr++;
 }
+
+} // End of namespace Simon

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- simon.h	18 Sep 2003 02:07:17 -0000	1.88
+++ simon.h	3 Oct 2003 19:42:27 -0000	1.89
@@ -29,6 +29,8 @@
 #include "sound/mixer.h"
 #include "simon/sound.h"
 
+namespace Simon {
+
 /* Various other settings */
 //#define DUMP_FILE_NR 8
 //#define DUMP_BITMAPS_FILE_NR 8
@@ -799,5 +801,7 @@
 };
 
 void palette_fadeout(uint32 *pal_values, uint num);
+
+} // End of namespace Simon
 
 #endif

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- sound.cpp	24 Sep 2003 06:19:30 -0000	1.46
+++ sound.cpp	3 Oct 2003 19:42:27 -0000	1.47
@@ -23,6 +23,8 @@
 #include "simon/sound.h"
 #include "sound/voc.h"
 
+namespace Simon {
+
 #define SOUND_BIG_ENDIAN true
 
 class BaseSound {
@@ -482,3 +484,5 @@
 		playAmbient(tmp);
 	}
 }
+
+} // End of namespace Simon

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sound.h	21 Jul 2003 04:00:04 -0000	1.11
+++ sound.h	3 Oct 2003 19:42:27 -0000	1.12
@@ -17,9 +17,14 @@
  *
  */
 
+#ifndef SIMON_SOUND_H
+#define SIMON_SOUND_H
+
 #include "sound/mixer.h"
 #include "simon/intern.h"
 
+namespace Simon {
+
 class BaseSound;
 
 class SimonSound {
@@ -67,3 +72,6 @@
 	void ambientPause(bool b);
 };
 
+} // End of namespace Simon
+
+#endif

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- verb.cpp	1 Jun 2003 09:41:56 -0000	1.20
+++ verb.cpp	3 Oct 2003 19:42:27 -0000	1.21
@@ -24,6 +24,8 @@
 #include "simon/simon.h"
 #include "simon/intern.h"
 
+namespace Simon {
+
 static const char *const verb_names[] = {
 	"Walk to",
 	"Look at",
@@ -455,3 +457,5 @@
 	
 	return true;
 }
+
+} // End of namespace Simon

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- vga.cpp	24 Sep 2003 06:31:42 -0000	1.81
+++ vga.cpp	3 Oct 2003 19:42:27 -0000	1.82
@@ -25,6 +25,8 @@
 #include "simon/intern.h"
 #include "simon/vga.h"
 
+namespace Simon {
+
 typedef void (SimonEngine::*VgaOpcodeProc) ();
 static uint16 vc_get_out_of_code = 0;
 
@@ -1905,3 +1907,5 @@
 	vc_read_next_byte();
 	_op_189_flags &= ~(1 << vc_read_next_byte());
 }
+
+} // End of namespace Simon

Index: vga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vga.h	6 Mar 2003 21:46:53 -0000	1.3
+++ vga.h	3 Oct 2003 19:42:27 -0000	1.4
@@ -22,6 +22,8 @@
 #ifndef SIMON_VGA_H
 #define SIMON_VGA_H
 
+namespace Simon {
+
 struct VgaFile1Header {
 	uint16 x_1, x_2;
 	uint16 hdr2_start;
@@ -79,5 +81,6 @@
 
 byte *vc_10_depack_column(VC10_state *vs);
 
+} // End of namespace Simon
 
 #endif