From 36b75561cc3aa8ac6f5e3f53f194a483ecee9292 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Mon, 8 Apr 2019 06:28:54 +0000 Subject: [PATCH] Update some program names git-svn-id: https://svn.eduke32.com/eduke32@7537 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 4 ++-- source/kenbuild/rsrc/buildres.rc | 2 +- source/kenbuild/rsrc/gameres.rc | 2 +- source/kenbuild/src/bstub.cpp | 14 ++++++------ source/kenbuild/src/game.cpp | 7 +++--- source/sw/rsrc/buildres.rc | 8 +++---- source/sw/src/common_game.h | 2 -- source/sw/src/config.cpp | 2 -- source/sw/src/config.h | 11 +++++---- source/sw/src/console.cpp | 1 - source/sw/src/game.cpp | 6 +++++ source/sw/src/jnstub.cpp | 38 ++++++++++++++++++++++++++++++++ 12 files changed, 70 insertions(+), 27 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 96708b380..8fe637174 100644 --- a/GNUmakefile +++ b/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 \ diff --git a/source/kenbuild/rsrc/buildres.rc b/source/kenbuild/rsrc/buildres.rc index 8caade098..925d236dd 100644 --- a/source/kenbuild/rsrc/buildres.rc +++ b/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 diff --git a/source/kenbuild/rsrc/gameres.rc b/source/kenbuild/rsrc/gameres.rc index 4fe0e87d2..d832eab47 100644 --- a/source/kenbuild/rsrc/gameres.rc +++ b/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 diff --git a/source/kenbuild/src/bstub.cpp b/source/kenbuild/src/bstub.cpp index ee57743bd..53600eada 100644 --- a/source/kenbuild/src/bstub.cpp +++ b/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_LOCAL_EXEC "testgame.exe" +#define DEFAULT_GAME_EXEC "ekenbuild.exe" +#define DEFAULT_GAME_LOCAL_EXEC "ekenbuild.exe" #else -#define DEFAULT_GAME_EXEC "eduke32" -#define DEFAULT_GAME_LOCAL_EXEC "./eduke32" +#define DEFAULT_GAME_EXEC "ekenbuild" +#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(); diff --git a/source/kenbuild/src/game.cpp b/source/kenbuild/src/game.cpp index b769daf08..e1df21666 100644 --- a/source/kenbuild/src/game.cpp +++ b/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(); diff --git a/source/sw/rsrc/buildres.rc b/source/sw/rsrc/buildres.rc index 58a9b21e9..4ef0a2084 100644 --- a/source/sw/rsrc/buildres.rc +++ b/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 "ProductName", "Mapster32" + VALUE "OriginalFilename", "wangulator.exe" + VALUE "ProductName", "Wangulator" VALUE "ProductVersion", STRPRODUCTVER END END diff --git a/source/sw/src/common_game.h b/source/sw/src/common_game.h index 77ebe2bd2..efda2c31f 100644 --- a/source/sw/src/common_game.h +++ b/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") diff --git a/source/sw/src/config.cpp b/source/sw/src/config.cpp index 62a405f8c..a939943c3 100644 --- a/source/sw/src/config.cpp +++ b/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; diff --git a/source/sw/src/config.h b/source/sw/src/config.h index ba8826c79..f1a7e1ae3 100644 --- a/source/sw/src/config.h +++ b/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" { -#endif + +#include "compat.h" #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 diff --git a/source/sw/src/console.cpp b/source/sw/src/console.cpp index 6282d9596..d704dbb58 100644 --- a/source/sw/src/console.cpp +++ b/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) diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 4534d5055..20d3f3a40 100644 --- a/source/sw/src/game.cpp +++ b/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 diff --git a/source/sw/src/jnstub.cpp b/source/sw/src/jnstub.cpp index e96c3bdec..b0da50988 100644 --- a/source/sw/src/jnstub.cpp +++ b/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) {