From 38bb172b9286dcd04d757e9db3ee56f37c64083a Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 20 Nov 2008 13:49:53 +0000 Subject: NDS: Fix link error in non-SCUMM builds by removing some dead & obsolete code svn-id: r35129 --- backends/platform/ds/arm9/source/dsoptions.cpp | 40 -------------------------- backends/platform/ds/arm9/source/dsoptions.h | 4 --- 2 files changed, 44 deletions(-) diff --git a/backends/platform/ds/arm9/source/dsoptions.cpp b/backends/platform/ds/arm9/source/dsoptions.cpp index 49ff5765ef..60f3c2225b 100644 --- a/backends/platform/ds/arm9/source/dsoptions.cpp +++ b/backends/platform/ds/arm9/source/dsoptions.cpp @@ -33,13 +33,6 @@ #define ALLOW_CPU_SCALER -#ifdef DS_SCUMM_BUILD -namespace Scumm { - extern Common::StringList generateSavegameList(Scumm::ScummEngine *scumm, bool saveMode); - extern Scumm::ScummEngine *g_scumm; -} -#endif - namespace DS { DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) { @@ -124,10 +117,6 @@ DSOptionsDialog::DSOptionsDialog() : GUI::Dialog(0, 0, 320 - 10, 230 - 40) { -#ifdef DS_SCUMM_BUILD - _delDialog = new Scumm::SaveLoadChooser("Delete game:", "Delete", false, Scumm::g_scumm); -#endif - if (ConfMan.hasKey("snaptoborder", "ds")) { _snapToBorderCheckbox->setState(ConfMan.getBool("snaptoborder", "ds")); } else { @@ -393,35 +382,6 @@ void DSOptionsDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint updateConfigManager(); close(); } - -#ifdef DS_SCUMM_BUILD -/* if (cmd == 'dels') { - _delDialog->setList(Scumm::generateSavegameList(Scumm::g_scumm, false)); - _delDialog->handleCommand(NULL, GUI::kListSelectionChangedCmd, 0); - - Common::Event event; - event.type = Common::EVENT_KEYDOWN; - event.kbd.ascii = 0; - event.kbd.keycode = Common::KEYCODE_DOWN; - OSystem_DS::instance()->addEvent(event); - - event.type = Common::EVENT_KEYUP; - OSystem_DS::instance()->addEvent(event); - - int idx = _delDialog->runModal(); - - if (idx >= 0) { - char name[256]; - Scumm::g_scumm->makeSavegameName(name, idx, false); - if (!DS::isGBAMPAvailable()) { - ((DSSaveFileManager *) (OSystem_DS::instance()->getSavefileManager()))->deleteFile(name); - } - } - - }*/ -#endif - - } void togglePause() { diff --git a/backends/platform/ds/arm9/source/dsoptions.h b/backends/platform/ds/arm9/source/dsoptions.h index 63abb13b92..229b27ebbb 100644 --- a/backends/platform/ds/arm9/source/dsoptions.h +++ b/backends/platform/ds/arm9/source/dsoptions.h @@ -71,10 +71,6 @@ protected: GUI::CheckboxWidget* _touchPadStyle; GUI::CheckboxWidget* _screenTaps; -#ifdef DS_SCUMM_BUILD - Scumm::SaveLoadChooser* _delDialog; -#endif - bool _radioButtonMode; }; -- cgit v1.2.3