incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'blankart-dev' into dashring

Browse source
This commit is contained in:
NepDisk 2025-11-19 16:54:28 -05:00
commit 70f2c8aca6
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_main.cpp
View file

@ -95,7 +95,7 @@
#define ASSET_HASH_CHARS_KART 0x1e68a3e01aa5c68b
#define ASSET_HASH_MAPS_KART 0x38558ed00da41ce9
#define ASSET_HASH_MAIN_PK3 0xa36c25b081f72cb2
#define ASSET_HASH_MAPPATCH_PK3 0x2f341099668489ac
#define ASSET_HASH_MAPPATCH_PK3 0x0afd8afc6fc50175
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
#ifdef USE_PATCH_FILE
#define ASSET_HASH_PATCH_PK3 0x0000000000000000

4
src/k_waypoint.cpp
View file

@ -855,7 +855,7 @@ void K_DebugWaypointsVisualise(void)
if (!K_GetWaypointIsSpawnpoint(waypoint))
{
debugmobj->frame |= FF_TRANS40;
debugmobj->frame |= FF_TRANS60;
}
// Valid waypoint, so draw lines of SPARKLES to its next or previous waypoints
@ -2111,7 +2111,7 @@ static UINT32 K_SetupCircuitLength(void)
if (bestcircuitpath.totaldist == 0) // try again using shortcuts
K_PathfindToWaypoint(wp, finishline, &bestcircuitpath, true, false);
if (bestcircuitpath.totaldist == 0 && wp != finishline && K_GetWaypointIsEnabled(wp)
if (bestcircuitpath.totaldist == 0 && wp != finishline
&& !(wp->numprevwaypoints > 0 && wp->prevwaypoints[0] == finishline)) // exception for sprint maps
CONS_Alert(CONS_WARNING, "Waypoint %d is a dead end\n", K_GetWaypointID(wp));

6
src/p_spec.c
View file

@ -6993,7 +6993,8 @@ void P_SpawnSpecials(boolean fromnetsave)
case 15: // Bouncy FOF
if (udmf)
break;
CONS_Alert(CONS_WARNING, M_GetText("Deprecated bouncy FOF sector type detected. Please use linedef type 76 instead.\n"));
if (mapnamespace != MNS_SRB2KART)
CONS_Alert(CONS_WARNING, M_GetText("Deprecated bouncy FOF sector type detected. Please use linedef type 76 instead.\n"));
CheckForBouncySector = true;
break;
}
@ -7004,7 +7005,8 @@ void P_SpawnSpecials(boolean fromnetsave)
case 11: // Custom global gravity!
if (udmf)
break;
CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for global gravity detected. Please use the Gravity level header option instead.\n"));
if (mapnamespace != MNS_SRB2KART)
CONS_Alert(CONS_WARNING, M_GetText("Deprecated sector type for global gravity detected. Please use the Gravity level header option instead.\n"));
gravity = sector->floorheight/1000;
break;
}