Commit graph

19562 commits

Author SHA1 Message Date
James R
1d688c3417 sdl/i_system.c: add -nofork option to disable forking signal handler 2023-02-14 04:16:57 -08:00
James R
98a4a90129 PARANOIA: do mobj scramble last 2023-02-14 04:16:57 -08:00
James R
0b2273b848 p_saveg.c: replace unknown thinker error with assert
It is undefined behavior to cast function pointer to
void*.
2023-02-14 04:16:56 -08:00
James R
f05f040cea Fix faulty assertions 2023-02-14 00:46:54 -08:00
toaster
b2bd5ecccd Merge branch 'blackhole-fault' into 'master'
Fault rework

See merge request KartKrew/Kart!910
2023-02-13 23:23:07 +00:00
AJ Martinez
9c3bcd44c7 Update positiondelay during hitlag 2023-02-13 16:01:19 -07:00
AJ Martinez
14fedef403 Revert line fault punish duration (Oni) 2023-02-13 15:54:35 -07:00
AJ Martinez
6996f06ceb Fix line faults doing pflag nonsense 2023-02-13 15:50:00 -07:00
AJ Martinez
c7374c6a91 Increase line fault penalty for similar punishment to old method 2023-02-13 15:32:27 -07:00
AJ Martinez
32ea795639 Fault rework cleanup for merge 2023-02-13 15:31:39 -07:00
toaster
98c333e313 Per discussion, always use short, FINISHless exit for special stage failure. 2023-02-13 18:18:54 +00:00
toaster
0d8ada50bf Merge branch 'fix-setlinetexture' into 'master'
Fix off-by-one in CallFunc_SetLineTexture

See merge request KartKrew/Kart!919
2023-02-13 18:05:13 +00:00
toaster
c2b0cca735 K_HandleLapIncrement: Do not spawn Finish Sign if player who crosses finish line is PF_NOCONTESTing. 2023-02-13 18:04:44 +00:00
toaster
8b14d10506 Special Stages: Distinguish between failures with and without lives.
- With lives remaining: No FINISH text, 1 second before restart
- With no lives remaining: Yes FINISH text, 2 and a half seconds before return to menu(/emeraldless podium when implemented)
2023-02-13 18:03:56 +00:00
toaster
61de5367d7 P_KillPlayer: In special stages, falling off the stage means immediate no contest and life loss. 2023-02-13 18:00:02 +00:00
toaster
24ae5ff65a Repair Linedef types 403 and 404
- P_ProcessSpecial: Correct likely copypaste error in desired plane height and texture
    - Was using sector floor's height and texture instead of ceiling's.
- P_ConvertBinaryLinedefTypes:  assign affected plane in a saner way
- Resolves issue #429
2023-02-13 15:12:53 +00:00
Sally Coolatta
8932ab4e91 Fix off-by-one in CallFunc_SetLineTexture 2023-02-12 17:04:51 -05:00
James R
437944927e Merge branch 'fix-png-get-trns' into 'master'
Fix potential crash in PNG_Read

See merge request KartKrew/Kart!917
2023-02-12 14:22:24 +00:00
AJ Martinez
065111af86 Use Super Ring 'assistance' only in 1st 2023-02-11 19:47:41 -07:00
AJ Martinez
de268b744b Beam fault cleanup, make non-circuit death faults respawn at wp behind finish 2023-02-11 19:09:52 -07:00
wolfy852
b76557045f Change mapmusrng to UINT8 2023-02-11 08:23:57 -06:00
wolfy852
2c162b50a3 mapmusrng variable, proper sync, cleanup 2023-02-11 08:16:37 -06:00
wolfy852
116d8d8f99 Sanity checking and cleanup 2023-02-11 03:08:46 -06:00
James R
a9469c8ffb Check return value of png_get_tRNS before using trans
png_get_tRNS may not set pointers if it fails.
2023-02-10 18:37:49 -08:00
wolfy852
4dbb7707e7 Have musname actually use MAXMUSNAMES
dunno how I forgot this
2023-02-10 13:26:54 -06:00
wolfy852
b089696021 Add MAXMUSNAMES constant 2023-02-10 13:22:39 -06:00
wolfy852
504788195e Remove crusty unused metatable code
Forgot to nix this in my last commit
2023-02-10 05:07:55 -06:00
wolfy852
3ad0b6fd96 Push musname_size and musname to Lua (correctly, this time) 2023-02-10 01:03:57 -06:00
toaster
78c6d10661 Y_IntermissionDrawer: Tidy up final text drawing conditions
- Do not say "vote starts in %d" in Match Race, since it will not actually be doing so
- Show demo recording information in GP, since demos can currently be recorded there (even if info is currently incorrect on playback)
2023-02-09 23:06:41 +00:00
toaster
c9535796ab G_GetNextMap: Return to menu after one Match Race is completed 2023-02-09 22:58:47 +00:00
toaster
df4d1fb10a M_SetupDifficultyOptions: Only show Encore on Difficulty select in Match Race
We have our own plans for Encore GP that I will definitely be addressing before release.
2023-02-09 22:40:13 +00:00
toaster
a154b1a565 restoreMenu: Go to Difficulty select after Match Race, instead of the level selection menu
- Splits M_SetupDifficultyOptions out of M_SetupDifficultySelect.
    - Permits Encore to be handled on Difficulty menu if unlocked after a Match Race.
- Fixes an issue where the in-game Pause menu could be accessed in the menu
    - The prevMenu that was set was overriden with in-game Pause.
    - The assumption made - that the levelsearch/levellist struct would not be touched - is pretty transparently violated.
- I made it go back to the Difficulty select instead of fixing the issue because:
    - Match Race is more dependent on the rules you configure for that particular round
    - This mode of play will be modified in future to not be literally offline MP with things like voting, but instead return to the menu
    - It was easier relative to the amount of work to properly restore (this is the biggest reason)
2023-02-09 22:38:04 +00:00
wolfy852
a46ba7ab92 UNIT lmfao 2023-02-08 23:16:34 -06:00
wolfy852
53d301112e musname_size variable
Should prevent errors when only 2 music entries are defined
2023-02-08 23:12:41 -06:00
wolfy852
4af4a4e59f Correct a blatant lie in m_random.c, fix RNG range 2023-02-08 22:38:51 -06:00
wolfy852
e1927b693f Correct shadowed declaration and missing include 2023-02-08 22:23:54 -06:00
wolfy852
276cba4641 Basic alt music
mapheaderinfo's musname field is now a 2 dimensional array, it can take up to 3 tracks and will randomly select between them on level load.
2023-02-08 22:11:37 -06:00
Eidolon
d6aecd2a91 Convert v_video.c to v_video.cpp 2023-02-08 08:06:46 -06:00
Eidolon
cb421eeb06 Merge branch 'r_patch_cpp' into 'master'
Convert r_patch.c to cpp

See merge request KartKrew/Kart!894
2023-02-08 00:43:45 +00:00
toaster
dc5f6eb991 G_UpdateRecords: Remove console print on RA Medal get as per textual request (UI now communicates this) 2023-02-06 22:38:32 +00:00
toaster
4ebc42d438 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into staffghost-repair 2023-02-06 22:29:24 +00:00
toaster
5a97dab6d4 Merge branch 'minor-cherrypicks-270123' into 'master'
Minor cherrypicks 270123

Closes STJr/SRB2#900

See merge request KartKrew/Kart!905
2023-02-06 22:19:32 +00:00
toaster
45e02b67be Merge branch 'stumble-repair' into 'master'
Stumble damage type repair

Closes #425 and #424

See merge request KartKrew/Kart!909
2023-02-06 22:18:07 +00:00
toaster
3dcc0c038f Merge branch 'bottrack-crash' into 'master'
K_BuildBotTiccmd: Catch NULL track predictions

See merge request KartKrew/Kart!904
2023-02-06 22:16:52 +00:00
toaster
daf11a1407 M_LevelListFromGametype: Z_Malloc instead of Z_Calloc for initialisation of cupgrid.builtgrid
A memset is already guaranteed to follow this initialisation.
2023-02-06 20:47:48 +00:00
toaster
8b7faa10c1 M_LevelListFromGametype: Remove memory-corrupting memset
- firstlen was in units of raw UINT8 address (pre-multiplied by sizeof(cupheader_t*)) to permit being used in Z_Realloc. However, it was being added onto the cupgrid.builtgrid pointer BEFORE it was cast into UINT8* for memset, leading to an offset, when considered in terms of UINT8 address.
- Z_Realloc2 is always guaranteed to memset any appended memory so this wasn't even required
2023-02-06 20:46:47 +00:00
James R
f0ea20d54d Merge branch 'move-acsvm-cmake' into 'master'
cmake: move ACSVM fetch to cpm-acsvm.cmake

See merge request KartKrew/Kart!902
2023-02-06 00:35:21 +00:00
toaster
75ee5d1c0b G_UpdateTimeStickerMedals: Fixes for issues with invalid ghost-Medal combinations.
- Only set timetoreach from Medal's var in valid cases
- Shorter invalid phrases to fit in 9-long buffer
2023-02-06 00:28:14 +00:00
toaster
31dcb3346e K_drawKartTimestamp: Still draw your best record even if the map has no ET_TIME medals 2023-02-05 19:48:25 +00:00
toaster
1df3da8379 G_TickTimeStickerMedals: Do not call in demo.playback 2023-02-05 19:26:18 +00:00