[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.49,1.50 console.cpp,1.36,1.37 defs.h,1.8,1.9 icons.cpp,1.27,1.28 interpreter.cpp,1.28,1.29 logic.cpp,1.35,1.36 maketext.cpp,1.32,1.33 mem_view.cpp,1.22,1.23 memory.cpp,1.18,1.19 protocol.cpp,1.20,1.21 resman.cpp,1.74,1.75 save_rest.cpp,1.41,1.42

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1:/tmp/cvs-serv5262

Modified Files:
	build_display.cpp console.cpp defs.h icons.cpp interpreter.cpp 
	logic.cpp maketext.cpp mem_view.cpp memory.cpp protocol.cpp 
	resman.cpp save_rest.cpp 
Log Message:
Mostly whitespace changes, but also a few modifications to the still
experimental resource dumping code.


Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- build_display.cpp	16 Nov 2003 14:18:27 -0000	1.49
+++ build_display.cpp	27 Nov 2003 07:34:19 -0000	1.50
@@ -431,7 +431,7 @@
 			spriteType |= RDSPR_RLE16;
 			// points to just after last cdt_entry, ie.
 			// start of colour table
-			colTablePtr = (uint8*) (anim_head + 1) + anim_head->noAnimFrames * sizeof(_cdtEntry);
+			colTablePtr = (uint8 *) (anim_head + 1) + anim_head->noAnimFrames * sizeof(_cdtEntry);
 			break;
 		}
 	}

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- console.cpp	19 Nov 2003 18:40:52 -0000	1.36
+++ console.cpp	27 Nov 2003 07:34:19 -0000	1.37
@@ -562,7 +562,7 @@
 	char dateStamp[255];
 	char version[6];
 
-	strcpy(version, (char*) version_string + HEAD_LEN);
+	strcpy(version, (char *) version_string + HEAD_LEN);
 	*(((unsigned char *) &t)) = *(version_string + 14);
 	*(((unsigned char *) &t) + 1) = *(version_string + 15);
 	*(((unsigned char *) &t) + 2) = *(version_string + 16);

Index: defs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/defs.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- defs.h	16 Nov 2003 14:18:28 -0000	1.8
+++ defs.h	27 Nov 2003 07:34:19 -0000	1.9
@@ -100,7 +100,7 @@
 // for the poor PSX so it knows what language is running.
 // #define GAME_LANGUAGE		VAR(111)
 
-//resource id's of pouse mointers. It's pretty much safe to do it like this
+// resource id's of pouse mointers. It's pretty much safe to do it like this
 
 #define NORMAL_MOUSE_ID			17
 #define SCROLL_LEFT_MOUSE_ID		1440

Index: icons.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/icons.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- icons.cpp	16 Nov 2003 14:18:28 -0000	1.27
+++ icons.cpp	27 Nov 2003 07:34:19 -0000	1.28
@@ -84,7 +84,7 @@
 	// objects. Run the 'build_menu' script in the 'menu_master' object
 
 	head = _resman->openResource(MENU_MASTER_OBJECT);
-	_logic->runScript((char*) head, (char*) head, &null_pc);
+	_logic->runScript((char *) head, (char *) head, &null_pc);
 	_resman->closeResource(MENU_MASTER_OBJECT);
 
 	// Compare new with old. Anything in master thats not in new gets

Index: interpreter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/interpreter.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- interpreter.cpp	25 Nov 2003 17:08:46 -0000	1.28
+++ interpreter.cpp	27 Nov 2003 07:34:19 -0000	1.29
@@ -519,7 +519,7 @@
 			break;
 		case OP_ANDAND:
 			// '&&'
-			debug(5, "%d != %d -> %d",
+			debug(5, "%d && %d -> %d",
 				stack2[stackPointer2 - 2],
 				stack2[stackPointer2 - 1],
 				stack2[stackPointer2 - 2] && stack2[stackPointer2 - 1]);

Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/logic.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- logic.cpp	23 Nov 2003 13:40:24 -0000	1.35
+++ logic.cpp	27 Nov 2003 07:34:19 -0000	1.36
@@ -123,7 +123,7 @@
 
 				raw_data_ad = (char *) head;
 
-				far_head = (_standardHeader*) _vm->_resman->openResource(script / SIZE);
+				far_head = (_standardHeader *) _vm->_resman->openResource(script / SIZE);
 
 				if (far_head->fileType != GAME_OBJECT && far_head->fileType != SCREEN_MANAGER)
 					error("Logic_engine %d not a far object (its a %d)", script / SIZE, far_head->fileType);

Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/maketext.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- maketext.cpp	25 Nov 2003 07:35:52 -0000	1.32
+++ maketext.cpp	27 Nov 2003 07:34:19 -0000	1.33
@@ -497,7 +497,7 @@
 
 	for (j = 0; j < MAX_text_blocs; j++) {
 		if (_blocList[j].text_mem) {
-			frame = (_frameHeader*) _blocList[j].text_mem->ad;
+			frame = (_frameHeader *) _blocList[j].text_mem->ad;
 
 			spriteInfo.x = _blocList[j].x;
 			spriteInfo.y = _blocList[j].y;

Index: mem_view.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/mem_view.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- mem_view.cpp	19 Nov 2003 18:40:52 -0000	1.22
+++ mem_view.cpp	27 Nov 2003 07:34:19 -0000	1.23
@@ -38,7 +38,7 @@
 	j = _baseMemBlock;
 	do {
 		if (_memList[j].uid < 65536) {
-			file_header = (_standardHeader*) _vm->_resman->openResource(_memList[j].uid);
+			file_header = (_standardHeader *) _vm->_resman->openResource(_memList[j].uid);
 			// close immediately so give a true count
 			_vm->_resman->closeResource(_memList[j].uid);
 

Index: memory.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/memory.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- memory.cpp	16 Nov 2003 14:18:28 -0000	1.18
+++ memory.cpp	27 Nov 2003 07:34:19 -0000	1.19
@@ -372,8 +372,8 @@
 				// block
 				// memcpy(_memList[cur_block].ad, _memList[child].ad, _memList[child].size);
 
-				a = (uint32*) _memList[cur_block].ad;
-				b = (uint32*) _memList[child].ad;
+				a = (uint32 *) _memList[cur_block].ad;
+				b = (uint32 *) _memList[child].ad;
 
 				for (j = 0; j < _memList[child].size / 4; j++)
 					*(a++) = *(b++);

Index: protocol.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/protocol.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- protocol.cpp	16 Nov 2003 14:18:28 -0000	1.20
+++ protocol.cpp	27 Nov 2003 07:34:19 -0000	1.21
@@ -64,7 +64,7 @@
 
 _screenHeader *Sword2Engine::fetchScreenHeader(uint8 *screenFile) {
 	_multiScreenHeader *mscreenHeader = (_multiScreenHeader *) (screenFile + sizeof(_standardHeader));
-	_screenHeader *screenHeader = (_screenHeader*) ((uint8 *) mscreenHeader + mscreenHeader->screen);
+	_screenHeader *screenHeader = (_screenHeader *) ((uint8 *) mscreenHeader + mscreenHeader->screen);
 
 	return screenHeader;
 }
@@ -184,7 +184,7 @@
 	_textHeader *text_header = (_textHeader *) (file + sizeof(_standardHeader));
 
 	if (text_line >= text_header->noOfLines) {
-		fileHeader = (_standardHeader*)file;
+		fileHeader = (_standardHeader *) file;
 		sprintf((char *) errorLine, "xxMissing line %d of %s (only 0..%d)", text_line, fileHeader->name, text_header->noOfLines - 1);
 
 

Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/resman.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- resman.cpp	23 Nov 2003 13:40:24 -0000	1.74
+++ resman.cpp	27 Nov 2003 07:34:19 -0000	1.75
@@ -253,7 +253,7 @@
 		SWAP32(mscreenHeader->maskOffset);
 
 		// screenHeader
-		_screenHeader *screenHeader = (_screenHeader*) (file + mscreenHeader->screen);
+		_screenHeader *screenHeader = (_screenHeader *) (file + mscreenHeader->screen);
 
 		SWAP16(screenHeader->width);
 		SWAP16(screenHeader->height);
@@ -312,7 +312,7 @@
 		break;
 	}
 	case GAME_OBJECT: {
-		_object_hub *objectHub = (_object_hub *)file;
+		_object_hub *objectHub = (_object_hub *) file;
 
 		objectHub->type = (int)SWAP_BYTES_32(objectHub->type);
 		SWAP32(objectHub->logic_level);
@@ -325,7 +325,7 @@
 		break;
 	}
 	case WALK_GRID_FILE: {
-		_walkGridHeader	*walkGridHeader = (_walkGridHeader *)file;
+		_walkGridHeader	*walkGridHeader = (_walkGridHeader *) file;
 
 		SWAP32(walkGridHeader->numBars);
 		SWAP32(walkGridHeader->numNodes);
@@ -499,18 +499,24 @@
 			case MOUSE_FILE:
 				strcpy(tag, "mouse");
 				break;
+			case WAV_FILE:
+				strcpy(tag, "wav");
+				break;
 			case ICON_FILE:
 				strcpy(tag, "icon");
 				break;
+			case PALETTE_FILE:
+				strcpy(tag, "palette");
+				break;
 			default:
 				strcpy(tag, "unknown");
 				break;
 			}
 
 #if defined(MACOS_CARBON)
-			sprintf(buf, ":dumps:%s-%d", tag, res);
+			sprintf(buf, ":dumps:%s-%d.dmp", tag, res);
 #else
-			sprintf(buf, "dumps/%s-%d", tag, res);
+			sprintf(buf, "dumps/%s-%d.dmp", tag, res);
 #endif
 
 			out.open(buf, "");
@@ -909,7 +915,7 @@
 			//not the global vars which are assumed to be open in
 			// memory & not the player object!
 			if (res != 1 && res != CUR_PLAYER_ID) {
-				header = (_standardHeader*) openResource(res);
+				header = (_standardHeader *) openResource(res);
 				closeResource(res);
 
 				if (header->fileType == GAME_OBJECT) {

Index: save_rest.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/save_rest.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- save_rest.cpp	16 Nov 2003 23:35:00 -0000	1.41
+++ save_rest.cpp	27 Nov 2003 07:34:19 -0000	1.42
@@ -464,7 +464,7 @@
  	char *raw_script_ad;
 	_standardHeader *head;
 
-	head = (_standardHeader*) _resman->openResource(CUR_PLAYER_ID);
+	head = (_standardHeader *) _resman->openResource(CUR_PLAYER_ID);
 
 	if (head->fileType != GAME_OBJECT)
 		error("incorrect CUR_PLAYER_ID=%d", CUR_PLAYER_ID);
@@ -483,7 +483,7 @@
  	char *raw_script_ad;
 	_standardHeader *head;
 
-	head = (_standardHeader*) _resman->openResource(CUR_PLAYER_ID);
+	head = (_standardHeader *) _resman->openResource(CUR_PLAYER_ID);
 
 	if (head->fileType != GAME_OBJECT)
 		error("incorrect CUR_PLAYER_ID=%d", CUR_PLAYER_ID);