thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Changed sci_obj_* enum value names to uppercase, in accordance with our code formatting conventions

Browse source 
svn-id: r40578
This commit is contained in:
Max Horn 2009-05-14 23:09:30 +00:00
parent a3efc5611c
commit cd063606a0
5 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/engine/game.cpp
View file

@ -331,7 +331,7 @@ static int create_class_table_sci0(EngineState *s) {
while (seeker < script->size) { while (seeker < script->size) {
unsigned int lastseeker = seeker; unsigned int lastseeker = seeker;
objtype = (int16)READ_LE_UINT16(script->data + seeker); objtype = (int16)READ_LE_UINT16(script->data + seeker);
if (objtype == sci_obj_class || objtype == sci_obj_terminator) if (objtype == SCI_OBJ_CLASS || objtype == SCI_OBJ_TERMINATOR)
break; break;
seeker += (int16)READ_LE_UINT16(script->data + seeker + 2); seeker += (int16)READ_LE_UINT16(script->data + seeker + 2);
if (seeker <= lastseeker) { if (seeker <= lastseeker) {
@ -340,7 +340,7 @@ static int create_class_table_sci0(EngineState *s) {
} }
} }
if (objtype == sci_obj_class) { if (objtype == SCI_OBJ_CLASS) {
int sugg_script; int sugg_script;
seeker -= SCRIPT_OBJECT_MAGIC_OFFSET; // Adjust position; script home is base +8 bytes seeker -= SCRIPT_OBJECT_MAGIC_OFFSET; // Adjust position; script home is base +8 bytes
@ -372,7 +372,7 @@ static int create_class_table_sci0(EngineState *s) {
seeker += (int16)READ_LE_UINT16(script->data + seeker + 2); // Move to next seeker += (int16)READ_LE_UINT16(script->data + seeker + 2); // Move to next
} }
} while (objtype != sci_obj_terminator && seeker <= script->size); } while (objtype != SCI_OBJ_TERMINATOR && seeker <= script->size);
} }
} }

6
engines/sci/engine/savegame.cpp
View file

@ -579,9 +579,9 @@ static void reconstruct_scripts(EngineState *s, SegManager *self) {
Script *scr = (Script *)mobj; Script *scr = (Script *)mobj;
load_script(s, i); load_script(s, i);
scr->locals_block = scr->locals_segment == 0 ? NULL : (LocalVariables *)(s->seg_manager->_heap[scr->locals_segment]); scr->locals_block = (scr->locals_segment == 0) ? NULL : (LocalVariables *)(s->seg_manager->_heap[scr->locals_segment]);
scr->export_table = (uint16 *) find_unique_script_block(s, scr->buf, sci_obj_exports); scr->export_table = (uint16 *) find_unique_script_block(s, scr->buf, SCI_OBJ_EXPORTS);
scr->synonyms = find_unique_script_block(s, scr->buf, sci_obj_synonyms); scr->synonyms = find_unique_script_block(s, scr->buf, SCI_OBJ_SYNONYMS);
scr->_codeBlocks.clear(); scr->_codeBlocks.clear();
if (!self->isSci1_1) if (!self->isSci1_1)

16
engines/sci/engine/script.cpp
View file

@ -339,11 +339,11 @@ void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringLis
objectctr[objtype]++; objectctr[objtype]++;
switch (objtype) { switch (objtype) {
case sci_obj_object: case SCI_OBJ_OBJECT:
script_dump_object((char *)script->data, seeker, objsize, selectorNames); script_dump_object((char *)script->data, seeker, objsize, selectorNames);
break; break;
case sci_obj_code: { case SCI_OBJ_CODE: {
sciprintf("Code\n"); sciprintf("Code\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker); Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
}; };
@ -355,7 +355,7 @@ void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringLis
}; };
break; break;
case sci_obj_said: { case SCI_OBJ_SAID: {
sciprintf("Said\n"); sciprintf("Said\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker); Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
@ -406,7 +406,7 @@ void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringLis
} }
break; break;
case sci_obj_strings: { case SCI_OBJ_STRINGS: {
sciprintf("Strings\n"); sciprintf("Strings\n");
while (script->data [seeker]) { while (script->data [seeker]) {
sciprintf("%04x: %s\n", seeker, script->data + seeker); sciprintf("%04x: %s\n", seeker, script->data + seeker);
@ -416,17 +416,17 @@ void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringLis
}; };
break; break;
case sci_obj_class: case SCI_OBJ_CLASS:
script_dump_class((char *)script->data, seeker, objsize, selectorNames); script_dump_class((char *)script->data, seeker, objsize, selectorNames);
break; break;
case sci_obj_exports: { case SCI_OBJ_EXPORTS: {
sciprintf("Exports\n"); sciprintf("Exports\n");
Common::hexdump((unsigned char *)script->data + seeker, objsize - 4, 16, seeker); Common::hexdump((unsigned char *)script->data + seeker, objsize - 4, 16, seeker);
}; };
break; break;
case sci_obj_pointers: { case SCI_OBJ_POINTERS: {
sciprintf("Pointers\n"); sciprintf("Pointers\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker); Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
}; };
@ -438,7 +438,7 @@ void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringLis
}; };
break; break;
case sci_obj_localvars: { case SCI_OBJ_LOCALVARS: {
sciprintf("Local vars\n"); sciprintf("Local vars\n");
Common::hexdump(script->data + seeker, objsize - 4, 16, seeker); Common::hexdump(script->data + seeker, objsize - 4, 16, seeker);
}; };

24
engines/sci/engine/script.h
View file

@ -37,18 +37,18 @@ class ResourceManager;
#define SCI_SCRIPTS_NR 1000 #define SCI_SCRIPTS_NR 1000
enum script_object_types { enum ScriptObjectTypes {
sci_obj_terminator, SCI_OBJ_TERMINATOR,
sci_obj_object, SCI_OBJ_OBJECT,
sci_obj_code, SCI_OBJ_CODE,
sci_obj_synonyms, SCI_OBJ_SYNONYMS,
sci_obj_said, SCI_OBJ_SAID,
sci_obj_strings, SCI_OBJ_STRINGS,
sci_obj_class, SCI_OBJ_CLASS,
sci_obj_exports, SCI_OBJ_EXPORTS,
sci_obj_pointers, SCI_OBJ_POINTERS,
sci_obj_preload_text, /* This is really just a flag. */ SCI_OBJ_PRELOAD_TEXT, /* This is really just a flag. */
sci_obj_localvars SCI_OBJ_LOCALVARS
}; };
void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringList &selectorNames); void script_dissect(ResourceManager *resmgr, int res_no, const Common::StringList &selectorNames);

18
engines/sci/engine/vm.cpp
View file

@ -1766,21 +1766,21 @@ int script_instantiate_sci0(EngineState *s, int script_nr) {
addr = data_base; addr = data_base;
switch (objtype) { switch (objtype) {
case sci_obj_exports: { case SCI_OBJ_EXPORTS: {
s->seg_manager->setExportTableOffset(data_base.offset, reg.segment, SEG_ID); s->seg_manager->setExportTableOffset(data_base.offset, reg.segment, SEG_ID);
} }
break; break;
case sci_obj_synonyms: case SCI_OBJ_SYNONYMS:
s->seg_manager->setSynonymsOffset(addr.offset, reg.segment, SEG_ID); // +4 is to step over the header s->seg_manager->setSynonymsOffset(addr.offset, reg.segment, SEG_ID); // +4 is to step over the header
s->seg_manager->setSynonymsNr((objlength) / 4, reg.segment, SEG_ID); s->seg_manager->setSynonymsNr((objlength) / 4, reg.segment, SEG_ID);
break; break;
case sci_obj_localvars: case SCI_OBJ_LOCALVARS:
s->seg_manager->scriptInitialiseLocals(data_base); s->seg_manager->scriptInitialiseLocals(data_base);
break; break;
case sci_obj_class: { case SCI_OBJ_CLASS: {
int classpos = addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET; int classpos = addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
int species; int species;
reg_tmp.offset = addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET; reg_tmp.offset = addr.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
@ -1821,11 +1821,11 @@ int script_instantiate_sci0(EngineState *s, int script_nr) {
addr = reg; addr = reg;
switch (objtype) { switch (objtype) {
case sci_obj_code: case SCI_OBJ_CODE:
s->seg_manager->scriptAddCodeBlock(addr); s->seg_manager->scriptAddCodeBlock(addr);
break; break;
case sci_obj_object: case SCI_OBJ_OBJECT:
case sci_obj_class: { // object or class? case SCI_OBJ_CLASS: { // object or class?
Object *obj = s->seg_manager->scriptObjInit(s, addr); Object *obj = s->seg_manager->scriptObjInit(s, addr);
Object *base_obj; Object *base_obj;
@ -1840,7 +1840,7 @@ int script_instantiate_sci0(EngineState *s, int script_nr) {
obj->_variables[SCRIPT_SUPERCLASS_SELECTOR] = INST_LOOKUP_CLASS(obj->_variables[SCRIPT_SUPERCLASS_SELECTOR].offset); obj->_variables[SCRIPT_SUPERCLASS_SELECTOR] = INST_LOOKUP_CLASS(obj->_variables[SCRIPT_SUPERCLASS_SELECTOR].offset);
} // if object or class } // if object or class
break; break;
case sci_obj_pointers: // A relocation table case SCI_OBJ_POINTERS: // A relocation table
relocation = addr.offset; relocation = addr.offset;
break; break;
@ -1916,7 +1916,7 @@ void script_uninstantiate_sci0(EngineState *s, int script_nr, SegmentId seg) {
reg.offset += 4; // Step over header reg.offset += 4; // Step over header
if ((objtype == sci_obj_object) || (objtype == sci_obj_class)) { // object or class? if ((objtype == SCI_OBJ_OBJECT) || (objtype == SCI_OBJ_CLASS)) { // object or class?
int superclass; int superclass;
reg.offset -= SCRIPT_OBJECT_MAGIC_OFFSET; reg.offset -= SCRIPT_OBJECT_MAGIC_OFFSET;