Commit graph

9266 commits

Author SHA1 Message Date
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
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
James R
909a9dccc7 Don't let us warp to a map that doesn't exist (really!)
Okay so 66524a1e3f, I WAS mistaken! Except that's
not how you check for a map's existence, at least not how the old map command
did it.
2019-12-29 02:44:27 -08:00
James R
d9e9a2e1ce If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R
69535cf202 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R
0004f47f94 Who cares? 2019-12-29 02:15:48 -08:00
James R
08016fbdca Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08:00
James R
aed7d817ab 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
65afc96c0c Merge branch 'next' into mapload-refactor 2019-12-29 09:40:19 +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
Zachary McAlpin
801d82b0e6 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-28 22:29:10 -06:00
Steel Titanium
0ecbd0baec Fix emerald hunt not working properly 2019-12-28 21:57:29 -05:00
Alam Ed Arias
1785b8149e Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Alam Ed Arias
efad84a2d5 Revert "Delete the original configuration file."
This reverts commit 196e76cece.
2019-12-28 21:43:10 -05:00
Alam Ed Arias
bdccabe6a7 Merge branch 'fixmain' into 'master'
Fix logfiles crashing Windoze (resolves #102)

Closes #102

See merge request STJr/SRB2!591
2019-12-28 21:15:23 -05:00
Jaime Passos
ba40acf626 Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
James R
31b03fadcd Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00
Jaime Passos
ce138d67dc Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos
ccbe29e5ab Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03: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
James R
963f757495 Merge branch 'give-brains-back' into 'next'
Remove MF_NOTHINK from join-breaking referenced objects

See merge request STJr/SRB2!589
2019-12-28 19:33:35 -05:00
Jaime Passos
37b1953a14 Disallow few more characters. 2019-12-28 21:05:42 -03:00
Jaime Passos
4dafc59133 Remove characters that will not be allowed in the constant string. 2019-12-28 20:54:22 -03:00
Zachary McAlpin
a91f008d1c Execute LUAh_PlayerThink(player) at the end if the player has a valid mobj_t object 2019-12-28 17:40:47 -06:00
Jaime Passos
e5e4b4891a Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03:00
Zachary McAlpin
930cda3469 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook 2019-12-28 17:32:27 -06:00
Jaime Passos
8f0d5bf468 Organise gametype ruleset again. 2019-12-28 20:18:21 -03:00
Jaime Passos
d165634870 Add GTR_FRIENDLY. 2019-12-28 19:56:18 -03:00
Jaime Passos
41e5789e04 Remove debugging stuff. 2019-12-28 19:50:14 -03:00
Jaime Passos
63132da7e0 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Jaime Passos
a7fa90d11d Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN. 2019-12-28 19:47:03 -03:00
lachwright
65c5f7f571 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08: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