libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 16:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the now unused GuiDummy class

Browse Source 
svn-id: r46967
This commit is contained in:
Filippos Karapetis 2010-01-04 08:34:07 +00:00
parent 3218da8975
commit c25f24efc7
2 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
engines/sci/gui/gui_dummy.h
View File

@ -1,55 +0,0 @@
/* 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.
*
* $URL$
* $Id$
*
*/
#ifndef SCI_GUI_DUMMY_H
#define SCI_GUI_DUMMY_H
#include "sci/gui/gui.h"
namespace Sci {
class SciGuiDummy : public SciGui {
public:
SciGuiDummy(EngineState *s, SciGuiScreen *screen, SciGuiPalette *palette, SciGuiCursor *cursor) : SciGui(s, screen, palette, cursor) {}
virtual ~SciGuiDummy() {}
virtual uint16 onControl(byte screenMask, Common::Rect rect) { return 0; }
virtual void animate(reg_t listReference, bool cycle, int argc, reg_t *argv) {}
virtual void addToPicList(reg_t listReference, int argc, reg_t *argv) {}
virtual void addToPicView(GuiResourceId viewId, GuiViewLoopNo loopNo, GuiViewCelNo celNo, int16 leftPos, int16 topPos, int16 priority, int16 control) {}
virtual void setNowSeen(reg_t objectReference) {}
virtual bool canBeHere(reg_t curObject, reg_t listReference) { return false; }
virtual bool isItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, Common::Point position) { return false; }
virtual void baseSetter(reg_t object) {}
virtual int16 getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo) { return 0; }
virtual int16 getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo) { return 0; }
virtual int16 getLoopCount(GuiResourceId viewId) { return 0; }
virtual int16 getCelCount(GuiResourceId viewId, int16 loopNo) { return 0; }
};
} // End of namespace Sci
#endif

15
engines/sci/sci.cpp
View File

@ -44,9 +44,6 @@
#include "sci/sfx/audio.h"
#include "sci/sfx/soundcmd.h"
#include "sci/gui/gui.h"
#ifdef ENABLE_SCI32
#include "sci/gui/gui_dummy.h"
#endif
#include "sci/gui/gui_palette.h"
#include "sci/gui/gui_cursor.h"
#include "sci/gui/gui_screen.h"
@ -149,13 +146,6 @@ Common::Error SciEngine::run() {
if (script_init_engine(_gamestate))
return Common::kUnknownError;
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2) {
// Falsify the Views with a Dummy GUI
//_gamestate->_gui = new SciGuiDummy(_gamestate, screen, palette, cursor);
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new
} else {
#endif
#ifdef INCLUDE_OLDGFX
#ifndef USE_OLDGFX
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor); // new
@ -163,10 +153,7 @@ Common::Error SciEngine::run() {
_gamestate->_gui = new SciGui32(_gamestate, screen, palette, cursor); // old
#endif
#else
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);
#endif
#ifdef ENABLE_SCI32
}
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor);
#endif
if (game_init(_gamestate)) { /* Initialize */