[Scummvm-cvs-logs] CVS: scummvm/simon charset.cpp,1.37,1.38 cursor.cpp,1.7,1.8 debug.cpp,1.38,1.39 debugger.cpp,1.19,1.20 intern.h,1.35,1.36 items.cpp,1.123,1.124 midi.cpp,1.70,1.71 saveload.cpp,1.12,1.13 simon.cpp,1.507,1.508 simon.h,1.138,1.139 sound.cpp,1.87,1.88 sound.h,1.26,1.27 verb.cpp,1.27,1.28 vga.cpp,1.130,1.131

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/simon

Modified Files:
	charset.cpp cursor.cpp debug.cpp debugger.cpp intern.h 
	items.cpp midi.cpp saveload.cpp simon.cpp simon.h sound.cpp 
	sound.h verb.cpp vga.cpp 
Log Message:
Remove trailing whitespaces.


Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/charset.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- charset.cpp	24 Jun 2005 15:23:40 -0000	1.37
+++ charset.cpp	30 Jul 2005 21:11:34 -0000	1.38
@@ -172,7 +172,7 @@
 
 	WRITE_BE_UINT16(p + 4, height);
 	WRITE_BE_UINT16(p + 6, width);
-	
+
 	dst += READ_BE_UINT32(p);
 
 	memset(dst, 0, count);
@@ -307,7 +307,7 @@
 				width = _hebrew_char_widths [b - 64];
 
 			if (fcs->textLength != 0) {
-				fcs->textLength--;			
+				fcs->textLength--;
 				fcs->textColumnOffset += width;
 				if (fcs->textColumnOffset >= 8) {
 					fcs->textColumnOffset -= 8;
@@ -912,7 +912,7 @@
 	112, 136, 136, 120, 8, 16, 96, 0,
 	0, 0, 48, 48, 0, 48, 48, 0,
 	32, 64, 0, 112, 8, 248, 120, 0,
-	32, 64, 0, 192, 64, 64, 224, 0, 
+	32, 64, 0, 192, 64, 64, 224, 0,
 	32, 64, 0, 112, 136, 136, 112, 0,
 	32, 64, 0, 144, 144, 144, 104, 0,
 	112, 136, 8, 16, 32, 0, 32, 0,

Index: cursor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/cursor.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cursor.cpp	24 Jun 2005 15:23:40 -0000	1.7
+++ cursor.cpp	30 Jul 2005 21:11:35 -0000	1.8
@@ -84,7 +84,7 @@
 	  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xeb,0xe4,0xef,0xff,
 	  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0xef,0xff,0xff,
 	  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff },
-	// pick up  
+	// pick up
 	{ 0xff,0xff,0xff,0xff,0xff,0xe5,0xe5,0xe5,0xe5,0xe5,0xe5,0xff,0xff,0xff,0xff,0xff,
 	  0xff,0xff,0xff,0xff,0xe5,0xe6,0xe6,0xe7,0xe7,0xe6,0xe6,0xe5,0xff,0xff,0xff,0xff,
 	  0xff,0xff,0xff,0xe5,0xe7,0xe7,0xe7,0xe7,0xe8,0xe8,0xe8,0xe8,0xe5,0xff,0xff,0xff,

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debug.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- debug.cpp	24 Jun 2005 15:23:40 -0000	1.38
+++ debug.cpp	30 Jul 2005 21:11:35 -0000	1.39
@@ -191,7 +191,7 @@
 		} else {
 			strn = str = simon2_video_opcode_name_table[opcode];
 		}
-		
+
 		while (*strn != '|')
 			strn++;
 		fprintf(_dumpFile, "%.2d: %s ", opcode, strn + 1);
@@ -375,10 +375,10 @@
 	uint num = (a == 0) ? 0x20 : 0x10;
 	byte *palptr;
 	const byte *src;
-	
+
 	palptr = (byte *)&pal[a << 4];
 	src = vga1 + 6 + b * 96;
-	
+
 	do {
 		palptr[0] = src[0] << 2;
 		palptr[1] = src[1] << 2;
@@ -406,7 +406,7 @@
 	}
 
 	int width, height, flags;
-	
+
 	i = 538;
 
 	for (i = 1; ; i++) {
@@ -417,7 +417,7 @@
 		 * assume the end when offset >= 200kb */
 		if (offs >= 200*1024)
 			return;
-		
+
 		width = READ_BE_UINT16(p2 + 6);
 		height = p2[5];
 		flags = p2[4];

Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/debugger.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- debugger.cpp	24 Jun 2005 15:23:40 -0000	1.19
+++ debugger.cpp	30 Jul 2005 21:11:35 -0000	1.20
@@ -27,10 +27,10 @@
 
 namespace Simon {
 
-Debugger::Debugger(SimonEngine *vm) 
+Debugger::Debugger(SimonEngine *vm)
 	: Common::Debugger<Debugger>() {
 	_vm = vm;
-		
+
 	DCmd_Register("continue", &Debugger::Cmd_Exit);
 	DCmd_Register("exit", &Debugger::Cmd_Exit);
 	DCmd_Register("help", &Debugger::Cmd_Help);
@@ -58,9 +58,9 @@
 
 bool Debugger::Cmd_Exit(int argc, const char **argv) {
 	_detach_now = true;
-	return false;	
+	return false;
 }
- 
+
 bool Debugger::Cmd_Help(int argc, const char **argv) {
 	// console normally has 39 line width
 	// wrap around nicely

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/intern.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- intern.h	8 May 2005 05:56:08 -0000	1.35
+++ intern.h	30 Jul 2005 21:11:35 -0000	1.36
@@ -60,7 +60,7 @@
 	uint16 unk4;
 	uint16 xxx_1;									/* unused? */
 	Child *children;
-	
+
 	Item() { memset(this, 0, sizeof(*this)); }
 };
 
@@ -95,7 +95,7 @@
 	FillOrCopyData *fcs_data;
 	FillOrCopyStruct() { memset(this, 0, sizeof(*this)); }
 };
-// note on text offset: 
+// note on text offset:
 // the actual x-coordinate is: textColumn * 8 + textColumnOffset
 // the actual y-coordinate is: textRow * 8
 
@@ -142,7 +142,7 @@
 	const char mp3_effects_filename[12];
 	const char vorbis_effects_filename[12];
 	const char flac_effects_filename[12];
- 	const char gamepc_filename[12]; 
+ 	const char gamepc_filename[12];
  #endif
 };
 

Index: items.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/items.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- items.cpp	11 Jul 2005 13:22:55 -0000	1.123
+++ items.cpp	30 Jul 2005 21:11:35 -0000	1.124
@@ -977,7 +977,7 @@
 
 				const char *string_ptr = (const char *)getStringPtrByID(_stringIdArray3[string_id]);
 				TextLocation *tl = getTextLocation(vgaSpriteId);
-				if (_game & GF_TALKIE) 
+				if (_game & GF_TALKIE)
 					speech_id = _speechIdArray4[string_id];
 
 				if (_speech && speech_id != 0)
@@ -1491,7 +1491,7 @@
 
 	if (_language == 20) { //Hebrew
 		x = 128;
-	} else { 
+	} else {
 		x += 120;
 		if (x != 128)
 			x = 129;
@@ -1522,7 +1522,7 @@
 		midi.setLoop (loop != 0);
 		if (_lastMusicPlayed != music)
 			_nextMusicToPlay = music;
-		else 
+		else
 			midi.startTrack (track);
 	} else {
 		if (music != _lastMusicPlayed) {

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- midi.cpp	24 Jun 2005 15:23:40 -0000	1.70
+++ midi.cpp	30 Jul 2005 21:11:35 -0000	1.71
@@ -42,7 +42,7 @@
 	_driver = 0;
 	_map_mt32_to_gm = false;
 	_passThrough = false;
-	
+
 	_enable_sfx = true;
 	_current = 0;
 

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/saveload.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- saveload.cpp	24 Jun 2005 15:23:41 -0000	1.12
+++ saveload.cpp	30 Jul 2005 21:11:35 -0000	1.13
@@ -359,7 +359,7 @@
 	} else {
 		string = "\r       Load failed.";
 		string2 = "\r     File not found.";
-	}			
+	}
 
 	video_putchar(fcs, 0xC);
 	for (; *string; string++)
@@ -589,7 +589,7 @@
 	// Write the bits in array 1 & 2
 	for (i = 0; i != 32; i++)
 		_bitArray[i] = f->readUint16BE();
-	
+
 	if (f->ioFailed()) {
 		error("load failed");
 	}

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -d -r1.507 -r1.508
--- simon.cpp	5 Jul 2005 20:22:38 -0000	1.507
+++ simon.cpp	30 Jul 2005 21:11:35 -0000	1.508
@@ -74,7 +74,7 @@
 	{"simon2win", "Simon the Sorcerer 2 Talkie (Windows)", GAME_SIMON2WIN, 0},
 	{"simon2mac", "Simon the Sorcerer 2 Talkie (Amiga or Mac)", GAME_SIMON2WIN, 0},
 	{"simon1cd32", "Simon the Sorcerer 1 Talkie (Amiga CD32)", GAME_SIMON1CD32, "gameamiga"},
-	{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GAME_SIMON1DEMO, "GDEMO"}, 
+	{"simon1demo", "Simon the Sorcerer 1 (DOS Demo)", GAME_SIMON1DEMO, "GDEMO"},
 
 	{NULL, NULL, 0, NULL}
 };
@@ -275,7 +275,7 @@
 	_vcPtr = 0;
 	_vc_get_out_of_code = 0;
 	_gameOffsetsPtr = 0;
-	
+
 	const SimonGameSettings *g = simon_settings;
 	while (g->name) {
 		if (!scumm_stricmp(detector->_game.name, g->name))
@@ -305,11 +305,11 @@
 	// Convert older targets
 	if (g->detectname == NULL) {
 		if (!strcmp("simon1win", g->name)) {
-			ConfMan.set("gameid", "simon1talkie"); 
-			ConfMan.set("platform", "Windows"); 
+			ConfMan.set("gameid", "simon1talkie");
+			ConfMan.set("platform", "Windows");
 		} else if (!strcmp("simon2win", g->name) || !strcmp("simon2mac", g->name)) {
-			ConfMan.set("gameid", "simon2talkie"); 
-			ConfMan.set("platform", "Windows"); 
+			ConfMan.set("gameid", "simon2talkie");
+			ConfMan.set("platform", "Windows");
 		}
 		ConfMan.flushToDisk();
 	} else {
@@ -321,7 +321,7 @@
 		f.open(buf);
 		if (f.isOpen() == false)
 			strcat(buf, ".");
-		
+
 		if (Common::md5_file(buf, md5sum)) {
 			char md5str[32+1];
 			for (j = 0; j < 16; j++) {
@@ -427,7 +427,7 @@
 	_keyPressed = 0;
 
 	_gameFile = 0;
-	
+
 	_strippedTxtMem = 0;
 	_textSize = 0;
 	_stringTabNum = 0;
@@ -547,14 +547,14 @@
 
 	_firstTimeStruct = 0;
 	_pendingDeleteTimeEvent = 0;
-	
+
 	_base_time = 0;
 
 	_mouseX = 0;
 	_mouseY = 0;
 	_mouseXOld = 0;
 	_mouseYOld = 0;
-	
+
 	_dummyItem1 = new Item();
 	_dummyItem2 = new Item();
 	_dummyItem3 = new Item();
@@ -623,7 +623,7 @@
 	memset(_fcsData2, 0, sizeof(_fcsData2));
 
 	_freeStringSlot = 0;
-	
+
 	memset(_stringReturnBuffer, 0, sizeof(_stringReturnBuffer));
 
 	memset(_pathFindArray, 0, sizeof(_pathFindArray));
@@ -660,7 +660,7 @@
 
 	_sdlMouseX = 0;
 	_sdlMouseY = 0;
-	
+
 	_sdl_buf_3 = 0;
 	_sdl_buf = 0;
 	_sdl_buf_attached = 0;
@@ -731,7 +731,7 @@
 
 	// FIXME Use auto dirty rects cleanup code to reduce CPU usage
 	g_system->setFeatureState(OSystem::kFeatureAutoComputeDirtyRects, true);
-	
+
 	return 0;
 }
 
@@ -751,9 +751,9 @@
 	delete _dummyItem1;
 	delete _dummyItem2;
 	delete _dummyItem3;
-	
+
 	delete [] _fcs_list;
-	
+
 	delete _sound;
 	delete _debugger;
 }
@@ -1684,7 +1684,7 @@
 	Subroutine *sub;
 
 	_sound->stopVoice();
-	
+
 	sub = getSubroutineByID(170);
 	if (sub != NULL)
 		startSubroutineEx(sub);
@@ -1976,7 +1976,7 @@
 	uint b, color;
 
 	_lockWord |= 0x8000;
-	
+
 	if (_game & GF_SIMON2)
 		color = 0xec;
 	else
@@ -2094,7 +2094,7 @@
 			if (_lastHitArea3 != 0)
 				break;
 			hitarea_stuff_helper();
-			delay(100);	
+			delay(100);
 		}
 
 		ha = _lastHitArea;
@@ -2662,7 +2662,7 @@
 
 	// When Simon talks to the Golum about stew in French version of
 	// Simon the Sorcerer 1 the code_ptr is at wrong location for
-	// sprite 200. This  was a bug in the original game, which 
+	// sprite 200. This  was a bug in the original game, which
 	// caused several glitches in this scene.
 	// We work around the problem by correcting the code_ptr for sprite
 	// 200 in this scene, if it is wrong.
@@ -2941,7 +2941,7 @@
 		_lockWord |= 0x4000;
 		vc27_resetSprite();
 		_lockWord &= ~0x4000;
-	}	
+	}
 }
 
 bool SimonEngine::itemIsSiblingOf(uint16 a) {
@@ -3307,7 +3307,7 @@
 			_dumpImages ^=1;
 		break;
 	}
-	
+
 	_keyPressed = 0;
 }
 
@@ -3558,13 +3558,13 @@
 		render_string_amiga(vgaSpriteId, color, width, height, convertedString);
 	else
 		render_string(vgaSpriteId, color, width, height, convertedString);
-		
+
 	int b = 4;
 	if (!(_bitArray[8] & 0x20))
 		b = 3;
 
 	x >>= 3;
-	
+
 	if (y < 2)
 		y = 2;
 
@@ -3696,17 +3696,17 @@
 		File in;
 		char buf[15];
 		uint32 size;
-		if (vga_id == 23) 
+		if (vga_id == 23)
 			vga_id = 112;
 		if (vga_id == 328)
 			vga_id = 119;
 
 		if (_game == GAME_SIMON1CD32) {
-			sprintf(buf, "0%d.out", vga_id); 
+			sprintf(buf, "0%d.out", vga_id);
 		} else if (_game == GAME_SIMON1AMIGA) {
 			sprintf(buf, "0%d.pkd", vga_id);
 		} else {
-			sprintf(buf, "0%d.VGA", vga_id); 
+			sprintf(buf, "0%d.VGA", vga_id);
 		}
 
 		in.open(buf);
@@ -3816,7 +3816,7 @@
 	loadIconFile();
 
 	vc34_forceLock();
-	
+
 	runSubroutine101();
 	startUp_helper_2();
 }
@@ -4022,7 +4022,7 @@
 
 	_lastMusicPlayed = -1;
 	_vgaBaseDelay = 1;
-	
+
 	_startMainScript = false;
 	_continousMainScript = false;
 	_startVgaScript = false;
@@ -4040,7 +4040,7 @@
 
 	if (_game & GF_TALKIE) {
 		// English and German versions of Simon the Sorcerer 1 don't have full subtitles
-		if (!(_game & GF_SIMON2) && _language < 2) 
+		if (!(_game & GF_SIMON2) && _language < 2)
 			_subtitles = false;
 	} else {
 		_subtitles = true;
@@ -4051,7 +4051,7 @@
 		handle_verb_clicked(_verbHitArea);
 		delay(100);
 	}
-	
+
 	return 0;
 }
 
@@ -4205,11 +4205,11 @@
 		midi.stop();
 		midi.setLoop (true); // Must do this BEFORE loading music. (GMF may have its own override.)
 
-		if (_game & GF_TALKIE) {	
+		if (_game & GF_TALKIE) {
 			// FIXME: The very last music resource, a cymbal crash for when the
-			// two demons crash into each other, should NOT be looped like the 
-			// other music tracks. In simon1dos/talkie the GMF resource includes 
-			// a loop override that acomplishes this, but there seems to be nothing 
+			// two demons crash into each other, should NOT be looped like the
+			// other music tracks. In simon1dos/talkie the GMF resource includes
+			// a loop override that acomplishes this, but there seems to be nothing
 			// for this in the SMF resources.
 			if (music == 35)
 				midi.setLoop (false);

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- simon.h	10 May 2005 22:56:17 -0000	1.138
+++ simon.h	30 Jul 2005 21:11:35 -0000	1.139
@@ -102,7 +102,7 @@
 };
 
 struct GameSpecificSettings;
-  
+
 class Debugger;
 
 class SimonEngine : public Engine {
@@ -111,7 +111,7 @@
 	void errorString(const char *buf_input, char *buf_output);
 protected:
 	void playSting(uint a);
-	
+
 	const byte *_vcPtr;								/* video code ptr */
 	uint16 _vc_get_out_of_code;
 
@@ -139,7 +139,7 @@
 	} SoundFormat;
 
 	Common::File *_gameFile;
-	
+
 	byte *_strippedTxtMem;
 	uint _textSize;
 	uint _stringTabNum, _stringTabPos, _stringtab_numalloc;
@@ -361,7 +361,7 @@
 	char _saveLoadName[32];
 
 	int _sdlMouseX, _sdlMouseY;
-	
+
 	byte *_sdl_buf_3;
 	byte *_sdl_buf;
 	byte *_sdl_buf_attached;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- sound.cpp	24 Jun 2005 15:23:42 -0000	1.87
+++ sound.cpp	30 Jul 2005 21:11:35 -0000	1.88
@@ -118,7 +118,7 @@
 		free(_offsets);
 	delete _file;
 }
-	
+
 void WavSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
 	if (_offsets == NULL)
 		return;
@@ -354,7 +354,7 @@
 Sound::~Sound() {
 	delete _voice;
 	delete _effects;
-	
+
 	free(_filenums);
 	free(_offsets);
 }
@@ -434,7 +434,7 @@
 			if (file->isOpen() == false) {
 				warning("playVoice: Can't load voice file %s", filename);
 				return;
-			} 
+			}
 			delete _voice;
 			_voice = new WavSound(_mixer, file, _offsets);
 		}
@@ -450,7 +450,7 @@
 void Sound::playEffects(uint sound) {
 	if (!_effects)
 		return;
-	
+
 	if (_effectsPaused)
 		return;
 

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sound.h	11 May 2005 00:01:33 -0000	1.26
+++ sound.h	30 Jul 2005 21:11:35 -0000	1.27
@@ -55,7 +55,7 @@
 public:
 	Sound(const byte game, const GameSpecificSettings *gss, Audio::Mixer *mixer);
 	~Sound();
-	
+
 	void readSfxFile(const char *filename);
 	void loadSfxTable(Common::File *gameFile, uint32 base);
 	void readVoiceFile(const char *filename);

Index: verb.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/verb.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- verb.cpp	24 Jun 2005 15:23:42 -0000	1.27
+++ verb.cpp	30 Jul 2005 21:11:35 -0000	1.28
@@ -572,7 +572,7 @@
 	else
 		x = 0;
 	showActionString(x, string_ptr);
-	
+
 	return true;
 }
 

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- vga.cpp	24 Jun 2005 15:23:42 -0000	1.130
+++ vga.cpp	30 Jul 2005 21:11:35 -0000	1.131
@@ -378,7 +378,7 @@
 		vc_skip_next_instruction();
 }
 
-void SimonEngine::vc8_skip_if_parent_is() {		
+void SimonEngine::vc8_skip_if_parent_is() {
 	uint a = vc_read_next_word();
 	uint b = vc_read_next_word();
 	if (!itemIsParentOf(a, b))
@@ -1101,7 +1101,7 @@
 /* helper routines */
 
 void SimonEngine::vc20_set_code_word() {
-	/* FIXME: This opcode is somewhat strange: it first reads a BE word from 
+	/* FIXME: This opcode is somewhat strange: it first reads a BE word from
 	 * the script (advancing the script pointer in doing so); then it writes
 	 * back the same word, this time as LE, into the script.
 	 */
@@ -1695,7 +1695,7 @@
 					byte *old_file_1 = _curVgaFile1;
 					byte *old_file_2 = _curVgaFile2;
 					uint palmode = _videoPaletteMode;
-	
+
 					vpe = &_vgaBufferPointers[vsp->fileId];
 					_curVgaFile1 = vpe->vgaFile1;
 					_curVgaFile2 = vpe->vgaFile2;