mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Rebrand all console / window stuff
This commit is contained in:
parent
4a9cf76f37
commit
852e9b8ce9
23 changed files with 70 additions and 66 deletions
|
|
@ -113,7 +113,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||||
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
|
||||||
|
|
||||||
# Set EXE names so the assets CMakeLists can refer to its target
|
# Set EXE names so the assets CMakeLists can refer to its target
|
||||||
set(SRB2_SDL2_EXE_NAME srb2kart CACHE STRING "Executable binary output name")
|
set(SRB2_SDL2_EXE_NAME drrr CACHE STRING "Executable binary output name")
|
||||||
|
|
||||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
|
||||||
|
|
||||||
|
|
@ -146,7 +146,7 @@ if("${SRB2_CPACK_GENERATOR}" STREQUAL "")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
set(CPACK_GENERATOR ${SRB2_CPACK_GENERATOR})
|
||||||
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart" CACHE STRING "Program name for display purposes")
|
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Dr. Robotnik's Ring Racers" CACHE STRING "Program name for display purposes")
|
||||||
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
set(CPACK_PACKAGE_VENDOR "Kart Krew" CACHE STRING "Vendor name for display purposes")
|
||||||
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
|
||||||
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
|
||||||
|
|
|
||||||
|
|
@ -235,7 +235,7 @@ bin:=../bin
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# default EXENAME (usually set by platform)
|
# default EXENAME (usually set by platform)
|
||||||
EXENAME?=srb2
|
EXENAME?=drrr
|
||||||
DBGNAME?=$(EXENAME).debug
|
DBGNAME?=$(EXENAME).debug
|
||||||
|
|
||||||
exe:=$(bin)/$(EXENAME)
|
exe:=$(bin)/$(EXENAME)
|
||||||
|
|
|
||||||
|
|
@ -1576,7 +1576,7 @@ void CONS_Error(const char *msg)
|
||||||
#if defined(RPC_NO_WINDOWS_H) && defined(_WINDOWS)
|
#if defined(RPC_NO_WINDOWS_H) && defined(_WINDOWS)
|
||||||
if (!graphics_started)
|
if (!graphics_started)
|
||||||
{
|
{
|
||||||
MessageBoxA(vid.WndParent, msg, "SRB2Kart Warning", MB_OK);
|
MessageBoxA(vid.WndParent, msg, "Dr. Robotnik's Ring Racers Warning", MB_OK);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -1515,7 +1515,7 @@ static boolean CL_FinishedFileList(void)
|
||||||
M_StartMessage(M_GetText(
|
M_StartMessage(M_GetText(
|
||||||
"You have too many WAD files loaded\n"
|
"You have too many WAD files loaded\n"
|
||||||
"to add ones the server is using.\n"
|
"to add ones the server is using.\n"
|
||||||
"Please restart SRB2Kart before connecting.\n\n"
|
"Please restart Ring Racers before connecting.\n\n"
|
||||||
"Press ESC\n"
|
"Press ESC\n"
|
||||||
), NULL, MM_NOTHING);
|
), NULL, MM_NOTHING);
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -1529,7 +1529,7 @@ static boolean CL_FinishedFileList(void)
|
||||||
"You have the wrong addons loaded.\n\n"
|
"You have the wrong addons loaded.\n\n"
|
||||||
"To play on this server, restart\n"
|
"To play on this server, restart\n"
|
||||||
"the game and don't load any addons.\n"
|
"the game and don't load any addons.\n"
|
||||||
"SRB2Kart will automatically add\n"
|
"Ring Racers will automatically add\n"
|
||||||
"everything you need when you join.\n\n"
|
"everything you need when you join.\n\n"
|
||||||
"Press ESC\n"
|
"Press ESC\n"
|
||||||
), NULL, MM_NOTHING);
|
), NULL, MM_NOTHING);
|
||||||
|
|
@ -3064,7 +3064,7 @@ static void Joinable_OnChange(void)
|
||||||
// called one time at init
|
// called one time at init
|
||||||
void D_ClientServerInit(void)
|
void D_ClientServerInit(void)
|
||||||
{
|
{
|
||||||
DEBFILE(va("- - -== SRB2Kart v%d.%d "VERSIONSTRING" debugfile ==- - -\n",
|
DEBFILE(va("- - -== Ring Racers v%d.%d "VERSIONSTRING" debugfile ==- - -\n",
|
||||||
VERSION, SUBVERSION));
|
VERSION, SUBVERSION));
|
||||||
|
|
||||||
#ifndef NONET
|
#ifndef NONET
|
||||||
|
|
@ -3715,10 +3715,10 @@ static void HandleConnect(SINT8 node)
|
||||||
SV_SendRefuse(node, "Incompatible packet formats.");
|
SV_SendRefuse(node, "Incompatible packet formats.");
|
||||||
else if (strncmp(netbuffer->u.clientcfg.application, SRB2APPLICATION,
|
else if (strncmp(netbuffer->u.clientcfg.application, SRB2APPLICATION,
|
||||||
sizeof netbuffer->u.clientcfg.application))
|
sizeof netbuffer->u.clientcfg.application))
|
||||||
SV_SendRefuse(node, "Different SRB2 modifications\nare not compatible.");
|
SV_SendRefuse(node, "Different Ring Racers modifications\nare not compatible.");
|
||||||
else if (netbuffer->u.clientcfg.version != VERSION
|
else if (netbuffer->u.clientcfg.version != VERSION
|
||||||
|| netbuffer->u.clientcfg.subversion != SUBVERSION)
|
|| netbuffer->u.clientcfg.subversion != SUBVERSION)
|
||||||
SV_SendRefuse(node, va(M_GetText("Different SRB2Kart versions cannot\nplay a netgame!\n(server version %d.%d)"), VERSION, SUBVERSION));
|
SV_SendRefuse(node, va(M_GetText("Different Ring Racers versions cannot\nplay a netgame!\n(server version %d.%d)"), VERSION, SUBVERSION));
|
||||||
else if (!cv_allownewplayer.value && node)
|
else if (!cv_allownewplayer.value && node)
|
||||||
SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment."));
|
SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment."));
|
||||||
else if (D_NumPlayers() >= maxplayers)
|
else if (D_NumPlayers() >= maxplayers)
|
||||||
|
|
|
||||||
|
|
@ -1233,8 +1233,8 @@ void D_SRB2Main(void)
|
||||||
|
|
||||||
// Print GPL notice for our console users (Linux)
|
// Print GPL notice for our console users (Linux)
|
||||||
CONS_Printf(
|
CONS_Printf(
|
||||||
"\n\nSonic Robo Blast 2 Kart\n"
|
"\n\nDr. Robotnik's Ring Racers\n"
|
||||||
"Copyright (C) 1998-2020 by Kart Krew & STJr\n\n"
|
"Copyright (C) 1998-2022 by Kart Krew & STJr\n\n"
|
||||||
"This program comes with ABSOLUTELY NO WARRANTY.\n\n"
|
"This program comes with ABSOLUTELY NO WARRANTY.\n\n"
|
||||||
"This is free software, and you are welcome to redistribute it\n"
|
"This is free software, and you are welcome to redistribute it\n"
|
||||||
"and/or modify it under the terms of the GNU General Public License\n"
|
"and/or modify it under the terms of the GNU General Public License\n"
|
||||||
|
|
|
||||||
|
|
@ -4314,9 +4314,9 @@ static void Command_ListDoomednums_f(void)
|
||||||
static void Command_Version_f(void)
|
static void Command_Version_f(void)
|
||||||
{
|
{
|
||||||
#ifdef DEVELOP
|
#ifdef DEVELOP
|
||||||
CONS_Printf("SRB2Kart %s-%s (%s %s)\n", compbranch, comprevision, compdate, comptime);
|
CONS_Printf("Ring Racers %s-%s (%s %s)\n", compbranch, comprevision, compdate, comptime);
|
||||||
#else
|
#else
|
||||||
CONS_Printf("SRB2Kart %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
|
CONS_Printf("Ring Racers %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Base library
|
// Base library
|
||||||
|
|
|
||||||
|
|
@ -1725,7 +1725,7 @@ void CURLPrepareFile(const char* url, int dfilenum)
|
||||||
// Only allow HTTP and HTTPS
|
// Only allow HTTP and HTTPS
|
||||||
curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
|
curl_easy_setopt(http_handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP|CURLPROTO_HTTPS);
|
||||||
|
|
||||||
curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("SRB2Kart/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
|
curl_easy_setopt(http_handle, CURLOPT_USERAGENT, va("Ring Racers/v%d.%d", VERSION, SUBVERSION)); // Set user agent as some servers won't accept invalid user agents.
|
||||||
|
|
||||||
// Authenticate if the user so wishes
|
// Authenticate if the user so wishes
|
||||||
login = CURLGetLogin(url, NULL);
|
login = CURLGetLogin(url, NULL);
|
||||||
|
|
|
||||||
|
|
@ -576,7 +576,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
|
|
||||||
readcupheader(f, cup);
|
readcupheader(f, cup);
|
||||||
}
|
}
|
||||||
else if (fastcmp(word, "SRB2KART"))
|
else if (fastcmp(word, "RINGRACERS"))
|
||||||
{
|
{
|
||||||
if (isdigit(word2[0]))
|
if (isdigit(word2[0]))
|
||||||
{
|
{
|
||||||
|
|
@ -584,7 +584,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
if (i != PATCHVERSION)
|
if (i != PATCHVERSION)
|
||||||
{
|
{
|
||||||
deh_warning(
|
deh_warning(
|
||||||
"Patch is for SRB2Kart version %d, "
|
"Patch is for Ring Racers version %d, "
|
||||||
"only version %d is supported",
|
"only version %d is supported",
|
||||||
i,
|
i,
|
||||||
PATCHVERSION
|
PATCHVERSION
|
||||||
|
|
@ -594,12 +594,16 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
deh_warning(
|
deh_warning(
|
||||||
"SRB2Kart version definition has incorrect format, "
|
"Ring Racers version definition has incorrect format, "
|
||||||
"use \"SRB2KART %d\"",
|
"use \"RINGRACERS %d\"",
|
||||||
PATCHVERSION
|
PATCHVERSION
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (fastcmp(word, "SRB2KART"))
|
||||||
|
{
|
||||||
|
deh_warning("Patch is only compatible with SRB2Kart.");
|
||||||
|
}
|
||||||
else if (fastcmp(word, "SRB2"))
|
else if (fastcmp(word, "SRB2"))
|
||||||
{
|
{
|
||||||
deh_warning("Patch is only compatible with base SRB2.");
|
deh_warning("Patch is only compatible with base SRB2.");
|
||||||
|
|
|
||||||
|
|
@ -526,7 +526,7 @@ boolean F_IntroResponder(event_t *event)
|
||||||
// CREDITS
|
// CREDITS
|
||||||
// =========
|
// =========
|
||||||
static const char *credits[] = {
|
static const char *credits[] = {
|
||||||
"\1SRB2Kart",
|
"\1Dr. Robotnik's Ring Racers",
|
||||||
"\1Credits",
|
"\1Credits",
|
||||||
"",
|
"",
|
||||||
"\1Game Design",
|
"\1Game Design",
|
||||||
|
|
@ -2032,7 +2032,7 @@ void F_TitleScreenDrawer(void)
|
||||||
V_DrawSmallScaledPatch(84, 36, transval<<V_ALPHASHIFT, ttkflash);
|
V_DrawSmallScaledPatch(84, 36, transval<<V_ALPHASHIFT, ttkflash);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
V_DrawCenteredString(BASEVIDWIDTH/2, 64, V_ALLOWLOWERCASE, "SRB2 Kart v2.0");
|
V_DrawCenteredString(BASEVIDWIDTH/2, 64, V_ALLOWLOWERCASE, "Dr. Robotnik's Ring Racers v2.0");
|
||||||
|
|
||||||
#ifdef DEVELOP
|
#ifdef DEVELOP
|
||||||
#if defined(TESTERS)
|
#if defined(TESTERS)
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,7 @@ closedir (DIR * dirp)
|
||||||
|
|
||||||
static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
|
static CV_PossibleValue_t addons_cons_t[] = {{0, "Default"},
|
||||||
#if 1
|
#if 1
|
||||||
{1, "HOME"}, {2, "SRB2"},
|
{1, "HOME"}, {2, "DRRR"},
|
||||||
#endif
|
#endif
|
||||||
{3, "CUSTOM"}, {0, NULL}};
|
{3, "CUSTOM"}, {0, NULL}};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2520,7 +2520,7 @@ void G_LoadDemoInfo(menudemo_t *pdemo)
|
||||||
|
|
||||||
if (memcmp(info_p, DEMOHEADER, 12))
|
if (memcmp(info_p, DEMOHEADER, 12))
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemo->filepath);
|
CONS_Alert(CONS_ERROR, M_GetText("%s is not a Ring Racers replay file.\n"), pdemo->filepath);
|
||||||
pdemo->type = MD_INVALID;
|
pdemo->type = MD_INVALID;
|
||||||
sprintf(pdemo->title, "INVALID REPLAY");
|
sprintf(pdemo->title, "INVALID REPLAY");
|
||||||
Z_Free(infobuffer);
|
Z_Free(infobuffer);
|
||||||
|
|
@ -2760,7 +2760,7 @@ void G_DoPlayDemo(char *defdemoname)
|
||||||
demo.playback = true;
|
demo.playback = true;
|
||||||
if (memcmp(demo_p, DEMOHEADER, 12))
|
if (memcmp(demo_p, DEMOHEADER, 12))
|
||||||
{
|
{
|
||||||
snprintf(msg, 1024, M_GetText("%s is not a SRB2Kart replay file.\n"), pdemoname);
|
snprintf(msg, 1024, M_GetText("%s is not a Ring Racers replay file.\n"), pdemoname);
|
||||||
CONS_Alert(CONS_ERROR, "%s", msg);
|
CONS_Alert(CONS_ERROR, "%s", msg);
|
||||||
M_StartMessage(msg, NULL, MM_NOTHING);
|
M_StartMessage(msg, NULL, MM_NOTHING);
|
||||||
Z_Free(pdemoname);
|
Z_Free(pdemoname);
|
||||||
|
|
|
||||||
|
|
@ -3972,7 +3972,7 @@ void G_LoadGameData(void)
|
||||||
// Version check
|
// Version check
|
||||||
if (READUINT32(save_p) != 0xFCAFE211)
|
if (READUINT32(save_p) != 0xFCAFE211)
|
||||||
{
|
{
|
||||||
const char *gdfolder = "the SRB2Kart folder";
|
const char *gdfolder = "the Ring Racers folder";
|
||||||
if (strcmp(srb2home,"."))
|
if (strcmp(srb2home,"."))
|
||||||
gdfolder = srb2home;
|
gdfolder = srb2home;
|
||||||
|
|
||||||
|
|
@ -4062,7 +4062,7 @@ void G_LoadGameData(void)
|
||||||
// Landing point for corrupt gamedata
|
// Landing point for corrupt gamedata
|
||||||
datacorrupt:
|
datacorrupt:
|
||||||
{
|
{
|
||||||
const char *gdfolder = "the SRB2Kart folder";
|
const char *gdfolder = "the Ring Racers folder";
|
||||||
if (strcmp(srb2home,"."))
|
if (strcmp(srb2home,"."))
|
||||||
gdfolder = srb2home;
|
gdfolder = srb2home;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3516,7 +3516,7 @@ void M_Init(void)
|
||||||
quitmsg[QUIT3MSG1] = M_GetText("Come on, just ONE more netgame!\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG1] = M_GetText("Come on, just ONE more netgame!\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG2] = M_GetText("Press 'N' to unlock\nthe Golden Kart!\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG2] = M_GetText("Press 'N' to unlock\nthe Golden Kart!\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG3] = M_GetText("Couldn't handle\nthe banana meta?\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG3] = M_GetText("Couldn't handle\nthe banana meta?\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG4] = M_GetText("Every time you press 'Y', an\nSRB2Kart Developer cries...\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG4] = M_GetText("Every time you press 'Y', a\nRing Racers Developer cries...\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG5] = M_GetText("You'll be back to play soon, though...\n...right?\n\n(Press 'Y' to quit)");
|
||||||
quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
|
quitmsg[QUIT3MSG6] = M_GetText("Aww, is Eggman's Nightclub too\ndifficult for you?\n\n(Press 'Y' to quit)");
|
||||||
|
|
||||||
|
|
@ -8804,7 +8804,7 @@ static void M_ConnectMenuModChecks(INT32 choice)
|
||||||
|
|
||||||
if (modifiedgame)
|
if (modifiedgame)
|
||||||
{
|
{
|
||||||
M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nSRB2Kart will automatically add\neverything you need when you join.\n\n(Press a key)\n"), FUNCPTRCAST(M_ConnectMenu), MM_EVENTHANDLER);
|
M_StartMessage(M_GetText("You have addons loaded.\nYou won't be able to join netgames!\n\nTo play online, restart the game\nand don't load any addons.\nRing Racers will automatically add\neverything you need when you join.\n\n(Press a key)\n"), FUNCPTRCAST(M_ConnectMenu), MM_EVENTHANDLER);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -650,7 +650,7 @@ void M_SaveConfig(const char *filename)
|
||||||
}
|
}
|
||||||
|
|
||||||
// header message
|
// header message
|
||||||
fprintf(f, "// SRB2Kart configuration file.\n");
|
fprintf(f, "// Dr. Robotnik's Ring Racers configuration file.\n");
|
||||||
|
|
||||||
// print execversion FIRST, because subsequent consvars need to be filtered
|
// print execversion FIRST, because subsequent consvars need to be filtered
|
||||||
// always print current EXECVERSION
|
// always print current EXECVERSION
|
||||||
|
|
@ -803,10 +803,10 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
|
||||||
char keytxt[SRB2PNGTXT][12] = {
|
char keytxt[SRB2PNGTXT][12] = {
|
||||||
"Title", "Description", "Playername", "Mapnum", "Mapname",
|
"Title", "Description", "Playername", "Mapnum", "Mapname",
|
||||||
"Location", "Interface", "Render Mode", "Revision", "Build Date", "Build Time"};
|
"Location", "Interface", "Render Mode", "Revision", "Build Date", "Build Time"};
|
||||||
char titletxt[] = "SRB2Kart " VERSIONSTRING;
|
char titletxt[] = "Dr. Robotnik's Ring Racers " VERSIONSTRING;
|
||||||
png_charp playertxt = cv_playername[0].zstring;
|
png_charp playertxt = cv_playername[0].zstring;
|
||||||
char desctxt[] = "SRB2Kart Screenshot";
|
char desctxt[] = "Ring Racers Screenshot";
|
||||||
char Movietxt[] = "SRB2Kart Movie";
|
char Movietxt[] = "Ring Racers Movie";
|
||||||
size_t i;
|
size_t i;
|
||||||
char interfacetxt[] =
|
char interfacetxt[] =
|
||||||
#ifdef HAVE_SDL
|
#ifdef HAVE_SDL
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ static CV_PossibleValue_t masterserver_update_rate_cons_t[] = {
|
||||||
|
|
||||||
consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ms.kartkrew.org/ms/api", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
|
consvar_t cv_masterserver = CVAR_INIT ("masterserver", "https://ms.kartkrew.org/ms/api", CV_SAVE|CV_CALL, NULL, MasterServer_OnChange);
|
||||||
consvar_t cv_rendezvousserver = CVAR_INIT ("rendezvousserver", "relay.kartkrew.org", CV_SAVE|CV_CALL, NULL, RendezvousServer_OnChange);
|
consvar_t cv_rendezvousserver = CVAR_INIT ("rendezvousserver", "relay.kartkrew.org", CV_SAVE|CV_CALL, NULL, RendezvousServer_OnChange);
|
||||||
consvar_t cv_servername = CVAR_INIT ("servername", "SRB2Kart server", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters);
|
consvar_t cv_servername = CVAR_INIT ("servername", "Ring Racers server", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters);
|
||||||
consvar_t cv_server_contact = CVAR_INIT ("server_contact", "", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters);
|
consvar_t cv_server_contact = CVAR_INIT ("server_contact", "", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Update_parameters);
|
||||||
|
|
||||||
consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, MasterClient_Ticker);
|
consvar_t cv_masterserver_update_rate = CVAR_INIT ("masterserver_update_rate", "15", CV_SAVE|CV_CALL|CV_NOINIT, masterserver_update_rate_cons_t, MasterClient_Ticker);
|
||||||
|
|
|
||||||
|
|
@ -269,7 +269,7 @@ int main(int argc, char **argv)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// startup SRB2
|
// startup SRB2
|
||||||
CONS_Printf("Setting up SRB2Kart...\n");
|
CONS_Printf("Setting up Dr. Robotnik's Ring Racers...\n");
|
||||||
D_SRB2Main();
|
D_SRB2Main();
|
||||||
#ifdef LOGMESSAGES
|
#ifdef LOGMESSAGES
|
||||||
if (!M_CheckParm("-nolog"))
|
if (!M_CheckParm("-nolog"))
|
||||||
|
|
|
||||||
|
|
@ -145,10 +145,10 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
|
||||||
|
|
||||||
// Locations for searching for main.kart
|
// Locations for searching for main.kart
|
||||||
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
|
||||||
#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
|
#define DEFAULTWADLOCATION1 "/usr/local/share/games/DRRR"
|
||||||
#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
|
#define DEFAULTWADLOCATION2 "/usr/local/games/DRRR"
|
||||||
#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
|
#define DEFAULTWADLOCATION3 "/usr/share/games/DRRR"
|
||||||
#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
|
#define DEFAULTWADLOCATION4 "/usr/games/DRRR"
|
||||||
#define DEFAULTSEARCHPATH1 "/usr/local/games"
|
#define DEFAULTSEARCHPATH1 "/usr/local/games"
|
||||||
#define DEFAULTSEARCHPATH2 "/usr/games"
|
#define DEFAULTSEARCHPATH2 "/usr/games"
|
||||||
#define DEFAULTSEARCHPATH3 "/usr/local"
|
#define DEFAULTSEARCHPATH3 "/usr/local"
|
||||||
|
|
@ -247,8 +247,8 @@ static void write_backtrace(INT32 signal)
|
||||||
void *array[BT_SIZE];
|
void *array[BT_SIZE];
|
||||||
char timestr[STR_SIZE];
|
char timestr[STR_SIZE];
|
||||||
|
|
||||||
const char *error = "An error occurred within SRB2! Send this stack trace to someone who can help!\n";
|
const char *error = "An error occurred within Dr. Robotnik's Ring Racers! Send this stack trace to someone who can help!\n";
|
||||||
const char *error2 = "(Or find crash-log.txt in your SRB2 directory.)\n"; // Shown only to stderr.
|
const char *error2 = "(Or find crash-log.txt in your Ring Racers directory.)\n"; // Shown only to stderr.
|
||||||
|
|
||||||
fd = open(va("%s" PATHSEP "%s", srb2home, "crash-log.txt"), O_CREAT|O_APPEND|O_RDWR, S_IRUSR|S_IWUSR);
|
fd = open(va("%s" PATHSEP "%s", srb2home, "crash-log.txt"), O_CREAT|O_APPEND|O_RDWR, S_IRUSR|S_IWUSR);
|
||||||
|
|
||||||
|
|
@ -682,7 +682,7 @@ static void I_StartupConsole(void)
|
||||||
|
|
||||||
if (gotConsole)
|
if (gotConsole)
|
||||||
{
|
{
|
||||||
SetConsoleTitleA("SRB2Kart Console");
|
SetConsoleTitleA("Dr. Robotnik's Ring Racers Console");
|
||||||
consolevent = SDL_TRUE;
|
consolevent = SDL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1513,8 +1513,8 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(mumble->uiVersion != 2) {
|
if(mumble->uiVersion != 2) {
|
||||||
wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
|
wcsncpy(mumble->name, L"Dr. Robotnik's Ring Racers "VERSIONSTRINGW, 256);
|
||||||
wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
|
wcsncpy(mumble->description, L"Dr. Robotnik's Ring Racers with integrated Mumble Link support.", 2048);
|
||||||
mumble->uiVersion = 2;
|
mumble->uiVersion = 2;
|
||||||
}
|
}
|
||||||
mumble->uiTick++;
|
mumble->uiTick++;
|
||||||
|
|
@ -1853,7 +1853,7 @@ INT32 I_StartupSystem(void)
|
||||||
I_OutputMsg("Linked with SDL version: %d.%d.%d\n",
|
I_OutputMsg("Linked with SDL version: %d.%d.%d\n",
|
||||||
SDLlinked.major, SDLlinked.minor, SDLlinked.patch);
|
SDLlinked.major, SDLlinked.minor, SDLlinked.patch);
|
||||||
if (SDL_Init(0) < 0)
|
if (SDL_Init(0) < 0)
|
||||||
I_Error("SRB2: SDL System Error: %s", SDL_GetError()); //Alam: Oh no....
|
I_Error("Dr. Robotnik's Ring Racers: SDL System Error: %s", SDL_GetError()); //Alam: Oh no....
|
||||||
#ifndef NOMUMBLE
|
#ifndef NOMUMBLE
|
||||||
I_SetupMumble();
|
I_SetupMumble();
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -1976,7 +1976,7 @@ void I_Error(const char *error, ...)
|
||||||
// on the target system
|
// on the target system
|
||||||
if (!M_CheckParm("-dedicated"))
|
if (!M_CheckParm("-dedicated"))
|
||||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
||||||
"SRB2Kart "VERSIONSTRING" Recursive Error",
|
"Dr. Robotnik's Ring Racers "VERSIONSTRING" Recursive Error",
|
||||||
buffer, NULL);
|
buffer, NULL);
|
||||||
|
|
||||||
W_Shutdown();
|
W_Shutdown();
|
||||||
|
|
@ -2025,7 +2025,7 @@ void I_Error(const char *error, ...)
|
||||||
// on the target system
|
// on the target system
|
||||||
if (!M_CheckParm("-dedicated"))
|
if (!M_CheckParm("-dedicated"))
|
||||||
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
|
||||||
"SRB2Kart "VERSIONSTRING" Error",
|
"Dr. Robotnik's Ring Racers "VERSIONSTRING" Error",
|
||||||
buffer, NULL);
|
buffer, NULL);
|
||||||
|
|
||||||
// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
|
// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
|
||||||
|
|
|
||||||
|
|
@ -1729,7 +1729,7 @@ INT32 VID_SetMode(INT32 modeNum)
|
||||||
src_rect.w = vid.width;
|
src_rect.w = vid.width;
|
||||||
src_rect.h = vid.height;
|
src_rect.h = vid.height;
|
||||||
|
|
||||||
//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
|
//Impl_SetWindowName("Dr. Robotnik's Ring Racers "VERSIONSTRING);
|
||||||
VID_CheckRenderer();
|
VID_CheckRenderer();
|
||||||
return SDL_TRUE;
|
return SDL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
@ -1756,7 +1756,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Create a window
|
// Create a window
|
||||||
window = SDL_CreateWindow("SRB2Kart "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
window = SDL_CreateWindow("Dr. Robotnik's Ring Racers "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
||||||
realwidth, realheight, flags);
|
realwidth, realheight, flags);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1932,7 +1932,7 @@ void I_StartupGraphics(void)
|
||||||
|
|
||||||
// Create window
|
// Create window
|
||||||
//Impl_CreateWindow(USE_FULLSCREEN);
|
//Impl_CreateWindow(USE_FULLSCREEN);
|
||||||
//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
|
//Impl_SetWindowName("Dr. Robotnik's Ring Racers "VERSIONSTRING);
|
||||||
VID_SetMode(VID_GetModeForSize(BASEVIDWIDTH, BASEVIDHEIGHT));
|
VID_SetMode(VID_GetModeForSize(BASEVIDWIDTH, BASEVIDHEIGHT));
|
||||||
|
|
||||||
vid.width = BASEVIDWIDTH; // Default size for startup
|
vid.width = BASEVIDWIDTH; // Default size for startup
|
||||||
|
|
|
||||||
|
|
@ -94,16 +94,16 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "04090000"
|
BLOCK "04090000"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "Comments", "Go go-karting with Dr. Eggman!\0"
|
VALUE "Comments", "Go go-karting with Dr. Robotnik!\0"
|
||||||
VALUE "CompanyName", "Kart Krew\0"
|
VALUE "CompanyName", "Kart Krew\0"
|
||||||
VALUE "FileDescription", "SRB2Kart\0"
|
VALUE "FileDescription", "Dr. Robotnik's Ring Racers\0"
|
||||||
VALUE "FileVersion", VERSIONSTRING_RC
|
VALUE "FileVersion", VERSIONSTRING_RC
|
||||||
VALUE "InternalName", "srb2kart\0"
|
VALUE "InternalName", "drrr\0"
|
||||||
VALUE "LegalCopyright", "Copyright 2018-2020 by Kart Krew\0"
|
VALUE "LegalCopyright", "Copyright 2018-2020 by Kart Krew\0"
|
||||||
VALUE "LegalTrademarks", "Dr. Eggman and related characters are trademarks of Sega.\0"
|
VALUE "LegalTrademarks", "Dr. Robotnik and related characters are trademarks of Sega.\0"
|
||||||
VALUE "OriginalFilename", "srb2kart.exe\0"
|
VALUE "OriginalFilename", "drrr.exe\0"
|
||||||
VALUE "PrivateBuild", "\0"
|
VALUE "PrivateBuild", "\0"
|
||||||
VALUE "ProductName", "SRB2Kart\0"
|
VALUE "ProductName", "Dr. Robotnik's Ring Racers\0"
|
||||||
VALUE "ProductVersion", VERSIONSTRING_RC
|
VALUE "ProductVersion", VERSIONSTRING_RC
|
||||||
VALUE "SpecialBuild", "\0"
|
VALUE "SpecialBuild", "\0"
|
||||||
END
|
END
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ BOOL InitBugTrap(void)
|
||||||
|
|
||||||
if (g_hmodBugTrap)
|
if (g_hmodBugTrap)
|
||||||
{
|
{
|
||||||
lpfnBT_SetAppName(TEXT("Sonic Robo Blast 2"));
|
lpfnBT_SetAppName(TEXT("Dr. Robotnik's Ring Racers"));
|
||||||
lpfnBT_SetAppVersion(TEXT(VERSIONSTRING));
|
lpfnBT_SetAppVersion(TEXT(VERSIONSTRING));
|
||||||
lpfnBT_SetFlags(BTF_DETAILEDMODE | BTF_ATTACHREPORT);
|
lpfnBT_SetFlags(BTF_DETAILEDMODE | BTF_ATTACHREPORT);
|
||||||
lpfnBT_SetSupportURL(TEXT("http://www.srb2.org/"));
|
lpfnBT_SetSupportURL(TEXT("http://www.srb2.org/"));
|
||||||
|
|
@ -454,7 +454,7 @@ LONG WINAPI RecordExceptionInfo(PEXCEPTION_POINTERS data/*, LPCSTR Message, LPST
|
||||||
FPrintf(fileHandle, "Email Sonic Team Junior so we can fix the bugs\r\n"); // Tails
|
FPrintf(fileHandle, "Email Sonic Team Junior so we can fix the bugs\r\n"); // Tails
|
||||||
FPrintf(fileHandle, "Make sure you tell us what you were doing to cause the crash, and if possible, record a demo!\r\n"); // Tails
|
FPrintf(fileHandle, "Make sure you tell us what you were doing to cause the crash, and if possible, record a demo!\r\n"); // Tails
|
||||||
FPrintf(fileHandle, "\r\n\r\n\r\n\r\n");
|
FPrintf(fileHandle, "\r\n\r\n\r\n\r\n");
|
||||||
FPrintf(fileHandle, "SRB2Kart %s -ERROR LOG-\r\n\r\n", VERSIONSTRING);
|
FPrintf(fileHandle, "Dr. Robotnik's Ring Racers %s -ERROR LOG-\r\n\r\n", VERSIONSTRING);
|
||||||
FPrintf(fileHandle, "\r\n");
|
FPrintf(fileHandle, "\r\n");
|
||||||
// VirtualQuery can be used to get the allocation base associated with a
|
// VirtualQuery can be used to get the allocation base associated with a
|
||||||
// code address, which is the same as the ModuleHandle. This can be used
|
// code address, which is the same as the ModuleHandle. This can be used
|
||||||
|
|
|
||||||
|
|
@ -325,8 +325,8 @@ static inline VOID OpenTextConsole(VOID)
|
||||||
{
|
{
|
||||||
if (AllocConsole()) //Let get the real console HANDLEs, because Mingw's Bash is bad!
|
if (AllocConsole()) //Let get the real console HANDLEs, because Mingw's Bash is bad!
|
||||||
{
|
{
|
||||||
SetConsoleTitleA("SRB2Kart Console");
|
SetConsoleTitleA("Dr. Robotnik's Ring Racers Console");
|
||||||
CONS_Printf(M_GetText("Hello, it's me, SRB2Kart's Console Window\n"));
|
CONS_Printf(M_GetText("Hello, it's me, Dr. Robotnik's Ring Racers' Console Window\n"));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
@ -612,7 +612,7 @@ static int WINAPI HandledWinMain(HINSTANCE hInstance)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// open a dummy window, both OpenGL and DirectX need one.
|
// open a dummy window, both OpenGL and DirectX need one.
|
||||||
if ((hWndMain = OpenMainWindow(hInstance, va("SRB2Kart "VERSIONSTRING))) == INVALID_HANDLE_VALUE)
|
if ((hWndMain = OpenMainWindow(hInstance, va("Dr. Robotnik's Ring Racers "VERSIONSTRING))) == INVALID_HANDLE_VALUE)
|
||||||
{
|
{
|
||||||
tlErrorMessage(TEXT("Couldn't open window"));
|
tlErrorMessage(TEXT("Couldn't open window"));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
@ -624,7 +624,7 @@ static int WINAPI HandledWinMain(HINSTANCE hInstance)
|
||||||
MakeCodeWritable();
|
MakeCodeWritable();
|
||||||
|
|
||||||
// startup SRB2
|
// startup SRB2
|
||||||
CONS_Printf("Setting up SRB2Kart...\n");
|
CONS_Printf("Setting up Dr. Robotnik's Ring Racers...\n");
|
||||||
D_SRB2Main();
|
D_SRB2Main();
|
||||||
CONS_Printf("Entering main game loop...\n");
|
CONS_Printf("Entering main game loop...\n");
|
||||||
// never return
|
// never return
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ boolean I_InitNetwork(void)
|
||||||
{
|
{
|
||||||
if (M_CheckParm ("-net"))
|
if (M_CheckParm ("-net"))
|
||||||
{
|
{
|
||||||
I_Error("The Win32 version of SRB2Kart doesn't work with external drivers like ipxsetup, sersetup, or doomatic\n"
|
I_Error("The Win32 version of Dr. Robotnik's Ring Racers doesn't work with external drivers like ipxsetup, sersetup, or doomatic\n"
|
||||||
"Read the documentation about \"-server\" and \"-connect\" parameters or just use the launcher\n");
|
"Read the documentation about \"-server\" and \"-connect\" parameters or just use the launcher\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -513,7 +513,7 @@ static void signal_handler(int num)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MessageBoxA(hWndMain, va("signal_handler(): %s", sigmsg), "SRB2Kart error", MB_OK|MB_ICONERROR);
|
MessageBoxA(hWndMain, va("signal_handler(): %s", sigmsg), "Dr. Robotnik's Ring Racers error", MB_OK|MB_ICONERROR);
|
||||||
|
|
||||||
signal(num, SIG_DFL); // default signal action
|
signal(num, SIG_DFL); // default signal action
|
||||||
raise(num);
|
raise(num);
|
||||||
|
|
@ -630,7 +630,7 @@ void I_Error(const char *error, ...)
|
||||||
va_end(argptr);
|
va_end(argptr);
|
||||||
|
|
||||||
OutputDebugStringA(txt);
|
OutputDebugStringA(txt);
|
||||||
MessageBoxA(hWndMain, txt, "SRB2Kart Recursive Error", MB_OK|MB_ICONERROR);
|
MessageBoxA(hWndMain, txt, "Dr. Robotnik's Ring Racers Recursive Error", MB_OK|MB_ICONERROR);
|
||||||
W_Shutdown();
|
W_Shutdown();
|
||||||
exit(-1); // recursive errors detected
|
exit(-1); // recursive errors detected
|
||||||
}
|
}
|
||||||
|
|
@ -673,7 +673,7 @@ void I_Error(const char *error, ...)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MessageBoxA(hWndMain, txt, "SRB2Kart Error", MB_OK|MB_ICONERROR);
|
MessageBoxA(hWndMain, txt, "Dr. Robotnik's Ring Racers Error", MB_OK|MB_ICONERROR);
|
||||||
|
|
||||||
W_Shutdown();
|
W_Shutdown();
|
||||||
exit(-1);
|
exit(-1);
|
||||||
|
|
@ -3092,8 +3092,8 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(mumble->uiVersion != 2) {
|
if(mumble->uiVersion != 2) {
|
||||||
wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
|
wcsncpy(mumble->name, L"Dr. Robotnik's Ring Racers "VERSIONSTRINGW, 256);
|
||||||
wcsncpy(mumble->description, L"SRB2Kart with integrated Mumble Link support.", 2048);
|
wcsncpy(mumble->description, L"Dr. Robotnik's Ring Racers with integrated Mumble Link support.", 2048);
|
||||||
mumble->uiVersion = 2;
|
mumble->uiVersion = 2;
|
||||||
}
|
}
|
||||||
mumble->uiTick++;
|
mumble->uiTick++;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue