[Scummvm-cvs-logs] SF.net SVN: scummvm: [32856] scummvm/branches/gsoc2008-tfmx

marwanhilmi at users.sourceforge.net marwanhilmi at users.sourceforge.net
Tue Jul 1 00:52:48 CEST 2008


Revision: 32856
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32856&view=rev
Author:   marwanhilmi
Date:     2008-06-30 15:52:48 -0700 (Mon, 30 Jun 2008)

Log Message:
-----------
Modified main.cpp for indefinite delay at console for testing. 
Modified scummvm.vcproj to ignore warnings.

Modified Paths:
--------------
    scummvm/branches/gsoc2008-tfmx/base/main.cpp
    scummvm/branches/gsoc2008-tfmx/dists/msvc9/scummvm.vcproj

Modified: scummvm/branches/gsoc2008-tfmx/base/main.cpp
===================================================================
--- scummvm/branches/gsoc2008-tfmx/base/main.cpp	2008-06-30 22:41:55 UTC (rev 32855)
+++ scummvm/branches/gsoc2008-tfmx/base/main.cpp	2008-06-30 22:52:48 UTC (rev 32856)
@@ -43,7 +43,9 @@
 #include "common/system.h"
 #include "gui/newgui.h"
 #include "gui/message.h"
+#include "sound/mods/tfmx.h"
 
+
 #if defined(_WIN32_WCE)
 #include "backends/platform/wince/CELauncherDialog.h"
 #elif defined(__DC__)
@@ -282,7 +284,18 @@
 	// Init the backend. Must take place after all config data (including
 	// the command line params) was read.
 	system.initBackend();
+	
+	Audio::Tfmx _aTfmx;
+	_aTfmx.load();
 
+
+
+	system.delayMillis( 999999 );
+
+
+
+/*
+
 	// Unless a game was specified, show the launcher dialog
 	if (0 == ConfMan.getActiveDomain()) {
 		launcherDialog(system);
@@ -332,6 +345,8 @@
 	}
 	PluginManager::instance().unloadPlugins();
 	PluginManager::destroy();
+
+*/
 	Common::ConfigManager::destroy();
 	GUI::NewGui::destroy();
 

Modified: scummvm/branches/gsoc2008-tfmx/dists/msvc9/scummvm.vcproj
===================================================================
--- scummvm/branches/gsoc2008-tfmx/dists/msvc9/scummvm.vcproj	2008-06-30 22:41:55 UTC (rev 32855)
+++ scummvm/branches/gsoc2008-tfmx/dists/msvc9/scummvm.vcproj	2008-06-30 22:52:48 UTC (rev 32856)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
+	Version="9.00"
 	Name="scummvm"
 	ProjectGUID="{8434CB15-D08F-427D-9E6D-581AE5B28440}"
 	RootNamespace="scummvm"
@@ -836,6 +836,14 @@
 					RelativePath="..\..\sound\mods\soundfx.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\sound\mods\tfmx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\sound\mods\tfmx.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter


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