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

Merge branch 'next' into eggmine

Browse source
This commit is contained in:
minenice55 2025-12-09 14:22:03 -05:00
commit 58dff6b0ff
5 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_main.cpp
View file

@ -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 0xaf9562709f075a88
#define ASSET_HASH_MAPPATCH_PK3 0x0afd8afc6fc50175
#define ASSET_HASH_MAIN_PK3 0xfea5cf465c3a62d1
#define ASSET_HASH_MAPPATCH_PK3 0x5928d3af98c18214
#define ASSET_HASH_BONUSCHARS_KART 0x60e6f13d822a7461
#ifdef USE_PATCH_FILE
#define ASSET_HASH_PATCH_PK3 0x0000000000000000

3
src/f_finale.c
View file

@ -972,6 +972,9 @@ const char *blancredits[] = {
"\"ArcadeStriker\"",
"\"Lugent\"",
"\"WumboSpasm\"",
"\"luna\"",
"\"Super Chris\"",
"\"Sunflower\" aka \"AnimeSonic\"",
"",
// Anyone who's been directly involved with getting rid of SIGSEGV
// culprits gets credited here.

6
src/k_bot.cpp
View file

@ -83,7 +83,7 @@ void K_DrawBotDebugger(const player_t *player)
V_DrawThinString(x2, y+32, vflags|(bd->driftlockout ? V_ORANGEMAP : 0), va("driftlockout: %d", bd->driftlockout));
V_DrawThinString(x1, y+40, vflags, va("driftturn: %d", bd->driftturn));
V_DrawThinString(x2, y+40, vflags, va("drifttime: %d", bd->drifttime));
V_DrawThinString(x1, y+48, vflags, va("preditionerror: %d", bd->predictionerror));
V_DrawThinString(x1, y+48, vflags, va("predicterr: %.1f", ((double)(INT32)bd->predictionerror)/ANG1));
V_DrawThinString(x2, y+48, vflags|(bd->griplockout ? V_ORANGEMAP : 0), va("griplockout: %d", bd->griplockout));
}
@ -1905,9 +1905,9 @@ void K_BotReborn(const player_t *player)
bd->driftskill = FixedMul(MAXDRIFTSKILL, K_BotDetermineDriftSkill(player));
// drift parameters, just fixed values for now
bd->driftmaxdist = 200 + gamespeed*50;
bd->driftmaxdist = 300;
bd->driftpowerdiv = 40;
bd->driftstatedelay = TICRATE/2 - gamespeed*5;
bd->driftstatedelay = TICRATE/5;
}
void K_BotResetItemConfirm(const player_t *player, boolean setdelay)

12
src/k_hud.c
View file

@ -5774,14 +5774,12 @@ static void K_DrawWaypointDebugger(void)
return;
if (stplyr->bigwaypointgap)
{
V_DrawString(8, 130, 0, va("Auto Respawn Timer: %d", stplyr->bigwaypointgap));
}
V_DrawString(8, 140, 0, va("Auto Respawn Timer: %d", stplyr->bigwaypointgap));
V_DrawString(8, 140, 0, va("Current Waypoint ID: %d", K_GetWaypointID(stplyr->currentwaypoint)));
V_DrawString(8, 150, 0, va("Next Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint)));
V_DrawString(8, 160, 0, va("Finishline Distance: %d", stplyr->distancetofinish));
V_DrawString(8, 170, 0, va("Waypoint DtF: %d", stplyr->currentwaypoint ? stplyr->currentwaypoint->distancetofinish : -1));
V_DrawString(8, 150, 0, va("Current Waypoint ID: %d", K_GetWaypointID(stplyr->currentwaypoint)));
V_DrawString(8, 160, 0, va("Next Waypoint ID: %d", K_GetWaypointID(stplyr->nextwaypoint)));
V_DrawString(8, 170, 0, va("Finishline Distance: %d (WP %d)", stplyr->distancetofinish,
stplyr->currentwaypoint ? stplyr->currentwaypoint->distancetofinish : -1));
}
static void K_DrawClusterDebugger(void)

6
src/lua_playerlib.c
View file

@ -1397,7 +1397,7 @@ static int player_get(lua_State *L)
return 1;
}
#define NOSET luaL_error(L, LUA_QL("player_t") " field " LUA_QS " should not be set directly.", field)
#define NOSET luaL_error(L, LUA_QL("player_t") " field " LUA_QS " should not be set directly.", player_opt[field])
static int player_set(lua_State *L)
{
player_t *plr = *((player_t **)luaL_checkudata(L, 1, META_PLAYER));
@ -2791,8 +2791,8 @@ static int karthud_len(lua_State *L)
}
// player.cmd get/set
#define NOFIELD luaL_error(L, LUA_QL("ticcmd_t") " has no field named " LUA_QS, field)
#define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " cannot be set.", field)
#define NOFIELD luaL_error(L, "%s %s", LUA_QL("ticcmd_t"), va("has no field named %ui", field))
#define NOSET luaL_error(L, LUA_QL("ticcmd_t") " field " LUA_QS " cannot be set.", ticcmd_opt[field])
enum ticcmd_e
{