[Scummvm-cvs-logs] CVS: scummvm/scumm bomp.cpp,2.23,2.24 charset.cpp,2.119,2.120 input.cpp,2.3,2.4 resource_v2.cpp,1.41,1.42 script_v2.cpp,2.254,2.255 script_v6.cpp,1.418,1.419 string.cpp,1.258,1.259

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Fri Oct 22 03:38:51 CEST 2004


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

Modified Files:
	bomp.cpp charset.cpp input.cpp resource_v2.cpp script_v2.cpp 
	script_v6.cpp string.cpp 
Log Message:
Whitespace


Index: bomp.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/bomp.cpp,v
retrieving revision 2.23
retrieving revision 2.24
diff -u -d -r2.23 -r2.24
--- bomp.cpp	7 Oct 2004 16:10:51 -0000	2.23
+++ bomp.cpp	22 Oct 2004 10:25:55 -0000	2.24
@@ -115,7 +115,7 @@
 
 void bompApplyShadow(int shadowMode, const byte *shadowPalette, const byte *line_buffer, byte *dst, int32 size, byte transparency, byte HE7Check) {
 	assert(size > 0);
-	switch(shadowMode) {
+	switch (shadowMode) {
 	case 0:
 		bompApplyShadow0(shadowPalette, line_buffer, dst, size, transparency, HE7Check);
 		break;

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.119
retrieving revision 2.120
diff -u -d -r2.119 -r2.120
--- charset.cpp	9 Oct 2004 00:33:35 -0000	2.119
+++ charset.cpp	22 Oct 2004 10:25:55 -0000	2.120
@@ -30,7 +30,7 @@
 	if ((_gameId == GID_DIG || _gameId == GID_CMI) && (_language == Common::KO_KOR || _language == Common::JA_JPN || _language == Common::ZH_TWN)) {
 		File fp;
 		const char *fontFile = NULL;
-		switch(_language) {
+		switch (_language) {
 		case Common::KO_KOR:
 			fontFile = "korean.fnt";
 			break;
@@ -53,7 +53,7 @@
 			_2byteHeight = fp.readByte();
 
 			int numChar = 0;
-			switch(_language) {
+			switch (_language) {
 			case Common::KO_KOR:
 				numChar = 2350;
 				break;
@@ -120,7 +120,7 @@
 	if ((base == 0x7f && s == 0x9e) || (base == 0x9f && s == 0xbe) || (base == 0xbf && s == 0xde))
 		base += 0x20; //correction
 
-	switch(base) {
+	switch (base) {
 	case 0x3f:
 		cr = 0; //3f
 		if (kanjiType == KANA) chunk = 1;
@@ -165,7 +165,7 @@
 }
 
 byte *ScummEngine::get2byteCharPtr(int idx) {
-	switch(_language) {
+	switch (_language) {
 	case Common::KO_KOR:
 		idx = ((idx % 256) - 0xb0) * 94 + (idx / 256) - 0xa1;
 		break;

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -d -r2.3 -r2.4
--- input.cpp	18 Oct 2004 06:40:33 -0000	2.3
+++ input.cpp	22 Oct 2004 10:25:55 -0000	2.4
@@ -42,7 +42,7 @@
 
 	while (_system->pollEvent(event)) {
 
-		switch(event.event_code) {
+		switch (event.event_code) {
 		case OSystem::EVENT_KEYDOWN:
 			if (event.kbd.keycode >= '0' && event.kbd.keycode <= '9'
 				&& (event.kbd.flags == OSystem::KBD_ALT ||

Index: resource_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v2.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- resource_v2.cpp	2 Jun 2004 01:54:59 -0000	1.41
+++ resource_v2.cpp	22 Oct 2004 10:25:55 -0000	1.42
@@ -154,7 +154,7 @@
 
 	magic = _fileHandle.readUint16LE();
 
-	switch(magic) {
+	switch (magic) {
 		case 0x0100:
 			printf("Enhanced V2 game detected\n");
 			readEnhancedIndexFile();			

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.254
retrieving revision 2.255
diff -u -d -r2.254 -r2.255
--- script_v2.cpp	19 Oct 2004 12:30:40 -0000	2.254
+++ script_v2.cpp	22 Oct 2004 10:25:55 -0000	2.255
@@ -897,7 +897,7 @@
 
 	// Execute or print the sentence
 	_opcode = fetchScriptByte();
-	switch(_opcode) {
+	switch (_opcode) {
 	case 0:
 		// Do nothing (besides setting up the sentence above)
 		break;

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -d -r1.418 -r1.419
--- script_v6.cpp	19 Oct 2004 12:30:40 -0000	1.418
+++ script_v6.cpp	22 Oct 2004 10:25:55 -0000	1.419
@@ -2769,7 +2769,7 @@
 // FIXME: check either some warning will trigger. I am not sure that those
 // keys are queried in scripts at all
 int ScummEngine::getKeyState(int key) {
-	switch(key) {
+	switch (key) {
 	case 0x145:
 		warning("ScummEngine::getKeyState(%x) 'numlock' is probed", key);
 		return 0;

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- string.cpp	1 Oct 2004 09:03:01 -0000	1.258
+++ string.cpp	22 Oct 2004 10:25:56 -0000	1.259
@@ -242,7 +242,7 @@
 
 		if (_heversion >= 72 && c == code) {
 			c = *buffer++;
-			switch(c) {
+			switch (c) {
 			case 84:
 				i = 0;
 				memset(value, 0, 32);
@@ -284,7 +284,7 @@
 			}
 		} else if (c == 0xFE || c == 0xFF) {
 			c = *buffer++;
-			switch(c) {
+			switch (c) {
 			case 1:
 				goto newLine;
 			case 2:





More information about the Scummvm-git-logs mailing list