[Scummvm-cvs-logs] SF.net SVN: scummvm:[49100] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 49100
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49100&view=rev
Author:   thebluegr
Date:     2010-05-19 14:45:56 +0000 (Wed, 19 May 2010)

Log Message:
-----------
Fixed signed/unsigned warning, changed to CamelCase

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/script.cpp
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp

Modified: scummvm/trunk/engines/sci/engine/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/script.cpp	2010-05-19 14:43:16 UTC (rev 49099)
+++ scummvm/trunk/engines/sci/engine/script.cpp	2010-05-19 14:45:56 UTC (rev 49100)
@@ -336,7 +336,7 @@
 	int was_new;
 	bool oldScriptHeader = (getSciVersion() == SCI_VERSION_0_EARLY);
 	const int seg_id = script_instantiate_common(resMan, segMan, script_nr, &script, NULL, &was_new);
-	int16 curOffset = oldScriptHeader ? 2 : 0;
+	uint16 curOffset = oldScriptHeader ? 2 : 0;
 
 	if (was_new)
 		return seg_id;

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2010-05-19 14:43:16 UTC (rev 49099)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2010-05-19 14:45:56 UTC (rev 49100)
@@ -495,11 +495,11 @@
 	}
 
 	while (_seeker < script->size) {
-		int objtype = (int16)READ_SCI11ENDIAN_UINT16(script->data + _seeker);
+		int objType = (int16)READ_SCI11ENDIAN_UINT16(script->data + _seeker);
 		int objsize;
 		unsigned int seeker = _seeker + 4;
 
-		if (!objtype) {
+		if (!objType) {
 			printf("End of script object (#0) encountered.\n");
 			printf("Classes: %i, Objects: %i, Export: %i,\n Var: %i (all base 10)",
 			          objectctr[6], objectctr[1], objectctr[7], objectctr[10]);
@@ -510,13 +510,13 @@
 
 		objsize = (int16)READ_SCI11ENDIAN_UINT16(script->data + _seeker + 2);
 
-		printf("Obj type #%x, size 0x%x: ", objtype, objsize);
+		printf("Obj type #%x, size 0x%x: ", objType, objsize);
 
 		_seeker += objsize;
 
-		objectctr[objtype]++;
+		objectctr[objType]++;
 
-		switch (objtype) {
+		switch (objType) {
 		case SCI_OBJ_OBJECT:
 			dumpScriptObject((char *)script->data, seeker, objsize);
 			break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.