diff options
| author | Torbjörn Andersson | 2003-10-18 08:11:50 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-10-18 08:11:50 +0000 |
| commit | 3a43829b885fe67b3165f2f75778dbbb65d1d560 (patch) | |
| tree | 278c5af17333be11f75eef711c004fc6a606f9f7 /sword2/startup.cpp | |
| parent | 23b3e4cc7da9797d8dcccf7d93a6dd2571272644 (diff) | |
| download | scummvm-rg350-3a43829b885fe67b3165f2f75778dbbb65d1d560.tar.gz scummvm-rg350-3a43829b885fe67b3165f2f75778dbbb65d1d560.tar.bz2 scummvm-rg350-3a43829b885fe67b3165f2f75778dbbb65d1d560.zip | |
Moved the opcode functions into the Logic class.
svn-id: r10885
Diffstat (limited to 'sword2/startup.cpp')
| -rw-r--r-- | sword2/startup.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sword2/startup.cpp b/sword2/startup.cpp index 1e32086529..a50d627672 100644 --- a/sword2/startup.cpp +++ b/sword2/startup.cpp @@ -18,22 +18,23 @@ */ #include "stdafx.h" +#include "bs2/sword2.h" // for CloseGame() #include "bs2/build_display.h" #include "bs2/console.h" #include "bs2/debug.h" #include "bs2/defs.h" #include "bs2/header.h" #include "bs2/interpreter.h" +#include "bs2/logic.h" #include "bs2/maketext.h" // for Kill_text_bloc() #include "bs2/memory.h" -#include "bs2/mouse.h" // for FN_add_human() +#include "bs2/mouse.h" #include "bs2/object.h" #include "bs2/resman.h" #include "bs2/router.h" #include "bs2/sound.h" #include "bs2/speech.h" // for 'speech_text_bloc_no' - so that speech text can be cleared when running a new start-script #include "bs2/startup.h" -#include "bs2/sword2.h" // for CloseGame() #include "bs2/sync.h" #include "bs2/tony_gsdk.h" @@ -139,12 +140,10 @@ uint32 Init_start_menu(void) { return 1; } -int32 FN_register_start_point(int32 *params) { +int32 Logic::fnRegisterStartPoint(int32 *params) { // params: 0 id of startup script to call - key // 1 pointer to ascii message - debug(5, " FN_register_start_point %d %s", params[0], params[1]); - #ifdef _SWORD2_DEBUG if (total_startups == MAX_starts) Con_fatal_error("ERROR: start_list full"); @@ -252,7 +251,7 @@ uint32 Con_start(uint8 *input) { Clear_fx_queue(); // fade out any music that is currently playing - FN_stop_music(NULL); + g_logic.fnStopMusic(NULL); // halt the sample prematurely g_sound->unpauseSpeech(); @@ -299,7 +298,7 @@ uint32 Con_start(uint8 *input) { // make sure thre's a mouse, in case restarting while // mouse not available - FN_add_human(NULL); + g_logic.fnAddHuman(NULL); } else Print_to_console("not a legal start position"); } else { |