stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-17 02:01:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing post-map name being weird

Browse source
This commit is contained in:
ZTsukei 2017-10-17 18:23:36 -04:00
parent ba7580d8e2
commit 4387455d9c
3 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/doomdef.h
View file

@ -143,16 +143,16 @@ extern FILE *logstream;
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP #ifdef DEVELOP
#define VERSION 104 // Game version #define VERSION 104 // Game version
#define SUBVERSION 7 // more precise version number #define SUBVERSION 8 // more precise version number
#define VERSIONSTRING "Development EXE" #define VERSIONSTRING "Development EXE"
#define VERSIONSTRINGW "v1.4.7" #define VERSIONSTRINGW "v1.4.8"
// most interface strings are ignored in development mode. // most interface strings are ignored in development mode.
// we use comprevision and compbranch instead. // we use comprevision and compbranch instead.
#else #else
#define VERSION 104 // Game version #define VERSION 104 // Game version
#define SUBVERSION 7 // more precise version number #define SUBVERSION 8 // more precise version number
#define VERSIONSTRING "DevEXE v1.4.7" #define VERSIONSTRING "DevEXE v1.4.8"
#define VERSIONSTRINGW L"v1.4.7" #define VERSIONSTRINGW L"v1.4.8"
// Hey! If you change this, add 1 to the MODVERSION below! // Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates! // Otherwise we can't force updates!
#endif #endif

2
src/p_spec.c
View file

@ -4632,7 +4632,7 @@ static void P_RunSpecialSectorCheck(player_t *player, sector_t *sector)
// Check Section 1 // Check Section 1
switch(GETSECSPECIAL(sector->special, 1)) switch(GETSECSPECIAL(sector->special, 1))
{ {
case 2: // Damage (water) //case 2: // Damage (water)
case 8: // Instant kill case 8: // Instant kill
case 10: // Ring drainer that doesn't require floor touch case 10: // Ring drainer that doesn't require floor touch
case 12: // Space countdown case 12: // Space countdown

34
src/y_inter.c
View file

@ -1290,16 +1290,32 @@ void Y_StartIntermission(void)
Y_CalculateTournamentPoints(); Y_CalculateTournamentPoints();
// set up the levelstring // set up the levelstring
if (mapheaderinfo[prevmap]->actnum) if (mapheaderinfo[prevmap]->zonttl)
snprintf(data.match.levelstring, {
sizeof data.match.levelstring, if (mapheaderinfo[prevmap]->actnum)
"%.32s * %d *", snprintf(data.match.levelstring,
mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum); sizeof data.match.levelstring,
"%.32s %.32s * %d *",
mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->zonttl, mapheaderinfo[prevmap]->actnum);
else
snprintf(data.match.levelstring,
sizeof data.match.levelstring,
"* %.32s %.32s *",
mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->zonttl);
}
else else
snprintf(data.match.levelstring, {
sizeof data.match.levelstring, if (mapheaderinfo[prevmap]->actnum)
"* %.32s *", snprintf(data.match.levelstring,
mapheaderinfo[prevmap]->lvlttl); sizeof data.match.levelstring,
"%.32s * %d *",
mapheaderinfo[prevmap]->lvlttl, mapheaderinfo[prevmap]->actnum);
else
snprintf(data.match.levelstring,
sizeof data.match.levelstring,
"* %.32s *",
mapheaderinfo[prevmap]->lvlttl);
}
data.match.levelstring[sizeof data.match.levelstring - 1] = '\0'; data.match.levelstring[sizeof data.match.levelstring - 1] = '\0';