Remove now unused patch. Blame cvs.

This commit is contained in:
pascal 2017-04-20 11:23:48 +00:00
parent c03379eff4
commit 00d4f10363

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-src_supertux_main_cpp,v 1.1 2016/01/21 16:04:47 pascal Exp $
--- src/supertux/main.cpp.orig Sun Dec 20 15:56:35 2015
+++ src/supertux/main.cpp Thu Jan 21 15:34:47 2016
@@ -156,34 +156,10 @@ class PhysfsSubsystem (public)
}
else
{
- // check if we run from source dir
- char* basepath_c = SDL_GetBasePath();
- std::string basepath = basepath_c;
- SDL_free(basepath_c);
-
- // If we are on windows, the data directory is one directory above the binary
-#ifdef WIN32
- const std::array<std::string, 2> subdirs = { "data", "../data" };
-#else
- const std::array<std::string, 1> subdirs = { "data" };
-#endif
- bool found = false;
- for (const std::string &subdir : subdirs)
- {
- datadir = FileSystem::join(basepath, subdir);
- if (FileSystem::exists(FileSystem::join(datadir, "credits.txt")))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- // if the game is not run from the source directory, try to find
- // the global install location
- datadir = datadir.substr(0, datadir.rfind(INSTALL_SUBDIR_BIN));
- datadir = FileSystem::join(datadir, INSTALL_SUBDIR_SHARE);
- }
+ // if the game is not run from the source directory, try to find
+ // the global install location
+ datadir = FileSystem::join(INSTALL_SUBDIR_BIN, "/../");
+ datadir = FileSystem::join(datadir, INSTALL_SUBDIR_SHARE);
}
if (!PHYSFS_addToSearchPath(datadir.c_str(), 1))