Commit graph

9266 commits

Author SHA1 Message Date
MascaraSnake
dff1e92ba8 Add support for flat offset and rotation fields in UDMF 2019-12-30 17:28:10 +01:00
MascaraSnake
b22460bd32 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Jaime Passos
8d1ad4dc2e Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos
2c247d8210 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03:00
Nev3r
e0b4921855 Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser 2019-12-30 14:48:10 +01:00
Nev3r
839718499d Make P_LoadMapData() a return a boolean as well as P_LoadMapFromFile(); if they fail to load, they return false, and thus P_SetupLevel() will also return false.
TextmapCount() also now returns false if brackets are left open inside a textmap.
2019-12-30 14:47:48 +01:00
Nev3r
73698c70aa Replace INT16_MAX with LUMPERROR in lump check. 2019-12-30 14:45:39 +01:00
Nev3r
0edb23eaf7 Add a disclaimer when loading textmaps/UDMF. 2019-12-30 14:42:41 +01:00
MascaraSnake
8756b81fa0 Refactor TextmapParse 2019-12-30 14:33:41 +01:00
Nev3r
dd56500ed0 Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens. 2019-12-30 13:46:37 +01:00
MascaraSnake
9c07bde69c Refactor TextmapCount 2019-12-30 13:27:05 +01:00
Monster Iestyn
014d2f6358 Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00:00
Nev3r
6fe6cfad1a Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile. 2019-12-30 12:33:24 +01:00
Nev3r
fadebabc78 Refactor TextmapFixFlatOffsets(). 2019-12-30 12:31:55 +01:00
Nev3r
ac81463031 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2019-12-30 12:23:31 +01:00
Nev3r
71d13d1a67 Adapt P_MakeMapMD5() for textmaps. 2019-12-30 12:07:54 +01:00
Nev3r
dd66aa9a14 Fixed missing M_GetToken(NULL); 2019-12-30 12:07:02 +01:00
lachwright
69663fe872 Add unused sounds and remove unused sound slots 2019-12-30 19:00:45 +08:00
Nev3r
6e8a023fdd Add basic textmap support; currently crashes when trying to free the virtres, at vres_free(). 2019-12-30 11:33:22 +01:00
James R
529ccf9271 Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
2019-12-30 00:25:37 -05:00
James R
b13b3f197f Improve COM_AddCommand boolean deprecated warning 2019-12-29 21:09:07 -08:00
Jaime Passos
e266073014 Some cleanup in general. 2019-12-30 02:07:39 -03:00
James R
c7821da6b6 COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2019-12-29 21:07:28 -08:00
James R
41a8bed879 No. 2019-12-29 21:02:42 -08:00
James R
2ab129b7bc Fuck magic numbers; COM_ flags for Lua commands! 2019-12-29 21:00:38 -08:00
James R
e37e9b0f99 Bro player 2 can't use the console 2019-12-29 21:00:38 -08:00
Jaime Passos
48950bbc16 Use strspn here. 2019-12-30 01:39:34 -03:00
Nami
e4d1b9491c Let's try this again! 2019-12-29 20:36:24 -08:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
Jaime Passos
30696bf981 MUSICDEF parser changes. 2019-12-30 00:22:27 -03:00
James R
a330a7ee40 Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R
3883d44bb5 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
Zachary McAlpin
29ca001ea3 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 20:37:11 -06:00
GoldenTails
0fc81794ea Slap in some Ctrl+Insert (copy) support too while I'm at it.
Also added a comment but you didn't see that.
2019-12-29 20:22:58 -06:00
GoldenTails
92b4044f01 Reverted to better, less complex system, and added support for Shift+Insert and Shift+Delete.
Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
2019-12-29 20:15:18 -06:00
James R
ca5a1b8a18 Merge branch 'bruh' into 'next'
Fix fuckup

See merge request STJr/SRB2!598
2019-12-29 19:56:20 -05:00
James R
2f6ec18562 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
GoldenTails
25b7577a0d Replace magic numbers with less magic and more readable chars. 2019-12-29 18:26:56 -06:00
James R
a33131d227 Merge branch 'newnodeformats' into 'next'
New node formats

See merge request STJr/SRB2!595
2019-12-29 19:11:07 -05:00
Jaime Passos
ee94af04d5 Update r_segs.c 2019-12-29 19:43:38 -03:00
Zachary McAlpin
cbebe934b7 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-29 16:19:53 -06:00
MascaraSnake
108af9935e Properly pass nodes data along to functions that need it without breaking the original data pointer 2019-12-29 22:11:15 +01:00
MascaraSnake
f74798f020 Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly"
This reverts commit 24acac6fe2.
2019-12-29 21:57:47 +01:00
MascaraSnake
24acac6fe2 Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly 2019-12-29 21:42:16 +01:00
MascaraSnake
3a123654b4 P_GetNodetype: The virtnodes pointer is supposed to be the output parameter, so we have to pass a pointer to that pointer 2019-12-29 21:00:20 +01:00
MascaraSnake
9ccd74e99a P_GetNodetype: Set virtnodes for traditional Doom format 2019-12-29 20:43:41 +01:00
MascaraSnake
039219d478 Separate shared parts of seg initialization into P_InitializeSeg 2019-12-29 20:24:14 +01:00
MascaraSnake
a73dc9a4d0 Move loading of extended subsectors and segs into its own function 2019-12-29 19:54:04 +01:00
MascaraSnake
2925030f8f Get rid of duplicated code in the extended seg parsing 2019-12-29 19:04:50 +01:00