lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8922 commits 1 branch 29 tags 122 MiB
Commit graph

7775 commits

Author SHA1 Message Date
MascaraSnake 72bb673209 Some minor refactoring of textmap loading code 2019-12-30 16:28:22 +01:00
Jaime Passos 7676f11112 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
Jaime Passos a04834d1aa Fix alignment in R_ThickStepping 2019-12-30 12:02:09 -03:00
Jaime Passos 590d6729e6 Merge remote-tracking branch 'origin/master' into software-clownery 2019-12-30 11:49:12 -03: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
Monster Iestyn 7c9b1ee2cb Fix P_SetTarget crash by setting th->target to NULL first 2019-12-30 11:49:01 +00: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
lachwright 0839287609 Add unused sounds and remove unused sound slots 2019-12-30 19:00:45 +08: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
Nami 58dd578b09 Let's try this again! 2019-12-29 20:36:24 -08: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 7886a4bbee Don't warn if we start in OpenGL 2019-12-29 18:37:44 -08:00
James R 569453ee93 Warn when going to OpenGL from the menu 2019-12-29 18:37:22 -08:00
James R 97c5e63dc3 Initialize 'supported' array 2019-12-29 16:52:39 -08:00
Jaime Passos 2f4c270a7b Update r_segs.c 2019-12-29 19:43:38 -03: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 566b4a1626 Don't let us warp to a map that doesn't exist (really!) 
Okay so 6464df9876, 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 404f3c13e4 If we move the -warp code down, map searching can be used 2019-12-29 02:31:48 -08:00
James R 0a014755b9 I'm still an idiot 2019-12-29 02:16:37 -08:00
James R 2ffff56b39 Who cares? 2019-12-29 02:15:48 -08:00
James R 19aafbfd0b Split map code checking from Command_Map_f 2019-12-29 02:14:02 -08: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
MascaraSnake cfadbb0f36 -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
Steel Titanium 0d15f27026 Fix emerald hunt not working properly 2019-12-28 21:57:29 -05:00
Alam Ed Arias d588e3ca9c Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Jaime Passos f997866b4d Fix broken dynlight list because of a SPR_NON2 that doesn't exist 2019-12-28 22:57:37 -03:00
James R 0237dc8ca2 Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00
Jaime Passos 244f0b228f Fix M_PathParts instead 2019-12-28 22:18:41 -03:00
Jaime Passos 3bb7fd4cbf Fix logfiles crashing Windoze 2019-12-28 22:14:23 -03:00
Jaime Passos e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
James R 90e56bcdf9 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
Jaime Passos dede51fc4c Disallow few more characters. 2019-12-28 21:05:42 -03:00
Jaime Passos 5b1b556946 Remove characters that will not be allowed in the constant string. 2019-12-28 20:54:22 -03:00
Jaime Passos 2166571920 Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03:00
Jaime Passos ae0acfba0f Organise gametype ruleset again. 2019-12-28 20:18:21 -03:00
Jaime Passos 7a00b3a331 Add GTR_FRIENDLY. 2019-12-28 19:56:18 -03:00
Jaime Passos 093a1baf1d Remove debugging stuff. 2019-12-28 19:50:14 -03:00
Jaime Passos 45af6d8899 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Jaime Passos 4b604328d5 Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN. 2019-12-28 19:47:03 -03:00
lachwright 5ed1dc5410 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
MascaraSnake bd7765227e Rename P_GroupLines to the more apt P_LinkMapData 2019-12-28 17:40:08 +01:00
MascaraSnake 7e5b87ce42 Fix debug prints 2019-12-28 17:37:32 +01:00
MascaraSnake d38ee51d49 Separate setting of sector field defaults into P_InitializeSector 2019-12-28 17:29:58 +01:00
MascaraSnake 54fe91b1cc Refactor P_SetupLines into P_InitializeLinedef 2019-12-28 17:21:31 +01:00
MascaraSnake 1ca25224c2 Fix P_SetupLines printing the wrong line number 2019-12-28 17:05:04 +01:00
MascaraSnake 85de3614cb Standardize P_LoadVertices and P_LoadSidedefs 2019-12-28 16:58:48 +01:00
MascaraSnake 86d1fb73f4 Split P_LoadLineDefs2 into P_ProcessLinedefsWithSidedefs and P_CompressSidedefs 2019-12-28 16:49:56 +01:00
MascaraSnake 21b7507aee Reorganize and partially rename map loading functions 2019-12-28 16:40:35 +01:00
MascaraSnake b1854b5c96 Remove stray #endif 2019-12-28 14:50:00 +01:00
MascaraSnake 5590343043 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 3971067cf3 Remove some old #if 0'd code 2019-12-28 14:03:48 +01:00
MascaraSnake 303e6cee4a Merge branch 'next' into mapload-refactor 2019-12-28 13:59:24 +01:00
MascaraSnake ceca99e3c5 Fix accidental removal of sector_t's spawn_lightlevel initialization 2019-12-28 13:58:23 +01:00
MascaraSnake e9376a8353 Cleaned up some more stuff in P_LoadLevel() 2019-12-28 12:48:32 +01:00
MascaraSnake c059146937 Move more P_LoadLevel parts into subfunctions 2019-12-28 11:37:56 +01:00
MascaraSnake 319ed09c00 Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions 2019-12-28 11:30:39 +01:00
GoldenTails f62579811b Fixed messed up comparison. 2019-12-27 23:51:13 -06:00
James R afc78fb56a Only return if we damaged the monitor 2019-12-27 14:48:55 -08:00
Alam Ed Arias 94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
James R 152a63b682 Merge branch 'rotsprite3' into 'next' 
More rollangle changes

See merge request STJr/SRB2!582
 2019-12-27 16:49:21 -05:00
James R 69ad41e58e Merge branch 'skinusable-fix' into 'next' 
Fix edge case with R_SkinUsable

See merge request STJr/SRB2!573
 2019-12-27 16:49:06 -05:00
Jaime Passos 1fb244d87f GTR_HIDETIME, not GTR_TAG 2019-12-27 18:24:08 -03:00
Jaime Passos e03eaa554b In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings. 2019-12-27 17:22:55 -03:00
Jaime Passos 4b2c88fab8 Fix CoopLives_OnChange. 2019-12-27 17:15:23 -03:00
Jaime Passos 3b341245f1 Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos 1f96f70173 Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos ed29efd9eb ST_drawLivesArea stuff. 2019-12-27 16:58:55 -03:00
Monster Iestyn 1d04001fdf use P_SetTarget to assign a value to th->target 2019-12-27 19:24:00 +00:00
Monster Iestyn 282fe7667c added a "target" pointer to polywaypoint_t, so the polyobj waypoint thinker doesn't have to re-find the next waypoint every tic 2019-12-27 19:10:14 +00:00
Alam Ed Arias c394ad056c use size_t to count the sprites 2019-12-27 13:20:58 -05:00
Alam Ed Arias 0caa08defd fread and fwrite use size_t, not int 2019-12-27 13:08:26 -05:00
Alam Ed Arias ff004c4cf6 we only need link on unix systems 2019-12-27 13:05:15 -05:00
Jaime Passos 6b8839d5aa burst emeralds with GTR_MATCHEMERALDS 2019-12-27 12:34:35 -03:00
Jaime Passos f0d58368f9 look for GTR_LIVES rule instead of coop/competition gametype 2019-12-27 12:29:21 -03:00
Jaime Passos f8eed7171a add G_CompetitionGametype(void) 2019-12-27 12:28:00 -03:00
Jaime Passos 5c023739e6 change this > to >= 2019-12-27 12:23:50 -03:00
Jaime Passos 1d0d404922 check if the gametype allows spectators to allow jump key respawn 2019-12-27 12:17:38 -03:00
Jaime Passos 9613bdeca6 use GTR_DEATHMATCHSTARTS 2019-12-27 12:14:33 -03:00
MascaraSnake 45c432462e Merge branch 'why-inline' into 'master' 
I got a compiler warning from P_PlayerHitsPlayer being too big

See merge request STJr/SRB2!581
 2019-12-27 02:12:01 -05:00
MascaraSnake e71d07fa8e Merge branch 'next' into kill-zshift 
# Conflicts:
#	src/p_mobj.c
 2019-12-27 08:11:04 +01:00
Jaime Passos 56e94182d5 P_SetupCamera funny 2019-12-27 02:07:13 -03:00
Jaime Passos 51404130af Respawn delay gametype rule 2019-12-27 01:44:27 -03:00
Jaime Passos 5ea43aa023 Fix sprite rotation crashes. 2019-12-27 00:37:40 -03:00
James R 855e61f59e Pop monitors properly so Metal doesn't destroy enemy team's monitors 2019-12-26 19:27:25 -08:00
Jaime Passos 96609e45ae OpenGL funny 2019-12-27 00:02:30 -03:00
Jaime Passos 2d3f45de0d Merge branch 'renderswitch' of https://git.magicalgirl.moe/STJr/SRB2 into renderswitch 2019-12-26 23:53:03 -03:00
Jaime Passos eca5be52b2 And the sound test 2019-12-26 23:52:42 -03:00
Jaime Passos 956905c8f4 Same deal, but for the level platter and save select screen 2019-12-26 23:49:31 -03:00
James R 76a1a80d71 Save the renderer 2019-12-26 18:44:02 -08:00
James R e19d0877e8 Merge branch 'time' into 'master' 
haha log files

See merge request STJr/SRB2!567
 2019-12-26 21:43:46 -05:00
Jaime Passos 644e41d90c Handle character select screen correctly after a renderer switch 2019-12-26 23:39:40 -03:00
James R 7df6a3090a Lua CV_FindVar function 
(cherry picked from commit b5746c231d17cd7b58c6b633e242d5ad26ad7017)
 2019-12-26 18:30:34 -08:00
James R e49d12b731 Expose CV_FindVar 
(cherry picked from commit 0e9d69d6a3759686ca8bb567817be650291ea0e1)
 2019-12-26 18:30:34 -08:00
Jaime Passos e617f35182 PU_PATCH funny 2019-12-26 23:26:43 -03:00
James R 4865a19057 One more optimization 2019-12-26 18:23:01 -08:00
James R 9673439628 e 2019-12-26 18:20:48 -08:00
James R 4959d52ae0 Make cv_renderer CV_NOLUA instead of hidden!!! 2019-12-26 18:15:52 -08:00
James R cb29a9dd0a CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
James R f26bdf00fe A system to encode flags in the command buffer 2019-12-26 18:12:10 -08:00
Jaime Passos da1718f93c Avoid possible overflows in the rotsprite arrays. 2019-12-26 21:49:36 -03:00
Jaime Passos 4b653a0b12 Remove the min() and max() calls. 2019-12-26 21:36:35 -03:00
Jaime Passos 56fd29a42a stuff 2019-12-26 21:27:30 -03:00
James R 1dac3d174e Merge remote-tracking branch 'origin/master' into next 2019-12-26 15:35:53 -08:00
Jaime Passos c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R 414a066ec8 Merge branch 'turnmultiplier' into 'master' 
Option to increase the turning speed

See merge request STJr/SRB2!553
 2019-12-26 18:18:23 -05:00
James R aa9cc6e6f2 Merge branch 'char-damage-fix' into 'next' 
Fix Amy and Fang being able to attack other players in MP Special Stages

See merge request STJr/SRB2!558
 2019-12-26 18:18:10 -05:00
James R e6532b9bad Merge branch 'gametype-clownery' into 'next' 
Custom gametypes

See merge request STJr/SRB2!566
 2019-12-26 18:08:41 -05:00
James R dd1ca69f54 P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Monster Iestyn ca5a4d90e0 Fix mixed declaration-and-code compiling error 2019-12-26 21:59:09 +00:00
Jaime Passos 69b4efb579 Rename R_WorldSegTextured 2019-12-26 18:13:03 -03:00
Jaime Passos ad6cda7c53 Masked stuff 2019-12-26 17:39:18 -03:00
Jaime Passos 0ec800b266 I forgot a `static` 2019-12-26 17:20:17 -03:00
Jaime Passos 919864d0f3 Thick stuff. Hoping I didn't break anything. 2019-12-26 17:15:30 -03:00
MascaraSnake 2d90098b6a Use startpos->z instead of startpos->options >> ZSHIFT in F_StartTitleScreen 2019-12-26 20:55:29 +01:00
MascaraSnake 7ccb695fa1 Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost 2019-12-26 20:54:06 +01:00
MascaraSnake 24e15387b3 Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift 2019-12-26 20:50:48 +01:00
Alam Ed Arias e823441e31 Merge branch 'next' into mobjthinker-refactoring 2019-12-26 14:50:35 -05:00
MascaraSnake f86c5f13ce Use mt->z instead of mt->options >> ZSHIFT in Command_Teleport_f 2019-12-26 20:48:52 +01:00
Alam Ed Arias 61a0197339 Merge branch 'next' into gametype-clownery 2019-12-26 14:48:04 -05:00
Alam Ed Arias 5a5d5a76d4 Merge branch 'next' into kill-zshift 2019-12-26 14:45:18 -05:00