diff --git a/.gitignore b/.gitignore index 7e46c9f21..2a867d7ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ obj/ +/amcsquad /eduke32 /mapster32 /voidsw diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp index 3e6deb172..2403aac80 100644 --- a/source/build/src/engine.cpp +++ b/source/build/src/engine.cpp @@ -11074,9 +11074,9 @@ static void check_sprite(int32_t i) static int32_t amc_strip_mapversion_flags(int32_t version) { if (version & MAPVERSION_FLAG_AMC5_0) - LOG_F(INFO, "Map uses AMCDuke32 v5.0 format (%d > MAXTILES >= %d).", MAXTILES, AMC4_0_MAXTILES); + LOG_F(INFO, "Map uses AMC Squad v4.5 format (%d > MAXTILES >= %d).", MAXTILES, AMC4_0_MAXTILES); else if (version & MAPVERSION_FLAG_AMC4_0) - LOG_F(INFO, "Map uses AMCDuke32 v3.5 format (%d > MAXTILES >= %d).", AMC4_0_MAXTILES, EDUKE32_MAXTILES); + LOG_F(INFO, "Map uses AMC Squad v3.5 format (%d > MAXTILES >= %d).", AMC4_0_MAXTILES, EDUKE32_MAXTILES); return version & ~(MAPVERSION_FLAG_AMC5_0 | MAPVERSION_FLAG_AMC4_0); } diff --git a/source/duke3d/rsrc/amcsquad/gameres.rc b/source/duke3d/rsrc/amcsquad/gameres.rc index 20509f9aa..a829ecbfc 100644 --- a/source/duke3d/rsrc/amcsquad/gameres.rc +++ b/source/duke3d/rsrc/amcsquad/gameres.rc @@ -61,13 +61,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "FileDescription", "AMCDuke32" + VALUE "FileDescription", "AMC Squad" VALUE "FileVersion", VERSTR VALUE "InternalName", "AMCDuke32" - VALUE "LegalCopyright", "Copyright © EDuke32 contributors. All rights reserved." - VALUE "LegalTrademarks", "Duke Nukem® is a Registered Trademark of Balls of Steel, LLC." + VALUE "LegalCopyright", "Copyright © AMCDuke32 contributors. All rights reserved." + VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "amcsquad.exe" - VALUE "ProductName", "AMCDuke32" + VALUE "ProductName", "AMC Squad" VALUE "ProductVersion", VERSTR END END diff --git a/source/duke3d/src/astub.cpp b/source/duke3d/src/astub.cpp index c088a3f38..7188d3de3 100644 --- a/source/duke3d/src/astub.cpp +++ b/source/duke3d/src/astub.cpp @@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # undef stat #endif -const char* AppProperName = "Mapster32 (AMCDuke32)"; +const char* AppProperName = "Mapster32 (AMC Squad)"; const char* AppTechnicalName = "mapster32"; #if defined(_WIN32) @@ -7992,7 +7992,7 @@ static void G_ShowParameterHelp(void) "-usecwd\t\t\tRead game data and configuration file from working directory\n" "\n-?, -help, --help\t\tDisplay this help message and exit" ; - Bsprintf(tempbuf, "Mapster32 (AMCDuke32) %s", s_buildRev); + Bsprintf(tempbuf, "Mapster32 (AMC Squad) %s", s_buildRev); wm_msgbox(tempbuf, "%s", s); } @@ -8410,7 +8410,7 @@ int32_t ExtPreInit(int32_t argc,char const * const * argv) g_useCwd = 1; OSD_SetVersion(AppProperName,0,2); - LOG_F(INFO, "Mapster32 (AMCDuke32) %s", s_buildRev); + LOG_F(INFO, "Mapster32 (AMC Squad) %s", s_buildRev); PrintBuildInfo(); G_CheckCommandLine(argc,argv); @@ -10128,7 +10128,7 @@ int32_t ExtInit(void) getmessageleng = 0; getmessagetimeoff = 0; - Bsprintf(apptitle, "Mapster32 (AMCDuke32) %s", s_buildRev); + Bsprintf(apptitle, "Mapster32 (AMC Squad) %s", s_buildRev); autosavetimer = (int32_t) totalclock+120*autosave; registerosdcommands();