diff options
author | Benjamin Haisch | 2008-05-06 11:45:23 +0000 |
---|---|---|
committer | Benjamin Haisch | 2008-05-06 11:45:23 +0000 |
commit | 9df82055f0dff7c242f889c5d776ad0cca2d5bc8 (patch) | |
tree | 5748f4f80aad87ae23478d8eea4beb7e7eef2013 /engines/made/scriptfuncs_rtz.cpp | |
parent | 397e04d0b1ff6d96502c4eca42c1ab4a31b2dbcd (diff) | |
download | scummvm-rg350-9df82055f0dff7c242f889c5d776ad0cca2d5bc8.tar.gz scummvm-rg350-9df82055f0dff7c242f889c5d776ad0cca2d5bc8.tar.bz2 scummvm-rg350-9df82055f0dff7c242f889c5d776ad0cca2d5bc8.zip |
- The Manhole: New and Enhanced is now (partially) playable
- Implemented cmd_objectp
- Changed how the script externals array is set up
- Cleanup
svn-id: r31895
Diffstat (limited to 'engines/made/scriptfuncs_rtz.cpp')
-rw-r--r-- | engines/made/scriptfuncs_rtz.cpp | 210 |
1 files changed, 104 insertions, 106 deletions
diff --git a/engines/made/scriptfuncs_rtz.cpp b/engines/made/scriptfuncs_rtz.cpp index 1186a88de8..20f6df8918 100644 --- a/engines/made/scriptfuncs_rtz.cpp +++ b/engines/made/scriptfuncs_rtz.cpp @@ -43,113 +43,111 @@ namespace Made { /* ScriptFunctionsRtz */ typedef Common::Functor2Mem<int16, int16*, int16, ScriptFunctionsRtz> ExternalFuncRtz; -#define External(x) ExternalFuncRtz(this, &ScriptFunctionsRtz::x) +#define External(x) \ + _externalFuncs.push_back(new ExternalFuncRtz(this, &ScriptFunctionsRtz::x)); \ + _externalFuncNames.push_back(#x); void ScriptFunctionsRtz::setupExternalsTable() { - static const ExternalFuncRtz externalsTable[] = { - External(o1_SYSTEM), - External(o1_INITGRAF), - External(o1_RESTOREGRAF), - External(o1_DRAWPIC), - External(o1_CLS), - External(o1_SHOWPAGE), - External(o1_EVENT), - External(o1_EVENTX), - External(o1_EVENTY), - External(o1_EVENTKEY), - External(o1_VISUALFX), - External(o1_PLAYSND), - External(o1_PLAYMUS), - External(o1_STOPMUS), - External(o1_ISMUS), - External(o1_TEXTPOS), - External(o1_FLASH), - External(o1_PLAYNOTE), - External(o1_STOPNOTE), - External(o1_PLAYTELE), - External(o1_STOPTELE), - External(o1_HIDECURS), - External(o1_SHOWCURS), - External(o1_MUSICBEAT), - External(o1_SCREENLOCK), - External(o1_ADDSPRITE), - External(o1_FREEANIM), - External(o1_DRAWSPRITE), - External(o1_ERASESPRITES), - External(o1_UPDATESPRITES), - External(o1_GETTIMER), - External(o1_SETTIMER), - External(o1_RESETTIMER), - External(o1_ALLOCTIMER), - External(o1_FREETIMER), - External(o1_PALETTELOCK), - External(o1_FONT), - External(o1_DRAWTEXT), - External(o1_HOMETEXT), - External(o1_TEXTRECT), - External(o1_TEXTXY), - External(o1_DROPSHADOW), - External(o1_TEXTCOLOR), - External(o1_OUTLINE), - External(o1_LOADCURSOR), - External(o1_SETGROUND), - External(o1_RESTEXT), - External(o1_CLIPAREA), - External(o1_SETCLIP), - External(o1_ISSND), - External(o1_STOPSND), - External(o1_PLAYVOICE), - External(o1_CDPLAY), - External(o1_STOPCD), - External(o1_CDSTATUS), - External(o1_CDTIME), - External(o1_CDPLAYSEG), - External(o1_PRINTF), - External(o1_MONOCLS), - External(o1_SNDENERGY), - External(o1_CLEARTEXT), - External(o1_ANIMTEXT), - External(o1_TEXTWIDTH), - External(o1_PLAYMOVIE), - External(o1_LOADSND), - External(o1_LOADMUS), - External(o1_LOADPIC), - External(o1_MUSICVOL), - External(o1_RESTARTEVENTS), - External(o1_PLACESPRITE), - External(o1_PLACETEXT), - External(o1_DELETECHANNEL), - External(o1_CHANNELTYPE), - External(o1_SETSTATE), - External(o1_SETLOCATION), - External(o1_SETCONTENT), - External(o1_EXCLUDEAREA), - External(o1_SETEXCLUDE), - External(o1_GETSTATE), - External(o1_PLACEANIM), - External(o1_SETFRAME), - External(o1_GETFRAME), - External(o1_GETFRAMECOUNT), - External(o1_PICWIDTH), - External(o1_PICHEIGHT), - External(o1_SOUNDRATE), - External(o1_DRAWANIMPIC), - External(o1_LOADANIM), - External(o1_READTEXT), - External(o1_READMENU), - External(o1_DRAWMENU), - External(o1_MENUCOUNT), - External(o1_SAVEGAME), - External(o1_LOADGAME), - External(o1_GAMENAME), - External(o1_SHAKESCREEN), - External(o1_PLACEMENU), - External(o1_SETVOLUME), - External(o1_WHATSYNTH), - External(o1_SLOWSYSTEM) - }; - - for (int i = 0; i < ARRAYSIZE(externalsTable); ++i) - _externalFuncs.push_back(&externalsTable[i]); + + External(o1_SYSTEM); + External(o1_INITGRAF); + External(o1_RESTOREGRAF); + External(o1_DRAWPIC); + External(o1_CLS); + External(o1_SHOWPAGE); + External(o1_EVENT); + External(o1_EVENTX); + External(o1_EVENTY); + External(o1_EVENTKEY); + External(o1_VISUALFX); + External(o1_PLAYSND); + External(o1_PLAYMUS); + External(o1_STOPMUS); + External(o1_ISMUS); + External(o1_TEXTPOS); + External(o1_FLASH); + External(o1_PLAYNOTE); + External(o1_STOPNOTE); + External(o1_PLAYTELE); + External(o1_STOPTELE); + External(o1_HIDECURS); + External(o1_SHOWCURS); + External(o1_MUSICBEAT); + External(o1_SCREENLOCK); + External(o1_ADDSPRITE); + External(o1_FREEANIM); + External(o1_DRAWSPRITE); + External(o1_ERASESPRITES); + External(o1_UPDATESPRITES); + External(o1_GETTIMER); + External(o1_SETTIMER); + External(o1_RESETTIMER); + External(o1_ALLOCTIMER); + External(o1_FREETIMER); + External(o1_PALETTELOCK); + External(o1_FONT); + External(o1_DRAWTEXT); + External(o1_HOMETEXT); + External(o1_TEXTRECT); + External(o1_TEXTXY); + External(o1_DROPSHADOW); + External(o1_TEXTCOLOR); + External(o1_OUTLINE); + External(o1_LOADCURSOR); + External(o1_SETGROUND); + External(o1_RESTEXT); + External(o1_CLIPAREA); + External(o1_SETCLIP); + External(o1_ISSND); + External(o1_STOPSND); + External(o1_PLAYVOICE); + External(o1_CDPLAY); + External(o1_STOPCD); + External(o1_CDSTATUS); + External(o1_CDTIME); + External(o1_CDPLAYSEG); + External(o1_PRINTF); + External(o1_MONOCLS); + External(o1_SNDENERGY); + External(o1_CLEARTEXT); + External(o1_ANIMTEXT); + External(o1_TEXTWIDTH); + External(o1_PLAYMOVIE); + External(o1_LOADSND); + External(o1_LOADMUS); + External(o1_LOADPIC); + External(o1_MUSICVOL); + External(o1_RESTARTEVENTS); + External(o1_PLACESPRITE); + External(o1_PLACETEXT); + External(o1_DELETECHANNEL); + External(o1_CHANNELTYPE); + External(o1_SETSTATE); + External(o1_SETLOCATION); + External(o1_SETCONTENT); + External(o1_EXCLUDEAREA); + External(o1_SETEXCLUDE); + External(o1_GETSTATE); + External(o1_PLACEANIM); + External(o1_SETFRAME); + External(o1_GETFRAME); + External(o1_GETFRAMECOUNT); + External(o1_PICWIDTH); + External(o1_PICHEIGHT); + External(o1_SOUNDRATE); + External(o1_DRAWANIMPIC); + External(o1_LOADANIM); + External(o1_READTEXT); + External(o1_READMENU); + External(o1_DRAWMENU); + External(o1_MENUCOUNT); + External(o1_SAVEGAME); + External(o1_LOADGAME); + External(o1_GAMENAME); + External(o1_SHAKESCREEN); + External(o1_PLACEMENU); + External(o1_SETVOLUME); + External(o1_WHATSYNTH); + External(o1_SLOWSYSTEM); } #undef External |