[Scummvm-cvs-logs] SF.net SVN: scummvm:[55770] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Fri Feb 4 16:55:54 CET 2011


Revision: 55770
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55770&view=rev
Author:   drmccoy
Date:     2011-02-04 15:55:54 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
GOB: Add the "envir" directory to the search path for Adibou

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/init.h
    scummvm/trunk/engines/gob/module.mk

Added Paths:
-----------
    scummvm/trunk/engines/gob/init_v7.cpp

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2011-02-04 15:55:20 UTC (rev 55769)
+++ scummvm/trunk/engines/gob/gob.cpp	2011-02-04 15:55:54 UTC (rev 55770)
@@ -548,7 +548,7 @@
 	case kGameTypeAdibou2:
 	case kGameTypeAdi2:
 	case kGameTypeAdi4:
-		_init     = new Init_v2(this);
+		_init     = new Init_v7(this);
 		_video    = new Video_v6(this);
 		_inter    = new Inter_v7(this);
 		_mult     = new Mult_v2(this);

Modified: scummvm/trunk/engines/gob/init.h
===================================================================
--- scummvm/trunk/engines/gob/init.h	2011-02-04 15:55:20 UTC (rev 55769)
+++ scummvm/trunk/engines/gob/init.h	2011-02-04 15:55:54 UTC (rev 55770)
@@ -26,6 +26,7 @@
 #ifndef GOB_INIT_H
 #define GOB_INIT_H
 
+#include "gob/gob.h"
 #include "gob/video.h"
 
 namespace Gob {
@@ -99,6 +100,15 @@
 	void updateConfig();
 	void initGame();
 };
+
+class Init_v7 : public Init_v2 {
+public:
+	Init_v7(GobEngine *vm);
+	~Init_v7();
+
+	void initGame();
+};
+
 } // End of namespace Gob
 
 #endif // GOB_INIT_H

Added: scummvm/trunk/engines/gob/init_v7.cpp
===================================================================
--- scummvm/trunk/engines/gob/init_v7.cpp	                        (rev 0)
+++ scummvm/trunk/engines/gob/init_v7.cpp	2011-02-04 15:55:54 UTC (rev 55770)
@@ -0,0 +1,48 @@
+/* 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$
+ *
+ */
+
+#include "common/fs.h"
+#include "common/config-manager.h"
+
+#include "gob/init.h"
+
+namespace Gob {
+
+Init_v7::Init_v7(GobEngine *vm) : Init_v2(vm) {
+}
+
+Init_v7::~Init_v7() {
+}
+
+void Init_v7::initGame() {
+	const Common::FSNode gameDataDir(ConfMan.get("path"));
+
+	// Add the environment directory
+	SearchMan.addSubDirectoryMatching(gameDataDir, "envir");
+
+	Init::initGame();
+}
+
+} // End of namespace Gob


Property changes on: scummvm/trunk/engines/gob/init_v7.cpp
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/engines/gob/module.mk	2011-02-04 15:55:20 UTC (rev 55769)
+++ scummvm/trunk/engines/gob/module.mk	2011-02-04 15:55:54 UTC (rev 55770)
@@ -30,6 +30,7 @@
 	init_v3.o \
 	init_v4.o \
 	init_v6.o \
+	init_v7.o \
 	inter.o \
 	inter_v1.o \
 	inter_v2.o \


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




More information about the Scummvm-git-logs mailing list