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
Sally Cochenour
c35ac81717
More blend image updates
...
- Allow the translations that don't make use a blend image to work without requiring a blend image to be present
- Fix TC_RAINBOW not working properly
- TC_METALSONIC now remaps the _blend image to SKINCOLOR_COBALT, then inverts all of the blue, replicating how it works in Software
2019-12-29 16:36:53 -05: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
MascaraSnake
3a02aa1c4e
Move reading of extra vertices into separate function
2019-12-29 18:07:44 +01:00
MascaraSnake
39f3a1e88d
-Move reading of actual extended nodes into separate function, cutting down on code duplication in the process
...
-Fix a typo in the segs reading
2019-12-29 17:52:49 +01:00
MascaraSnake
f9a1d4a36d
Merge branch 'next' into newnodeformats
2019-12-29 16:05:55 +01:00
MascaraSnake
6b53b883c5
Merge branch 'mapload-refactor' into 'next'
...
Refactor map loading functions
See merge request STJr/SRB2!594
2019-12-29 10:04:27 -05:00
MascaraSnake
ac6c61e419
Move copying of the nodes signature out of the else case
2019-12-29 15:59:15 +01:00
MascaraSnake
464c2b04de
Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.)
2019-12-29 15:50:53 +01:00
MascaraSnake
ae66bbda24
Separate loading of extended nodes into its own file
2019-12-29 15:15:32 +01:00
MascaraSnake
8d561a20c1
Merge branch 'kill-zshift' into 'next'
...
Eliminate all unnecessary uses of ZSHIFT
See merge request STJr/SRB2!580
2019-12-29 08:35:52 -05:00
Nev3r
d689e06c6a
Add XNOD, XGLN and XGL3 BSP formats recognition and support.
2019-12-29 14:17:51 +01:00
MascaraSnake
1e3a06f420
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
2019-12-29 12:26:02 +01:00