diff options
| -rw-r--r-- | engines/cge/cge.h | 1 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 1 | ||||
| -rw-r--r-- | engines/cge/config.cpp | 47 | ||||
| -rw-r--r-- | engines/cge/config.h | 35 | ||||
| -rw-r--r-- | engines/cge/module.mk | 1 | ||||
| -rw-r--r-- | engines/cge/snail.cpp | 2 |
6 files changed, 1 insertions, 86 deletions
diff --git a/engines/cge/cge.h b/engines/cge/cge.h index 8aff3334a0..1c5e680901 100644 --- a/engines/cge/cge.h +++ b/engines/cge/cge.h @@ -243,7 +243,6 @@ public: void snRelZ(Sprite *spr, int z); void snRNNext(Sprite *spr, int p); void snRTNext(Sprite *spr, int p); - void snSelect(); void snSend(Sprite *spr, int val); void snRelX(Sprite *spr, int x); void snRelY(Sprite *spr, int y); diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 5b98b0a4e8..39e65370e8 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -36,7 +36,6 @@ #include "graphics/thumbnail.h" #include "cge/general.h" #include "cge/sound.h" -#include "cge/config.h" #include "cge/vga13h.h" #include "cge/snail.h" #include "cge/text.h" diff --git a/engines/cge/config.cpp b/engines/cge/config.cpp deleted file mode 100644 index b1cc5769d8..0000000000 --- a/engines/cge/config.cpp +++ /dev/null @@ -1,47 +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. - * - */ - -/* - * This code is based on original Soltys source code - * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon - */ - -#include "cge/config.h" -#include "cge/sound.h" -#include "cge/vmenu.h" -#include "cge/text.h" -#include "cge/cge_main.h" - -namespace CGE { - -static Choice *_cho; -static int _hlp; - -void CGEEngine::snSelect() { - debugC(1, kCGEDebugEngine, "CGEEngine::snSelect()"); - - inf(_text->getText(_hlp)); - _talk->gotoxy(_talk->_x, kFontHigh / 2); - (new Vmenu(this, _cho, kScrWidth / 2, _talk->_y + _talk->_h + kTextVMargin + kFontHigh))->setName(_text->getText(kMenu)); -} - -} // End of namespace CGE diff --git a/engines/cge/config.h b/engines/cge/config.h deleted file mode 100644 index 5ea677b97d..0000000000 --- a/engines/cge/config.h +++ /dev/null @@ -1,35 +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. - * - */ - -/* - * This code is based on original Soltys source code - * Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon - */ - -#ifndef __CGE_CONFIG__ -#define __CGE_CONFIG__ - -namespace CGE { - #define kMenu 56 -} // End of namespace CGE - -#endif diff --git a/engines/cge/module.mk b/engines/cge/module.mk index 8829883e26..3ea061419b 100644 --- a/engines/cge/module.mk +++ b/engines/cge/module.mk @@ -6,7 +6,6 @@ MODULE_OBJS := \ cfile.o \ cge.o \ cge_main.o \ - config.o \ console.o \ detection.o \ events.o \ diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 6a5556ca58..ea8e480b35 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -1141,7 +1141,7 @@ void Snail::runCom() { warning("TODO: Select sound card"); break; case kSnSelect: - _vm->snSelect(); + warning("TODO: Sound card selection"); break; case kSndSetVolume: sndSetVolume(); |