Skip to content
Permalink
Browse files

- GAMESIG was never supposed to be used in printed output. Replaced a…

…ll occurences with GAMENAME.
  • Loading branch information
coelckers committed Jan 12, 2020
1 parent 1d0ece2 commit d636acb0026ff2fa890f9a4993a4c4c9f2f62ae5
@@ -152,7 +152,7 @@ - (void)updateTitle
{
if (nil == m_title)
{
m_title = [NSString stringWithFormat:@"%s %s", GAMESIG, GetVersionString()];
m_title = [NSString stringWithFormat:@"%s %s", GAMENAME, GetVersionString()];
}

[super setTitle:m_title];
@@ -101,7 +101,7 @@
[m_scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[m_scrollView setDocumentView:m_textView];

NSString* const title = [NSString stringWithFormat:@"%s %s - Console", GAMESIG, GetVersionString()];
NSString* const title = [NSString stringWithFormat:@"%s %s - Console", GAMENAME, GetVersionString()];

[m_window initWithContentRect:initialRect
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
@@ -117,7 +117,7 @@ void Linux_I_FatalError(const char* errortext)
if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
{
FString cmd;
cmd << "kdialog --title \"" GAMESIG " " << GetVersionString()
cmd << "kdialog --title \"" GAMENAME " " << GetVersionString()
<< "\" --msgbox \"" << errortext << "\"";
popen(cmd, "r");
}
@@ -130,7 +130,7 @@ void Linux_I_FatalError(const char* errortext)
else
{
FString title;
title << GAMESIG " " << GetVersionString();
title << GAMENAME " " << GetVersionString();

if (SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, errortext, NULL) < 0)
{
@@ -200,7 +200,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
const char *str;
if((str=getenv("KDE_FULL_SESSION")) && strcmp(str, "true") == 0)
{
FString cmd("kdialog --title \"" GAMESIG " ");
FString cmd("kdialog --title \"" GAMENAME " ");
cmd << GetVersionString() << ": Select an IWAD to use\""
" --menu \"" GAMENAME " found more than one IWAD\n"
"Select from the list below to determine which one to use:\"";
@@ -165,7 +165,7 @@ namespace Priv
}

FString caption;
caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime());
caption.Format(GAMENAME " %s (%s)", GetVersionString(), GetGitTime());

const uint32_t windowFlags = (win_maximized ? SDL_WINDOW_MAXIMIZED : 0) | SDL_WINDOW_RESIZABLE | extraFlags;
Priv::window = SDL_CreateWindow(caption,
@@ -771,7 +771,7 @@ void I_SetWindowTitle(const char* caption)
else
{
FString default_caption;
default_caption.Format(GAMESIG " %s (%s)", GetVersionString(), GetGitTime());
default_caption.Format(GAMENAME " %s (%s)", GetVersionString(), GetGitTime());
SDL_SetWindowTitle(Priv::window, default_caption);
}
}
@@ -207,7 +207,7 @@ static int PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)

// Create the dialog window.
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
mysnprintf(caption, countof(caption), GAMESIG " %s: Select an IWAD to use", GetVersionString());
mysnprintf(caption, countof(caption), GAMENAME " %s: Select an IWAD to use", GetVersionString());
gtk_window_set_title (GTK_WINDOW(window), caption);
gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_gravity (GTK_WINDOW(window), GDK_GRAVITY_CENTER);
@@ -896,7 +896,7 @@ int DoMain (HINSTANCE hInstance)
}

/* create window */
FStringf caption("" GAMESIG " %s " X64 " (%s)", GetVersionString(), GetGitTime());
FStringf caption("" GAMENAME " %s " X64 " (%s)", GetVersionString(), GetGitTime());
std::wstring wcaption = caption.WideString();
Window = CreateWindowExW(
WS_EX_APPWINDOW,
@@ -578,7 +578,7 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa

GetWindowTextW(hDlg, label, countof(label));
FString alabel(label);
newlabel.Format(GAMESIG " %s: %s", GetVersionString(), alabel.GetChars());
newlabel.Format(GAMENAME " %s: %s", GetVersionString(), alabel.GetChars());
auto wlabel = newlabel.WideString();
SetWindowTextW(hDlg, wlabel.c_str());
}

0 comments on commit d636acb

Please sign in to comment.
You can’t perform that action at this time.