Update some program names

git-svn-id: https://svn.eduke32.com/eduke32@7537 1a8010ca-5511-0410-912e-c29ae57300e0

GNUmakefile

@@ -716,10 +716,10 @@ sw_game_deps := duke3d_common_midi audiolib mact
 sw_editor_deps := audiolib
 
 sw_game := voidsw
-sw_editor := voidsw-editor
+sw_editor := wangulator
 
 sw_game_proper := VoidSW
-sw_editor_proper := VoidSW Editor
+sw_editor_proper := Wangulator
 
 sw_game_objs := \
     actor.cpp \

source/kenbuild/rsrc/buildres.rc

@@ -57,7 +57,7 @@ BEGIN
             VALUE "FileVersion", STRFILEVER
             VALUE "InternalName", "Mapster32"
             VALUE "LegalCopyright", "Copyright © 2015 EDuke32 Developers, 2000, 2003 Ken Silverman"
-            VALUE "OriginalFilename", "testeditor.exe"
+            VALUE "OriginalFilename", "ekenbuild-editor.exe"
             VALUE "ProductName", "Mapster32"
             VALUE "ProductVersion", STRPRODUCTVER
         END

source/kenbuild/rsrc/gameres.rc

@@ -55,7 +55,7 @@ BEGIN
             VALUE "FileVersion", STRFILEVER
             VALUE "InternalName", "KenBuild"
             VALUE "LegalCopyright", "Copyright © 2015 EDuke32 Developers, 2000, 2003 Ken Silverman"
-            VALUE "OriginalFilename", "testgame.exe"
+            VALUE "OriginalFilename", "ekenbuild.exe"
             VALUE "ProductName", "KenBuild"
             VALUE "ProductVersion", STRPRODUCTVER
         END

source/kenbuild/src/bstub.cpp

@@ -19,20 +19,20 @@
 #include "common_game.h"
 
 const char *AppProperName = "KenBuild Editor";
-const char *AppTechnicalName = "testeditor";
+const char *AppTechnicalName = "ekenbuild-editor";
 
 #if defined(_WIN32)
-#define DEFAULT_GAME_EXEC "testgame.exe"
+#define DEFAULT_GAME_EXEC "ekenbuild.exe"
-#define DEFAULT_GAME_LOCAL_EXEC "testgame.exe"
+#define DEFAULT_GAME_LOCAL_EXEC "ekenbuild.exe"
 #else
-#define DEFAULT_GAME_EXEC "eduke32"
+#define DEFAULT_GAME_EXEC "ekenbuild"
-#define DEFAULT_GAME_LOCAL_EXEC "./eduke32"
+#define DEFAULT_GAME_LOCAL_EXEC "./ekenbuild"
 #endif
 
 const char *DefaultGameExec = DEFAULT_GAME_EXEC;
 const char *DefaultGameLocalExec = DEFAULT_GAME_LOCAL_EXEC;
 
-#define SETUPFILENAME "testeditor.cfg"
+#define SETUPFILENAME "ekenbuild-editor.cfg"
 const char *defaultsetupfilename = SETUPFILENAME;
 char setupfilename[BMAX_PATH] = SETUPFILENAME;
 
@@ -91,7 +91,7 @@ int32_t ExtPreInit(int32_t argc,char const * const * argv)
     UNREFERENCED_PARAMETER(argc);
     UNREFERENCED_PARAMETER(argv);
 
-    OSD_SetLogFile("testeditor.log");
+    OSD_SetLogFile("ekenbuild-editor.log");
     OSD_SetVersion(AppProperName,0,2);
     initprintf("%s %s\n", AppProperName, s_buildRev);
     PrintBuildInfo();

source/kenbuild/src/game.cpp

@@ -19,9 +19,9 @@
 #include "common_game.h"
 
 const char *AppProperName = "KenBuild";
-const char *AppTechnicalName = "testgame";
+const char *AppTechnicalName = "ekenbuild";
 
-#define SETUPFILENAME "testgame.cfg"
+#define SETUPFILENAME "ekenbuild.cfg"
 char setupfilename[BMAX_PATH] = SETUPFILENAME;
 
 #define TIMERINTSPERSECOND 140 //280
@@ -457,6 +457,8 @@ int32_t app_main(int32_t argc, char const * const * argv)
     int i, j, k /*, l, fil, waitplayers, x1, y1, x2, y2*/;
     int /*other, packleng,*/ netparm;
 
+    OSD_SetLogFile("ekenbuild.log");
+
     OSD_SetFunctions(
         NULL, NULL, NULL, NULL, NULL,
         COMMON_clearbackground,
@@ -466,7 +468,6 @@ int32_t app_main(int32_t argc, char const * const * argv)
 
     OSD_SetParameters(0,2, 0,0, 4,0, 0, 0, 0); // TODO: Add error and red palookup IDs.
 
-    OSD_SetLogFile("testgame.log");
     initprintf("%s %s\n", AppProperName, s_buildRev);
     PrintBuildInfo();
 

source/sw/rsrc/buildres.rc

@@ -53,13 +53,13 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileDescription", "Mapster32 for VoidSW"
+            VALUE "FileDescription", "Wangulator for VoidSW"
             VALUE "FileVersion", STRFILEVER
-            VALUE "InternalName", "Mapster32"
+            VALUE "InternalName", "Wangulator"
             VALUE "LegalCopyright", "Copyright © 2015 EDuke32 Developers, 1997, 2005 3D Realms Entertainment"
             VALUE "LegalTrademarks", "Shadow Warrior® is a Registered Trademark of GHI Media LLC."
-            VALUE "OriginalFilename", "voidsw-editor.exe"
+            VALUE "OriginalFilename", "wangulator.exe"
-            VALUE "ProductName", "Mapster32"
+            VALUE "ProductName", "Wangulator"
             VALUE "ProductVersion", STRPRODUCTVER
         END
     END

source/sw/src/common_game.h

@@ -68,8 +68,6 @@ extern "C" {
 // Setup program defines
 //
 
-#define SETUPFILENAME "sw.cfg"
-
 #define SETUPPROGRAMNAME ("Shadow Warrior Setup")
 #define SETUPPROGRAMVERSION ("1.2")
 

source/sw/src/config.cpp

@@ -93,8 +93,6 @@ int32_t ForceSetup = 1;
 
 extern char WangBangMacro[10][64];
 char  RTSName[MAXRTSNAMELENGTH];
-//static char setupfilename[64]={SETUPFILENAME};
-char setupfilename[64]= {SETUPFILENAME};
 static int32_t scripthandle = -1;
 
 

source/sw/src/config.h

@@ -26,14 +26,17 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 
 #ifndef config_public_
 #define config_public_
-#ifdef __cplusplus
+
-extern "C" {
+#include "compat.h"
-#endif
 
 #include "function.h"
 #include "keyboard.h"
 #include "control.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SETUPNAMEPARM "SETUPFILE"
 
 // screen externs
@@ -108,7 +111,7 @@ extern int32_t EnableRudder;
 extern int32_t MouseDigitalAxes[MAXMOUSEAXES][2];
 extern int32_t JoystickDigitalAxes[MAXJOYAXES][2];
 
-extern char setupfilename[64];
+extern char setupfilename[BMAX_PATH];
 extern char ExternalControlFilename[64];
 
 //style=0: classic

source/sw/src/console.cpp

@@ -1129,7 +1129,6 @@ void CON_LoadSetup(void)
 {
     /*
     char base[80],command[80];
-    extern char setupfilename[64];
 
     // Format: showuser [SpriteNum]
     if (sscanf(MessageInputString,"%s %s",base,command) < 2)

source/sw/src/game.cpp

@@ -94,6 +94,12 @@ Things required to make savegames work:
 
 #include "crc32.h"
 
+const char* AppProperName = "VoidSW";
+const char* AppTechnicalName = "voidsw";
+
+#define SETUPFILENAME "voidsw.cfg"
+char setupfilename[BMAX_PATH] = SETUPFILENAME;
+
 #if DEBUG
 #define BETA 0
 #endif

source/sw/src/jnstub.cpp

@@ -39,6 +39,26 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
 #include "common.h"
 #include "common_game.h"
 
+
+const char* AppProperName = "Wangulator";
+const char* AppTechnicalName = "wangulator";
+
+#if defined(_WIN32)
+#define DEFAULT_GAME_EXEC "voidsw.exe"
+#define DEFAULT_GAME_LOCAL_EXEC "voidsw.exe"
+#else
+#define DEFAULT_GAME_EXEC "voidsw"
+#define DEFAULT_GAME_LOCAL_EXEC "./voidsw"
+#endif
+
+const char *DefaultGameExec = DEFAULT_GAME_EXEC;
+const char *DefaultGameLocalExec = DEFAULT_GAME_LOCAL_EXEC;
+
+#define SETUPFILENAME "wangulator.cfg"
+const char *defaultsetupfilename = SETUPFILENAME;
+char setupfilename[BMAX_PATH] = SETUPFILENAME;
+
+
 #define M_RED 102
 #define M_BLUE 198
 
@@ -649,6 +669,24 @@ ExtInit(void)
 
 const char *startwin_labeltext = "Starting Build Editor for Shadow Warrior...";
 
+const char *ExtGetVer(void)
+{
+    return s_buildRev;
+}
+
+int32_t ExtPreInit(int32_t argc,char const * const * argv)
+{
+    UNREFERENCED_PARAMETER(argc);
+    UNREFERENCED_PARAMETER(argv);
+
+    OSD_SetLogFile("wangulator.log");
+    OSD_SetVersion(AppProperName,0,2);
+    initprintf("%s %s\n", AppProperName, s_buildRev);
+    PrintBuildInfo();
+
+    return 0;
+}
+
 int
 ExtInit(void)
 {