aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/cge2/cge2_main.cpp72
-rw-r--r--engines/cge2/inventory.cpp105
-rw-r--r--engines/cge2/module.mk3
3 files changed, 107 insertions, 73 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index ecc741efae..24adb0e0ae 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -619,36 +619,6 @@ void CGE2Engine::tick() {
_mouse->tick();
}
-void CGE2Engine::openPocket() {
- for (int i = 0; i < 2; i++) {
- for (int j = 0; j < kPocketMax + 1; j++) {
- int ref = (int)_heroTab[i]->_downPocketId[j];
- _heroTab[i]->_pocket[j] = (ref == -1) ? nullptr : _vga->_showQ->locate(ref);
- }
- }
-}
-
-void CGE2Engine::closePocket() {
- for (int i = 0; i < 2; i++) {
- for (int j = 0; j < kPocketMax + 1; j++) {
- Sprite *spr = _heroTab[i]->_pocket[j];
- _heroTab[i]->_downPocketId[j] = (spr) ? spr->_ref : -1;
- }
- }
-}
-
-void CGE2Engine::selectPocket(int n) {
- Sprite **p = _heroTab[_sex]->_pocket;
- int &pp = _heroTab[_sex]->_pocPtr;
- if (n < 0 || pp == n) {
- n = findActivePocket(-1);
- if (n >= 0)
- pp = n;
- } else if (p[n]) {
- pp = n;
- }
-}
-
void CGE2Engine::busy(bool on) {
if (on) {
_spriteNotify = _midiNotify = &CGE2::CGE2Engine::busyStep;
@@ -763,19 +733,6 @@ void CGE2Engine::loadPos() {
error("Missing file: CGE.HXY");
}
-void CGE2Engine::releasePocket(Sprite *spr) {
- for (int i = 0; i < 2; i++) {
- for (int j = 0; j < kPocketMax; j++) {
- Sprite *&poc = _heroTab[i]->_pocket[j];
- if (poc == spr) {
- spr->_flags._kept = false;
- poc = nullptr;
- return;
- }
- }
- }
-}
-
void CGE2Engine::loadTab() {
setEye(_text->getText(240));
for (int i = 0; i < kSceneMax; i++)
@@ -879,35 +836,6 @@ bool CGE2Engine::showTitle(const char *name) {
return true;
}
-int CGE2Engine::freePockets(int sx) {
- int n = 0;
- for (int i = 0; i < kPocketMax; i++){
- if (_heroTab[sx]->_pocket[i] == nullptr)
- ++n;
- }
- return n;
-}
-
-int CGE2Engine::findActivePocket(int ref) {
- for (int i = 0; i < kPocketMax; i++) {
- Sprite *spr = _heroTab[_sex]->_pocket[i];
- if (ref >= 0) {
- if (spr && spr->_ref == ref)
- return i;
- } else if (!spr)
- return i;
- }
- return -1;
-}
-
-void CGE2Engine::pocFul() {
- Hero *h = _heroTab[_sex]->_ptr;
- h->park();
- _commandHandler->addCommand(kCmdWait, -1, -1, h);
- _commandHandler->addCommand(kCmdSound, -1, 2, h);
- _commandHandler->addCommand(kCmdSay, -1, kPocketFull + _sex, h);
-}
-
void CGE2Engine::killText() {
if (!_talk)
return;
diff --git a/engines/cge2/inventory.cpp b/engines/cge2/inventory.cpp
new file mode 100644
index 0000000000..7029a6494c
--- /dev/null
+++ b/engines/cge2/inventory.cpp
@@ -0,0 +1,105 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This code is based on original Sfinx source code
+ * Copyright (c) 1994-1997 Janus B. Wisniewski and L.K. Avalon
+ */
+
+#include "cge2/cge2.h"
+#include "cge2/hero.h"
+
+namespace CGE2 {
+
+int CGE2Engine::findActivePocket(int ref) {
+ for (int i = 0; i < kPocketMax; i++) {
+ Sprite *spr = _heroTab[_sex]->_pocket[i];
+ if (ref >= 0) {
+ if (spr && spr->_ref == ref)
+ return i;
+ } else if (!spr)
+ return i;
+ }
+ return -1;
+}
+
+void CGE2Engine::selectPocket(int n) {
+ Sprite **p = _heroTab[_sex]->_pocket;
+ int &pp = _heroTab[_sex]->_pocPtr;
+ if (n < 0 || pp == n) {
+ n = findActivePocket(-1);
+ if (n >= 0)
+ pp = n;
+ } else if (p[n]) {
+ pp = n;
+ }
+}
+
+void CGE2Engine::pocFul() {
+ Hero *h = _heroTab[_sex]->_ptr;
+ h->park();
+ _commandHandler->addCommand(kCmdWait, -1, -1, h);
+ _commandHandler->addCommand(kCmdSound, -1, 2, h);
+ _commandHandler->addCommand(kCmdSay, -1, kPocketFull + _sex, h);
+}
+
+void CGE2Engine::releasePocket(Sprite *spr) {
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < kPocketMax; j++) {
+ Sprite *&poc = _heroTab[i]->_pocket[j];
+ if (poc == spr) {
+ spr->_flags._kept = false;
+ poc = nullptr;
+ return;
+ }
+ }
+ }
+}
+
+int CGE2Engine::freePockets(int sx) {
+ int n = 0;
+ for (int i = 0; i < kPocketMax; i++){
+ if (_heroTab[sx]->_pocket[i] == nullptr)
+ ++n;
+ }
+ return n;
+}
+
+void CGE2Engine::openPocket() {
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < kPocketMax + 1; j++) {
+ int ref = (int)_heroTab[i]->_downPocketId[j];
+ _heroTab[i]->_pocket[j] = (ref == -1) ? nullptr : _vga->_showQ->locate(ref);
+ }
+ }
+}
+
+void CGE2Engine::closePocket() {
+ for (int i = 0; i < 2; i++) {
+ for (int j = 0; j < kPocketMax + 1; j++) {
+ Sprite *spr = _heroTab[i]->_pocket[j];
+ _heroTab[i]->_downPocketId[j] = (spr) ? spr->_ref : -1;
+ }
+ }
+}
+
+} // End of namespace CGE2
diff --git a/engines/cge2/module.mk b/engines/cge2/module.mk
index e3cdf7673c..256087fd17 100644
--- a/engines/cge2/module.mk
+++ b/engines/cge2/module.mk
@@ -17,7 +17,8 @@ MODULE_OBJS = \
map.o \
vmenu.o \
saveload.o \
- toolbar.o
+ toolbar.o \
+ inventory.o
# This module can be built as a plugin
ifeq ($(ENABLE_CGE2), DYNAMIC_PLUGIN)