Commit graph

864 commits

Author SHA1 Message Date
MascaraSnake
f26f41e03a Fix thinker functions that still use tag instead of args[0] for FOFs 2021-09-26 06:48:26 +02:00
MascaraSnake
280d23782c Adapt linedef executor triggers that don't involve sector effects to UDMF 2021-09-23 10:21:53 +02:00
MascaraSnake
a61343bc8b P_LinedefExecute: Use global taglists to find trigger linedefs 2021-09-22 10:38:08 +02:00
MascaraSnake
03c1c592ab I surrender - we need more linedef args (also adapt the remaining linedef executors to UDMF) 2021-09-22 08:57:48 +02:00
MascaraSnake
8ef8279764 Adapt FOF-related linedef executors to UDMF 2021-09-22 07:32:39 +02:00
MascaraSnake
61e9adf30b Adapt linedef type 412 to UDMF 2021-09-21 15:31:53 +02:00
MascaraSnake
132f3f21f1 Adapt linedef type 457 to UDMF 2021-09-21 15:10:50 +02:00
MascaraSnake
d8b5cb6c90 Adapt linedef type 422 to UDMF 2021-09-21 14:59:58 +02:00
MascaraSnake
be480eead0 Linedef type 464: Re-add mobjtype check that I accidentally removed 2021-09-21 12:59:20 +02:00
MascaraSnake
8b6140ddb2 Linedef type 464: Use taglist search to find egg capsule center 2021-09-21 12:55:56 +02:00
MascaraSnake
d47069fbb6 Adapt linedef types 409 and 410 to UDMF 2021-09-21 11:30:34 +02:00
MascaraSnake
cabafeef1c Adapt linedef type 464 to UDMF 2021-09-21 10:35:01 +02:00
MascaraSnake
890934264b Adapt linedef type 414 to UDMF 2021-09-21 10:14:55 +02:00
MascaraSnake
69e0c636a0 Adapt linedef type 459 to UDMF 2021-09-21 09:05:40 +02:00
MascaraSnake
ea1d442f31 Adapt linedef type 434 to UDMF 2021-09-21 08:34:55 +02:00
MascaraSnake
17bd20a15e Adapt linedef type 463 to UDMF 2021-09-21 07:44:55 +02:00
MascaraSnake
b898a773ab Adapt linedef types 425 and 442 to UDMF 2021-09-21 07:36:54 +02:00
MascaraSnake
76c6b6f24f Forgot to adapt half of linedef type 449 2021-09-20 15:07:08 +02:00
MascaraSnake
1bbf1b2887 Adapt linedef type 438 to UDMF 2021-09-20 14:50:18 +02:00
MascaraSnake
3a73c6167c Adapt linedef type 439 to UDMF 2021-09-20 14:42:21 +02:00
MascaraSnake
877ec96eec Adapt a whole bunch of linedef executors to UDMF 2021-09-20 14:25:07 +02:00
MascaraSnake
00b04f6d9e Adapt some player-related linedef executors to UDMF 2021-09-20 13:31:32 +02:00
MascaraSnake
4028d392b0 Adapt linedef types 423 and 424 to UDMF 2021-09-20 12:42:31 +02:00
MascaraSnake
d2eb4587c2 Adapt linedef type 415 to UDMF 2021-09-20 12:32:01 +02:00
MascaraSnake
1b339a9e00 Adapt linedef types 600-601 to UDMF 2021-09-20 08:36:55 +02:00
MascaraSnake
609fb91e4b Stop elevator abuse 2021-09-20 08:18:59 +02:00
MascaraSnake
1784c7b0ef Add linedef executor for modifying (as opposed to copying) a sector's light level 2021-09-20 07:54:10 +02:00
MascaraSnake
6871262909 Allow "fade light level" linedef executor to fade relative to current value 2021-09-19 23:12:30 +02:00
MascaraSnake
318c1b477d Adapt lighting effects to UDMF 2021-09-19 17:07:08 +02:00
MascaraSnake
9180b86e9e No more unnecessary light level twiddling 2021-09-19 16:12:06 +02:00
MascaraSnake
18c2cfcace Clean up arguments for the lighting effect functions 2021-09-19 15:52:54 +02:00
MascaraSnake
fe708db398 Adapt setup of some lighting linedef executors to UDMF 2021-09-19 14:23:04 +02:00
MascaraSnake
e15c160773 Implement per-sector floor/ceiling lighting 2021-09-19 08:58:21 +02:00
MascaraSnake
de82afe338 Merge branch 'udmf-scrollers' into udmf-polyobjects 2021-09-17 10:36:35 +02:00
MascaraSnake
e144f97d35 Merge branch 'udmf-plane-linedefs' into udmf-scrollers 2021-09-17 10:35:41 +02:00
MascaraSnake
a5959c0248 Merge branch 'next' into udmf-plane-linedefs
# Conflicts:
#	src/p_inter.c
2021-09-17 10:34:07 +02:00
James R
923e6f31aa Fix faulty comparison
Logical comparisons evaluate to a boolean value...
2021-09-12 19:03:39 -07:00
Tatsuru
66f054f150 Merge branch 'mapload-trigger-fix' into 'next'
Don't call map load trigger linedefs when joining or reloading gamestate

See merge request STJr/SRB2!1592
2021-09-12 21:08:52 +00:00
katsy
50fe45efe6 Refactor weather switching (fixes #541) 2021-09-10 17:00:43 +00:00
LJ Sonic
d1e8b05749 Don't call map load trigger linedefs when joining or reloading gamestate 2021-08-08 19:43:42 +02:00
MascaraSnake
7e88db938d Adapt polyobject translucency fade linedef to UDMF 2021-07-04 19:28:14 +02:00
MascaraSnake
6d007f388a Adapt set translucency linedef to UDMF 2021-07-04 15:37:42 +02:00
MascaraSnake
d2ad12c034 Adapt polyobject displacement linedefs to UDMF 2021-07-04 14:41:37 +02:00
MascaraSnake
429c6588af Adapt polyobject waving flag linedef to UDMF 2021-07-04 14:10:11 +02:00
MascaraSnake
5c2ce62f00 Adapt polyobject visibility/tangibility linedefs to UDMF 2021-07-04 13:45:41 +02:00
MascaraSnake
2cbda0e5ac Adapt polyobject waypoint movement linedef to UDMF 2021-07-04 13:20:10 +02:00
MascaraSnake
6e9afabd44 Adapt polyobject move and rotate linedef types to UDMF 2021-07-04 12:54:48 +02:00
MascaraSnake
3b1d64703d Adapt polyobject door move linedef types to UDMF 2021-07-02 17:18:55 +02:00
MascaraSnake
805bafd936 Adapt "change plane scroller direction" linedef type to UDMF 2021-07-02 12:51:39 +02:00
MascaraSnake
64b67bcfe0 Wind/current linedef: Apply to front sector if tag = 0 2021-07-01 23:15:13 +02:00
MascaraSnake
9718674d3b Check for sector type in T_PointPusher 2021-07-01 20:59:46 +02:00
MascaraSnake
dcba011cf3 Adapt wind/current linedefs to UDMF 2021-07-01 20:35:13 +02:00
MascaraSnake
6f698b3065 Refactor wind/current thinker 2021-07-01 20:05:23 +02:00
MascaraSnake
d0888c4ac5 Split wind/current and point push/pull thinkers 2021-07-01 18:48:18 +02:00
MascaraSnake
052bfe130c Make exclusive scrolling the default 2021-07-01 00:47:56 +02:00
MascaraSnake
977887f456 Adapt scroller linedefs to UDMF 2021-06-30 23:50:54 +02:00
MascaraSnake
06e06a1cb6 Replicate old hack in binary maps: Translucent FOFs set to full opacity cut cyan pixels 2021-06-27 18:45:56 +02:00
MascaraSnake
b0a762a45e Add missing null checks after P_AddFakeFloor calls 2021-06-27 17:49:00 +02:00
MascaraSnake
09bcc918c5 Fix alpha for rising and intangible FOFs 2021-06-27 17:14:34 +02:00
MascaraSnake
ac5eb1518d Add floor/ceiling/both enum 2021-06-27 12:36:46 +02:00
MascaraSnake
2da5b54e73 Now that set flats linedef exists, simplify set heights linedef 2021-06-27 12:21:26 +02:00
MascaraSnake
099cea0a19 Implement "set flats" linedef type 2021-06-27 11:56:06 +02:00
MascaraSnake
4b0e311740 Fix typo 2021-06-27 09:54:48 +02:00
MascaraSnake
92982be76b Adapt the remaining plane movement linedef types to UDMF 2021-06-27 09:53:57 +02:00
MascaraSnake
9fdd9060e4 Adapt crusher linedefs to UDMF 2021-06-26 12:53:14 +02:00
MascaraSnake
8f39e23105 Adapt linedef type 405 and 407 to UDMF 2021-06-26 08:43:35 +02:00
MascaraSnake
53976e4b52 Adapt linedef types 403-404 to UDMF 2021-06-26 08:31:59 +02:00
MascaraSnake
df965b1578 Fix thwomps going too fast by a factor of 8 2021-06-25 18:41:14 +02:00
MascaraSnake
6abcba6876 Adapt linedef types 400-401 to UDMF + some EV_ cleanup 2021-06-25 18:34:56 +02:00
MascaraSnake
259700be3c Get rid of customspeed in EV_DoElevator and read speed from args[1] 2021-06-25 11:11:16 +02:00
MascaraSnake
7025f12d95 -Pass tag as argument to EV_ functions
-Get rid of junk linedefs for specialized EV_ calls
-Store tag in args[0]
2021-06-25 10:12:16 +02:00
MascaraSnake
5df079c653 Backwards compatibility: Add back bouncy FOF sector type, but mark it as deprecated 2021-06-23 22:21:19 +02:00
MascaraSnake
23efeeed8e Merge branch 'next' into udmf-fofs-mkii 2021-06-23 19:48:26 +02:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Nev3r
b49238f7c4 Merge branch 'remove-iterdeclarations' into 'next'
Remove TAG_ITER_DECLARECOUNTER

See merge request STJr/SRB2!1398
2021-06-01 07:36:50 -04:00
SteelT
2cb920a5a6 Merge branch 'failed-level-lua' into 'next'
[SUGOI] Make stagefailed more useful, add linedef executor to toggle, and expose to Lua

Closes #361

See merge request STJr/SRB2!1463
2021-05-28 21:51:00 -04:00
sphere
60bbf1d8bc Merge branch 'fix-pit_checkthing-crash' into 'next'
Check against null tmpusher source before attempting to push a thing.

See merge request STJr/SRB2!1413
2021-05-19 08:12:30 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Sally Coolatta
d8d3dee46f Add linedef executor for toggling stagefailed
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
2021-04-19 17:20:34 -04:00
GoldenTails
12205314bc Check against null tmpusher source before attempting to push a thing. 2021-02-21 19:32:00 -06:00
Nev3r
66d858fbcb Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations
# Conflicts:
#	src/p_spec.c
2021-02-15 09:20:40 +01:00
LJ Sonic
09d911a5b6 Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 75633bde50.
2021-02-13 17:45:20 +01:00
Nev3r
eda6b0ad8e Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros.
Declare the position counters inside the for loops instead; RIP C90.
2021-02-11 13:24:20 +01:00
LJ Sonic
83947d4428 Merge branch 'redundant-hypot' into 'next'
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
James R
353692fa79 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-16 08:43:49 -08:00
James R
00c5d70bfc Merge branch 'drain-antiri' into 'next'
Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00
James R
73a7365798 Merge branch 'circuit-finallap' into 'next'
Final lap text for circuit

See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
75633bde50 Replace all instances of P_AproxDistance with FixedHypot 2020-12-12 14:53:54 -08:00
James R
2778cc3ce9 Merge remote-tracking branch 'origin/next' into hooklib-refactor 2020-12-12 02:02:38 -08:00
Zippy_Zolton
68de9f4bbe Make Ring Drain sectors play the depletion sound instead of the ring sound 2020-12-11 12:34:30 -06:00
James R
0b2e60ba1d Merge branch 'my-junk' into 'next'
Initialize dummy linedef tag lists

See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
James R
8d382e49fb Big Large Lua Hooklib Refactor
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
  to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
  hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
  and name array.
2020-12-10 00:36:41 -08:00
Zippy_Zolton
1b888c689c CTF text 1 2020-12-08 15:56:45 -06:00
Zippy_Zolton
45a4b728b3 zwip suggestion 2020-12-08 12:05:06 -06:00
Zippy_Zolton
2721725962 Final lap text for circuit 2020-12-07 16:46:05 -06:00
Tatsuru
fae845f935 Initialize in p_spec.c too + magic number replacement 2020-12-03 17:50:10 -03:00
SMS Alfredo
7ad8aa1477 Allow the Forcespin sector type to be used with intangible fofs
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
16fd754a39 Allow forcespin sectors to work on no spin characters 2020-11-18 11:49:17 -06:00
Nev3r
70512f11ff Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray
# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
2020-11-13 13:23:14 +01:00
Nev3r
2c8a99f25a Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing. 2020-11-12 13:48:14 +01:00