MascaraSnake
|
2da9c3cf81
|
P_LoadTextmap: Bail out if certain mandatory fields are not set
|
2020-01-01 23:52:30 +01:00 |
|
MascaraSnake
|
4f26a8e73a
|
Move MAXFLATSIZE define to p_spec.h so p_spec.c doesn't have to redefine it
|
2020-01-01 16:01:07 +01:00 |
|
MascaraSnake
|
9cda82d896
|
Rework textmap parser to always read a parameter's value, even if it doesn't recognize the parameter
|
2020-01-01 15:52:59 +01:00 |
|
MascaraSnake
|
6724b11c36
|
Whoops
|
2020-01-01 15:11:39 +01:00 |
|
MascaraSnake
|
a41c640559
|
Move shared parts of sidedef initialization into P_InitializeSidedef
|
2020-01-01 15:10:41 +01:00 |
|
MascaraSnake
|
fe198b8a32
|
Check if certain mandatory linedef and sidedef fields are set, and use fallback values if not
|
2020-01-01 14:27:01 +01:00 |
|
MascaraSnake
|
b59532bcca
|
Setup repeatcnt in P_LoadSidedefs instead of P_ProcessLinedefsWithSidedefs, since UDMF can set it directly
|
2020-01-01 14:13:24 +01:00 |
|
MascaraSnake
|
24d68ba07e
|
P_LoadTextmap: Set defaults for all linedef and sidedef fields that UDMF is allowed to set
|
2020-01-01 13:40:17 +01:00 |
|
MascaraSnake
|
013f1f70d9
|
-Set defaults for vertex and mapthing fields in textmap
-Fix P_InitializeSector being called too early (band-aid fix for now, will reorganize this properly later)
|
2019-12-30 21:23:00 +01:00 |
|
MascaraSnake
|
05a97530c1
|
Add support for flat offset and rotation fields in UDMF
|
2019-12-30 17:28:10 +01:00 |
|
MascaraSnake
|
72bb673209
|
Some minor refactoring of textmap loading code
|
2019-12-30 16:28:22 +01:00 |
|
Nev3r
|
99aace19f5
|
Merge branch 'textmap-parser' of https://git.magicalgirl.moe/STJr/SRB2/ into textmap-parser
|
2019-12-30 14:48:10 +01:00 |
|
Nev3r
|
4a5498473c
|
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
|
f9d6e26558
|
Replace INT16_MAX with LUMPERROR in lump check.
|
2019-12-30 14:45:39 +01:00 |
|
Nev3r
|
7ae2143c91
|
Add a disclaimer when loading textmaps/UDMF.
|
2019-12-30 14:42:41 +01:00 |
|
MascaraSnake
|
ea87af0076
|
Refactor TextmapParse
|
2019-12-30 14:33:41 +01:00 |
|
Nev3r
|
c6c00aa7d5
|
Tweak TextmapCount()'s bracket detection to account for multiple levels, if that ever happens.
|
2019-12-30 13:46:37 +01:00 |
|
MascaraSnake
|
4aee4e3684
|
Refactor TextmapCount
|
2019-12-30 13:27:05 +01:00 |
|
Nev3r
|
e43df2993f
|
Move TextmapFixFlatOffsets() above P_LoadTextmap() so that it can compile.
|
2019-12-30 12:33:24 +01:00 |
|
Nev3r
|
f9aabe753e
|
Refactor TextmapFixFlatOffsets().
|
2019-12-30 12:31:55 +01:00 |
|
Nev3r
|
493c6c8ae2
|
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2019-12-30 12:23:31 +01:00 |
|
Nev3r
|
f49b8de5fd
|
Adapt P_MakeMapMD5() for textmaps.
|
2019-12-30 12:07:54 +01:00 |
|
Nev3r
|
ed114f655b
|
Fixed missing M_GetToken(NULL);
|
2019-12-30 12:07:02 +01:00 |
|
Nev3r
|
aaef412823
|
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
|
c46bfa2be9
|
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 |
|
Tatsuru
|
3d724f302d
|
Fix saloon doors not letting players through when marked with the Ambush flag
|
2019-12-30 01:16:50 -03:00 |
|
James R
|
98313a8216
|
Merge branch 'bruh' into 'next'
Fix fuckup
See merge request STJr/SRB2!598
|
2019-12-29 19:56:20 -05:00 |
|
James R
|
97c5e63dc3
|
Initialize 'supported' array
|
2019-12-29 16:52:39 -08:00 |
|
James R
|
a4db30b0cc
|
Merge branch 'newnodeformats' into 'next'
New node formats
See merge request STJr/SRB2!595
|
2019-12-29 19:11:07 -05:00 |
|
MascaraSnake
|
136c656cc0
|
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
|
81422c4e6d
|
Revert "Pass along virtnodes to extended nodes loading functions to make sure virtnodes->data is moved correctly"
This reverts commit cfc6428569.
|
2019-12-29 21:57:47 +01:00 |
|
MascaraSnake
|
cfc6428569
|
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
|
e88556efe1
|
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
|
dd02fe0d78
|
P_GetNodetype: Set virtnodes for traditional Doom format
|
2019-12-29 20:43:41 +01:00 |
|
MascaraSnake
|
882e8ef7b8
|
Separate shared parts of seg initialization into P_InitializeSeg
|
2019-12-29 20:24:14 +01:00 |
|
MascaraSnake
|
36f86077da
|
Move loading of extended subsectors and segs into its own function
|
2019-12-29 19:54:04 +01:00 |
|
MascaraSnake
|
c287b86fab
|
Get rid of duplicated code in the extended seg parsing
|
2019-12-29 19:04:50 +01:00 |
|
MascaraSnake
|
3839e95d63
|
Move reading of extra vertices into separate function
|
2019-12-29 18:07:44 +01:00 |
|
MascaraSnake
|
45ca959f97
|
-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
|
e5cb7a7833
|
Merge branch 'next' into newnodeformats
|
2019-12-29 16:05:55 +01:00 |
|
MascaraSnake
|
bf25128986
|
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
|
9d009edfc8
|
Move copying of the nodes signature out of the else case
|
2019-12-29 15:59:15 +01:00 |
|
MascaraSnake
|
0aed60f4de
|
Separate retrieval of nodetype and nodes lump into its own function (Function. Not file. Sorry.)
|
2019-12-29 15:50:53 +01:00 |
|
MascaraSnake
|
8032054a47
|
Separate loading of extended nodes into its own file
|
2019-12-29 15:15:32 +01:00 |
|
MascaraSnake
|
bb9093ff57
|
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
|
389b9e35c4
|
Add XNOD, XGLN and XGL3 BSP formats recognition and support.
|
2019-12-29 14:17:51 +01:00 |
|
MascaraSnake
|
c43a83dc04
|
Remove virtres_t pointer in P_SpawnSpecials that's no longer needed
|
2019-12-29 12:26:02 +01:00 |
|
MascaraSnake
|
abdfe60aa7
|
Store custom FOF flags directly in back toptexture field at map load instead of re-reading the sidedefs data later on
|
2019-12-29 12:01:41 +01:00 |
|
James R
|
e04e1ac1b4
|
Merge branch 'mfe-lua' into 'next'
Add missing MFE_ flags to Lua (resolves #103)
See merge request STJr/SRB2!592
|
2019-12-29 04:44:29 -05:00 |
|
MascaraSnake
|
b333770a3b
|
Merge branch 'next' into mapload-refactor
|
2019-12-29 09:40:19 +01:00 |
|