diff options
| author | Filippos Karapetis | 2010-05-19 14:45:56 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-19 14:45:56 +0000 |
| commit | 893af1600aa8f4619e6c56ca2a8f074e230c1084 (patch) | |
| tree | 0467e0b0053552c2dfda86d0f83c0ed6da552042 | |
| parent | d1f1c71f5007eb26b3945f1508f886d219491f42 (diff) | |
| download | scummvm-rg350-893af1600aa8f4619e6c56ca2a8f074e230c1084.tar.gz scummvm-rg350-893af1600aa8f4619e6c56ca2a8f074e230c1084.tar.bz2 scummvm-rg350-893af1600aa8f4619e6c56ca2a8f074e230c1084.zip | |
Fixed signed/unsigned warning, changed to CamelCase
svn-id: r49100
| -rw-r--r-- | engines/sci/engine/script.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/scriptdebug.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 0f88f759ce..d680280640 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -336,7 +336,7 @@ int script_instantiate_sci0(ResourceManager *resMan, SegManager *segMan, int scr 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; diff --git a/engines/sci/engine/scriptdebug.cpp b/engines/sci/engine/scriptdebug.cpp index d3eff1376f..4b60626b2e 100644 --- a/engines/sci/engine/scriptdebug.cpp +++ b/engines/sci/engine/scriptdebug.cpp @@ -495,11 +495,11 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { } 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 @@ void Kernel::dissectScript(int scriptNumber, Vocabulary *vocab) { 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; |