raze-git-1.6pre+2012+g003382654-1

1 files changed, 0 insertions, 87 deletions

diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch
deleted file mode 100644
index 9f026a8cb274..000000000000
--- a/0001-Fix-file-paths.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/source/common/platform/posix/sdl/i_main.cpp b/source/common/platform/posix/sdl/i_main.cpp
-index a28b90f01..3bd907336 100644
---- a/source/common/platform/posix/sdl/i_main.cpp
-+++ b/source/common/platform/posix/sdl/i_main.cpp
-@@ -175,19 +175,7 @@ int main (int argc, char **argv)
- 	Args = new FArgs(argc, argv);
- 
- 	// Should we even be doing anything with progdir on Unix systems?
--	char program[PATH_MAX];
--	if (realpath (argv[0], program) == NULL)
--		strcpy (program, argv[0]);
--	char *slash = strrchr (program, '/');
--	if (slash != NULL)
--	{
--		*(slash + 1) = '\0';
--		progdir = program;
--	}
--	else
--	{
--		progdir = "./";
--	}
-+	progdir = "/usr/lib/raze/";
- 
- 	I_StartupJoysticks();
- 
-diff --git a/source/core/gameconfigfile.cpp b/source/core/gameconfigfile.cpp
-index 68e63b9c9..9ece4fe78 100644
---- a/source/core/gameconfigfile.cpp
-+++ b/source/core/gameconfigfile.cpp
-@@ -103,17 +103,11 @@ FGameConfigFile::FGameConfigFile ()
- 		// I assume other distributions don't do anything radically different
- 		SetValueForKey ("Path", "/opt/raze", true);
- 		SetValueForKey ("Path", "/usr/share/games/raze", true);
--		SetValueForKey ("Path", "/usr/local/share/games/raze", true);
- 		SetValueForKey ("Path", "/usr/share/games/jfduke3d", true);
--		SetValueForKey ("Path", "/usr/local/share/games/jfduke3d", true);
- 		SetValueForKey ("Path", "/usr/share/games/eduke32", true);
--		SetValueForKey ("Path", "/usr/local/share/games/eduke32", true);
- 		SetValueForKey ("Path", "/usr/share/games/nblood", true);
--		SetValueForKey ("Path", "/usr/local/share/games/nblood", true);
- 		SetValueForKey("Path", "/usr/share/games/jfsw", true);
--		SetValueForKey("Path", "/usr/local/share/games/jfsw", true);
- 		SetValueForKey("Path", "/usr/share/games/voidsw", true);
--		SetValueForKey("Path", "/usr/local/share/games/voidsw", true);
- 
- #endif
- 		SetValueForKey ("Path", "$STEAM", true); // also covers GOG.
-@@ -133,13 +127,10 @@ FGameConfigFile::FGameConfigFile ()
- 		SetValueForKey ("Path", "$GAMEDIR", true);
- #else
- 		SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
--		SetValueForKey ("Path", SHARE_DIR, true);
-+		SetValueForKey ("Path", "/usr/share/raze", true);
- 		SetValueForKey ("Path", "/usr/share/games/jfduke3d", true);
--		SetValueForKey ("Path", "/usr/local/share/games/jfduke3d", true);
- 		SetValueForKey ("Path", "/usr/share/games/eduke32", true);
--		SetValueForKey ("Path", "/usr/local/share/games/eduke32", true);
- 		SetValueForKey ("Path", "/usr/share/games/nblood", true);
--		SetValueForKey ("Path", "/usr/local/share/games/nblood", true);
- #endif
- 	}
- 
-@@ -156,10 +147,7 @@ FGameConfigFile::FGameConfigFile ()
- 		SetValueForKey("Path", "$PROGDIR/soundfonts", true);
- #else
- 		SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
--		SetValueForKey("Path", "/usr/local/share/" GAME_DIR "/soundfonts", true);
--		SetValueForKey("Path", "/usr/local/share/games/" GAME_DIR "/soundfonts", true);
--		SetValueForKey("Path", "/usr/share/" GAME_DIR "/soundfonts", true);
--		SetValueForKey("Path", "/usr/share/games/" GAME_DIR "/soundfonts", true);
-+		SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/soundfonts", true);
- #endif
- 	}
- 
-diff --git a/source/core/gamecontrol.cpp b/source/core/gamecontrol.cpp
-index d70e20584..0c5322464 100644
---- a/source/core/gamecontrol.cpp
-+++ b/source/core/gamecontrol.cpp
-@@ -929,7 +929,7 @@ int RunGame()
- 	FString logfile = Args->TakeValue("+logfile");
- 
- 	// As long as this engine is still in prerelease mode let's always write a log file.
--	if (logfile.IsEmpty()) logfile.Format("%s" GAMENAMELOWERCASE ".log", M_GetDocumentsPath().GetChars());
-+	if (logfile.IsEmpty()) logfile.Format("%s/" GAMENAMELOWERCASE ".log", M_GetDocumentsPath().GetChars());
- 
- 	if (logfile.IsNotEmpty())
- 	{