diff options
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/actionmap.cpp | 114 | ||||
| -rw-r--r-- | saga/actionmap.h | 67 | ||||
| -rw-r--r-- | saga/module.mk | 1 | ||||
| -rw-r--r-- | saga/scene.h | 1 | ||||
| -rw-r--r-- | saga/xref.txt | 4 |
5 files changed, 2 insertions, 185 deletions
diff --git a/saga/actionmap.cpp b/saga/actionmap.cpp deleted file mode 100644 index 1dfb654e20..0000000000 --- a/saga/actionmap.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2005 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ - -/* Action map module */ -#include "saga/saga.h" - -#include "saga/gfx.h" -#include "saga/console.h" - -#include "saga/actionmap.h" -#include "saga/stream.h" - -namespace Saga { - - -void ActionMap::load(const byte *resourcePointer, size_t resourceLength) { - int i; - - if (resourceLength < 4) { - error("ActionMap::load wrong resourceLength"); - } - - MemoryReadStreamEndian readS(resourcePointer, resourceLength, IS_BIG_ENDIAN); - - _stepZoneListCount = readS.readSint16(); - if (_stepZoneListCount < 0) { - error("ActionMap::load _stepZoneListCount < 0"); - } - - if (_stepZoneList) - error("ActionMap::load _stepZoneList != NULL"); - - _stepZoneList = (HitZone **) malloc(_stepZoneListCount * sizeof(HitZone *)); - if (_stepZoneList == NULL) { - error("ActionMap::load Memory allocation failure"); - } - - for (i = 0; i < _stepZoneListCount; i++) { - _stepZoneList[i] = new HitZone(&readS); - } -} - -void ActionMap::freeMem() { - int i; - - if (_stepZoneList) { - for (i = 0; i < _stepZoneListCount; i++) { - delete _stepZoneList[i]; - } - - free(_stepZoneList); - _stepZoneList = NULL; - } -} - -int ActionMap::getExitSceneNumber(int index) const { - if (index >= _stepZoneListCount) - error("ActionMap::getExitSceneNumber wrong index"); - - return _stepZoneList[index]->getSceneNumber(); -} - -int ActionMap::hitTest(const Point &testPoint) { - int i; - - // Loop through all scene objects - for (i = 0; i < _stepZoneListCount; i++) { - if (_stepZoneList[i]->hitTest(testPoint)) { - return i; - } - } - - return -1; -} - -int ActionMap::draw(SURFACE *ds, int color) { - int i; - - for (i = 0; i < _stepZoneListCount; i++) { - _stepZoneList[i]->draw(ds, color); - } - - return SUCCESS; -} - -void ActionMap::cmdInfo() { - _vm->_console->DebugPrintf("%d step zone(s) loaded.\n\n", _stepZoneListCount); - - for (int i = 0; i < _stepZoneListCount; i++) { - _vm->_console->DebugPrintf("StepZone %d: Exit to Scene number: %d\n", i, _stepZoneList[i]->getSceneNumber()); - } -} - -} // End of namespace Saga diff --git a/saga/actionmap.h b/saga/actionmap.h deleted file mode 100644 index 3329d47b59..0000000000 --- a/saga/actionmap.h +++ /dev/null @@ -1,67 +0,0 @@ -/* ScummVM - Scumm Interpreter - * Copyright (C) 2004-2005 The ScummVM project - * - * The ReInherit Engine is (C)2000-2003 by Daniel Balsom. - * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Header$ - * - */ - -// Action map module - private header - -#ifndef SAGA_ACTIONMAP_H_ -#define SAGA_ACTIONMAP_H_ - -#include "saga/objectmap.h" - -namespace Saga { - - -class ActionMap { - public: - ActionMap(SagaEngine *vm): _vm(vm) { - _stepZoneList = NULL; - _stepZoneListCount = 0; - } - ~ActionMap(void) { - freeMem(); - } - - void load(const byte *resourcePointer, size_t resourceLength); - void freeMem(); - - int getExitSceneNumber(int index) const; - int hitTest(const Point &testPoint); - int draw(SURFACE *ds, int color); - const HitZone * getHitZone(int index) const { - if ((index < 0) || (index >= _stepZoneListCount)) { - error("ActionMap::getHitZone wrong index 0x%X", index); - } - return _stepZoneList[index]; - } - void cmdInfo(); - -private: - SagaEngine *_vm; - - int _stepZoneListCount; - HitZone **_stepZoneList; -}; - -} // End of namespace Saga - -#endif diff --git a/saga/module.mk b/saga/module.mk index 08e9e567e8..064d6ea77e 100644 --- a/saga/module.mk +++ b/saga/module.mk @@ -1,7 +1,6 @@ MODULE := saga MODULE_OBJS := \ - saga/actionmap.o \ saga/actor.o \ saga/actordata.o \ saga/animation.o \ diff --git a/saga/scene.h b/saga/scene.h index c76037ae60..705c05c871 100644 --- a/saga/scene.h +++ b/saga/scene.h @@ -34,7 +34,6 @@ namespace Saga { #define SCENE_DOORS_MAX 16 -class ActionMap; class ObjectMap; struct EVENT; diff --git a/saga/xref.txt b/saga/xref.txt index 33ce644d5d..03b7876283 100644 --- a/saga/xref.txt +++ b/saga/xref.txt @@ -35,8 +35,8 @@ Sceneres.h LOADREQ_FACES SAGA_FACES LOADREQ_PALETTE - hitZone ObjectMap - stepZone ActionMap + hitZone _objectMap + stepZone _actionMap HZONEF_EXIT OBJECT_EXIT (in Verb.c), ACTION_EXIT (in Actor.c) HZONEF_ENABLED OBJECT_ENABLED (in Verb.c), ACTION_ENABLED (in Actor.c) |