diff --git a/CMakeLists.txt b/CMakeLists.txt
index c85f237435bcf73dff0e68ba96356d64654c724d..e141537c586c2356aade7485fb76feb5b56b6c85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,7 @@ if(${CMAKE_SYSTEM} MATCHES "Darwin")
set(CPACK_GENERATOR "DragNDrop")
endif()
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Sonic Robo Blast 2 Kart")
set(CPACK_PACKAGE_VENDOR "Sonic Team Jr.")
#set(CPACK_PACKAGE_DESCRIPTION_FILE )
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
diff --git a/libs/DLL-README.txt b/libs/DLL-README.txt
index 058ec06857776433f042da0b888e1f7efa24a259..06fae1278b8e7e4720503c345b3d62c4780a5c8b 100644
--- a/libs/DLL-README.txt
+++ b/libs/DLL-README.txt
@@ -1,4 +1,4 @@
-# SRB2 - Which DLLs do I need to bundle?
+# SRB2Kart - Which DLLs do I need to bundle?
Updated 12/4/2018 (v2.1.21)
@@ -10,7 +10,7 @@ Here are the required DLLs, per build. For each architecture, copy all the binar
and don't forget to build r_opengl.dll for srb2dd.
-## srb2win, 32-bit
+## srb2kart, 32-bit
* libs\dll-binaries\i686\exchndl.dll
* libs\dll-binaries\i686\libgme.dll
@@ -18,7 +18,7 @@ and don't forget to build r_opengl.dll for srb2dd.
* libs\SDL2\i686-w64-mingw32\bin\SDL2.dll
* libs\SDL2_mixer\i686-w64-mingw32\bin\*.dll (get everything)
-## srb2win, 64-bit
+## srb2kart, 64-bit
* libs\dll-binaries\x86_64\exchndl.dll
* libs\dll-binaries\x86_64\libgme.dll
@@ -26,7 +26,7 @@ and don't forget to build r_opengl.dll for srb2dd.
* libs\SDL2\x86_64-w64-mingw32\bin\SDL2.dll
* libs\SDL2_mixer\x86_64-w64-mingw32\bin\*.dll (get everything)
-## srb2dd, 32-bit
+## srb2kartdd, 32-bit
* libs\dll-binaries\i686\exchndl.dll
* libs\dll-binaries\i686\fmodex.dll
@@ -34,7 +34,7 @@ and don't forget to build r_opengl.dll for srb2dd.
* libs\dll-binaries\i686\mgwhelp.dll (depend for exchndl.dll)
* r_opengl.dll (build this from make)
-## srb2dd, 64-bit
+## srb2kartdd, 64-bit
* libs\dll-binaries\x86_64\exchndl.dll
* libs\dll-binaries\x86_64\fmodex.dll
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f4e2898e405c416c652a29a683f51c23dd69d4ac..faa860d4440d440b3241c35817bd14d1b034910d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -358,7 +358,7 @@ if(${SRB2_CONFIG_HAVE_ZLIB})
set(SRB2_HAVE_ZLIB ON)
add_definitions(-DHAVE_ZLIB)
else()
- message(WARNING "You have specified that ZLIB is available but it was not found. SRB2 may not compile correctly.")
+ message(WARNING "You have specified that ZLIB is available but it was not found. SRB2Kart may not compile correctly.")
endif()
endif()
@@ -380,7 +380,7 @@ if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB})
add_definitions(-DHAVE_PNG)
add_definitions(-D_LARGEFILE64_SOURCE)
else()
- message(WARNING "You have specified that PNG is available but it was not found. SRB2 may not compile correctly.")
+ message(WARNING "You have specified that PNG is available but it was not found. SRB2Kart may not compile correctly.")
endif()
endif()
endif()
@@ -485,5 +485,5 @@ if(${CMAKE_SYSTEM} MATCHES Windows)
endif()
if(NOT ${SRB2_SDL2_AVAILABLE} AND NOT ${SRB2_WIN32_AVAILABLE})
- message(FATAL_ERROR "There are no targets available to build an SRB2 executable. :(")
+ message(FATAL_ERROR "There are no targets available to build an SRB2Kart executable. :(")
endif()
diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 76c319b9afa8edb231d6dfa27e589d27298eba4f..ed864425c942714d3ded391e2770c185e07f0767 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1916,7 +1916,7 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
M_StartMessage(M_GetText(
"You have too many WAD files loaded\n"
"to add ones the server is using.\n"
- "Please restart SRB2 before connecting.\n\n"
+ "Please restart SRB2Kart before connecting.\n\n"
"Press ESC\n"
), NULL, MM_NOTHING);
return false;
@@ -3552,7 +3552,7 @@ static void HandleConnect(SINT8 node)
SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server"));
else if (netbuffer->u.clientcfg.version != VERSION
|| netbuffer->u.clientcfg.subversion != SUBVERSION)
- SV_SendRefuse(node, va(M_GetText("Different SRB2 versions cannot\nplay a netgame!\n(server version %d.%d.%d)"), VERSION/100, VERSION%100, SUBVERSION));
+ SV_SendRefuse(node, va(M_GetText("Different SRB2Kart versions cannot\nplay a netgame!\n(server version %d.%d.%d)"), VERSION/100, VERSION%100, SUBVERSION));
else if (!cv_allownewplayer.value && node)
SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment"));
else if (D_NumPlayers() >= maxplayers)
diff --git a/src/m_menu.c b/src/m_menu.c
index 59f9482eef400a2d9690bae7cbe630151ad5e4cb..a79bf904fe5e721461df1b8e4014d9f02220b853 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -4887,7 +4887,7 @@ static void M_HandleAddons(INT32 choice)
case EXT_LUA:
#ifndef HAVE_BLUA
S_StartSound(NULL, sfx_s26d);
- M_StartMessage(va("%c%s\x80\nThis copy of SRB2 was compiled\nwithout support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
+ M_StartMessage(va("%c%s\x80\nThis copy of SRB2Kart was compiled\nwithout support for .lua files.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), dirmenu[dir_on[menudepthleft]]+DIR_STRING),NULL,MM_NOTHING);
break;
#endif
// else intentional fallthrough
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 9e8826c38fd0fdb734350cf57d23ed4ec41bbdef..bfd8972879f50f1723b999d09d5d3cf4365060d3 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -133,16 +133,16 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
// Locations for searching the srb2.srb
#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
-#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2"
-#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2"
-#define DEFAULTWADLOCATION4 "/usr/games/SRB2"
+#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
+#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
+#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
+#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
#define DEFAULTSEARCHPATH1 "/usr/local/games"
#define DEFAULTSEARCHPATH2 "/usr/games"
#define DEFAULTSEARCHPATH3 "/usr/local"
#elif defined (_WIN32)
-#define DEFAULTWADLOCATION1 "c:\\games\\srb2"
-#define DEFAULTWADLOCATION2 "\\games\\srb2"
+#define DEFAULTWADLOCATION1 "c:\\games\\srb2kart"
+#define DEFAULTWADLOCATION2 "\\games\\srb2kart"
#define DEFAULTSEARCHPATH1 "c:\\games"
#define DEFAULTSEARCHPATH2 "\\games"
#endif
@@ -2184,7 +2184,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
if(mumble->uiVersion != 2) {
wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRINGW, 256);
- wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
+ wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
mumble->uiVersion = 2;
}
mumble->uiTick++;
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 7c1605e1b200db365a60dcddb65028287d7a5d91..78dfc820c2fb79565c56b9005bbaa4dde1fcbe1d 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1563,7 +1563,7 @@ void I_StartupGraphics(void)
HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL);
// check gl renderer lib
if (HWD.pfnGetRenderVersion() != VERSION)
- I_Error("%s", M_GetText("The version of the renderer doesn't match the version of the executable\nBe sure you have installed SRB2 properly.\n"));
+ I_Error("%s", M_GetText("The version of the renderer doesn't match the version of the executable\nBe sure you have installed SRB2Kart properly.\n"));
if (!HWD.pfnInit(I_Error)) // let load the OpenGL library
{
rendermode = render_soft;
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index 0e2fd55da4978f352d7d04306c5ad04885c99b5f..0e5adbb4068e70724e7e4271c21f036656493465 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -155,9 +155,9 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
//#define DEFAULTSEARCHPATH3 "/pc/home/alam/srb2code/data"
#elif defined (GP2X)
#define DEFAULTWADLOCATION1 "/mnt/sd"
-#define DEFAULTWADLOCATION2 "/mnt/sd/SRB2"
+#define DEFAULTWADLOCATION2 "/mnt/sd/SRB2Kart"
#define DEFAULTWADLOCATION3 "/tmp/mnt/sd"
-#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2"
+#define DEFAULTWADLOCATION4 "/tmp/mnt/sd/SRB2Kart"
#define DEFAULTSEARCHPATH1 "/mnt/sd"
#define DEFAULTSEARCHPATH2 "/tmp/mnt/sd"
#elif defined (_WII)
@@ -184,10 +184,10 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#define DEFAULTSEARCHPATH1 "host0:/"
#define DEFAULTSEARCHPATH2 "ms0:/PSP/GAME/SRB2PSP"
#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2"
-#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2"
-#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2"
-#define DEFAULTWADLOCATION4 "/usr/games/SRB2"
+#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
+#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
+#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart"
+#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart"
#define DEFAULTSEARCHPATH1 "/usr/local/games"
#define DEFAULTSEARCHPATH2 "/usr/games"
#define DEFAULTSEARCHPATH3 "/usr/local"
@@ -196,21 +196,21 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#ifdef __GNUC__
#include <openxdk/debug.h>
#endif
-#define DEFAULTWADLOCATION1 "c:\\srb2"
-#define DEFAULTWADLOCATION2 "d:\\srb2"
-#define DEFAULTWADLOCATION3 "e:\\srb2"
-#define DEFAULTWADLOCATION4 "f:\\srb2"
-#define DEFAULTWADLOCATION5 "g:\\srb2"
-#define DEFAULTWADLOCATION6 "h:\\srb2"
-#define DEFAULTWADLOCATION7 "i:\\srb2"
+#define DEFAULTWADLOCATION1 "c:\\srb2kart"
+#define DEFAULTWADLOCATION2 "d:\\srb2kart"
+#define DEFAULTWADLOCATION3 "e:\\srb2kart"
+#define DEFAULTWADLOCATION4 "f:\\srb2kart"
+#define DEFAULTWADLOCATION5 "g:\\srb2kart"
+#define DEFAULTWADLOCATION6 "h:\\srb2kart"
+#define DEFAULTWADLOCATION7 "i:\\srb2kart"
#elif defined (_WIN32_WCE)
#define NOCWD
#define NOHOME
-#define DEFAULTWADLOCATION1 "\\Storage Card\\SRB2DEMO"
+#define DEFAULTWADLOCATION1 "\\Storage Card\\SRB2Kart"
#define DEFAULTSEARCHPATH1 "\\Storage Card"
#elif defined (_WIN32)
-#define DEFAULTWADLOCATION1 "c:\\games\\srb2"
-#define DEFAULTWADLOCATION2 "\\games\\srb2"
+#define DEFAULTWADLOCATION1 "c:\\games\\srb2kart"
+#define DEFAULTWADLOCATION2 "\\games\\srb2kart"
#define DEFAULTSEARCHPATH1 "c:\\games"
#define DEFAULTSEARCHPATH2 "\\games"
#endif
@@ -2334,7 +2334,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
if(mumble->uiVersion != 2) {
wcsncpy(mumble->name, L"SRB2Kart "VERSIONSTRING, 256);
- wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
+ wcsncpy(mumble->description, L"Sonic Robo Blast 2 Kart with integrated Mumble Link support.", 2048);
mumble->uiVersion = 2;
}
mumble->uiTick++;