From 2ca8efd7eea4b3d531ac5fca4ef09a5da9f2efd1 Mon Sep 17 00:00:00 2001
From: Jaime Ita Passos <jp6781615@gmail.com>
Date: Thu, 25 Feb 2021 20:17:27 -0300
Subject: [PATCH] Revert accidental push
---
README.md | 9 ++++++---
src/d_netcmd.c | 4 ++--
src/m_misc.c | 6 +++---
src/sdl/i_system.c | 8 ++++----
src/sdl/i_video.c | 2 +-
src/win32/Makefile.cfg | 2 +-
src/win32/Srb2win.rc | 6 +++---
7 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index 98cff8fec..8a5ca1a1f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
-# Kitchen Sink Faucet SRB2
+# Sonic Robo Blast 2
-[](https://ci.appveyor.com/project/jimita/kitchensinkfaucetsrb2)
-[](https://app.circleci.com/pipelines/github/Jimita/KitchenSinkFaucetSRB2)
+[](https://ci.appveyor.com/project/STJr/srb2)
+[](https://travis-ci.org/STJr/SRB2)
+[](https://circleci.com/gh/STJr/SRB2/tree/master)
+
+[Sonic Robo Blast 2](https://srb2.org/) is a 3D Sonic the Hedgehog fangame based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/).
## Dependencies
- NASM (x86 builds only)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 8d42ca4c2..4208e4c4f 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3477,9 +3477,9 @@ static void Command_ListWADS_f(void)
static void Command_Version_f(void)
{
#ifdef DEVELOP
- CONS_Printf("Kitchen Sink Faucet %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
+ CONS_Printf("Sonic Robo Blast 2 %s-%s (%s %s) ", compbranch, comprevision, compdate, comptime);
#else
- CONS_Printf("Kitchen Sink Faucet %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
+ CONS_Printf("Sonic Robo Blast 2 %s (%s %s %s %s) ", VERSIONSTRING, compdate, comptime, comprevision, compbranch);
#endif
// Base library
diff --git a/src/m_misc.c b/src/m_misc.c
index 376e7512f..42890cb08 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -783,10 +783,10 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
char keytxt[SRB2PNGTXT][12] = {
"Title", "Description", "Playername", "Mapnum", "Mapname",
"Location", "Interface", "Render Mode", "Revision", "Build Date", "Build Time"};
- char titletxt[] = "Kitchen Sink Faucet " VERSIONSTRING;
+ char titletxt[] = "Sonic Robo Blast 2 " VERSIONSTRING;
png_charp playertxt = cv_playername.zstring;
- char desctxt[] = "Kitchen Sink Faucet Screenshot";
- char Movietxt[] = "Kitchen Sink Faucet Movie";
+ char desctxt[] = "SRB2 Screenshot";
+ char Movietxt[] = "SRB2 Movie";
size_t i;
char interfacetxt[] =
#ifdef HAVE_SDL
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index 1c47b89c9..10c0747bf 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -629,7 +629,7 @@ static void I_StartupConsole(void)
if (gotConsole)
{
- SetConsoleTitleA("Kitchen Sink Faucet Console");
+ SetConsoleTitleA("SRB2 Console");
consolevent = SDL_TRUE;
}
@@ -1622,7 +1622,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
return;
if(mumble->uiVersion != 2) {
- wcsncpy(mumble->name, L"Kitchen Sink Faucet "VERSIONSTRINGW, 256);
+ wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256);
wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
mumble->uiVersion = 2;
}
@@ -2400,7 +2400,7 @@ void I_Error(const char *error, ...)
// which should fail gracefully if it can't put a message box up
// on the target system
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "Kitchen Sink Faucet Recursive Error",
+ "SRB2 "VERSIONSTRING" Recursive Error",
buffer, NULL);
W_Shutdown();
@@ -2444,7 +2444,7 @@ void I_Error(const char *error, ...)
// which should fail gracefully if it can't put a message box up
// on the target system
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
- "Kitchen Sink Faucet Error",
+ "SRB2 "VERSIONSTRING" Error",
buffer, NULL);
// Note that SDL_ShowSimpleMessageBox does *not* require SDL to be
// initialized at the time, so calling it after SDL_Quit() is
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 032521c0a..c8f67da77 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -1631,7 +1631,7 @@ static SDL_bool Impl_CreateWindow(SDL_bool fullscreen)
#endif
// Create a window
- window = SDL_CreateWindow("Kitchen Sink Faucet "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+ window = SDL_CreateWindow("SRB2 "VERSIONSTRING, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
realwidth, realheight, flags);
diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg
index 0365f617d..702ae3765 100644
--- a/src/win32/Makefile.cfg
+++ b/src/win32/Makefile.cfg
@@ -68,7 +68,7 @@ endif
endif
# name of the exefile
- EXENAME?=kitchensinkfaucet.exe
+ EXENAME?=srb2win.exe
ifdef SDL
i_system_o+=$(OBJDIR)/SRB2.res
diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc
index 98927e2a6..5ba366bda 100644
--- a/src/win32/Srb2win.rc
+++ b/src/win32/Srb2win.rc
@@ -84,14 +84,14 @@ BEGIN
BEGIN
VALUE "Comments", "Visit our web site at www.srb2.org for news and updates!\0"
VALUE "CompanyName", "Sonic Team Junior\0"
- VALUE "FileDescription", "Kitchen Sink Faucet\0"
+ VALUE "FileDescription", "Sonic Robo Blast 2\0"
VALUE "FileVersion", VERSIONSTRING_RC
VALUE "InternalName", "srb2\0"
VALUE "LegalCopyright", "Copyright 1998-2020 by Sonic Team Junior\0"
VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0"
- VALUE "OriginalFilename", "kitchensinkfaucet.exe\0"
+ VALUE "OriginalFilename", "srb2win.exe\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Kitchen Sink Faucet\0"
+ VALUE "ProductName", "Sonic Robo Blast 2\0"
VALUE "ProductVersion", VERSIONSTRING_RC
VALUE "SpecialBuild", "\0"
END
--
GitLab