[Scummvm-cvs-logs] SF.net SVN: scummvm:[38678] scummvm/trunk/engines/sci
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Sat Feb 21 11:47:56 CET 2009
Revision: 38678
http://scummvm.svn.sourceforge.net/scummvm/?rev=38678&view=rev
Author: jvprat
Date: 2009-02-21 10:47:56 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
Replaced "typedef struct _state state_t" with "struct EngineState"
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/gc.cpp
scummvm/trunk/engines/sci/engine/gc.h
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kernel_types.h
scummvm/trunk/engines/sci/engine/kevent.cpp
scummvm/trunk/engines/sci/engine/kfile.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/klists.cpp
scummvm/trunk/engines/sci/engine/kmath.cpp
scummvm/trunk/engines/sci/engine/kmenu.cpp
scummvm/trunk/engines/sci/engine/kmovement.cpp
scummvm/trunk/engines/sci/engine/kpathing.cpp
scummvm/trunk/engines/sci/engine/kscripts.cpp
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/engine/kstring.cpp
scummvm/trunk/engines/sci/engine/said.cpp
scummvm/trunk/engines/sci/engine/savegame.cfsml
scummvm/trunk/engines/sci/engine/savegame.cpp
scummvm/trunk/engines/sci/engine/scriptconsole.cpp
scummvm/trunk/engines/sci/engine/scriptdebug.cpp
scummvm/trunk/engines/sci/engine/seg_manager.cpp
scummvm/trunk/engines/sci/engine/seg_manager.h
scummvm/trunk/engines/sci/engine/vm.cpp
scummvm/trunk/engines/sci/gfx/menubar.cpp
scummvm/trunk/engines/sci/gfx/sci_widgets.cpp
scummvm/trunk/engines/sci/include/console.h
scummvm/trunk/engines/sci/include/engine.h
scummvm/trunk/engines/sci/include/event.h
scummvm/trunk/engines/sci/include/kdebug.h
scummvm/trunk/engines/sci/include/kernel.h
scummvm/trunk/engines/sci/include/menubar.h
scummvm/trunk/engines/sci/include/sci_widgets.h
scummvm/trunk/engines/sci/include/script.h
scummvm/trunk/engines/sci/include/uinput.h
scummvm/trunk/engines/sci/include/versions.h
scummvm/trunk/engines/sci/include/vm.h
scummvm/trunk/engines/sci/include/vm_types.h
scummvm/trunk/engines/sci/include/vocabulary.h
scummvm/trunk/engines/sci/sci.cpp
scummvm/trunk/engines/sci/scicore/script.cpp
scummvm/trunk/engines/sci/scicore/tools.cpp
scummvm/trunk/engines/sci/scicore/versions.cpp
scummvm/trunk/engines/sci/scicore/vocab.cpp
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -36,7 +36,7 @@
extern int send_calls_allocated;
extern int bp_flag;
-static int _init_vocabulary(state_t *s) { // initialize vocabulary and related resources
+static int _init_vocabulary(EngineState *s) { // initialize vocabulary and related resources
s->parser_lastmatch_word = SAID_NO_MATCH;
s->parser_rules = NULL;
@@ -70,7 +70,7 @@
extern int _allocd_rules;
-static void _free_vocabulary(state_t *s) {
+static void _free_vocabulary(EngineState *s) {
sciprintf("Freeing vocabulary\n");
if (s->parser_words) {
@@ -91,14 +91,14 @@
}
-static int _init_graphics_input(state_t *s) {
+static int _init_graphics_input(EngineState *s) {
s->pic_priority_table = NULL;
s->pics = NULL;
s->pics_nr = 0;
return 0;
}
-static void _sci1_alloc_system_colors(state_t *s) {
+static void _sci1_alloc_system_colors(EngineState *s) {
gfx_color_t white;
gfx_color_t black;
@@ -117,7 +117,7 @@
gfxop_set_system_color(s->gfx_state, &black);
}
-int _reset_graphics_input(state_t *s) {
+int _reset_graphics_input(EngineState *s) {
resource_t *resource;
int font_nr;
gfx_color_t transparent;
@@ -241,7 +241,7 @@
return 0;
}
-int game_init_graphics(state_t *s) {
+int game_init_graphics(EngineState *s) {
#ifndef WITH_PIC_SCALING
if (s->gfx_state->options->pic0_unscaled == 0)
sciprintf("WARNING: Pic scaling was disabled; your version of FreeSCI has no support for scaled pic drawing built in.\n");
@@ -251,7 +251,7 @@
return _reset_graphics_input(s);
}
-static void _free_graphics_input(state_t *s) {
+static void _free_graphics_input(EngineState *s) {
sciprintf("Freeing graphics\n");
s->visual->widfree(GFXW(s->visual));
@@ -266,7 +266,7 @@
s->pics = NULL;
}
-int game_init_sound(state_t *s, int sound_flags) {
+int game_init_sound(EngineState *s, int sound_flags) {
if (s->resmgr->sci_version >= SCI_VERSION_01)
sound_flags |= SFX_STATE_FLAG_MULTIPLAY;
@@ -290,7 +290,7 @@
return getInt16(res->data + offset);
}
-int test_cursor_style(state_t *s) {
+int test_cursor_style(EngineState *s) {
int resource_nr = 0;
int ok = 0;
@@ -301,7 +301,7 @@
return ok;
}
-int create_class_table_sci11(state_t *s) {
+int create_class_table_sci11(EngineState *s) {
int scriptnr;
unsigned int seeker_offset;
char *seeker_ptr;
@@ -356,7 +356,7 @@
return 0;
}
-static int create_class_table_sci0(state_t *s) {
+static int create_class_table_sci0(EngineState *s) {
int scriptnr;
unsigned int seeker;
int classnr;
@@ -441,7 +441,7 @@
}
// Architectural stuff: Init/Unintialize engine
-int script_init_engine(state_t *s, sci_version_t version) {
+int script_init_engine(EngineState *s, sci_version_t version) {
int result;
s->max_version = SCI_VERSION(9, 999, 999);
@@ -531,11 +531,11 @@
return 0;
}
-void script_set_gamestate_save_dir(state_t *s, const char *path) {
+void script_set_gamestate_save_dir(EngineState *s, const char *path) {
sys_string_set(s->sys_strings, SYS_STRING_SAVEDIR, path);
}
-void script_free_vm_memory(state_t *s) {
+void script_free_vm_memory(EngineState *s) {
int i;
sciprintf("Freeing VM memory\n");
@@ -556,10 +556,10 @@
// exception fault whenever you try to close a never-opened file
}
-extern void free_kfunct_tables(state_t *s);
+extern void free_kfunct_tables(EngineState *s);
// From kernel.c
-void script_free_engine(state_t *s) {
+void script_free_engine(EngineState *s) {
script_free_vm_memory(s);
sciprintf("Freeing state-dependant data\n");
@@ -569,7 +569,7 @@
_free_vocabulary(s);
}
-void script_free_breakpoints(state_t *s) {
+void script_free_breakpoints(EngineState *s) {
breakpoint_t *bp, *bp_next;
// Free breakpoint list
@@ -589,7 +589,7 @@
/* Game instance stuff: Init/Unitialize state-dependant data */
/*************************************************************/
-int game_init(state_t *s) {
+int game_init(EngineState *s) {
#ifdef __GNUC__XX
# warning "Fixme: Use new VM instantiation code all over the place"
#endif
@@ -666,7 +666,7 @@
return 0;
}
-int game_exit(state_t *s) {
+int game_exit(EngineState *s) {
if (s->execution_stack) {
free(s->execution_stack);
}
Modified: scummvm/trunk/engines/sci/engine/gc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/gc.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -129,7 +129,7 @@
worklist_push(wm->worklist_ref, wm->nonnormal_map, addr);
}
-reg_t_hash_map *find_all_used_references(state_t *s) {
+reg_t_hash_map *find_all_used_references(EngineState *s) {
seg_manager_t *sm = &(s->seg_manager);
seg_interface_t **interfaces = (seg_interface_t**)sci_calloc(sizeof(seg_interface_t *), sm->heap_size);
reg_t_hash_map *nonnormal_map = new reg_t_hash_map();
@@ -253,7 +253,7 @@
}
-void run_gc(state_t *s) {
+void run_gc(EngineState *s) {
int seg_nr;
deallocator_t deallocator;
seg_manager_t *sm = &(s->seg_manager);
Modified: scummvm/trunk/engines/sci/engine/gc.h
===================================================================
--- scummvm/trunk/engines/sci/engine/gc.h 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/gc.h 2009-02-21 10:47:56 UTC (rev 38678)
@@ -48,15 +48,15 @@
// The reg_t_hash_map is actually really a hashset
typedef Common::HashMap<reg_t, bool, reg_t_Hash, reg_t_EqualTo> reg_t_hash_map;
-reg_t_hash_map *find_all_used_references(state_t *s);
+reg_t_hash_map *find_all_used_references(EngineState *s);
/* Finds all used references and normalises them to their memory addresses
-** Parameters: (state_t *) s: The state to gather all information from
+** Parameters: (EngineState *) s: The state to gather all information from
** Returns : (reg_t_hash_map *) A hash map containing entries for all used references
*/
-void run_gc(state_t *s);
+void run_gc(EngineState *s);
/* Runs garbage collection on the current system state
-** Parameters: (state_t *) s: The state in which we should gc
+** Parameters: (EngineState *) s: The state in which we should gc
*/
} // End of namespace Sci
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -39,142 +39,142 @@
namespace Sci {
// New kernel functions
-reg_t kStrLen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetFarText(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kReadNumber(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kStrCat(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kStrCmp(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetSynonyms(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kLock(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kPalette(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNumCels(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNumLoops(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDrawCel(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCoordPri(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kPriCoord(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kShakeScreen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetCursor(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMoveCursor(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kShow(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kPicNotValid(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kOnControl(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDrawPic(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetPort(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetPort(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNewWindow(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDisposeWindow(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCelWide(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCelHigh(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetJump(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDirLoop(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDoAvoider(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetAngle(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetDistance(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kRandom(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAbs(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSqrt(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kTimesSin(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kTimesCos(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCosMult(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSinMult(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kTimesTan(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kTimesCot(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCosDiv(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSinDiv(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kValidPath(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFOpen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFPuts(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFGets(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFClose(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMapKeyToDir(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGlobalToLocal(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kLocalToGlobal(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kWait(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kRestartGame(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kStrLen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetFarText(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kReadNumber(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kStrCat(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kStrCmp(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetSynonyms(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kLock(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kPalette(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNumCels(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNumLoops(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDrawCel(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCoordPri(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kPriCoord(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kShakeScreen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetCursor(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMoveCursor(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kShow(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kPicNotValid(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kOnControl(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDrawPic(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetPort(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetPort(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNewWindow(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDisposeWindow(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCelWide(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCelHigh(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetJump(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDirLoop(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetAngle(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetDistance(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kRandom(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAbs(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSqrt(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kTimesSin(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kTimesCos(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCosMult(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSinMult(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kTimesCot(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCosDiv(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kValidPath(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFOpen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFPuts(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFGets(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFClose(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMapKeyToDir(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGlobalToLocal(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kLocalToGlobal(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kWait(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kRestartGame(EngineState *s, int funct_nr, int argc, reg_t *argv);
#ifdef WIN32
-reg_t kDeviceInfo_Win32(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDeviceInfo_Win32(EngineState *s, int funct_nr, int argc, reg_t *argv);
#else
-reg_t kDeviceInfo_Unix(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDeviceInfo_Unix(EngineState *s, int funct_nr, int argc, reg_t *argv);
#endif
-reg_t kGetEvent(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCheckFreeSpace(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFlushResources(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetSaveFiles(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetDebug(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCheckSaveGame(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSaveGame(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kRestoreGame(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFileIO(struct _state *s, int funct_nr, int argc, reg_t *argp);
-reg_t kGetTime(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kHaveMouse(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kJoystick(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGameIsRestarting(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetCWD(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSort(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kStrEnd(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMemory(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAvoidPath(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kParse(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSaid(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kStrCpy(struct _state *s, int funct_nr, int argc, reg_t *argp);
-reg_t kStrAt(struct _state *s, int funct_nr, int argc, reg_t *argp);
-reg_t kEditControl(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDrawControl(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kHiliteControl(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kClone(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDisposeClone(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kCanBeHere(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetNowSeen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kInitBresen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDoBresen(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kBaseSetter(struct _state *s, int funct_nr, int argc, reg_t *argp);
-reg_t kAddToPic(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAnimate(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDisplay(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGraph(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFormat(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDoSound(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAddMenu(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kSetMenu(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetMenu(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDrawStatus(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDrawMenuBar(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMenuSelect(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetEvent(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCheckFreeSpace(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFlushResources(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetSaveFiles(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetDebug(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCheckSaveGame(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSaveGame(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kRestoreGame(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFileIO(EngineState *s, int funct_nr, int argc, reg_t *argp);
+reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kHaveMouse(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kJoystick(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGameIsRestarting(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetCWD(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSort(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kStrEnd(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAvoidPath(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kParse(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSaid(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kStrCpy(EngineState *s, int funct_nr, int argc, reg_t *argp);
+reg_t kStrAt(EngineState *s, int funct_nr, int argc, reg_t *argp);
+reg_t kEditControl(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDrawControl(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kHiliteControl(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kClone(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDisposeClone(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kCanBeHere(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetNowSeen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kInitBresen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kBaseSetter(EngineState *s, int funct_nr, int argc, reg_t *argp);
+reg_t kAddToPic(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAnimate(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDisplay(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGraph(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFormat(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAddMenu(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kSetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDrawStatus(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv);
-reg_t kLoad(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kUnLoad(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kScriptID(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDisposeScript(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kIsObject(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kRespondsTo(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNewList(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDisposeList(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNewNode(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFirstNode(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kLastNode(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kEmptyList(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNextNode(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kPrevNode(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kNodeValue(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAddAfter(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAddToFront(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kAddToEnd(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kFindKey(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDeleteKey(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMemoryInfo(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kGetSaveDir(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kTextSize(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kIsItSkip(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kMessage(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t kDoAudio(struct _state *s, int funct_nr, int argc, reg_t *argv);
-reg_t k_Unknown(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kLoad(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kUnLoad(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kScriptID(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDisposeScript(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kIsObject(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kRespondsTo(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNewList(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDisposeList(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNewNode(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFirstNode(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kLastNode(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kEmptyList(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNextNode(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kPrevNode(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNodeValue(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAddAfter(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAddToFront(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kAddToEnd(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFindKey(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDeleteKey(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMemoryInfo(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kGetSaveDir(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kTextSize(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kIsItSkip(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kMessage(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv);
+reg_t k_Unknown(EngineState *s, int funct_nr, int argc, reg_t *argv);
// The Unknown/Unnamed kernel function
-reg_t kstub(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kstub(EngineState *s, int funct_nr, int argc, reg_t *argv);
// for unimplemented kernel functions
-reg_t kNOP(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kNOP(EngineState *s, int funct_nr, int argc, reg_t *argv);
// for kernel functions that don't do anything
-reg_t kFsciEmu(struct _state *s, int funct_nr, int argc, reg_t *argv);
+reg_t kFsciEmu(EngineState *s, int funct_nr, int argc, reg_t *argv);
// Emulating "old" kernel functions on the heap
@@ -354,7 +354,7 @@
static const char *argtype_description[] = { "Undetermined (WTF?)", "List", "Node", "Object", "Reference", "Arithmetic" };
-int kernel_oops(state_t *s, const char *file, int line, const char *reason) {
+int kernel_oops(EngineState *s, const char *file, int line, const char *reason) {
sciprintf("Kernel Oops in file %s, line %d: %s\n", file, line, reason);
error("Kernel Oops in file %s, line %d: %s\n", file, line, reason);
script_debug_flag = script_error_flag = 1;
@@ -362,7 +362,7 @@
}
// Allocates a set amount of memory for a specified use and returns a handle to it.
-reg_t kalloc(state_t *s, const char *type, int space) {
+reg_t kalloc(EngineState *s, const char *type, int space) {
reg_t reg;
sm_alloc_hunk_entry(&s->seg_manager, type, space, ®);
@@ -371,7 +371,7 @@
return reg;
}
-int has_kernel_function(state_t *s, const char *kname) {
+int has_kernel_function(EngineState *s, const char *kname) {
int i = 0;
while (s->kernel_names[i]) {
@@ -384,7 +384,7 @@
}
// Returns a pointer to the memory indicated by the specified handle
-byte *kmem(state_t *s, reg_t handle) {
+byte *kmem(EngineState *s, reg_t handle) {
mem_obj_t *mobj = GET_SEGMENT(s->seg_manager, handle.segment, MEM_OBJ_HUNK);
hunk_table_t *ht = &(mobj->data.hunks);
@@ -397,7 +397,7 @@
}
// Frees the specified handle. Returns 0 on success, 1 otherwise.
-int kfree(state_t *s, reg_t handle) {
+int kfree(EngineState *s, reg_t handle) {
sm_free_hunk_entry(&s->seg_manager, handle);
return 0;
@@ -405,7 +405,7 @@
char *old_save_dir;
-reg_t kRestartGame(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kRestartGame(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *deref_save_dir = (char*)kernel_dereference_bulk_pointer(s, s->save_dir_copy, 1);
old_save_dir = strdup(deref_save_dir);
@@ -419,7 +419,7 @@
/* kGameIsRestarting():
** Returns the restarting_flag in acc
*/
-reg_t kGameIsRestarting(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGameIsRestarting(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *deref_save_dir = (char*)kernel_dereference_bulk_pointer(s, s->save_dir_copy, 1);
if (old_save_dir && deref_save_dir) {
@@ -438,11 +438,11 @@
return s->r_acc;
}
-reg_t kHaveMouse(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kHaveMouse(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(0, -1);
}
-reg_t kMemoryInfo(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMemoryInfo(EngineState *s, int funct_nr, int argc, reg_t *argv) {
switch (argv[0].offset) {
case 0: // Total free heap memory
case 1: // Largest heap block available
@@ -458,7 +458,7 @@
return NULL_REG;
}
-reg_t k_Unknown(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t k_Unknown(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (funct_nr >= SCI_MAPPED_UNKNOWN_KFUNCTIONS_NR) {
warning("Unhandled Unknown function %04x", funct_nr);
return NULL_REG;
@@ -474,14 +474,14 @@
}
}
-reg_t kFlushResources(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFlushResources(EngineState *s, int funct_nr, int argc, reg_t *argv) {
run_gc(s);
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
debugC(2, Sci::kDebugLevelRoom, "Entering room number %d\n", UKPV(0));
return s->r_acc;
}
-reg_t kSetDebug(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetDebug(EngineState *s, int funct_nr, int argc, reg_t *argv) {
sciprintf("Debug mode activated\n");
script_debug_flag = 1; // Enter debug mode
@@ -494,7 +494,7 @@
#define _K_NEW_GETTIME_TIME_24HOUR 2
#define _K_NEW_GETTIME_DATE 3
-reg_t kGetTime(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) {
struct tm* loc_time;
GTimeVal time_prec;
time_t the_time;
@@ -583,7 +583,7 @@
#define K_MEMORY_PEEK 5
#define K_MEMORY_POKE 6
-reg_t kMemory(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) {
switch (UKPV(0)) {
case K_MEMORY_ALLOCATE_CRITICAL :
if (!sm_alloc_dynmem(&s->seg_manager, UKPV(1), "kMemory() critical", &s->r_acc)) {
@@ -656,7 +656,7 @@
return s->r_acc;
}
-reg_t kstub(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kstub(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int i;
warning("Unimplemented syscall: %s[%x](", s->kernel_names[funct_nr], funct_nr);
@@ -670,7 +670,7 @@
return NULL_REG;
}
-reg_t kNOP(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNOP(EngineState *s, int funct_nr, int argc, reg_t *argv) {
const char *problem = (const char*)(s->kfunct_table[funct_nr].orig_name ? "unmapped" : "NOP");
warning("Warning: Kernel function 0x%02x invoked: %s", funct_nr, problem);
@@ -764,7 +764,7 @@
*s = result; // Write back
}
-int script_map_kernel(state_t *s) {
+int script_map_kernel(EngineState *s) {
int functnr;
int mapped = 0;
int ignored = 0;
@@ -833,12 +833,12 @@
return 0;
}
-void free_kfunct_tables(state_t *s) {
+void free_kfunct_tables(EngineState *s) {
free(s->kfunct_table);
s->kfunct_table = NULL;
}
-int determine_reg_type(state_t *s, reg_t reg, int allow_invalid) {
+int determine_reg_type(EngineState *s, reg_t reg, int allow_invalid) {
mem_obj_t *mobj;
if (!reg.segment) {
@@ -920,7 +920,7 @@
return argtype_description[sci_ffs(type)];
}
-int kernel_matches_signature(state_t *s, const char *sig, int argc, reg_t *argv) {
+int kernel_matches_signature(EngineState *s, const char *sig, int argc, reg_t *argv) {
if (!sig)
return 1;
@@ -955,7 +955,7 @@
return (*sig == 0 || (*sig & KSIG_ELLIPSIS));
}
-static inline void *_kernel_dereference_pointer(struct _state *s, reg_t pointer, int entries, int align) {
+static inline void *_kernel_dereference_pointer(EngineState *s, reg_t pointer, int entries, int align) {
int maxsize;
void *retval = sm_dereference(&s->seg_manager, pointer, &maxsize);
@@ -972,11 +972,11 @@
}
-byte *kernel_dereference_bulk_pointer(struct _state *s, reg_t pointer, int entries) {
+byte *kernel_dereference_bulk_pointer(EngineState *s, reg_t pointer, int entries) {
return (byte*)_kernel_dereference_pointer(s, pointer, entries, 1);
}
-reg_t *kernel_dereference_reg_pointer(struct _state *s, reg_t pointer, int entries) {
+reg_t *kernel_dereference_reg_pointer(EngineState *s, reg_t pointer, int entries) {
return (reg_t*)_kernel_dereference_pointer(s, pointer, entries, sizeof(reg_t));
}
Modified: scummvm/trunk/engines/sci/engine/kernel_types.h
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel_types.h 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kernel_types.h 2009-02-21 10:47:56 UTC (rev 38678)
@@ -64,18 +64,18 @@
#define KSIG_ALLOW_INV 0x20
#define KSIG_INVALID KSIG_ALLOW_INV
-int kernel_matches_signature(state_t *s, const char *sig, int argc, reg_t *argv);
+int kernel_matches_signature(EngineState *s, const char *sig, int argc, reg_t *argv);
/* Determines whether a list of registers matches a given signature
-** Parameters: (state_t *) s: The state to operate on
+** Parameters: (EngineState *) s: The state to operate on
** (char *) sig: The signature to test against
** (int) argc: Number of arguments to test
** (reg_t *) argv: Argument list
** Returns : (int) 0 iff the signature was not matched
*/
-int determine_reg_type(state_t *s, reg_t reg, int allow_invalid);
+int determine_reg_type(EngineState *s, reg_t reg, int allow_invalid);
/* Determines the type of the object indicated by reg
-** Parameters: (state_t *) s: The state to operate on
+** Parameters: (EngineState *) s: The state to operate on
** (reg_t) reg: The register to check
** (int) allow_invalid: Allow invalid pointer values
** Returns : one of KSIG_* below KSIG_NULL.
Modified: scummvm/trunk/engines/sci/engine/kevent.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kevent.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kevent.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -31,7 +31,7 @@
#define SCI_VARIABLE_GAME_SPEED 3
-reg_t kGetEvent(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetEvent(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int mask = UKPV(0);
reg_t obj = argv[1];
sci_event_t e;
@@ -143,7 +143,7 @@
return s->r_acc;
}
-reg_t kMapKeyToDir(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMapKeyToDir(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
if (GET_SEL32V(obj, type) == SCI_EVT_KEYBOARD) { // Keyboard
@@ -191,7 +191,7 @@
return s->r_acc;
}
-reg_t kGlobalToLocal(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGlobalToLocal(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars
if (obj.segment) {
@@ -206,7 +206,7 @@
}
-reg_t kLocalToGlobal(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kLocalToGlobal(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars
if (obj.segment) {
@@ -220,7 +220,7 @@
return s->r_acc;
}
-reg_t kJoystick(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kJoystick(EngineState *s, int funct_nr, int argc, reg_t *argv) {
warning("Unimplemented syscall 'Joystick()");
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -58,7 +58,7 @@
** to the working directory. Returns NULL if the file didn't exist.
** Otherwise, the new file is then opened for reading or writing.
*/
-static FILE *f_open_mirrored(state_t *s, char *fname) {
+static FILE *f_open_mirrored(EngineState *s, char *fname) {
int fd;
char *buf = NULL;
int fsize;
@@ -137,7 +137,7 @@
#define _K_FILE_MODE_OPEN_OR_FAIL 1
#define _K_FILE_MODE_CREATE 2
-void file_open(state_t *s, char *filename, int mode) {
+void file_open(EngineState *s, char *filename, int mode) {
int retval = 1; // Ignore file_handles[0]
FILE *file = NULL;
@@ -176,7 +176,7 @@
s->r_acc = make_reg(0, retval);
}
-reg_t kFOpen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFOpen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *name = kernel_dereference_char_pointer(s, argv[0], 0);
int mode = UKPV(1);
@@ -184,7 +184,7 @@
return s->r_acc;
}
-static FILE *getFileFromHandle(state_t *s, int handle) {
+static FILE *getFileFromHandle(EngineState *s, int handle) {
if (handle == 0) {
error("Attempt to use file handle 0\n");
return 0;
@@ -198,7 +198,7 @@
return s->file_handles[handle];
}
-void file_close(state_t *s, int handle) {
+void file_close(EngineState *s, int handle) {
SCIkdebug(SCIkFILE, "Closing file %d\n", handle);
FILE *f = getFileFromHandle(s, handle);
@@ -210,12 +210,12 @@
s->file_handles[handle] = NULL;
}
-reg_t kFClose(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFClose(EngineState *s, int funct_nr, int argc, reg_t *argv) {
file_close(s, UKPV(0));
return s->r_acc;
}
-void fputs_wrapper(state_t *s, int handle, int size, char *data) {
+void fputs_wrapper(EngineState *s, int handle, int size, char *data) {
SCIkdebug(SCIkFILE, "FPuts'ing \"%s\" to handle %d\n", data, handle);
FILE *f = getFileFromHandle(s, handle);
@@ -223,7 +223,7 @@
fwrite(data, 1, size, f);
}
-void fwrite_wrapper(state_t *s, int handle, char *data, int length) {
+void fwrite_wrapper(EngineState *s, int handle, char *data, int length) {
SCIkdebug(SCIkFILE, "fwrite()'ing \"%s\" to handle %d\n", data, handle);
FILE *f = getFileFromHandle(s, handle);
@@ -231,7 +231,7 @@
fwrite(data, 1, length, f);
}
-reg_t kFPuts(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFPuts(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int handle = UKPV(0);
char *data = kernel_dereference_char_pointer(s, argv[1], 0);
@@ -239,7 +239,7 @@
return s->r_acc;
}
-static void fgets_wrapper(state_t *s, char *dest, int maxsize, int handle) {
+static void fgets_wrapper(EngineState *s, char *dest, int maxsize, int handle) {
SCIkdebug(SCIkFILE, "FGets'ing %d bytes from handle %d\n", maxsize, handle);
FILE *f = getFileFromHandle(s, handle);
@@ -251,7 +251,7 @@
SCIkdebug(SCIkFILE, "FGets'ed \"%s\"\n", dest);
}
-static void fread_wrapper(state_t *s, char *dest, int bytes, int handle) {
+static void fread_wrapper(EngineState *s, char *dest, int bytes, int handle) {
SCIkdebug(SCIkFILE, "fread()'ing %d bytes from handle %d\n", bytes, handle);
FILE *f = getFileFromHandle(s, handle);
@@ -261,7 +261,7 @@
s->r_acc = make_reg(0, fread(dest, 1, bytes, f));
}
-static void fseek_wrapper(state_t *s, int handle, int offset, int whence) {
+static void fseek_wrapper(EngineState *s, int handle, int offset, int whence) {
FILE *f = getFileFromHandle(s, handle);
if (!f)
return;
@@ -271,7 +271,7 @@
#define TEST_DIR_OR_QUIT(dir) if (!dir) { return NULL_REG; }
-reg_t kFGets(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFGets(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *dest = kernel_dereference_char_pointer(s, argv[0], 0);
int maxsize = UKPV(1);
int handle = UKPV(2);
@@ -283,7 +283,7 @@
/* kGetCWD(address):
** Writes the cwd to the supplied address and returns the address in acc.
*/
-reg_t kGetCWD(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetCWD(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *wd = sci_getcwd();
char *targetaddr = kernel_dereference_char_pointer(s, argv[0], 0);
@@ -296,7 +296,7 @@
return argv[0];
}
-void delete_savegame(state_t *s, int savedir_nr) {
+void delete_savegame(EngineState *s, int savedir_nr) {
Common::String filename = ((Sci::SciEngine*)g_engine)->getSavegameName(savedir_nr);
sciprintf("Deleting savegame '%s'\n", filename.c_str());
@@ -314,7 +314,7 @@
#ifdef WIN32
-reg_t kDeviceInfo_Win32(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDeviceInfo_Win32(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char dir_buffer[MAXPATHLEN], dir_buffer2[MAXPATHLEN];
int mode = UKPV(0);
@@ -388,7 +388,7 @@
#else // !WIN32
-reg_t kDeviceInfo_Unix(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDeviceInfo_Unix(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int mode = UKPV(0);
switch (mode) {
@@ -451,11 +451,11 @@
#endif // !WIN32
-reg_t kGetSaveDir(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetSaveDir(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(s->sys_strings_segment, SYS_STRING_SAVEDIR);
}
-reg_t kCheckFreeSpace(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCheckFreeSpace(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *path = kernel_dereference_char_pointer(s, argv[0], 0);
char *testpath = (char*)sci_malloc(strlen(path) + 15);
char buf[1024];
@@ -551,7 +551,7 @@
qsort(_savegame_indices, _savegame_indices_nr, sizeof(struct _savegame_index_struct), _savegame_index_struct_compare);
}
-reg_t kCheckSaveGame(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCheckSaveGame(EngineState *s, int funct_nr, int argc, reg_t *argv) {
//char *game_id = kernel_dereference_char_pointer(s, argv[0], 0);
int savedir_nr = UKPV(1);
@@ -587,7 +587,7 @@
return s->r_acc;
}
-reg_t kGetSaveFiles(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetSaveFiles(EngineState *s, int funct_nr, int argc, reg_t *argv) {
//char *game_id = kernel_dereference_char_pointer(s, argv[0], 0);
char *nametarget = kernel_dereference_char_pointer(s, argv[1], 0);
reg_t nametarget_base = argv[1];
@@ -639,7 +639,7 @@
return s->r_acc;
}
-reg_t kSaveGame(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSaveGame(EngineState *s, int funct_nr, int argc, reg_t *argv) {
//char *game_id = (char*)kernel_dereference_bulk_pointer(s, argv[0], 0);
int savedir_nr = UKPV(1);
int savedir_id; // Savegame ID, derived from savedir_nr and the savegame ID list
@@ -709,7 +709,7 @@
return s->r_acc;
}
-reg_t kRestoreGame(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kRestoreGame(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *game_id = (char*)kernel_dereference_bulk_pointer(s, argv[0], 0);
int savedir_nr = UKPV(1);
@@ -727,7 +727,7 @@
if ((in = saveFileMan->openForLoading(filename.c_str()))) {
// found a savegame file
- state_t *newstate = gamestate_restore(s, in);
+ EngineState *newstate = gamestate_restore(s, in);
delete in;
if (newstate) {
@@ -748,7 +748,7 @@
return s->r_acc;
}
-reg_t kValidPath(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kValidPath(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *pathname = kernel_dereference_char_pointer(s, argv[0], 0);
char cpath[MAXPATHLEN + 1];
getcwd(cpath, MAXPATHLEN + 1);
@@ -771,7 +771,7 @@
#define K_FILEIO_FIND_NEXT 9
#define K_FILEIO_STAT 10
-char * write_filename_to_mem(state_t *s, reg_t address, char *string) {
+char * write_filename_to_mem(EngineState *s, reg_t address, char *string) {
char *mem = kernel_dereference_char_pointer(s, address, 0);
if (string) {
@@ -782,14 +782,14 @@
return string;
}
-void next_file(state_t *s) {
+void next_file(EngineState *s) {
if (write_filename_to_mem(s, s->dirseeker_outbuffer, sci_find_next(&(s->dirseeker))))
s->r_acc = s->dirseeker_outbuffer;
else
s->r_acc = NULL_REG;
}
-void first_file(state_t *s, const char *dir, char *mask, reg_t buffer) {
+void first_file(EngineState *s, const char *dir, char *mask, reg_t buffer) {
if (!buffer.segment) {
sciprintf("Warning: first_file(state,\"%s\",\"%s\", 0) invoked", dir, mask);
s->r_acc = NULL_REG;
@@ -814,7 +814,7 @@
s->r_acc = NULL_REG;
}
-reg_t kFileIO(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFileIO(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int func_nr = UKPV(0);
switch (func_nr) {
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -114,7 +114,7 @@
return value;
}
-static void assert_primary_widget_lists(state_t *s) {
+static void assert_primary_widget_lists(EngineState *s) {
if (!s->dyn_views) {
rect_t bounds = s->picture_port->bounds;
@@ -132,7 +132,7 @@
}
}
-static void reparentize_primary_widget_lists(state_t *s, gfxw_port_t *newport) {
+static void reparentize_primary_widget_lists(EngineState *s, gfxw_port_t *newport) {
if (!newport)
newport = s->picture_port;
@@ -143,7 +143,7 @@
}
}
-int _find_view_priority(state_t *s, int y) {
+int _find_view_priority(EngineState *s, int y) {
/*if (s->version <= SCI_VERSION_LTU_PRIORITY_OB1)
++y; */
@@ -161,7 +161,7 @@
}
}
-int _find_priority_band(state_t *s, int nr) {
+int _find_priority_band(EngineState *s, int nr) {
if (s->version >= SCI_VERSION_FTU_PRIORITY_14_ZONES && (nr < 0 || nr > 14)) {
if (nr == 15)
return 0xffff;
@@ -192,7 +192,7 @@
}
}
-reg_t graph_save_box(state_t *s, rect_t area) {
+reg_t graph_save_box(EngineState *s, rect_t area) {
reg_t handle = kalloc(s, "graph_save_box()", sizeof(gfxw_snapshot_t *));
gfxw_snapshot_t **ptr = (gfxw_snapshot_t **) kmem(s, handle);
@@ -201,7 +201,7 @@
return handle;
}
-void graph_restore_box(state_t *s, reg_t handle) {
+void graph_restore_box(EngineState *s, reg_t handle) {
gfxw_snapshot_t **ptr;
int port_nr = s->port->ID;
@@ -264,7 +264,7 @@
static gfx_pixmap_color_t white = {GFX_COLOR_INDEX_UNMAPPED, 255, 255, 255};
-gfx_pixmap_color_t *get_pic_color(state_t *s, int color) {
+gfx_pixmap_color_t *get_pic_color(EngineState *s, int color) {
if (s->resmgr->sci_version < SCI_VERSION_01_VGA)
return &(s->ega_colors[color].visual);
@@ -279,7 +279,7 @@
}
}
-static gfx_color_t graph_map_color(state_t *s, int color, int priority, int control) {
+static gfx_color_t graph_map_color(EngineState *s, int color, int priority, int control) {
gfx_color_t retval;
if (s->resmgr->sci_version < SCI_VERSION_01_VGA) {
@@ -297,7 +297,7 @@
return retval;
}
-reg_t kSetCursor_SCI11(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetCursor_SCI11(EngineState *s, int funct_nr, int argc, reg_t *argv) {
switch (argc) {
case 1 :
if (UKPV(0) == 0) {
@@ -340,7 +340,7 @@
return s->r_acc;
}
-reg_t kSetCursor(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetCursor(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (s->version >= SCI_VERSION(1, 001, 000) ||
has_kernel_function(s, "MoveCursor")) {
return kSetCursor_SCI11(s, funct_nr, argc, argv);
@@ -365,7 +365,7 @@
extern int oldx, oldy;
-reg_t kMoveCursor(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMoveCursor(EngineState *s, int funct_nr, int argc, reg_t *argv) {
Common::Point newpos;
static Common::Point oldpos(0, 0);
@@ -398,7 +398,7 @@
port->contents = (gfxw_widget_t *) gfxw_new_list(port->bounds, 0);
}
-reg_t kShow(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kShow(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int old_map = s->pic_visible_map;
s->pic_visible_map = (gfx_map_mask_t) UKPV_OR_ALT(0, 1);
@@ -428,7 +428,7 @@
return s->r_acc;
}
-reg_t kPicNotValid(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kPicNotValid(EngineState *s, int funct_nr, int argc, reg_t *argv) {
s->r_acc = make_reg(0, s->pic_not_valid);
if (argc)
s->pic_not_valid = (byte)UKPV(0);
@@ -436,7 +436,7 @@
return s->r_acc;
}
-void _k_redraw_box(state_t *s, int x1, int y1, int x2, int y2) {
+void _k_redraw_box(EngineState *s, int x1, int y1, int x2, int y2) {
sciprintf("_k_redraw_box(): Unimplemented");
#if 0
int i;
@@ -461,7 +461,7 @@
#endif
}
-void _k_graph_rebuild_port_with_color(state_t *s, gfx_color_t newbgcolor) {
+void _k_graph_rebuild_port_with_color(EngineState *s, gfx_color_t newbgcolor) {
gfxw_port_t *port = s->port;
gfxw_port_t *newport;
@@ -487,7 +487,7 @@
static int port_origin_x;
static int port_origin_y;
-reg_t kGraph(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGraph(EngineState *s, int funct_nr, int argc, reg_t *argv) {
rect_t area;
gfxw_port_t *port = s->port;
int redraw_port = 0;
@@ -613,7 +613,7 @@
return s->r_acc;
}
-reg_t kTextSize(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kTextSize(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int width, height;
char *text = argv[1].segment ? (char *) kernel_dereference_bulk_pointer(s, argv[1], 0) : NULL;
reg_t *dest = kernel_dereference_reg_pointer(s, argv[0], 4);
@@ -644,7 +644,7 @@
int debug_sleeptime_factor = 1;
-reg_t kWait(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kWait(EngineState *s, int funct_nr, int argc, reg_t *argv) {
GTimeVal time;
int sleep_time = UKPV(0);
@@ -663,19 +663,19 @@
return s->r_acc;
}
-reg_t kCoordPri(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCoordPri(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int y = SKPV(0);
return make_reg(0, VIEW_PRIORITY(y));
}
-reg_t kPriCoord(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kPriCoord(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int priority = SKPV(0);
return make_reg(0, PRIORITY_BAND_FIRST(priority));
}
-void _k_dirloop(reg_t obj, word angle, state_t *s, int funct_nr, int argc, reg_t *argv) {
+void _k_dirloop(reg_t obj, word angle, EngineState *s, int funct_nr, int argc, reg_t *argv) {
int view = GET_SEL32V(obj, view);
int signal = GET_SEL32V(obj, signal);
int loop;
@@ -720,7 +720,7 @@
PUT_SEL32V(obj, loop, loop);
}
-reg_t kDirLoop(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDirLoop(EngineState *s, int funct_nr, int argc, reg_t *argv) {
_k_dirloop(argv[0], UKPV(1), s, funct_nr, argc, argv);
return s->r_acc;
@@ -729,13 +729,13 @@
#define GASEOUS_VIEW_MASK_ACTIVE (_K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_IGNORE_ACTOR)
#define GASEOUS_VIEW_MASK_PASSIVE (_K_VIEW_SIG_FLAG_NO_UPDATE | _K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_IGNORE_ACTOR)
-abs_rect_t set_base(struct _state *s, reg_t object);
+abs_rect_t set_base(EngineState *s, reg_t object);
-inline abs_rect_t get_nsrect(struct _state *s, reg_t object, byte clip);
+inline abs_rect_t get_nsrect(EngineState *s, reg_t object, byte clip);
-static inline abs_rect_t nsrect_clip(state_t *s, int y, abs_rect_t retval, int priority);
+static inline abs_rect_t nsrect_clip(EngineState *s, int y, abs_rect_t retval, int priority);
-static int collides_with(state_t *s, abs_rect_t area, reg_t other_obj, int use_nsrect, int view_mask, int funct_nr, int argc, reg_t *argv) {
+static int collides_with(EngineState *s, abs_rect_t area, reg_t other_obj, int use_nsrect, int view_mask, int funct_nr, int argc, reg_t *argv) {
int other_signal = GET_SEL32V(other_obj, signal);
int other_priority = GET_SEL32V(other_obj, priority);
int y = GET_SEL32SV(other_obj, y);
@@ -775,7 +775,7 @@
return 0;
}
-reg_t kCanBeHere(state_t *s, int funct_nr, int argc, reg_t * argv) {
+reg_t kCanBeHere(EngineState *s, int funct_nr, int argc, reg_t * argv) {
reg_t obj = argv[0];
reg_t cliplist_ref = KP_ALT(1, NULL_REG);
list_t *cliplist = NULL;
@@ -868,7 +868,7 @@
return not_register(s, make_reg(0, retval));
} // CanBeHere
-reg_t kIsItSkip(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kIsItSkip(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int view = SKPV(0);
int loop = SKPV(1);
int cel = SKPV(2);
@@ -891,7 +891,7 @@
return make_reg(0, pxm->index_data[y * pxm->index_xl + x] == pxm->color_key);
}
-reg_t kCelHigh(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCelHigh(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int view = SKPV(0);
int loop = SKPV(1);
int cel = SKPV(2);
@@ -909,7 +909,7 @@
return make_reg(0, height);
}
-reg_t kCelWide(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCelWide(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int view = SKPV(0);
int loop = SKPV(1);
int cel = SKPV(2);
@@ -927,7 +927,7 @@
return make_reg(0, width);
}
-reg_t kNumLoops(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNumLoops(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
int view = GET_SEL32V(obj, view);
int loops_nr = gfxop_lookup_view_get_loops(s->gfx_state, view);
@@ -942,7 +942,7 @@
return make_reg(0, loops_nr);
}
-reg_t kNumCels(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNumCels(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
int loop = GET_SEL32V(obj, loop);
int view = GET_SEL32V(obj, view);
@@ -961,7 +961,7 @@
return make_reg(0, cel + 1);
}
-reg_t kOnControl(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kOnControl(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int arg = 0;
gfx_map_mask_t map;
int xstart, ystart;
@@ -985,11 +985,11 @@
return make_reg(0, gfxop_scan_bitmask(s->gfx_state, gfx_rect(xstart, ystart + 10, xlen, ylen), map));
}
-void _k_view_list_free_backgrounds(state_t *s, view_object_t *list, int list_nr);
+void _k_view_list_free_backgrounds(EngineState *s, view_object_t *list, int list_nr);
int sci01_priority_table_flags = 0;
-reg_t kDrawPic(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDrawPic(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int pic_nr = SKPV(0);
int add_to_pic = 1;
int palette = SKPV_OR_ALT(3, 0);
@@ -1085,7 +1085,7 @@
}
-abs_rect_t set_base(state_t *s, reg_t object) {
+abs_rect_t set_base(EngineState *s, reg_t object) {
int x, y, original_y, z, ystep, xsize, ysize;
int xbase, ybase, xend, yend;
int view, loop, cel;
@@ -1147,7 +1147,7 @@
return retval;
}
-void _k_base_setter(state_t *s, reg_t object) {
+void _k_base_setter(EngineState *s, reg_t object) {
abs_rect_t absrect = set_base(s, object);
if (lookup_selector(s, object, s->selector_map.brLeft, NULL, NULL) != SELECTOR_VARIABLE)
@@ -1162,7 +1162,7 @@
PUT_SEL32V(object, brBottom, absrect.yend);
}
-reg_t kBaseSetter(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kBaseSetter(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t object = argv[0];
_k_base_setter(s, object);
@@ -1170,7 +1170,7 @@
return s->r_acc;
} // kBaseSetter
-static inline abs_rect_t nsrect_clip(state_t *s, int y, abs_rect_t retval, int priority) {
+static inline abs_rect_t nsrect_clip(EngineState *s, int y, abs_rect_t retval, int priority) {
int pri_top;
if (priority == -1)
@@ -1188,7 +1188,7 @@
return retval;
}
-inline abs_rect_t calculate_nsrect(state_t *s, int x, int y, int view, int loop, int cel) {
+inline abs_rect_t calculate_nsrect(EngineState *s, int x, int y, int view, int loop, int cel) {
int xbase, ybase, xend, yend, xsize, ysize;
int xmod = 0, ymod = 0;
abs_rect_t retval = {0, 0, 0, 0};
@@ -1217,7 +1217,7 @@
return retval;
}
-inline abs_rect_t get_nsrect(state_t *s, reg_t object, byte clip) {
+inline abs_rect_t get_nsrect(EngineState *s, reg_t object, byte clip) {
int x, y, z;
int view, loop, cel;
abs_rect_t retval;
@@ -1246,7 +1246,7 @@
return retval;
}
-static void _k_set_now_seen(state_t *s, reg_t object) {
+static void _k_set_now_seen(EngineState *s, reg_t object) {
abs_rect_t absrect = get_nsrect(s, object, 0);
if (lookup_selector(s, object, s->selector_map.nsTop, NULL, NULL) != SELECTOR_VARIABLE) {
@@ -1259,7 +1259,7 @@
PUT_SEL32V(object, nsBottom, absrect.yend);
}
-reg_t kSetNowSeen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetNowSeen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t object = argv[0];
_k_set_now_seen(s, object);
@@ -1267,7 +1267,7 @@
return s->r_acc;
} // kSetNowSeen
-reg_t kPalette(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kPalette(EngineState *s, int funct_nr, int argc, reg_t *argv) {
switch (UKPV(0)) {
case 5 : {
int r = UKPV(1);
@@ -1304,9 +1304,9 @@
return s->r_acc;
}
-static void _k_draw_control(state_t *s, reg_t obj, int inverse);
+static void _k_draw_control(EngineState *s, reg_t obj, int inverse);
-static void _k_disable_delete_for_now(state_t *s, reg_t obj) {
+static void _k_disable_delete_for_now(EngineState *s, reg_t obj) {
reg_t text_pos = GET_SEL32(obj, text);
char *text = IS_NULL_REG(text_pos) ? NULL : (char *) sm_dereference(&s->seg_manager, text_pos, NULL);
int type = GET_SEL32V(obj, type);
@@ -1318,7 +1318,7 @@
}
}
-reg_t kDrawControl(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDrawControl(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
_k_disable_delete_for_now(s, obj);
@@ -1327,7 +1327,7 @@
return NULL_REG;
}
-reg_t kHiliteControl(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kHiliteControl(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
_k_draw_control(s, obj, 1);
@@ -1357,7 +1357,7 @@
--textlen; \
}
-reg_t kEditControl(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kEditControl(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
reg_t event = argv[1];
@@ -1536,7 +1536,7 @@
return s->r_acc;
}
-static void _k_draw_control(state_t *s, reg_t obj, int inverse) {
+static void _k_draw_control(EngineState *s, reg_t obj, int inverse) {
int x = GET_SEL32SV(obj, nsLeft);
int y = GET_SEL32SV(obj, nsTop);
int xl = GET_SEL32SV(obj, nsRight) - x;
@@ -1655,7 +1655,7 @@
}
-static void draw_rect_to_control_map(state_t *s, abs_rect_t abs_zone) {
+static void draw_rect_to_control_map(EngineState *s, abs_rect_t abs_zone) {
gfxw_box_t *box;
gfx_color_t color;
@@ -1671,7 +1671,7 @@
ADD_TO_CURRENT_PICTURE_PORT(box);
}
-static inline void draw_obj_to_control_map(state_t *s, gfxw_dyn_view_t *view) {
+static inline void draw_obj_to_control_map(EngineState *s, gfxw_dyn_view_t *view) {
reg_t obj = make_reg(view->ID, view->subID);
if (!is_object(s, obj))
@@ -1683,7 +1683,7 @@
}
}
-static void _k_view_list_do_postdraw(state_t *s, gfxw_list_t *list) {
+static void _k_view_list_do_postdraw(EngineState *s, gfxw_list_t *list) {
gfxw_dyn_view_t *widget = (gfxw_dyn_view_t *) list->contents;
while (widget) {
@@ -1744,7 +1744,7 @@
}
}
-void _k_view_list_mark_free(state_t *s, reg_t off) {
+void _k_view_list_mark_free(EngineState *s, reg_t off) {
if (s->dyn_views) {
gfxw_dyn_view_t *w = (gfxw_dyn_view_t *) s->dyn_views->contents;
@@ -1762,7 +1762,7 @@
static int _k_animate_ran = 0;
-int _k_view_list_dispose_loop(state_t *s, list_t *list, gfxw_dyn_view_t *widget, int funct_nr, int argc, reg_t *argv) {
+int _k_view_list_dispose_loop(EngineState *s, list_t *list, gfxw_dyn_view_t *widget, int funct_nr, int argc, reg_t *argv) {
// disposes all list members flagged for disposal; funct_nr is the invoking kfunction
// returns non-zero IFF views were dropped
int signal;
@@ -1852,7 +1852,7 @@
#define _K_MAKE_VIEW_LIST_CALC_PRIORITY 2
#define _K_MAKE_VIEW_LIST_DRAW_TO_CONTROL_MAP 4
-static gfxw_dyn_view_t *_k_make_dynview_obj(state_t *s, reg_t obj, int options, int nr, int funct_nr, int argc, reg_t *argv) {
+static gfxw_dyn_view_t *_k_make_dynview_obj(EngineState *s, reg_t obj, int options, int nr, int funct_nr, int argc, reg_t *argv) {
short oldloop, oldcel;
int cel, loop, view_nr = GET_SEL32SV(obj, view);
int palette;
@@ -1930,7 +1930,7 @@
}
}
-static void _k_make_view_list(state_t *s, gfxw_list_t **widget_list, list_t *list, int options, int funct_nr, int argc, reg_t *argv) {
+static void _k_make_view_list(EngineState *s, gfxw_list_t **widget_list, list_t *list, int options, int funct_nr, int argc, reg_t *argv) {
/* Creates a view_list from a node list in heap space. Returns the list, stores the
** number of list entries in *list_nr. Calls doit for each entry if cycle is set.
** argc, argv, funct_nr should be the same as in the calling kernel function.
@@ -1991,7 +1991,7 @@
}
}
-static void _k_prepare_view_list(state_t *s, gfxw_list_t *list, int options) {
+static void _k_prepare_view_list(EngineState *s, gfxw_list_t *list, int options) {
gfxw_dyn_view_t *view = (gfxw_dyn_view_t *) list->contents;
while (view) {
reg_t obj = make_reg(view->ID, view->subID);
@@ -2121,7 +2121,7 @@
}
}
-static void _k_raise_topmost_in_view_list(state_t *s, gfxw_list_t *list, gfxw_dyn_view_t *view) {
+static void _k_raise_topmost_in_view_list(EngineState *s, gfxw_list_t *list, gfxw_dyn_view_t *view) {
if (view) {
gfxw_dyn_view_t *next = (gfxw_dyn_view_t *)view->next;
@@ -2150,7 +2150,7 @@
}
}
-static void _k_redraw_view_list(state_t *s, gfxw_list_t *list) {
+static void _k_redraw_view_list(EngineState *s, gfxw_list_t *list) {
gfxw_dyn_view_t *view = (gfxw_dyn_view_t *) list->contents;
while (view) {
@@ -2201,7 +2201,7 @@
// Draw as picviews
#define _K_DRAW_VIEW_LIST_PICVIEW 8
-void _k_draw_view_list(state_t *s, gfxw_list_t *list, int flags) {
+void _k_draw_view_list(EngineState *s, gfxw_list_t *list, int flags) {
// Draws list_nr members of list to s->pic.
gfxw_dyn_view_t *widget = (gfxw_dyn_view_t *) list->contents;
@@ -2245,7 +2245,7 @@
}
-reg_t kAddToPic(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAddToPic(EngineState *s, int funct_nr, int argc, reg_t *argv) {
gfxw_list_t *pic_views;
reg_t list_ref = argv[0];
@@ -2304,11 +2304,11 @@
return s->r_acc;
}
-reg_t kGetPort(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetPort(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(0, s->port->ID);
}
-reg_t kSetPort(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetPort(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (activated_icon_bar && argc == 6) {
port_origin_x = port_origin_y = 0;
activated_icon_bar = 0;
@@ -2366,7 +2366,7 @@
return NULL_REG;
}
-static inline void add_to_chrono(state_t *s, gfxw_widget_t *widget) {
+static inline void add_to_chrono(EngineState *s, gfxw_widget_t *widget) {
gfxw_port_t *chrono_port;
gfxw_list_t *tw;
@@ -2377,7 +2377,7 @@
ADD_TO_CURRENT_PORT(chrono_port);
}
-reg_t kDrawCel(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDrawCel(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int view = SKPV(0);
int loop = SKPV(1);
int cel = SKPV(2);
@@ -2413,7 +2413,7 @@
return s->r_acc;
}
-reg_t kDisposeWindow(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDisposeWindow(EngineState *s, int funct_nr, int argc, reg_t *argv) {
unsigned int goner_nr = SKPV(0);
gfxw_port_t *goner;
gfxw_port_t *pred;
@@ -2453,7 +2453,7 @@
return s->r_acc;
}
-reg_t kNewWindow(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNewWindow(EngineState *s, int funct_nr, int argc, reg_t *argv) {
gfxw_port_t *window;
int x, y, xl, yl, flags;
gfx_color_t bgcolor;
@@ -2553,7 +2553,7 @@
#define GRAPH_UPDATE_BOX(s, x, y, xl, yl) GFX_ASSERT(gfxop_draw_pixmap(s->gfx_state, newscreen, \
gfx_rect(x, (((y) < 10)? 10 : (y)) - 10, xl, (((y) < 10)? ((y) - 10) : 0) + (yl)), Common::Point(x, ((y) < 10)? 10 : (y) )));
-static void animate_do_animation(state_t *s, int funct_nr, int argc, reg_t *argv) {
+static void animate_do_animation(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int i, remaining_checkers;
int update_counter;
int granularity0 = s->animation_granularity << 1;
@@ -2935,7 +2935,7 @@
s->old_screen = NULL;
}
-reg_t kAnimate(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAnimate(EngineState *s, int funct_nr, int argc, reg_t *argv) {
// Animations are supposed to take a maximum of s->animation_delay milliseconds.
reg_t cast_list_ref = KP_ALT(0, NULL_REG);
int cycle = (KP_ALT(1, NULL_REG)).offset;
@@ -3045,7 +3045,7 @@
#define SHAKE_DOWN 1
#define SHAKE_RIGHT 2
-reg_t kShakeScreen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kShakeScreen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int shakes = SKPV_OR_ALT(0, 1);
int directions = SKPV_OR_ALT(1, 1);
gfx_pixmap_t *screen = gfxop_grab_pixmap(s->gfx_state, gfx_rect(0, 0, 320, 200));
@@ -3093,7 +3093,7 @@
#define K_DISPLAY_RESTORE_UNDER 108
#define K_DONT_UPDATE_IMMEDIATELY 121
-reg_t kDisplay(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDisplay(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int argpt;
reg_t textp = argv[0];
int index = UKPV_OR_ALT(1, 0);
Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/klists.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -32,7 +32,7 @@
# define LOOKUP_NODE(addr) inline_lookup_node(s, (addr), __FILE__, __LINE__)
#endif
-inline node_t *inline_lookup_node(state_t *s, reg_t addr, const char *file, int line) {
+inline node_t *inline_lookup_node(EngineState *s, reg_t addr, const char *file, int line) {
mem_obj_t *mobj;
node_table_t *nt;
@@ -57,13 +57,13 @@
return &(nt->table[addr.offset].entry);
}
-node_t *lookup_node(state_t *s, reg_t addr, const char *file, int line) {
+node_t *lookup_node(EngineState *s, reg_t addr, const char *file, int line) {
return inline_lookup_node(s, addr, file, line);
}
#define LOOKUP_NULL_LIST(addr) _lookup_list(s, addr, __FILE__, __LINE__, 1)
-inline list_t *_lookup_list(state_t *s, reg_t addr, const char *file, int line, int may_be_null) {
+inline list_t *_lookup_list(EngineState *s, reg_t addr, const char *file, int line, int may_be_null) {
mem_obj_t *mobj;
list_table_t *lt;
@@ -89,7 +89,7 @@
return &(lt->table[addr.offset].entry);
}
-list_t *lookup_list(state_t *s, reg_t addr, const char *file, int line) {
+list_t *lookup_list(EngineState *s, reg_t addr, const char *file, int line) {
return _lookup_list(s, addr, file, line, 0);
}
@@ -100,7 +100,7 @@
#else
-static inline int sane_nodep(state_t *s, reg_t addr) {
+static inline int sane_nodep(EngineState *s, reg_t addr) {
int have_prev = 0;
reg_t prev = addr;
@@ -121,7 +121,7 @@
return 1;
}
-int sane_listp(state_t *s, reg_t addr) {
+int sane_listp(EngineState *s, reg_t addr) {
list_t *l = LOOKUP_LIST(addr);
int empties = 0;
@@ -156,7 +156,7 @@
}
#endif
-reg_t kNewList(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNewList(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t listbase;
list_t *l;
l = sm_alloc_list(&s->seg_manager, &listbase);
@@ -166,7 +166,7 @@
return listbase; // Return list base address
}
-reg_t kDisposeList(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDisposeList(EngineState *s, int funct_nr, int argc, reg_t *argv) {
list_t *l = LOOKUP_LIST(argv[0]);
if (!l) {
@@ -192,7 +192,7 @@
return s->r_acc;
}
-inline reg_t _k_new_node(state_t *s, reg_t value, reg_t key) {
+inline reg_t _k_new_node(EngineState *s, reg_t value, reg_t key) {
reg_t nodebase;
node_t *n = sm_alloc_node(&s->seg_manager, &nodebase);
@@ -208,7 +208,7 @@
return nodebase;
}
-reg_t kNewNode(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNewNode(EngineState *s, int funct_nr, int argc, reg_t *argv) {
s->r_acc = _k_new_node(s, argv[0], argv[1]);
SCIkdebug(SCIkNODES, "New nodebase at "PREG"\n", PRINT_REG(s->r_acc));
@@ -216,7 +216,7 @@
return s->r_acc;
}
-reg_t kFirstNode(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFirstNode(EngineState *s, int funct_nr, int argc, reg_t *argv) {
list_t *l = LOOKUP_NULL_LIST(argv[0]);
if (l && !sane_listp(s, argv[0]))
@@ -228,7 +228,7 @@
return NULL_REG;
}
-reg_t kLastNode(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kLastNode(EngineState *s, int funct_nr, int argc, reg_t *argv) {
list_t *l = LOOKUP_LIST(argv[0]);
if (l && !sane_listp(s, argv[0]))
@@ -240,7 +240,7 @@
return NULL_REG;
}
-reg_t kEmptyList(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kEmptyList(EngineState *s, int funct_nr, int argc, reg_t *argv) {
list_t *l = LOOKUP_LIST(argv[0]);
if (!l || !sane_listp(s, argv[0]))
@@ -249,7 +249,7 @@
return make_reg(0, ((l) ? IS_NULL_REG(l->first) : 0));
}
-inline void _k_add_to_front(state_t *s, reg_t listbase, reg_t nodebase) {
+inline void _k_add_to_front(EngineState *s, reg_t listbase, reg_t nodebase) {
list_t *l = LOOKUP_LIST(listbase);
node_t *new_n = LOOKUP_NODE(nodebase);
@@ -272,7 +272,7 @@
l->first = nodebase;
}
-inline void _k_add_to_end(state_t *s, reg_t listbase, reg_t nodebase) {
+inline void _k_add_to_end(EngineState *s, reg_t listbase, reg_t nodebase) {
list_t *l = LOOKUP_LIST(listbase);
node_t *new_n = LOOKUP_NODE(nodebase);
@@ -295,7 +295,7 @@
l->last = nodebase;
}
-reg_t kNextNode(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNextNode(EngineState *s, int funct_nr, int argc, reg_t *argv) {
node_t *n = LOOKUP_NODE(argv[0]);
if (!sane_nodep(s, argv[0])) {
error("List node at "PREG" is not sane anymore", PRINT_REG(argv[0]));
@@ -306,7 +306,7 @@
return n->succ;
}
-reg_t kPrevNode(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kPrevNode(EngineState *s, int funct_nr, int argc, reg_t *argv) {
node_t *n = LOOKUP_NODE(argv[0]);
if (!sane_nodep(s, argv[0]))
error("List node at "PREG" is not sane anymore", PRINT_REG(argv[0]));
@@ -314,7 +314,7 @@
return n->pred;
}
-reg_t kNodeValue(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kNodeValue(EngineState *s, int funct_nr, int argc, reg_t *argv) {
node_t *n = LOOKUP_NODE(argv[0]);
if (!sane_nodep(s, argv[0])) {
error("List node at "PREG" is not sane", PRINT_REG(argv[0]));
@@ -325,12 +325,12 @@
return n->value;
}
-reg_t kAddToFront(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAddToFront(EngineState *s, int funct_nr, int argc, reg_t *argv) {
_k_add_to_front(s, argv[0], argv[1]);
return s->r_acc;
}
-reg_t kAddAfter(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAddAfter(EngineState *s, int funct_nr, int argc, reg_t *argv) {
list_t *l = LOOKUP_LIST(argv[0]);
node_t *firstnode = IS_NULL_REG(argv[1]) ? NULL : LOOKUP_NODE(argv[1]);
node_t *newnode = LOOKUP_NODE(argv[2]);
@@ -369,12 +369,12 @@
}
}
-reg_t kAddToEnd(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAddToEnd(EngineState *s, int funct_nr, int argc, reg_t *argv) {
_k_add_to_end(s, argv[0], argv[1]);
return s->r_acc;
}
-reg_t kFindKey(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFindKey(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t node_pos;
reg_t key = argv[1];
reg_t list_pos = argv[0];
@@ -403,7 +403,7 @@
return NULL_REG;
}
-reg_t kDeleteKey(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDeleteKey(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t node_pos = kFindKey(s, funct_nr, 2, argv);
node_t *n;
list_t *l = LOOKUP_LIST(argv[0]);
@@ -445,7 +445,7 @@
return 0;
}
-reg_t kSort(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSort(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t source = argv[0];
reg_t dest = argv[1];
reg_t order_func = argv[2];
Modified: scummvm/trunk/engines/sci/engine/kmath.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmath.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kmath.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -27,18 +27,18 @@
namespace Sci {
-reg_t kRandom(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kRandom(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(0, SKPV(0) + (int)((SKPV(1) + 1.0 - SKPV(0)) * (rand() / (RAND_MAX + 1.0))));
}
-reg_t kAbs(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAbs(EngineState *s, int funct_nr, int argc, reg_t *argv) {
// This is a hack, but so is the code in Hoyle1 that needs it.
if (argv[0].segment)
return make_reg(0, 0x3e8); // Yes people, this is an object
return make_reg(0, abs(SKPV(0)));
}
-reg_t kSqrt(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSqrt(EngineState *s, int funct_nr, int argc, reg_t *argv) {
return make_reg(0, (gint16) sqrt((float) abs(SKPV(0))));
}
@@ -62,7 +62,7 @@
}
}
-reg_t kGetAngle(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetAngle(EngineState *s, int funct_nr, int argc, reg_t *argv) {
// Based on behavior observed with a test program created with
// SCI Studio.
int x1 = SKPV(0);
@@ -99,28 +99,28 @@
return make_reg(0, angle);
}
-reg_t kGetDistance(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetDistance(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int xrel = (int)(((float) SKPV(1) - SKPV_OR_ALT(3, 0)) / cos(SKPV_OR_ALT(5, 0) * PI / 180.0)); // This works because cos(0)==1
int yrel = SKPV(0) - SKPV_OR_ALT(2, 0);
return make_reg(0, (gint16)sqrt((float) xrel*xrel + yrel*yrel));
}
-reg_t kTimesSin(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kTimesSin(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int angle = SKPV(0);
int factor = SKPV(1);
return make_reg(0, (int)(factor * 1.0 * sin(angle * PI / 180.0)));
}
-reg_t kTimesCos(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kTimesCos(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int angle = SKPV(0);
int factor = SKPV(1);
return make_reg(0, (int)(factor * 1.0 * cos(angle * PI / 180.0)));
}
-reg_t kCosDiv(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kCosDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int angle = SKPV(0);
int value = SKPV(1);
double cosval = cos(angle * PI / 180.0);
@@ -132,7 +132,7 @@
return make_reg(0, (gint16)(value / cosval));
}
-reg_t kSinDiv(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSinDiv(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int angle = SKPV(0);
int value = SKPV(1);
double sinval = sin(angle * PI / 180.0);
@@ -144,7 +144,7 @@
return make_reg(0, (gint16)(value / sinval));
}
-reg_t kTimesTan(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kTimesTan(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int param = SKPV(0);
int scale = SKPV_OR_ALT(1, 1);
@@ -156,7 +156,7 @@
return make_reg(0, (gint16) - (tan(param * PI / 180.0) * scale));
}
-reg_t kTimesCot(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kTimesCot(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int param = SKPV(0);
int scale = SKPV_OR_ALT(1, 1);
Modified: scummvm/trunk/engines/sci/engine/kmenu.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmenu.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kmenu.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -30,7 +30,7 @@
namespace Sci {
reg_t
-kAddMenu(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kAddMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *name = kernel_dereference_char_pointer(s, argv[0], 0);
char *contents = kernel_dereference_char_pointer(s, argv[1], 0);
@@ -43,7 +43,7 @@
reg_t
-kSetMenu(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kSetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int index = UKPV(0);
int i = 2;
@@ -56,7 +56,7 @@
}
reg_t
-kGetMenu(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kGetMenu(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int index = UKPV(0);
return menubar_get_attribute(s, (index >> 8) - 1, (index & 0xff) - 1, UKPV(1));
@@ -64,7 +64,7 @@
reg_t
-kDrawStatus(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDrawStatus(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t text = argv[0];
int fgcolor = SKPV_OR_ALT(1, s->status_bar_foreground);
int bgcolor = SKPV_OR_ALT(2, s->status_bar_background);
@@ -94,7 +94,7 @@
reg_t
-kDrawMenuBar(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDrawMenuBar(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (SKPV(0))
sciw_set_menubar(s, s->titlebar_port, s->menubar, -1);
@@ -203,7 +203,7 @@
void
-about_freesci(state_t *s) {
+about_freesci(EngineState *s) {
int page;
gfxw_port_t *port;
int bodyfont, titlefont;
@@ -287,7 +287,7 @@
static inline int
-_menu_go_down(state_t *s, int menu_nr, int item_nr) {
+_menu_go_down(EngineState *s, int menu_nr, int item_nr) {
int seeker, max = s->menubar->menus[menu_nr].items_nr;
seeker = item_nr + 1;
@@ -305,7 +305,7 @@
reg_t
-kMenuSelect(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kMenuSelect(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t event = argv[0];
/*int pause_sound = UKPV_OR_ALT(1, 1);*/ /* FIXME: Do this eventually */
int claimed = 0;
Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -65,7 +65,7 @@
used in an iterative stepping algorithm
*/
-reg_t kSetJump(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetJump(EngineState *s, int funct_nr, int argc, reg_t *argv) {
// Input data
reg_t object = argv[0];
int dx = SKPV(1);
@@ -162,7 +162,7 @@
#define _K_BRESEN_AXIS_X 0
#define _K_BRESEN_AXIS_Y 1
-void initialize_bresen(state_t *s, int funct_nr, int argc, reg_t *argv, reg_t mover, int step_factor, int deltax, int deltay) {
+void initialize_bresen(EngineState *s, int funct_nr, int argc, reg_t *argv, reg_t mover, int step_factor, int deltax, int deltay) {
reg_t client = GET_SEL32(mover, client);
int stepx = GET_SEL32SV(client, xStep) * step_factor;
int stepy = GET_SEL32SV(client, yStep) * step_factor;
@@ -215,7 +215,7 @@
PUT_SEL32V(mover, b_i2, bdi * 2);
}
-reg_t kInitBresen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kInitBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t mover = argv[0];
reg_t client = GET_SEL32(mover, client);
@@ -236,7 +236,7 @@
UNINITIALIZED
} handle_movecnt = UNINITIALIZED;
-int parse_reg_t(state_t *s, const char *str, reg_t *dest);
+int parse_reg_t(EngineState *s, const char *str, reg_t *dest);
static int checksum_bytes(byte *data, int size) {
int result = 0;
@@ -250,7 +250,7 @@
return result;
}
-static void bresenham_autodetect(state_t *s) {
+static void bresenham_autodetect(EngineState *s) {
reg_t motion_class;
if (!parse_reg_t(s, "?Motion", &motion_class)) {
@@ -279,7 +279,7 @@
}
}
-reg_t kDoBresen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t mover = argv[0];
reg_t client = GET_SEL32(mover, client);
@@ -384,11 +384,11 @@
return make_reg(0, completed);
}
-extern void _k_dirloop(reg_t obj, word angle, state_t *s, int funct_nr, int argc, reg_t *argv);
-int is_heap_object(state_t *s, reg_t pos);
+extern void _k_dirloop(reg_t obj, word angle, EngineState *s, int funct_nr, int argc, reg_t *argv);
+int is_heap_object(EngineState *s, reg_t pos);
extern int get_angle(int xrel, int yrel);
-reg_t kDoAvoider(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t avoider = argv[0];
reg_t client, looper, mover;
int angle;
Modified: scummvm/trunk/engines/sci/engine/kpathing.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kpathing.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kpathing.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -172,7 +172,7 @@
return point;
}
-static void draw_line(state_t *s, Common::Point p1, Common::Point p2, int type) {
+static void draw_line(EngineState *s, Common::Point p1, Common::Point p2, int type) {
// Colors for polygon debugging.
// Green: Total access
// Red : Barred access
@@ -199,7 +199,7 @@
decorations->add((gfxw_container_t *)decorations, (gfxw_widget_t *)line);
}
-static void draw_point(state_t *s, Common::Point p, int start) {
+static void draw_point(EngineState *s, Common::Point p, int start) {
// Colors for starting and end point
// Green: End point
// Blue: Starting point
@@ -221,7 +221,7 @@
decorations->add((gfxw_container_t *) decorations, (gfxw_widget_t *) box);
}
-static void draw_polygon(state_t *s, reg_t polygon) {
+static void draw_polygon(EngineState *s, reg_t polygon) {
reg_t points = GET_SEL32(polygon, points);
int size = KP_UINT(GET_SEL32(polygon, size));
int type = KP_UINT(GET_SEL32(polygon, type));
@@ -241,7 +241,7 @@
draw_line(s, prev, first, type % 3);
}
-static void draw_input(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
+static void draw_input(EngineState *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
list_t *list;
node_t *node;
@@ -266,7 +266,7 @@
}
}
-static void print_polygon(state_t *s, reg_t polygon) {
+static void print_polygon(EngineState *s, reg_t polygon) {
reg_t points = GET_SEL32(polygon, points);
int size = KP_UINT(GET_SEL32(polygon, size));
int type = KP_UINT(GET_SEL32(polygon, type));
@@ -286,7 +286,7 @@
sciprintf(" (%i, %i);\n", point.x, point.y);
}
-static void print_input(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
+static void print_input(EngineState *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
list_t *list;
node_t *node;
@@ -1077,9 +1077,9 @@
return v_new;
}
-static polygon_t *convert_polygon(state_t *s, reg_t polygon) {
+static polygon_t *convert_polygon(EngineState *s, reg_t polygon) {
// Converts an SCI polygon into a polygon_t
- // Parameters: (state_t *) s: The game state
+ // Parameters: (EngineState *) s: The game state
// (reg_t) polygon: The SCI polygon to convert
// Returns : (polygon_t *) The converted polygon
int i;
@@ -1153,9 +1153,9 @@
}
}
-static pf_state_t *convert_polygon_set(state_t *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
+static pf_state_t *convert_polygon_set(EngineState *s, reg_t poly_list, Common::Point start, Common::Point end, int opt) {
// Converts the SCI input data for pathfinding
- // Parameters: (state_t *) s: The game state
+ // Parameters: (EngineState *) s: The game state
// (reg_t) poly_list: Polygon list
// (Common::Point) start: The start point
// (Common::Point) end: The end point
@@ -1366,10 +1366,10 @@
}
}
-static reg_t output_path(pf_state_t *p, state_t *s) {
+static reg_t output_path(pf_state_t *p, EngineState *s) {
// Stores the final path in newly allocated dynmem
// Parameters: (pf_state_t *) p: The pathfinding state
- // (state_t *) s: The game state
+ // (EngineState *) s: The game state
// Returns : (reg_t) Pointer to dynmem containing path
int path_len = 0;
byte *oref;
@@ -1439,7 +1439,7 @@
return output;
}
-reg_t kAvoidPath(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kAvoidPath(EngineState *s, int funct_nr, int argc, reg_t *argv) {
Common::Point start = Common::Point(SKPV(0), SKPV(1));
if (s->debug_mode & (1 << SCIkAVOIDPATH_NR)) {
Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -29,7 +29,7 @@
namespace Sci {
-reg_t read_selector(state_t *s, reg_t object, selector_t selector_id, const char *file, int line) {
+reg_t read_selector(EngineState *s, reg_t object, selector_t selector_id, const char *file, int line) {
reg_t *address;
if (lookup_selector(s, object, selector_id, &address, NULL) != SELECTOR_VARIABLE)
@@ -38,7 +38,7 @@
return *address;
}
-void write_selector(state_t *s, reg_t object, selector_t selector_id, reg_t value, const char *fname, int line) {
+void write_selector(EngineState *s, reg_t object, selector_t selector_id, reg_t value, const char *fname, int line) {
reg_t *address;
if ((selector_id < 0) || (selector_id > s->selector_names_nr)) {
@@ -54,7 +54,7 @@
*address = value;
}
-int invoke_selector(state_t *s, reg_t object, int selector_id, int noinvalid, int kfunct,
+int invoke_selector(EngineState *s, reg_t object, int selector_id, int noinvalid, int kfunct,
stack_ptr_t k_argp, int k_argc, const char *fname, int line, int argc, ...) {
va_list argp;
int i;
@@ -106,13 +106,13 @@
return 0;
}
-bool is_object(state_t *s, reg_t object) {
+bool is_object(EngineState *s, reg_t object) {
return obj_get(s, object) != NULL;
}
// Loads arbitrary resources of type 'restype' with resource numbers 'resnrs'
// This implementation ignores all resource numbers except the first one.
-reg_t kLoad(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kLoad(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int restype = KP_UINT(argv[0]);
int resnr = KP_UINT(argv[1]);
@@ -122,7 +122,7 @@
return make_reg(0, ((restype << 11) | resnr)); // Return the resource identifier as handle
}
-reg_t kLock(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kLock(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int restype = UKPV(0) & 0x7f;
int resnr = UKPV(1);
int state = argc > 2 ? UKPV(2) : 1;
@@ -142,7 +142,7 @@
}
// Unloads an arbitrary resource of type 'restype' with resource numbber 'resnr'
-reg_t kUnLoad(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kUnLoad(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int restype = KP_UINT(argv[0]);
reg_t resnr = argv[1];
@@ -152,7 +152,7 @@
return s->r_acc;
}
-reg_t kClone(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kClone(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t parent_addr = argv[0];
object_t *parent_obj = obj_get(s, parent_addr);
reg_t clone_addr;
@@ -190,9 +190,9 @@
return clone_addr;
}
-extern void _k_view_list_mark_free(state_t *s, reg_t off);
+extern void _k_view_list_mark_free(EngineState *s, reg_t off);
-reg_t kDisposeClone(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDisposeClone(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t victim_addr = argv[0];
clone_t *victim_obj = obj_get(s, victim_addr);
word underBits;
@@ -230,7 +230,7 @@
}
// Returns script dispatch address index in the supplied script
-reg_t kScriptID(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kScriptID(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int script = KP_UINT(argv[0]);
int index = KP_UINT(KP_ALT(1, NULL_REG));
@@ -258,7 +258,7 @@
return make_reg(scriptid, sm_validate_export_func(&s->seg_manager, index, scriptid));
}
-reg_t kDisposeScript(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kDisposeScript(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int script = argv[0].offset;
// Work around QfG1 graveyard bug
@@ -277,19 +277,19 @@
return s->r_acc;
}
-int is_heap_object(state_t *s, reg_t pos) {
+int is_heap_object(EngineState *s, reg_t pos) {
object_t *obj = obj_get(s, pos);
return (obj != NULL && (!(obj->flags & OBJECT_FLAG_FREED)) && (!sm_script_is_marked_as_deleted(&s->seg_manager, pos.segment)));
}
-reg_t kIsObject(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kIsObject(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (argv[0].offset == 0xffff) // Treated specially
return NULL_REG;
else
return make_reg(0, is_heap_object(s, argv[0]));
}
-reg_t kRespondsTo(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kRespondsTo(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = argv[0];
int selector = KP_UINT(argv[1]);
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -91,7 +91,7 @@
static void
-script_set_priority(state_t *s, reg_t obj, int priority) {
+script_set_priority(EngineState *s, reg_t obj, int priority) {
int song_nr = GET_SEL32V(obj, number);
resource_t *song = scir_find_resource(s->resmgr, sci_sound, song_nr, 0);
int flags = GET_SEL32V(obj, flags);
@@ -110,7 +110,7 @@
}
song_iterator_t *
-build_iterator(state_t *s, int song_nr, int type, songit_id_t id) {
+build_iterator(EngineState *s, int song_nr, int type, songit_id_t id) {
resource_t *song = scir_find_resource(s->resmgr, sci_sound, song_nr, 0);
if (!song)
@@ -121,7 +121,7 @@
void
-process_sound_events(state_t *s) { /* Get all sound events, apply their changes to the heap */
+process_sound_events(EngineState *s) { /* Get all sound events, apply their changes to the heap */
int result;
song_handle_t handle;
int cue;
@@ -174,7 +174,7 @@
reg_t
-kDoSound_SCI0(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDoSound_SCI0(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t obj = KP_ALT(1, NULL_REG);
word command = UKPV(0);
song_handle_t handle = FROBNICATE_HANDLE(obj);
@@ -366,7 +366,7 @@
int command, int arg1, int arg2);
reg_t
-kDoSound_SCI01(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDoSound_SCI01(EngineState *s, int funct_nr, int argc, reg_t *argv) {
word command = UKPV(0);
reg_t obj = KP_ALT(1, NULL_REG);
song_handle_t handle = FROBNICATE_HANDLE(obj);
@@ -671,7 +671,7 @@
int command, int arg1, int arg2);
reg_t
-kDoSound_SCI1(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) {
word command = UKPV(0);
reg_t obj = KP_ALT(1, NULL_REG);
song_handle_t handle = FROBNICATE_HANDLE(obj);
@@ -979,7 +979,7 @@
}
reg_t
-kDoSound(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDoSound(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_2)
return kDoSound_SCI1(s, funct_nr, argc, argv);
else if (s->version >= SCI_VERSION_FTU_DOSOUND_VARIANT_1)
@@ -989,7 +989,7 @@
}
reg_t
-kDoAudio(state_t *s, int funct_nr, int argc, reg_t *argv) {
+kDoAudio(EngineState *s, int funct_nr, int argc, reg_t *argv) {
switch (UKPV(0)) {
case _K_SCI1_AUDIO_POSITION :
return make_reg(0, -1); /* Finish immediately */
Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -38,7 +38,7 @@
}
/* Returns the string the script intended to address */
-char *kernel_lookup_text(state_t *s, reg_t address, int index) {
+char *kernel_lookup_text(EngineState *s, reg_t address, int index) {
char *seeker;
resource_t *textres;
@@ -77,7 +77,7 @@
/**********/
#ifdef SCI_SIMPLE_SAID_CODE
-int vocab_match_simple(state_t *s, heap_ptr addr) {
+int vocab_match_simple(EngineState *s, heap_ptr addr) {
int nextitem;
int listpos = 0;
@@ -112,7 +112,7 @@
#endif /* SCI_SIMPLE_SAID_CODE */
-reg_t kSaid(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSaid(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t heap_said_block = argv[0];
byte *said_block;
int new_lastmatch;
@@ -179,8 +179,7 @@
}
-reg_t
-kSetSynonyms(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kSetSynonyms(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t object = argv[0];
list_t *list;
node_t *node;
@@ -251,8 +250,7 @@
-reg_t
-kParse(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kParse(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t stringpos = argv[0];
char *string = kernel_dereference_char_pointer(s, stringpos, 0);
int words_nr;
@@ -341,8 +339,7 @@
}
-reg_t
-kStrEnd(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrEnd(EngineState *s, int funct_nr, int argc, reg_t *argv) {
reg_t address = argv[0];
char *seeker = kernel_dereference_char_pointer(s, address, 0);
@@ -352,8 +349,7 @@
return address;
}
-reg_t
-kStrCat(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrCat(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *s1 = kernel_dereference_char_pointer(s, argv[0], 0);
char *s2 = kernel_dereference_char_pointer(s, argv[1], 0);
@@ -361,8 +357,7 @@
return argv[0];
}
-reg_t
-kStrCmp(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrCmp(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *s1 = kernel_dereference_char_pointer(s, argv[0], 0);
char *s2 = kernel_dereference_char_pointer(s, argv[1], 0);
@@ -373,8 +368,7 @@
}
-reg_t
-kStrCpy(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrCpy(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *dest = (char *) kernel_dereference_bulk_pointer(s, argv[0], 0);
char *src = (char *) kernel_dereference_bulk_pointer(s, argv[1], 0);
@@ -415,8 +409,7 @@
}
-reg_t
-kStrAt(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrAt(EngineState *s, int funct_nr, int argc, reg_t *argv) {
unsigned char *dest = (unsigned char *) kernel_dereference_bulk_pointer(s, argv[0], 0);
reg_t *dest2;
@@ -451,8 +444,7 @@
}
-reg_t
-kReadNumber(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kReadNumber(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *source = kernel_dereference_char_pointer(s, argv[0], 0);
while (isspace(*source))
@@ -476,8 +468,7 @@
** Formats the text from text.textresnr (offset index_inside_res) or heap_text_addr according to
** the supplied parameters and writes it to the targ_address.
*/
-reg_t
-kFormat(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kFormat(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int *arguments;
reg_t dest = argv[0];
char *target = (char *) kernel_dereference_bulk_pointer(s, dest, 0);
@@ -692,16 +683,14 @@
}
-reg_t
-kStrLen(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kStrLen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
char *str = kernel_dereference_char_pointer(s, argv[0], 0);
return make_reg(0, strlen(str));
}
-reg_t
-kGetFarText(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kGetFarText(EngineState *s, int funct_nr, int argc, reg_t *argv) {
resource_t *textres = scir_find_resource(s->resmgr, sci_text, UKPV(0), 0);
char *seeker;
int counter = UKPV(1);
@@ -728,8 +717,7 @@
static message_state_t state;
-reg_t
-kMessage(state_t *s, int funct_nr, int argc, reg_t *argv) {
+reg_t kMessage(EngineState *s, int funct_nr, int argc, reg_t *argv) {
if (!state.initialized)
message_state_initialize(s->resmgr, &state);
Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/said.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -1999,7 +1999,7 @@
return 0;
}
-int said_parse_spec(state_t *s, byte *spec) {
+int said_parse_spec(EngineState *s, byte *spec) {
int nextitem;
said_parse_error = NULL;
@@ -2434,7 +2434,7 @@
/**** Main code ****/
/*******************/
-int said(state_t *s, byte *spec, int verbose) {
+int said(EngineState *s, byte *spec, int verbose) {
int retval;
parse_tree_node_t *parse_tree_ptr = s->parser_nodes;
@@ -2465,7 +2465,7 @@
#ifdef SAID_DEBUG_PROGRAM
int main (int argc, char *argv) {
byte block[] = {0x01, 0x00, 0xf8, 0xf5, 0x02, 0x01, 0xf6, 0xf2, 0x02, 0x01, 0xf2, 0x01, 0x03, 0xff};
- state_t s;
+ EngineState s;
con_passthrough = 1;
s.parser_valid = 1;
Modified: scummvm/trunk/engines/sci/engine/savegame.cfsml
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/savegame.cfsml 2009-02-21 10:47:56 UTC (rev 38678)
@@ -23,7 +23,7 @@
*
*/
-/* Savegame handling for state_t structs. Makes heavy use of cfsml magic. */
+/* Savegame handling for EngineState structs. Makes heavy use of cfsml magic. */
/* DON'T EDIT savegame.cpp ! Only modify savegame.cfsml, if something needs
** to be changed. Refer to freesci/docs/misc/cfsml.spec if you don't understand
** savegame.cfsml. If this doesn't solve your problem, contact the maintainer.
@@ -103,7 +103,7 @@
-static state_t *_global_save_state;
+static EngineState *_global_save_state;
// Needed for some graphical stuff.
#define FILE_VERSION _global_save_state->savegame_version
@@ -316,7 +316,7 @@
int savegame_time;
}
-RECORD state_t "state_t" {
+RECORD EngineState "EngineState" {
int savegame_version;
string game_version;
@@ -521,7 +521,7 @@
%CFSMLWRITE song_t *foo INTO fh;
}
-song_iterator_t *build_iterator(state_t *s, int song_nr, int type, songit_id_t id);
+song_iterator_t *build_iterator(EngineState *s, int song_nr, int type, songit_id_t id);
int read_song_tp(Common::SeekableReadStream *fh, song_t **foo, const char *lastval, int *line, int *hiteof) {
char *token;
@@ -707,11 +707,11 @@
// This function is called to undo some strange stuff done in preparation
// to writing a gamestate to disk
-void _gamestate_unfrob(state_t *s) {
+void _gamestate_unfrob(EngineState *s) {
}
-int gamestate_save(state_t *s, Common::WriteStream *fh, const char* savename) {
+int gamestate_save(EngineState *s, Common::WriteStream *fh, const char* savename) {
tm curTime;
g_system->getTimeAndDate(curTime);
@@ -748,7 +748,7 @@
s->game_time = time(NULL) - s->game_start_time.tv_sec;
%CFSMLWRITE SavegameMetadata meta INTO fh;
- %CFSMLWRITE state_t s INTO fh;
+ %CFSMLWRITE EngineState s INTO fh;
delete meta;
@@ -767,7 +767,7 @@
return -1;
}
-static byte *find_unique_script_block(state_t *s, byte *buf, int type) {
+static byte *find_unique_script_block(EngineState *s, byte *buf, int type) {
int magic_pos_adder = s->version >= SCI_VERSION_FTU_NEW_SCRIPT_HEADER ? 0 : 2;
buf += magic_pos_adder;
@@ -785,7 +785,7 @@
return NULL;
}
-static void reconstruct_stack(state_t *retval) {
+static void reconstruct_stack(EngineState *retval) {
seg_id_t stack_seg = find_unique_seg_by_type(&retval->seg_manager, MEM_OBJ_STACK);
dstack_t *stack = &(retval->seg_manager.heap[stack_seg]->data.stack);
@@ -810,7 +810,7 @@
return 1;
}
-static void load_script(state_t *s, seg_id_t seg) {
+static void load_script(EngineState *s, seg_id_t seg) {
resource_t *script, *heap = NULL;
script_t *scr = &(s->seg_manager.heap[seg]->data.script);
@@ -831,7 +831,7 @@
}
}
-static void reconstruct_scripts(state_t *s, seg_manager_t *self) {
+static void reconstruct_scripts(EngineState *s, seg_manager_t *self) {
int i;
mem_obj_t *mobj;
for (i = 0; i < self->heap_size; i++) {
@@ -905,7 +905,7 @@
}
}
-void reconstruct_clones(state_t *s, seg_manager_t *self) {
+void reconstruct_clones(EngineState *s, seg_manager_t *self) {
int i;
mem_obj_t *mobj;
@@ -959,11 +959,11 @@
}
}
-int _reset_graphics_input(state_t *s);
+int _reset_graphics_input(EngineState *s);
song_iterator_t *new_fast_forward_iterator(song_iterator_t *it, int delta);
-static void reconstruct_sounds(state_t *s) {
+static void reconstruct_sounds(EngineState *s) {
song_t *seeker;
int it_type = s->resmgr->sci_version >= SCI_VERSION_01 ? SCI_SONG_ITERATOR_TYPE_SCI1 : SCI_SONG_ITERATOR_TYPE_SCI0;
@@ -997,9 +997,9 @@
}
}
-state_t *gamestate_restore(state_t *s, Common::SeekableReadStream *fh) {
+EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
int read_eof = 0;
- state_t *retval;
+ EngineState *retval;
songlib_t temp;
/*
@@ -1011,9 +1011,9 @@
}
*/
- retval = (state_t *) sci_malloc(sizeof(state_t));
+ retval = (EngineState *) sci_malloc(sizeof(EngineState));
- memset(retval, 0, sizeof(state_t));
+ memset(retval, 0, sizeof(EngineState));
retval->savegame_version = -1;
_global_save_state = retval;
@@ -1045,7 +1045,7 @@
retval->sound_mute = s->sound_mute;
retval->sound_volume = s->sound_volume;
- %CFSMLREAD-ATOMIC state_t retval FROM fh ERRVAR read_eof;
+ %CFSMLREAD-ATOMIC EngineState retval FROM fh ERRVAR read_eof;
sfx_exit(&s->sound);
_gamestate_unfrob(retval);
Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-21 10:44:06 UTC (rev 38677)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp 2009-02-21 10:47:56 UTC (rev 38678)
@@ -23,7 +23,7 @@
*
*/
-/* Savegame handling for state_t structs. Makes heavy use of cfsml magic. */
+/* Savegame handling for EngineState structs. Makes heavy use of cfsml magic. */
/* DON'T EDIT savegame.cpp ! Only modify savegame.cfsml, if something needs
** to be changed. Refer to freesci/docs/misc/cfsml.spec if you don't understand
** savegame.cfsml. If this doesn't solve your problem, contact the maintainer.
@@ -103,7 +103,7 @@
-static state_t *_global_save_state;
+static EngineState *_global_save_state;
// Needed for some graphical stuff.
#define FILE_VERSION _global_save_state->savegame_version
@@ -226,11 +226,11 @@
// Auto-generated CFSML declaration and function block
-#line 736 "../../engines/sci/engine/savegame.cfsml"
+#line 736 "engines/sci/engine/savegame.cfsml"
#define CFSML_SUCCESS 0
#define CFSML_FAILURE 1
-#line 102 "../../engines/sci/engine/savegame.cfsml"
+#line 102 "engines/sci/engine/savegame.cfsml"
#include <stdarg.h> // We need va_lists
#include "sci/include/sci_memory.h"
@@ Diff output truncated at 100000 characters. @@
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