aboutsummaryrefslogtreecommitdiff
path: root/sword2/icons.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2003-10-18 08:11:50 +0000
committerTorbjörn Andersson2003-10-18 08:11:50 +0000
commit3a43829b885fe67b3165f2f75778dbbb65d1d560 (patch)
tree278c5af17333be11f75eef711c004fc6a606f9f7 /sword2/icons.cpp
parent23b3e4cc7da9797d8dcccf7d93a6dd2571272644 (diff)
downloadscummvm-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/icons.cpp')
-rw-r--r--sword2/icons.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/sword2/icons.cpp b/sword2/icons.cpp
index 8de09452a1..06a80e585d 100644
--- a/sword2/icons.cpp
+++ b/sword2/icons.cpp
@@ -23,6 +23,7 @@
#include "bs2/defs.h"
#include "bs2/icons.h"
#include "bs2/interpreter.h"
+#include "bs2/logic.h"
#include "bs2/mouse.h"
namespace Sword2 {
@@ -34,10 +35,8 @@ uint32 total_temp = 0;
menu_object master_menu_list[TOTAL_engine_pockets];
uint32 total_masters=0;
-int32 FN_add_menu_object(int32 *params) {
- // param 0 pointer to a menu_object structure to copy down
-
- debug(5, "FN_add_menu_object icon res");
+int32 Logic::fnAddMenuObject(int32 *params) {
+ // params: 0 pointer to a menu_object structure to copy down
#ifdef _SWORD2_DEBUG
if (total_temp == TOTAL_engine_pockets)
@@ -52,12 +51,14 @@ int32 FN_add_menu_object(int32 *params) {
return IR_CONT;
}
-int32 FN_refresh_inventory(int32 *params) {
+int32 Logic::fnRefreshInventory(int32 *params) {
// called from 'menu_look_or_combine' script in 'menu_master' object
// to update the menu to display a combined object while George runs
// voice-over. Note that 'object_held' must be set to the graphic of
// the combined object
+ // params: none
+
// can reset this now
COMBINE_BASE = 0;