From 5262a87a44337112ee811d0be7a19c4cc51fab0d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 15 Feb 2009 08:22:24 +0000
Subject: Minor cleanup

svn-id: r38199
---
 engines/sci/scummvm/scummvm.patch      | 55 ----------------------------------
 engines/sci/scummvm/scummvm_engine.cpp | 10 ++-----
 2 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 engines/sci/scummvm/scummvm.patch

diff --git a/engines/sci/scummvm/scummvm.patch b/engines/sci/scummvm/scummvm.patch
deleted file mode 100644
index 779f4fce7c..0000000000
--- a/engines/sci/scummvm/scummvm.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 32642)
-+++ configure	(working copy)
-@@ -97,6 +97,7 @@
- add_engine parallaction "Parallaction" yes
- add_engine queen "Flight of the Amazon Queen" yes
- add_engine saga "SAGA" yes
-+add_engine sci "SCI" no
- add_engine sky "Beneath a Steel Sky" yes
- add_engine sword1 "Broken Sword 1" yes
- add_engine sword2 "Broken Sword 2" yes
-Index: engines/engines.mk
-===================================================================
---- engines/engines.mk	(revision 32642)
-+++ engines/engines.mk	(working copy)
-@@ -82,6 +82,11 @@
- MODULES += engines/saga
- endif
- 
-+ifdef ENABLE_SCI
-+DEFINES += -DENABLE_SCI=$(ENABLE_SCI)
-+MODULES += engines/sci
-+endif
-+
- ifdef ENABLE_SKY
- DEFINES += -DENABLE_SKY=$(ENABLE_SKY)
- MODULES += engines/sky
-Index: base/plugins.cpp
-===================================================================
---- base/plugins.cpp	(revision 32642)
-+++ base/plugins.cpp	(working copy)
-@@ -131,6 +131,9 @@
- 		#if PLUGIN_ENABLED_STATIC(SAGA)
- 		LINK_PLUGIN(SAGA)
- 		#endif
-+		#if PLUGIN_ENABLED_STATIC(SCI)
-+		LINK_PLUGIN(SCI)
-+		#endif
- 		#if PLUGIN_ENABLED_STATIC(SKY)
- 		LINK_PLUGIN(SKY)
- 		#endif
-Index: Makefile
-===================================================================
---- Makefile	(revision 32642)
-+++ Makefile	(working copy)
-@@ -9,7 +9,7 @@
- 
- DEFINES     := -DHAVE_CONFIG_H
- LDFLAGS     :=
--INCLUDES    := -I. -I$(srcdir) -I$(srcdir)/engines
-+INCLUDES    := -I. -I$(srcdir) #-I$(srcdir)/engines
- LIBS        :=
- OBJS        :=
- DEPDIR      := .deps
diff --git a/engines/sci/scummvm/scummvm_engine.cpp b/engines/sci/scummvm/scummvm_engine.cpp
index 907aa39e05..2f910e044c 100644
--- a/engines/sci/scummvm/scummvm_engine.cpp
+++ b/engines/sci/scummvm/scummvm_engine.cpp
@@ -215,7 +215,7 @@ detect_versions(sci_version_t *version, int *res_version)
 }
 
 int
-main_(const char* gamedir)
+main_()
 {
 	resource_mgr_t *resmgr;
 
@@ -225,11 +225,6 @@ main_(const char* gamedir)
 	getcwd(startdir, MAXPATHLEN);
 	script_debug_flag = 0;
 
-	if (chdir(gamedir)) {
-		printf ("Error changing to game directory '%s'\n", gamedir);
-		exit(1);
-	}
-
 	sci_version_t version;
 	int res_version;
 
@@ -408,8 +403,7 @@ Common::Error SciEngine::go() {
 		_system->delayMillis(10);
 	} */
 
-	// FIXME: Not a good idea to use _gameDataDir.getPath() like this...
-	main_(_gameDataDir.getPath().c_str());
+	main_();
 
 	return Common::kNoError;
 }
-- 
cgit v1.2.3