Merge branch 'blankart-dev' into dashring

src/d_main.cpp

@@ -94,8 +94,8 @@
 #define ASSET_HASH_TEXTURES_KART       0xb4211b2f32b6a291
 #define ASSET_HASH_CHARS_KART          0x1e68a3e01aa5c68b
 #define ASSET_HASH_MAPS_KART           0x38558ed00da41ce9
-#define ASSET_HASH_MAIN_PK3            0x9dc33fb314952e03
-#define ASSET_HASH_MAPPATCH_PK3        0xd4d4ce4a090d5473
+#define ASSET_HASH_MAIN_PK3            0xa36c25b081f72cb2
+#define ASSET_HASH_MAPPATCH_PK3        0x2f341099668489ac
 #define ASSET_HASH_BONUSCHARS_KART     0x60e6f13d822a7461
 #ifdef USE_PATCH_FILE
 #define ASSET_HASH_PATCH_PK3           0x0000000000000000

src/f_finale.c

@@ -955,13 +955,15 @@ const char *blancredits[] = {
 	"\"scizor300\"",
 	"",
 	"\1Map Patches",
-	"\"Sonic1983\" (PB)",
-	"\"SinosTH\" (PB)",
+	"\"Sonic1983\" (Playerbots)",
+	"\"SinosTH\" (Playerbots)",
 	"\"Frank_th\"",
 	"\"GenericHeroGuy\"",
 	"\"NepDisk\"",
 	"\"Mayo\"",
 	"\"ArcadeStriker\"",
+	"\"Lugent\"",
+	"\"WumboSpasm\"",
 	"",
 	// Anyone who's been directly involved with getting rid of SIGSEGV
 	// culprits gets credited here.

src/k_waypoint.cpp

@@ -2106,9 +2106,15 @@ static UINT32 K_SetupCircuitLength(void)
 	{
 		waypoint_t *wp = &waypointheap[i];
 		path_t bestcircuitpath = {0};
+
 		K_PathfindToWaypoint(wp, finishline, &bestcircuitpath, false, false);
-		if (K_GetWaypointIsEnabled(wp) && wp != finishline && bestcircuitpath.totaldist == 0)
+		if (bestcircuitpath.totaldist == 0) // try again using shortcuts
+			K_PathfindToWaypoint(wp, finishline, &bestcircuitpath, true, false);
+
+		if (bestcircuitpath.totaldist == 0 && wp != finishline && K_GetWaypointIsEnabled(wp)
+		 && !(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));
+
 		wp->distancetofinish = bestcircuitpath.totaldist;
 		Z_Free(bestcircuitpath.array);
 	}

src/st_stuff.c

@@ -745,6 +745,10 @@ void ST_drawTitleCard(void)
 	if (actnum[0])
 		V_DrawLevelTitle(ttlnumxpos+12, bary+6, V_SNAPTOBOTTOM, actnum);
 
+	// TODO: a bit more elaborate?
+	if (grandprixinfo.gp)
+		V_DrawCenteredString(BASEVIDWIDTH/2 + sub, bary+24, V_SNAPTOBOTTOM|V_YELLOWMAP, va("ROUND %d", grandprixinfo.roundnum));
+
 luahook:
 	if (renderisnewtic)
 	{