[Scummvm-cvs-logs] SF.net SVN: scummvm:[40689] scummvm/trunk/engines/sci
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon May 18 17:07:04 CEST 2009
Revision: 40689
http://scummvm.svn.sourceforge.net/scummvm/?rev=40689&view=rev
Author: fingolfin
Date: 2009-05-18 15:07:04 +0000 (Mon, 18 May 2009)
Log Message:
-----------
SCI: cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/state.cpp
scummvm/trunk/engines/sci/engine/state.h
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-05-18 12:36:04 UTC (rev 40688)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-05-18 15:07:04 UTC (rev 40689)
@@ -401,14 +401,14 @@
return 1;
}
- s->script_000_segment = script_get_segment(s, 0, SCRIPT_GET_LOCK);
+ SegmentId script_000_segment = script_get_segment(s, 0, SCRIPT_GET_LOCK);
- if (s->script_000_segment <= 0) {
+ if (script_000_segment <= 0) {
sciprintf("Failed to instantiate script.000\n");
return 1;
}
- s->script_000 = s->seg_manager->getScript(s->script_000_segment);
+ s->script_000 = s->seg_manager->getScript(script_000_segment);
s->sys_strings = s->seg_manager->allocateSysStrings(&s->sys_strings_segment);
s->string_frag_segment = s->seg_manager->allocateStringFrags();
Modified: scummvm/trunk/engines/sci/engine/state.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/state.cpp 2009-05-18 12:36:04 UTC (rev 40688)
+++ scummvm/trunk/engines/sci/engine/state.cpp 2009-05-18 15:07:04 UTC (rev 40689)
@@ -116,10 +116,8 @@
stack_base = 0;
stack_top = 0;
- parser_segment = 0;
parser_base = NULL_REG;
parser_event = NULL_REG;
- script_000_segment = 0;
script_000 = 0;
string_frag_segment = 0;
Modified: scummvm/trunk/engines/sci/engine/state.h
===================================================================
--- scummvm/trunk/engines/sci/engine/state.h 2009-05-18 12:36:04 UTC (rev 40688)
+++ scummvm/trunk/engines/sci/engine/state.h 2009-05-18 15:07:04 UTC (rev 40689)
@@ -224,10 +224,8 @@
StackPtr stack_base; /**< Pointer to the least stack element */
StackPtr stack_top; /**< First invalid stack element */
- SegmentId parser_segment; /**< A heap area used by the parser for error reporting */
reg_t parser_base; /**< Base address for the parser error reporting mechanism */
reg_t parser_event; /**< The event passed to Parse() and later used by Said() */
- SegmentId script_000_segment;
Script *script_000; /**< script 000, e.g. for globals */
uint16 currentRoomNumber() { return KP_UINT(script_000->locals_block->_locals[13]); }
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2009-05-18 12:36:04 UTC (rev 40688)
+++ scummvm/trunk/engines/sci/sci.cpp 2009-05-18 15:07:04 UTC (rev 40689)
@@ -93,10 +93,6 @@
"SCI01 priority table debugging flags: 1:Disable, 2:Print on change\n");
}
-static int init_gamestate(EngineState *gamestate, sci_version_t version) {
- return script_init_engine(gamestate, version);
-}
-
SciEngine::SciEngine(OSystem *syst, const SciGameDescription *desc)
: Engine(syst), _gameDescription(desc) {
// Put your engine in a sane state, but do nothing big yet;
@@ -230,7 +226,7 @@
error ("Unknown SCI version in game entry");
}
- if (init_gamestate(gamestate, version))
+ if (script_init_engine(gamestate, version))
return Common::kUnknownError;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list