12d30b7acc
Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup
2019-12-25 09:46:09 +01:00
64df10f7be
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
ddccfbd73d
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
13eb71e1ee
Fixed missing break in offset handling for horizontal springs
2019-12-24 12:58:12 +01:00
a57f903933
Move bonus time handling into new function P_SetBonusTime()
2019-12-24 12:52:43 +01:00
ac3a57aaf5
Allow P_SpawnItemRow to spawn different item types in the same row
2019-12-24 12:47:44 +01:00
72a1571937
Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:38:16 +01:00
2dac47a54c
Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:19:13 +01:00
dd01fce1a8
Separate P_SpawnHoopsAndRings into different functions:
...
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
2019-12-24 10:50:49 +01:00
ffd6cf4aca
Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF)
2019-12-24 00:10:29 +01:00
50dd0a71db
Turn size and number of items for item circle into function parameters (in preparation for UDMF)
2019-12-23 22:58:58 +01:00
6939da0164
Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter
2019-12-23 21:35:03 +01:00
24f8d4ef51
Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.
2019-12-23 21:17:12 +01:00
2b3922a8f3
Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore
2019-12-23 20:12:45 +01:00
eab5f8c851
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
2019-12-23 19:08:40 +01:00
e382c2e094
P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well
2019-12-23 18:59:11 +01:00
8ddd078b20
P_MapThingSpawn(): Move early returning/substitution code into their own functions
2019-12-23 17:28:21 +01:00
e90eb9a5e7
Move P_GetMobjtype above first use
2019-12-23 16:54:26 +01:00
6a69aa4ffa
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
2019-12-23 16:53:45 +01:00
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
97adf3e246
Merge branch 'next' into hoop_refactor
...
# Conflicts:
# src/p_mobj.c
2019-12-22 18:12:58 +01:00
dacd5614f9
Make both NiGHTS hoop types use the same spawning code.
...
As a result, the old generic hoops now use 24 sprites instead of 32.
2019-12-22 17:37:54 +01:00
4da57653eb
Merge branch 'spawn_z_refactor' into 'next'
...
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
2019-12-16 23:21:07 -05:00
bcfd9fe504
Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?
2019-12-15 00:22:17 +01:00
c5d8fe4752
Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection.
2019-12-12 15:04:48 +01:00
d40359ee02
Hugging now requires being in the same Z position
...
Don't try this at home
2019-12-11 19:13:22 -06:00
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
d2cbdd4fb1
Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.
2019-12-11 11:10:31 +01:00
584348b91e
Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.
2019-12-11 10:13:52 +01:00
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
0bd1399c52
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
2019-12-07 10:22:10 +00:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
4a26aec031
Actually fix F12 issues
2019-12-07 02:27:48 +08:00
e7574957bc
Hopefully fix F12 issues
2019-12-07 01:52:40 +08:00
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
6928763961
Merge branch 'nullplayerslopelaunch' into 'master'
...
Fix slope launch with NULL player causing SIGSEGV.
See merge request STJr/SRB2Internal!595
2019-12-04 17:07:04 -05:00
01da9f7f16
Merge branch 'tokenultimate' into 'master'
...
Fix tokens not spawning in ultimate mode
See merge request STJr/SRB2Internal!594
2019-12-04 17:06:43 -05:00
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
c843f22a24
Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.
2019-12-03 23:21:36 +00:00
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
0d4158bbd0
Fix the flung Brak not being removed on deathpits.
2019-11-30 10:29:51 +00:00
0d433b9e51
Merge branch 'brakyeet' into 'master'
...
This Black Eggman? ***YEET*** (resolves #399 )
Closes #399
See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
c2bd91af50
Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.
2019-11-30 10:12:45 +00:00
339907fd5d
This Black Eggman? ***YEET***
...
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
MascaraSnake