aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/items.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-10-10 12:13:47 +0000
committerTravis Howell2006-10-10 12:13:47 +0000
commit89f79acb84071d56c3758281287d9c3b0c0ed545 (patch)
tree193c515eca77703dfc4c6f3d8fd3c51b8c35dfb7 /engines/agos/items.cpp
parent99df94503818613b4ae799a2b1742b3b2318dbd4 (diff)
downloadscummvm-rg350-89f79acb84071d56c3758281287d9c3b0c0ed545.tar.gz
scummvm-rg350-89f79acb84071d56c3758281287d9c3b0c0ed545.tar.bz2
scummvm-rg350-89f79acb84071d56c3758281287d9c3b0c0ed545.zip
Fix and remove duplicate opcode for Elvira 1
svn-id: r24262
Diffstat (limited to 'engines/agos/items.cpp')
-rw-r--r--engines/agos/items.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index cc2a69f3f4..bb69e836cf 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.cpp
@@ -338,7 +338,7 @@ void AGOSEngine::setupElvira1Opcodes(OpcodeProc *op) {
op[279] = &AGOSEngine::o_freezeZones;
op[280] = &AGOSEngine::o_placeNoIcons;
op[281] = &AGOSEngine::o_clearTimers;
- op[282] = &AGOSEngine::oe1_setStore;
+ op[282] = &AGOSEngine::o_setDollar;
op[283] = &AGOSEngine::o_isBox;
}
@@ -2135,16 +2135,6 @@ void AGOSEngine::oe1_printMonsterHit() {
printStats();
}
-void AGOSEngine::oe1_setStore() {
- // 282: set store
- Item *item = getNextItemPtr();
-
- if (getVarOrWord() == 1)
- _subjectItem = item;
- else
- _objectItem = item;
-}
-
// -----------------------------------------------------------------------
// Elvira 2 Opcodes
// -----------------------------------------------------------------------