mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-11 23:32:04 +00:00
Merge pull request #312 from edward-san/gamename_more
- More GAMENAME replacements in strings.
This commit is contained in:
commit
1e8f362217
8 changed files with 15 additions and 18 deletions
|
@ -2516,7 +2516,7 @@ bool G_ProcessIFFDemo (FString &mapname)
|
|||
id = ReadLong (&demo_p);
|
||||
if (id != ZDEM_ID)
|
||||
{
|
||||
Printf ("Not a ZDoom demo file!\n");
|
||||
Printf ("Not a " GAMENAME " demo file!\n");
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -2541,12 +2541,12 @@ bool G_ProcessIFFDemo (FString &mapname)
|
|||
demover = ReadWord (&demo_p); // ZDoom version demo was created with
|
||||
if (demover < MINDEMOVERSION)
|
||||
{
|
||||
Printf ("Demo requires an older version of ZDoom!\n");
|
||||
Printf ("Demo requires an older version of " GAMENAME "!\n");
|
||||
//return true;
|
||||
}
|
||||
if (ReadWord (&demo_p) > DEMOGAMEVERSION) // Minimum ZDoom version
|
||||
{
|
||||
Printf ("Demo requires a newer version of ZDoom!\n");
|
||||
Printf ("Demo requires a newer version of " GAMENAME "!\n");
|
||||
return true;
|
||||
}
|
||||
if (demover >= 0x21a)
|
||||
|
@ -2673,7 +2673,7 @@ void G_DoPlayDemo (void)
|
|||
|
||||
if (ReadLong (&demo_p) != FORM_ID)
|
||||
{
|
||||
const char *eek = "Cannot play non-ZDoom demos.\n";
|
||||
const char *eek = "Cannot play non-" GAMENAME " demos.\n";
|
||||
|
||||
C_ForgetCVars();
|
||||
M_Free(demobuffer);
|
||||
|
|
|
@ -1502,7 +1502,7 @@ void DBaseStatusBar::DrawTopStuff (EHudState state)
|
|||
{
|
||||
screen->DrawText (SmallFont, CR_TAN, 0, ST_Y - 40 * CleanYfac,
|
||||
"Demo was recorded with a different version\n"
|
||||
"of ZDoom. Expect it to go out of sync.",
|
||||
"of " GAMENAME ". Expect it to go out of sync.",
|
||||
DTA_CleanNoMove, true, TAG_DONE);
|
||||
}
|
||||
|
||||
|
|
|
@ -331,7 +331,7 @@ int I_PickIWad_Gtk (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
|
|||
gtk_container_add (GTK_CONTAINER(window), vbox);
|
||||
|
||||
// Create the top label.
|
||||
widget = gtk_label_new ("ZDoom found more than one IWAD\nSelect from the list below to determine which one to use:");
|
||||
widget = gtk_label_new (GAMENAME " found more than one IWAD\nSelect from the list below to determine which one to use:");
|
||||
gtk_box_pack_start (GTK_BOX(vbox), widget, false, false, 0);
|
||||
gtk_misc_set_alignment (GTK_MISC(widget), 0, 0);
|
||||
|
||||
|
@ -450,7 +450,7 @@ int I_PickIWad (WadStuff *wads, int numwads, bool showwin, int defaultiwad)
|
|||
{
|
||||
FString cmd("kdialog --title \"" GAMESIG " ");
|
||||
cmd << GetVersionString() << ": Select an IWAD to use\""
|
||||
" --menu \"ZDoom found more than one IWAD\n"
|
||||
" --menu \"" GAMENAME " found more than one IWAD\n"
|
||||
"Select from the list below to determine which one to use:\"";
|
||||
|
||||
for(i = 0; i < numwads; ++i)
|
||||
|
|
|
@ -22,7 +22,7 @@ void ChildSigHandler (int signum)
|
|||
#ifdef _WIN32
|
||||
BOOL SafeTerminateProcess(HANDLE hProcess, UINT uExitCode);
|
||||
|
||||
static char TimidityTitle[] = "TiMidity (ZDoom Launched)";
|
||||
static char TimidityTitle[] = "TiMidity (" GAMENAME " Launched)";
|
||||
const char TimidityPPMIDIDevice::EventName[] = "TiMidity Killer";
|
||||
|
||||
CVAR (String, timidity_exe, "timidity.exe", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||
|
@ -347,7 +347,7 @@ bool TimidityPPMIDIDevice::ValidateTimidity()
|
|||
}
|
||||
if (!good)
|
||||
{
|
||||
Printf(PRINT_BOLD, "ZDoom requires a special version of TiMidity++\n");
|
||||
Printf(PRINT_BOLD, GAMENAME " requires a special version of TiMidity++\n");
|
||||
}
|
||||
|
||||
UnmapViewOfFile((LPVOID)exeBase);
|
||||
|
|
|
@ -175,7 +175,7 @@ bool FCDThread::Init ()
|
|||
CD_WindowClass.style = CS_NOCLOSE;
|
||||
CD_WindowClass.lpfnWndProc = CD_WndProc;
|
||||
CD_WindowClass.hInstance = g_hInst;
|
||||
CD_WindowClass.lpszClassName = "ZDoom CD Player";
|
||||
CD_WindowClass.lpszClassName = GAMENAME " CD Player";
|
||||
CD_WindowAtom = RegisterClass (&CD_WindowClass);
|
||||
|
||||
if (CD_WindowAtom == 0)
|
||||
|
@ -183,7 +183,7 @@ bool FCDThread::Init ()
|
|||
|
||||
CD_Window = CreateWindow (
|
||||
(LPCTSTR)(INT_PTR)(int)CD_WindowAtom,
|
||||
"ZDoom CD Player",
|
||||
GAMENAME " CD Player",
|
||||
0,
|
||||
0, 0, 10, 10,
|
||||
NULL,
|
||||
|
|
|
@ -125,10 +125,7 @@ RtlVirtualUnwind (
|
|||
#define UPLOAD_BOUNDARY "Von-DnrNbJl0 P9d_BD;cEEsQVWpYMq0pbZ6NUmYHus;yIbFbkgB?.N=YC5O=BGZm+Rab5"
|
||||
#define DBGHELP_URI "/msredist/dbghelp.dl_"
|
||||
|
||||
// If you are working on your own modified version of ZDoom, change
|
||||
// the last part of the UPLOAD_AGENT (between parentheses) to your
|
||||
// own program's name. e.g. (Skulltag) or (ZDaemon) or (ZDoomFu)
|
||||
#define UPLOAD_AGENT "ZDoom/" VERSIONSTR " (" GAMESIG ")"
|
||||
#define UPLOAD_AGENT GAMENAME "/" VERSIONSTR " (" GAMESIG ")"
|
||||
|
||||
// Time, in milliseconds, to wait for a send() or recv() to complete.
|
||||
#define TIMEOUT 60000
|
||||
|
|
|
@ -143,7 +143,7 @@ LONG ErrorIconChar;
|
|||
|
||||
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
||||
|
||||
static const char WinClassName[] = "ZDoomMainWindow";
|
||||
static const char WinClassName[] = GAMENAME "MainWindow";
|
||||
static HMODULE hwtsapi32; // handle to wtsapi32.dll
|
||||
static void (*TermFuncs[MAX_TERMS])(void);
|
||||
static int NumTerms;
|
||||
|
@ -1224,7 +1224,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
|
|||
// This should only happen on basic Windows 95 installations, but since we
|
||||
// don't support Windows 95, we have no obligation to provide assistance in
|
||||
// getting it installed.
|
||||
MessageBoxA(NULL, "Could not load riched20.dll", "ZDoom Error", MB_OK | MB_ICONSTOP);
|
||||
MessageBoxA(NULL, "Could not load riched20.dll", GAMENAME " Error", MB_OK | MB_ICONSTOP);
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
|
|
@ -301,7 +301,7 @@ void Win32Video::InitDDraw ()
|
|||
DDraw->Release ();
|
||||
DDraw = NULL;
|
||||
I_FatalError ("DirectDraw returned no display modes.\n\n"
|
||||
"If you started ZDoom from a fullscreen DOS box, run it from "
|
||||
"If you started " GAMENAME " from a fullscreen DOS box, run it from "
|
||||
"a DOS window instead. If that does not work, you may need to reboot.");
|
||||
}
|
||||
if (Args->CheckParm ("-2"))
|
||||
|
|
Loading…
Reference in a new issue