diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/fullpipe/module.mk | 5 | ||||
-rw-r--r-- | engines/fullpipe/scenes.cpp | 71 | ||||
-rw-r--r-- | engines/fullpipe/scenes/sceneDbg.cpp | 107 |
3 files changed, 110 insertions, 73 deletions
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk index ad6fa45fe2..0a7e195321 100644 --- a/engines/fullpipe/module.mk +++ b/engines/fullpipe/module.mk @@ -23,10 +23,11 @@ MODULE_OBJS = \ stateloader.o \ statics.o \ utils.o \ - scenes/sceneIntro.o \ scenes/scene01.o \ scenes/scene02.o \ - scenes/scene03.o + scenes/scene03.o \ + scenes/sceneDbg.o \ + scenes/sceneIntro.o # This module can be built as a plugin ifeq ($(ENABLE_FULLPIPE), DYNAMIC_PLUGIN) diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 7ddc7cfa53..978964414f 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -669,75 +669,4 @@ int defaultUpdateCursor() { return g_fullpipe->_cursorId; } -void sceneDbgMenu_initScene(Scene *sc) { - g_vars->selector = sc->getPictureObjectById(PIC_SCD_SEL, 0); - getGameLoaderInteractionController()->disableFlag24(); - setInputDisabled(0); -} - -GameObject *sceneHandlerDbgMenu_getObjectAtXY(int x, int y) { - if (g_fullpipe->_currentScene) - for (uint i = 0; i < g_fullpipe->_currentScene->_picObjList.size(); i++) { - PictureObject *pic = (PictureObject *)g_fullpipe->_currentScene->_picObjList[i]; - - if (x >= pic->_ox && y >= pic->_oy) { - Common::Point point; - - pic->getDimensions(&point); - - if (x <= pic->_ox + point.x && y <= pic->_oy + point.y && pic != g_vars->selector) - return pic; - } - } - - return 0; -} - -int sceneHandlerDbgMenu(ExCommand *ex) { - if (ex->_messageKind != 17) - return 0; - - int mx = g_fullpipe->_mouseScreenPos.x + g_fullpipe->_sceneRect.left; - int my = g_fullpipe->_mouseScreenPos.y + g_fullpipe->_sceneRect.top; - - if (ex->_messageNum == 29) { - GameObject *obj = sceneHandlerDbgMenu_getObjectAtXY(mx, my); - if (obj && canInteractAny(0, obj, -3) ) { - getGameLoaderInteractionController()->enableFlag24(); - handleObjectInteraction(0, obj, 0); - } - return 0; - } - if (ex->_messageNum != 33) { - if (ex->_messageNum == MSG_RESTARTGAME) { - g_fullpipe->_needRestart = true; - return 0; - } - return 0; - } - - g_fullpipe->_cursorId = PIC_CSR_DEFAULT; - GameObject *obj = g_fullpipe->_currentScene->getStaticANIObjectAtPos(mx, my); - if (obj) { - if (canInteractAny(0, obj, -3)) { - g_fullpipe->_cursorId = PIC_CSR_DEFAULT; - g_fullpipe->setCursor(PIC_CSR_DEFAULT); - return 0; - } - } else { - obj = sceneHandlerDbgMenu_getObjectAtXY(mx, my); - if (obj && canInteractAny(0, obj, -3) ) { - g_vars->selector->_flags |= 4; - g_vars->selector->setOXY(obj->_ox, obj->_oy); - g_fullpipe->_cursorId = PIC_CSR_DEFAULT; - g_fullpipe->setCursor(PIC_CSR_DEFAULT); - return 0; - } - g_vars->selector->_flags &= 0xFFFB; - } - g_fullpipe->setCursor(g_fullpipe->_cursorId); - - return 0; -} - } // End of namespace Fullpipe diff --git a/engines/fullpipe/scenes/sceneDbg.cpp b/engines/fullpipe/scenes/sceneDbg.cpp new file mode 100644 index 0000000000..83f3b64ee5 --- /dev/null +++ b/engines/fullpipe/scenes/sceneDbg.cpp @@ -0,0 +1,107 @@ +/* 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. + * + */ + +#include "fullpipe/fullpipe.h" + +#include "fullpipe/constants.h" + +#include "fullpipe/gameloader.h" +#include "fullpipe/scenes.h" +#include "fullpipe/statics.h" +#include "fullpipe/input.h" + +#include "fullpipe/interaction.h" + +namespace Fullpipe { + +void sceneDbgMenu_initScene(Scene *sc) { + g_vars->selector = sc->getPictureObjectById(PIC_SCD_SEL, 0); + getGameLoaderInteractionController()->disableFlag24(); + setInputDisabled(0); +} + +GameObject *sceneHandlerDbgMenu_getObjectAtXY(int x, int y) { + if (g_fullpipe->_currentScene) + for (uint i = 0; i < g_fullpipe->_currentScene->_picObjList.size(); i++) { + PictureObject *pic = (PictureObject *)g_fullpipe->_currentScene->_picObjList[i]; + + if (x >= pic->_ox && y >= pic->_oy) { + Common::Point point; + + pic->getDimensions(&point); + + if (x <= pic->_ox + point.x && y <= pic->_oy + point.y && pic != g_vars->selector) + return pic; + } + } + + return 0; +} + +int sceneHandlerDbgMenu(ExCommand *ex) { + if (ex->_messageKind != 17) + return 0; + + int mx = g_fullpipe->_mouseScreenPos.x + g_fullpipe->_sceneRect.left; + int my = g_fullpipe->_mouseScreenPos.y + g_fullpipe->_sceneRect.top; + + if (ex->_messageNum == 29) { + GameObject *obj = sceneHandlerDbgMenu_getObjectAtXY(mx, my); + if (obj && canInteractAny(0, obj, -3) ) { + getGameLoaderInteractionController()->enableFlag24(); + handleObjectInteraction(0, obj, 0); + } + return 0; + } + if (ex->_messageNum != 33) { + if (ex->_messageNum == MSG_RESTARTGAME) { + g_fullpipe->_needRestart = true; + return 0; + } + return 0; + } + + g_fullpipe->_cursorId = PIC_CSR_DEFAULT; + GameObject *obj = g_fullpipe->_currentScene->getStaticANIObjectAtPos(mx, my); + if (obj) { + if (canInteractAny(0, obj, -3)) { + g_fullpipe->_cursorId = PIC_CSR_DEFAULT; + g_fullpipe->setCursor(PIC_CSR_DEFAULT); + return 0; + } + } else { + obj = sceneHandlerDbgMenu_getObjectAtXY(mx, my); + if (obj && canInteractAny(0, obj, -3) ) { + g_vars->selector->_flags |= 4; + g_vars->selector->setOXY(obj->_ox, obj->_oy); + g_fullpipe->_cursorId = PIC_CSR_DEFAULT; + g_fullpipe->setCursor(PIC_CSR_DEFAULT); + return 0; + } + g_vars->selector->_flags &= 0xFFFB; + } + g_fullpipe->setCursor(g_fullpipe->_cursorId); + + return 0; +} + +} // End of namespace Fullpipe |