diff options
| author | Max Horn | 2003-05-20 20:58:26 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 20:58:26 +0000 |
| commit | 49e7f7564a6d33e0079898cc9584fb69c0fcdcfd (patch) | |
| tree | 6687f674e24fe1187cfce58c3d569d184316ea95 /scumm/scumm.h | |
| parent | 1a394aa3c764c8a50def5bb9d8aa1342d962fbdd (diff) | |
| download | scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.tar.gz scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.tar.bz2 scummvm-rg350-49e7f7564a6d33e0079898cc9584fb69c0fcdcfd.zip | |
renamed various things for clarity
svn-id: r7754
Diffstat (limited to 'scumm/scumm.h')
| -rw-r--r-- | scumm/scumm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index a797315d1a..e7abedd2d8 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -507,7 +507,7 @@ protected: public: void runScript(int script, bool freezeResistant, bool recursive, int *lvarptr); - void stopScriptNr(int script); + void stopScript(int script); protected: void runScriptNested(int script); @@ -532,9 +532,9 @@ protected: void freezeScripts(int scr); void unfreezeScripts(); void runAllScripts(); - void cutscene(int *args); + void beginCutscene(int *args); void endCutscene(); - void exitCutscene(); + void abortCutscene(); void runExitScript(); void runEntryScript(); @@ -709,7 +709,7 @@ protected: int getVerbEntrypoint(int obj, int entry); int getVerbSlot(int id, int mode); void killVerb(int slot); - void runVerbCode(int script, int entry, bool freezeResistant, bool recursive, int *vars); + void runObjectScript(int script, int entry, bool freezeResistant, bool recursive, int *vars); void setVerbObject(uint room, uint object, uint verb); public: |