Commit graph

662 commits

Author SHA1 Message Date
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
MascaraSnake
1654119ae9 -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
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
fickleheart
f8599ffcb9 Save separate camera settings for standard/simple modes 2019-12-30 12:10:38 -06:00
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
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
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
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
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
2f6ec18562 Initialize 'supported' array 2019-12-29 16:52:39 -08: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
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
Nev3r
d689e06c6a Add XNOD, XGLN and XGL3 BSP formats recognition and support. 2019-12-29 14:17:51 +01:00
MascaraSnake
2cf9408a7d 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
MascaraSnake
1fc2a4755a -Add linedef pointer to side_t, so sidedefs are able to tell if they're a front or back sidedef during setup
-Fix a broken condition during setup of texture fields for the change music linedef
2019-12-29 09:39:50 +01:00
Jaime Passos
bd28daea02 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
James R
c576804671 Merge branch 'levelload-refactor' into 'next'
Hack P_SetupLevel into little pie- actually just clean it up a bit

See merge request STJr/SRB2!587
2019-12-28 19:37:06 -05:00
MascaraSnake
411b1e17d9 Rename P_GroupLines to the more apt P_LinkMapData 2019-12-28 17:40:08 +01:00
MascaraSnake
ea402eea09 Fix debug prints 2019-12-28 17:37:32 +01:00
MascaraSnake
40d45d9221 Separate setting of sector field defaults into P_InitializeSector 2019-12-28 17:29:58 +01:00
MascaraSnake
f06184b466 Refactor P_SetupLines into P_InitializeLinedef 2019-12-28 17:21:31 +01:00
MascaraSnake
532a1bbfb7 Fix P_SetupLines printing the wrong line number 2019-12-28 17:05:04 +01:00
MascaraSnake
8646f6061c Standardize P_LoadVertices and P_LoadSidedefs 2019-12-28 16:58:48 +01:00
MascaraSnake
06bcb74b37 Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs 2019-12-28 16:49:56 +01:00
MascaraSnake
04dcc177ea Reorganize and partially rename map loading functions 2019-12-28 16:40:35 +01:00
MascaraSnake
45359f830b Remove stray #endif 2019-12-28 14:50:00 +01:00
MascaraSnake
af85de53d7 Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them. 2019-12-28 14:13:26 +01:00
MascaraSnake
d085296cbe Remove some old #if 0'd code 2019-12-28 14:03:48 +01:00
MascaraSnake
9e72dcddb6 Merge branch 'next' into mapload-refactor 2019-12-28 13:59:24 +01:00