From 0e0de77439258053d3d85276f9ab31dd91af8f03 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 7 Mar 2018 04:21:37 +0000
Subject: [PATCH] Move APPNAME and APPBASENAME to common_game.h so we can use
 them for the data paths in common.cpp

git-svn-id: https://svn.eduke32.com/eduke32@6728 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/common.cpp    | 6 +++---
 source/duke3d/src/common_game.h | 8 ++++++++
 source/duke3d/src/duke3d.h      | 8 --------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/duke3d/src/common.cpp b/source/duke3d/src/common.cpp
index 7ea47dee7..18f15262a 100644
--- a/source/duke3d/src/common.cpp
+++ b/source/duke3d/src/common.cpp
@@ -317,11 +317,11 @@ void G_ExtInit(void)
         {
             Bsnprintf(cwd,sizeof(cwd),"%s/"
 #if defined(_WIN32)
-                      "EDuke32 Settings"
+                      APPNAME " Settings"
 #elif defined(GEKKO)
-                      "apps/eduke32"
+                      "apps/" APPBASENAME
 #else
-                      ".eduke32"
+                      "." APPBASENAME
 #endif
                       ,homedir);
             asperr = addsearchpath(cwd);
diff --git a/source/duke3d/src/common_game.h b/source/duke3d/src/common_game.h
index c619d7740..0ac5f97ce 100644
--- a/source/duke3d/src/common_game.h
+++ b/source/duke3d/src/common_game.h
@@ -15,6 +15,14 @@ extern "C" {
 
 extern int g_useCwd;
 
+#ifndef APPNAME
+#define APPNAME             "EDuke32"
+#endif
+
+#ifndef APPBASENAME
+#define APPBASENAME         "eduke32"
+#endif
+
 #define GAMEFLAG_DUKE       0x00000001
 #define GAMEFLAG_NAM        0x00000002
 #define GAMEFLAG_NAPALM     0x00000004
diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h
index c3b8d8823..b8564bdab 100644
--- a/source/duke3d/src/duke3d.h
+++ b/source/duke3d/src/duke3d.h
@@ -43,14 +43,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "keyboard.h"
 #include "fx_man.h"
 
-#ifndef APPNAME
-    #define APPNAME             "EDuke32"
-#endif
-
-#ifndef APPBASENAME
-    #define APPBASENAME         "eduke32"
-#endif
-
 #define HEAD2                   APPNAME
 
 #ifdef EDUKE32_STANDALONE