From b25e48a1b3ed5c3fac7b2c798ddab40513f075c9 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 29 Jan 2018 11:13:16 +0000
Subject: [PATCH] boardfilename cleanups

git-svn-id: https://svn.eduke32.com/eduke32@6614 1a8010ca-5511-0410-912e-c29ae57300e0
---
 source/duke3d/src/game.h     | 1 -
 source/duke3d/src/premap.cpp | 8 +++-----
 source/duke3d/src/premap.h   | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h
index fb3509fdf..4b78a273a 100644
--- a/source/duke3d/src/game.h
+++ b/source/duke3d/src/game.h
@@ -278,7 +278,6 @@ extern const char *s_buildDate;
 extern const char *g_rtsNamePtr;
 
 extern char boardfilename[BMAX_PATH], currentboardfilename[BMAX_PATH];
-extern char boardfilename[BMAX_PATH];
 
 extern const char *defaultrtsfilename[GAMECOUNT];
 extern const char *G_DefaultRtsFile(void);
diff --git a/source/duke3d/src/premap.cpp b/source/duke3d/src/premap.cpp
index 87ca213b9..e46bcb364 100644
--- a/source/duke3d/src/premap.cpp
+++ b/source/duke3d/src/premap.cpp
@@ -1876,16 +1876,14 @@ int G_EnterLevel(int gameMode)
 
     if (G_HaveUserMap())
     {
-        Bstrcpy(levelName, boardfilename);
-
         if (g_gameNamePtr)
 #ifdef EDUKE32_STANDALONE
-            Bsprintf(apptitle,"%s - %s",levelName,g_gameNamePtr);
+            Bsprintf(apptitle, "%s - %s", boardfilename, g_gameNamePtr);
 #else
-            Bsprintf(apptitle, "%s - %s - " APPNAME, levelName, g_gameNamePtr);
+            Bsprintf(apptitle, "%s - %s - " APPNAME, boardfilename, g_gameNamePtr);
 #endif
         else
-            Bsprintf(apptitle,"%s - " APPNAME,levelName);
+            Bsprintf(apptitle, "%s - " APPNAME, boardfilename);
     }
     else
     {
diff --git a/source/duke3d/src/premap.h b/source/duke3d/src/premap.h
index 69853843e..0a0d51e7e 100644
--- a/source/duke3d/src/premap.h
+++ b/source/duke3d/src/premap.h
@@ -38,7 +38,7 @@ extern int32_t g_halveScreenArea;
 extern int32_t g_levelTextTime;
 extern int32_t voting,vote_map,vote_episode;
 extern palette_t CrosshairColors;
-void G_SetupFilenameBasedMusic(char *levnamebuf, const char *boardfilename, int levelNum);
+void G_SetupFilenameBasedMusic(char *nameBuf, const char *fileName, int levelNum);
 int G_EnterLevel(int gameMode);
 int G_FindLevelByFile(const char *fileName);
 void G_CacheMapData(void);