diff options
| author | Greg Frieger | 2009-02-28 21:59:49 +0000 |
|---|---|---|
| committer | Greg Frieger | 2009-02-28 21:59:49 +0000 |
| commit | 61ab59138a1e1ba1bac9cdb0dbf3c5372667930d (patch) | |
| tree | 2c9095b54e01b8e0761f70a6d63bf71638d07b6b /engines/sci/engine/vm.cpp | |
| parent | 4f3a50913e3305d5e13986ada915451312cd3707 (diff) | |
| download | scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.tar.gz scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.tar.bz2 scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.zip | |
resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
Diffstat (limited to 'engines/sci/engine/vm.cpp')
| -rw-r--r-- | engines/sci/engine/vm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index b35736cd4a..746df27b80 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -1593,7 +1593,7 @@ SelectorType lookup_selector(EngineState *s, reg_t obj_location, Selector select // Detects SCI versions by their different script header void script_detect_versions(EngineState *s) { int c; - resource_t *script = {0}; + Resource *script = {0}; if (s->resmgr->findResource(sci_heap, 0, 0)) { version_require_later_than(s, SCI_VERSION(1, 001, 000)); @@ -1670,7 +1670,7 @@ reg_t script_lookup_export(EngineState *s, int script_nr, int export_index) { #define INST_LOOKUP_CLASS(id) ((id == 0xffff)? NULL_REG : get_class_address(s, id, SCRIPT_GET_LOCK, reg)) -int script_instantiate_common(EngineState *s, int script_nr, resource_t **script, resource_t **heap, int *was_new) { +int script_instantiate_common(EngineState *s, int script_nr, Resource **script, Resource **heap, int *was_new) { int seg; int seg_id; int marked_for_deletion; @@ -1740,7 +1740,7 @@ int script_instantiate_sci0(EngineState *s, int script_nr) { int seg_id; int relocation = -1; int magic_pos_adder; // Usually 0; 2 for older SCI versions - resource_t *script; + Resource *script; int was_new; seg_id = script_instantiate_common(s, script_nr, &script, NULL, &was_new); @@ -1888,7 +1888,7 @@ int script_instantiate_sci0(EngineState *s, int script_nr) { } int script_instantiate_sci11(EngineState *s, int script_nr) { - resource_t *script, *heap; + Resource *script, *heap; int seg_id; int heap_start; reg_t reg; |