[Scummvm-cvs-logs] SF.net SVN: scummvm:[35129] scummvm/trunk/backends/platform/ds/arm9/source

[fingolfin at users.sourceforge.net]

Revision: 35129
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35129&view=rev
Author:   fingolfin
Date:     2008-11-20 13:49:53 +0000 (Thu, 20 Nov 2008)

Log Message:
-----------
NDS: Fix link error in non-SCUMM builds by removing some dead & obsolete code

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp	2008-11-20 13:46:59 UTC (rev 35128)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.cpp	2008-11-20 13:49:53 UTC (rev 35129)
@@ -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 @@
 
 
 
-#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 @@
 		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() {

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h	2008-11-20 13:46:59 UTC (rev 35128)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsoptions.h	2008-11-20 13:49:53 UTC (rev 35129)
@@ -71,10 +71,6 @@
 	GUI::CheckboxWidget* _touchPadStyle;
 	GUI::CheckboxWidget* _screenTaps;
 
-#ifdef DS_SCUMM_BUILD
-	Scumm::SaveLoadChooser* _delDialog;
-#endif
-
 	bool	_radioButtonMode;
 
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.