MascaraSnake
a6d921e37c
Fix "all players" check in T_EachTimeThinker
2022-03-18 20:15:10 +00:00
toaster
487103bc47
Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros.
...
Declare the position counters inside the for loops instead; RIP C90.
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
2022-03-18 16:43:03 +00:00
toaster
00972a83d2
remove the prefix since everything seems to function
2021-04-17 11:30:08 +01:00
toaster
b3d006b093
structs gunched
2021-04-17 00:27:13 +01:00
Sryder
8344ac3489
Actually just get rid of seenplayer and NAMECHECK altogether.
2021-03-03 18:03:41 +00:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
LJ Sonic
85cd429d1d
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 498ff708bb
2021-02-13 17:45:20 +01:00
James R
498ff708bb
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
James R
41f1b3b97c
Kill SEENAMES
2020-12-12 02:11:23 -08:00
Nev3r
003f46c18e
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
2020-11-12 13:48:14 +01:00
Nev3r
c22dbe1d2e
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
2020-11-10 12:22:55 +01:00
Sally Coolatta
7ce53ac104
Add blue spheres
...
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
30144d5d06
Things to get it to run
...
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
372eb72d5b
Merge p_floor.c
2020-08-06 11:07:33 -04:00
Nev3r
ebe16a66d9
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Monster Iestyn
dbe7b57c74
T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)
2020-05-24 21:15:31 +01:00
Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
238513ffd6
Merge branch 'find-sector-from-tag' into 'next'
...
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
e967c32a10
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
c2cf8d57d0
Remove P_FindSectorFromLineTag
2020-04-27 14:31:37 +02:00
MascaraSnake
40d0fb714d
Store tag instead of sourceline in raise thinker
2020-04-27 12:54:08 +02:00
MascaraSnake
38a3be00d0
T_StartCrumble refactoring, part 1
2020-04-26 16:51:14 +02:00
MascaraSnake
62ab099b6f
Make T_StartCrumble use its own thinker data structure
2020-04-26 11:55:10 +02:00
Nev3r
dbf2b9c0f0
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
2020-04-25 10:47:45 +02:00
MascaraSnake
0d21e4ad87
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
09f369846e
Remove return values from a few elevator functions that don't use them
2020-04-18 10:52:58 +02:00
MascaraSnake
1d35442e16
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
54de7584d1
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
71f9fe167b
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
a90735fdf0
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
e6193297d8
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
06ce2b3b2c
Refactor T_MovePlane a little bit
2020-04-18 01:08:01 +02:00
MascaraSnake
272a8e532b
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
MascaraSnake
7e617fa938
Refactoring in T_BounceCheese
2020-04-17 23:32:39 +02:00
MascaraSnake
3add9943a8
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
Nev3r
71ab943298
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
MascaraSnake
e971a26d1d
Refactor T_EachTimeThinker
2020-04-17 21:19:21 +02:00
MascaraSnake
21b92b63e9
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
MascaraSnake
1f038e827a
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
MascaraSnake
dc41ed93cd
Get rid of code duplication in T_RaiseSector
2020-04-17 10:19:02 +02:00
MascaraSnake
cd036b57fd
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
23ed07e08e
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
Nev3r
f230438625
Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence.
2020-04-14 23:33:56 +02:00
Nev3r
cccf5d8151
Merge branch 'udmf-next' into udmf-multitag
2020-04-14 22:21:32 +02:00
Nev3r
1ea15aa643
Merge branch 't_moveplane-refactor' into 'next'
...
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
