MascaraSnake
ac3a57aaf5
Allow P_SpawnItemRow to spawn different item types in the same row
2019-12-24 12:47:44 +01:00
MascaraSnake
72a1571937
Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:38:16 +01:00
MascaraSnake
2dac47a54c
Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:19:13 +01:00
MascaraSnake
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
Nev3r
36996c8c91
Treat strings inside ""s as a single token.
2019-12-24 10:27:23 +01:00
Nev3r
ce3f526a5e
Ignore '=' and ';' when tokenizing, for textmap reading's sake.
2019-12-24 10:25:38 +01:00
James R
9defd997c3
Merge branch 'fixsignalhandler' into 'master'
...
Handle signals correctly on linux
See merge request STJr/SRB2!530
2019-12-24 02:54:44 -05:00
MascaraSnake
04a56120d4
Merge branch 'spawnmapthing-refactor' into 'next'
...
Hack P_SpawnMapThing into tiny little pieces
See merge request STJr/SRB2!564
2019-12-24 01:59:36 -05:00
Jaime Passos
d76c4eaba8
Fix Lua HUD library crashes.
2019-12-24 00:14:25 -03:00
Jaime Passos
40b0c853b7
Add IDENTIFIER to gametype DeHackEd.
2019-12-23 23:19:48 -03:00
Jaime Passos
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
Jaime Passos
a657392d39
ViewpointSwitch improvements.
2019-12-23 20:22:57 -03:00
MascaraSnake
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
Jaime Passos
630c06b7b0
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
2019-12-23 19:24:06 -03:00
Jaime Passos
bb1f43d374
Add gametyperules to LUA_CheckGlobals.
2019-12-23 19:16:10 -03:00
Jaime Passos
e9f69b9c6a
Add sstimer to LUA_PushGlobals.
2019-12-23 19:08:57 -03:00
Jaime Passos
bbe946ac1e
Bail out earlier.
2019-12-23 19:00:46 -03:00
MascaraSnake
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
Jaime Passos
d050e04dae
Bail out if there are no more free gametype slots.
2019-12-23 18:58:33 -03:00
Jaime Passos
edddc3e64e
Custom gametype constant support for Lua.
2019-12-23 18:54:25 -03:00
Jaime Passos
5ebd84c3e7
Move ALL the Lua global variable stuff into lua_script.c.
2019-12-23 18:49:23 -03:00
Jaime Passos
7425591815
Add pointlimit and timelimit to Lua.
2019-12-23 18:37:38 -03:00
Jaime Passos
d0f7877fd0
Turn noglobals into setglobals, move the extra global variable handling to gamestateglobals.
2019-12-23 18:33:39 -03:00
Jaime Passos
61b72203a8
Merge remote-tracking branch 'origin/master' into gametype-clownery
2019-12-23 18:21:13 -03:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
6fc325f3d2
Merge branch 'netarchive_compare_changes' into 'next'
...
Netarchive compare changes
See merge request STJr/SRB2!563
2019-12-23 13:57:49 -05:00
MascaraSnake
d7d9113208
Merge branch 'hoops_and_rings_refactor' into 'next'
...
Refactor P_SpawnHoopsAndRings
See merge request STJr/SRB2!562
2019-12-23 13:57:01 -05:00
MascaraSnake
eab5f8c851
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
2019-12-23 19:08:40 +01:00
MascaraSnake
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
MascaraSnake
8ddd078b20
P_MapThingSpawn(): Move early returning/substitution code into their own functions
2019-12-23 17:28:21 +01:00
MascaraSnake
e90eb9a5e7
Move P_GetMobjtype above first use
2019-12-23 16:54:26 +01:00
MascaraSnake
6a69aa4ffa
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
2019-12-23 16:53:45 +01:00
Nev3r
9a9f72f598
Don't reload mapthings in P_LoadThingsOnly() as they should no longer be modified past the mapload procedure.
2019-12-23 16:37:44 +01:00
Nev3r
d6a86c37b2
P_PrepareRawThings() is now where it was supposed to be at; moved save and flat & texture caching related functions to the end of P_LoadMapData().
2019-12-23 16:36:26 +01:00
Jaime Passos
6779c508e7
Satisfy rollangle table with a 3deg angle
2019-12-23 12:19:05 -03:00
MascaraSnake
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
Nev3r
1221c108c6
Make lines and sides use the mapload copies in P_NetArchiveWorld() too; do no longer use vres stuff there.
2019-12-23 12:47:40 +01:00
Nev3r
bb54597552
Remove redundant netarchive-related sector vars as they're not used anymore.
...
Replace lump-based difference checks for sectors in P_NetArchiveWorld(), now it uses the mapload-created copy instead.
2019-12-23 12:42:38 +01:00
MascaraSnake
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
Nev3r
eadf953957
Store a copy of sectors, lines and sides in memory so that P_NetArchiveWorld() can soon use them instead of relying on re-opening the original lumps.
...
Fix print type issue.
2019-12-23 12:30:32 +01:00
MascaraSnake
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
James R
f574cd0ce2
Whoops I forgot player 2
2019-12-22 21:29:41 -08:00
Steel Titanium
356b25def4
Spawn Amy's shields for other players
2019-12-23 00:28:06 -05:00
James R
3e2b28e162
Merge remote-tracking branch 'origin/master' into turnmultiplier
2019-12-22 21:26:36 -08:00
James R
7e0152f37b
Merge branch 'hoop_refactor' into 'next'
...
Make both NiGHTS hoop types use the same spawning code.
See merge request STJr/SRB2!560
2019-12-23 00:16:46 -05:00
Steel Titanium
a0ce243051
Merge branch 'next' into char-damage-fix
2019-12-22 23:56:16 -05:00
James R
64af7badfb
Merge remote-tracking branch 'origin/master' into next
2019-12-22 20:47:15 -08:00
MascaraSnake
1e13604007
Merge branch 'flats-in-walls' into 'master'
...
Flats in walls
See merge request STJr/SRB2!548
2019-12-22 17:44:50 -05:00
