projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
<MatzeB> -cleanup in resource management functions
[supertux.git]
/
src
/
setup.cpp
diff --git
a/src/setup.cpp
b/src/setup.cpp
index
60ebc4c
..
4bfd9c3
100644
(file)
--- a/
src/setup.cpp
+++ b/
src/setup.cpp
@@
-348,10
+348,10
@@
void st_directory_setup(void)
{
std::string exedir = std::string(dirname(exe_file)) + "/";
{
std::string exedir = std::string(dirname(exe_file)) + "/";
- datadir = exedir + "../data
/
"; // SuperTux run from source dir
+ datadir = exedir + "../data"; // SuperTux run from source dir
if (access(datadir.c_str(), F_OK) != 0)
{
if (access(datadir.c_str(), F_OK) != 0)
{
- datadir = exedir + "../share/supertux
/
"; // SuperTux run from PATH
+ datadir = exedir + "../share/supertux"; // SuperTux run from PATH
if (access(datadir.c_str(), F_OK) != 0)
{ // If all fails, fall back to compiled path
datadir = DATA_PREFIX;
if (access(datadir.c_str(), F_OK) != 0)
{ // If all fails, fall back to compiled path
datadir = DATA_PREFIX;
@@
-880,7
+880,6
@@
void st_abort(const std::string& reason, const std::string& details)
abort();
}
abort();
}
-
/* Set Icon (private) */
void seticon(void)
/* Set Icon (private) */
void seticon(void)