From 48cd9372342b44ced021f04ed98eb608a0c405ca Mon Sep 17 00:00:00 2001 From: oy Date: Sat, 11 Dec 2010 22:48:37 +0100 Subject: [PATCH] fixed wrong $DATADIR path. Closes #316 --- src/engine/shared/storage.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/engine/shared/storage.cpp b/src/engine/shared/storage.cpp index 9349b7d27..0274ea19c 100644 --- a/src/engine/shared/storage.cpp +++ b/src/engine/shared/storage.cpp @@ -187,18 +187,20 @@ public: // 4) check for all default locations { const char *aDirs[] = { - "/usr/share/teeworlds/data/mapres", - "/usr/share/games/teeworlds/data/mapres", - "/usr/local/share/teeworlds/data/mapres", - "/usr/local/share/games/teeworlds/data/mapres", - "/opt/teeworlds/data/mapres" + "/usr/share/teeworlds/data", + "/usr/share/games/teeworlds/data", + "/usr/local/share/teeworlds/data", + "/usr/local/share/games/teeworlds/data", + "/opt/teeworlds/data" }; const int DirsCount = sizeof(aDirs) / sizeof(aDirs[0]); int i; for (i = 0; i < DirsCount; i++) { - if (fs_is_dir(aDirs[i])) + char aBuf[128]; + str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]); + if(fs_is_dir(aBuf)) { str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir)); return;