vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git

This commit is contained in:
Sryder 2018-11-18 11:05:20 +00:00
parent 5a96a0d0a4 7b142dbad1
commit 9ffcc79288
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.h.in
View File

@ -52,7 +52,7 @@
#define ASSET_HASH_CHARS_KART "784ee9177b01c8cb26edff43eaf93d87"
#define ASSET_HASH_MAPS_KART "84018d9b35d181ca9fcc2be5a9d43a45"
#ifdef USE_PATCH_KART
#define ASSET_HASH_PATCH_KART "heyguysdidyouknowilovedogssomuch"
#define ASSET_HASH_PATCH_KART "c19c373465f9240c5d61238c35b36a8e"
#endif
#endif

6
src/d_netcmd.c
View File

@ -4835,11 +4835,11 @@ static void Fishcake_OnChange(void)
static void Command_Isgamemodified_f(void)
{
if (savemoddata)
CONS_Printf(M_GetText("modifiedgame is true, but you can save medal and time data in this mod.\n"));
CONS_Printf(M_GetText("modifiedgame is true, but you can save medal and record data in this mod.\n"));
else if (modifiedgame)
CONS_Printf(M_GetText("modifiedgame is true, secrets will not be unlocked\n"));
CONS_Printf(M_GetText("modifiedgame is true, extras will not be unlocked\n"));
else
CONS_Printf(M_GetText("modifiedgame is false, you can unlock secrets\n"));
CONS_Printf(M_GetText("modifiedgame is false, you can unlock extras\n"));
}
static void Command_Cheats_f(void)

8
src/doomdef.h
View File

@ -150,9 +150,9 @@ extern FILE *logstream;
// we use comprevision and compbranch instead.
#else
#define VERSION 100 // Game version
#define SUBVERSION 0 // more precise version number
#define VERSIONSTRING "v1.0.0"
#define VERSIONSTRINGW L"v1.0.0"
#define SUBVERSION 1 // more precise version number
#define VERSIONSTRING "v1.0.1"
#define VERSIONSTRINGW L"v1.0.1"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
#endif
@ -162,7 +162,7 @@ extern FILE *logstream;
//#define USE_PATCH_DTA
// Kart has it's own, as well.
//#define USE_PATCH_KART
#define USE_PATCH_KART
// Modification options
// If you want to take advantage of the Master Server's ability to force clients to update

2
src/m_menu.c
View File

@ -2706,7 +2706,7 @@ boolean M_Responder(event_t *ev)
if (((currentMenu->menuitems[itemOn].status & IT_CALLTYPE) & IT_CALL_NOTMODIFIED) && modifiedgame && !savemoddata)
{
S_StartSound(NULL, sfx_menu1);
M_StartMessage(M_GetText("This cannot be done in a modified game.\n\n(Press a key)\n"), NULL, MM_NOTHING);
M_StartMessage(M_GetText("This cannot be done with add-ons\nor in a cheated game.\n\n(Press a key)\n"), NULL, MM_NOTHING);
return true;
}
}