stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-31 05:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'udmf-scrollers' into udmf-polyobjects

Browse source
This commit is contained in:
MascaraSnake 2022-01-14 20:24:13 +01:00
commit 7d2a188c31
48 changed files with 1605 additions and 794 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

278
extras/conf/SRB2-22.cfg
View file

@ -1097,6 +1097,7 @@ linedeftypes
{ {
title = "Water, Opaque"; title = "Water, Opaque";
prefix = "(120)"; prefix = "(120)";
flags2text = "[1] Make lava intangible";
flags8text = "[3] Slope skew sides"; flags8text = "[3] Slope skew sides";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
@ -1112,6 +1113,7 @@ linedeftypes
{ {
title = "Water, Translucent"; title = "Water, Translucent";
prefix = "(121)"; prefix = "(121)";
flags2text = "[1] Make lava intangible";
flags8text = "[3] Slope skew sides"; flags8text = "[3] Slope skew sides";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
@ -1128,6 +1130,7 @@ linedeftypes
{ {
title = "Water, Opaque, No Sides"; title = "Water, Opaque, No Sides";
prefix = "(122)"; prefix = "(122)";
flags2text = "[1] Make lava intangible";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect"; flags1024text = "[10] Ripple effect";
@ -1142,6 +1145,7 @@ linedeftypes
{ {
title = "Water, Translucent, No Sides"; title = "Water, Translucent, No Sides";
prefix = "(123)"; prefix = "(123)";
flags2text = "[1] Make lava intangible";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect"; flags1024text = "[10] Ripple effect";
@ -1157,6 +1161,7 @@ linedeftypes
{ {
title = "Goo Water, Translucent"; title = "Goo Water, Translucent";
prefix = "(124)"; prefix = "(124)";
flags2text = "[1] Make lava intangible";
flags8text = "[3] Slope skew sides"; flags8text = "[3] Slope skew sides";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
@ -1173,6 +1178,7 @@ linedeftypes
{ {
title = "Goo Water, Translucent, No Sides"; title = "Goo Water, Translucent, No Sides";
prefix = "(125)"; prefix = "(125)";
flags2text = "[1] Make lava intangible";
flags64text = "[6] Use two light levels"; flags64text = "[6] Use two light levels";
flags512text = "[9] Use target light level"; flags512text = "[9] Use target light level";
flags1024text = "[10] Ripple effect"; flags1024text = "[10] Ripple effect";
@ -1675,12 +1681,14 @@ linedeftypes
{ {
title = "Continuous"; title = "Continuous";
prefix = "(300)"; prefix = "(300)";
flags1024text = "[10] Use faster, unordered execution";
} }
301 301
{ {
title = "Each Time"; title = "Each Time";
prefix = "(301)"; prefix = "(301)";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Also trigger on exit"; flags16384text = "[14] Also trigger on exit";
} }
@ -1688,6 +1696,7 @@ linedeftypes
{ {
title = "Once"; title = "Once";
prefix = "(302)"; prefix = "(302)";
flags1024text = "[10] Use faster, unordered execution";
} }
303 303
@ -1697,6 +1706,7 @@ linedeftypes
flags2text = "[1] Rings greater or equal"; flags2text = "[1] Rings greater or equal";
flags64text = "[6] Rings less or equal"; flags64text = "[6] Rings less or equal";
flags512text = "[9] Consider all players"; flags512text = "[9] Consider all players";
flags1024text = "[10] Use faster, unordered execution";
} }
304 304
@ -1706,18 +1716,21 @@ linedeftypes
flags2text = "[1] Rings greater or equal"; flags2text = "[1] Rings greater or equal";
flags64text = "[6] Rings less or equal"; flags64text = "[6] Rings less or equal";
flags512text = "[9] Consider all players"; flags512text = "[9] Consider all players";
flags1024text = "[10] Use faster, unordered execution";
} }
305 305
{ {
title = "Character Ability - Continuous"; title = "Character Ability - Continuous";
prefix = "(305)"; prefix = "(305)";
flags1024text = "[10] Use faster, unordered execution";
} }
306 306
{ {
title = "Character Ability - Each Time"; title = "Character Ability - Each Time";
prefix = "(306)"; prefix = "(306)";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Also trigger on exit"; flags16384text = "[14] Also trigger on exit";
} }
@ -1725,24 +1738,28 @@ linedeftypes
{ {
title = "Character Ability - Once"; title = "Character Ability - Once";
prefix = "(307)"; prefix = "(307)";
flags1024text = "[10] Use faster, unordered execution";
} }
308 308
{ {
title = "Race Only - Once"; title = "Race Only - Once";
prefix = "(308)"; prefix = "(308)";
flags1024text = "[10] Use faster, unordered execution";
} }
309 309
{ {
title = "CTF Red Team - Continuous"; title = "CTF Red Team - Continuous";
prefix = "(309)"; prefix = "(309)";
flags1024text = "[10] Use faster, unordered execution";
} }
310 310
{ {
title = "CTF Red Team - Each Time"; title = "CTF Red Team - Each Time";
prefix = "(310)"; prefix = "(310)";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Also trigger on exit"; flags16384text = "[14] Also trigger on exit";
} }
@ -1750,12 +1767,14 @@ linedeftypes
{ {
title = "CTF Blue Team - Continuous"; title = "CTF Blue Team - Continuous";
prefix = "(311)"; prefix = "(311)";
flags1024text = "[10] Use faster, unordered execution";
} }
312 312
{ {
title = "CTF Blue Team - Each Time"; title = "CTF Blue Team - Each Time";
prefix = "(312)"; prefix = "(312)";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Also trigger on exit"; flags16384text = "[14] Also trigger on exit";
} }
@ -1763,6 +1782,7 @@ linedeftypes
{ {
title = "No More Enemies - Once"; title = "No More Enemies - Once";
prefix = "(313)"; prefix = "(313)";
flags1024text = "[10] Use faster, unordered execution";
} }
314 314
@ -1771,6 +1791,7 @@ linedeftypes
prefix = "(314)"; prefix = "(314)";
flags64text = "[6] Number greater or equal"; flags64text = "[6] Number greater or equal";
flags512text = "[9] Number less"; flags512text = "[9] Number less";
flags1024text = "[10] Use faster, unordered execution";
} }
315 315
@ -1779,30 +1800,35 @@ linedeftypes
prefix = "(315)"; prefix = "(315)";
flags64text = "[6] Number greater or equal"; flags64text = "[6] Number greater or equal";
flags512text = "[9] Number less"; flags512text = "[9] Number less";
flags1024text = "[10] Use faster, unordered execution";
} }
317 317
{ {
title = "Condition Set Trigger - Continuous"; title = "Condition Set Trigger - Continuous";
prefix = "(317)"; prefix = "(317)";
flags1024text = "[10] Use faster, unordered execution";
} }
318 318
{ {
title = "Condition Set Trigger - Once"; title = "Condition Set Trigger - Once";
prefix = "(318)"; prefix = "(318)";
flags1024text = "[10] Use faster, unordered execution";
} }
319 319
{ {
title = "Unlockable - Continuous"; title = "Unlockable - Continuous";
prefix = "(319)"; prefix = "(319)";
flags1024text = "[10] Use faster, unordered execution";
} }
320 320
{ {
title = "Unlockable - Once"; title = "Unlockable - Once";
prefix = "(320)"; prefix = "(320)";
flags1024text = "[10] Use faster, unordered execution";
} }
321 321
@ -1810,6 +1836,7 @@ linedeftypes
title = "Trigger After X Calls - Continuous"; title = "Trigger After X Calls - Continuous";
prefix = "(321)"; prefix = "(321)";
flags64text = "[6] Trigger more than once"; flags64text = "[6] Trigger more than once";
flags1024text = "[10] Use faster, unordered execution";
} }
@ -1818,6 +1845,7 @@ linedeftypes
title = "Trigger After X Calls - Each Time"; title = "Trigger After X Calls - Each Time";
prefix = "(322)"; prefix = "(322)";
flags64text = "[6] Trigger more than once"; flags64text = "[6] Trigger more than once";
flags1024text = "[10] Use faster, unordered execution";
} }
323 323
@ -1832,6 +1860,7 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Run if no more mares"; flags16384text = "[14] Run if no more mares";
flags32768text = "[15] Run if player is not NiGHTS"; flags32768text = "[15] Run if player is not NiGHTS";
} }
@ -1839,6 +1868,7 @@ linedeftypes
324 324
{ {
title = "NiGHTSerize - Once"; title = "NiGHTSerize - Once";
prefix = "(324)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags8text = "[3] Run only if player is NiGHTS"; flags8text = "[3] Run only if player is NiGHTS";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
@ -1847,14 +1877,15 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Run if no more mares"; flags16384text = "[14] Run if no more mares";
flags32768text = "[15] Run if player is not NiGHTS"; flags32768text = "[15] Run if player is not NiGHTS";
prefix = "(324)";
} }
325 325
{ {
title = "De-NiGHTSerize - Each Time"; title = "De-NiGHTSerize - Each Time";
prefix = "(325)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags8text = "[3] Run if anyone is NiGHTS"; flags8text = "[3] Run if anyone is NiGHTS";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
@ -1863,13 +1894,14 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags32768text = "[15] Run if no one is NiGHTS"; flags32768text = "[15] Run if no one is NiGHTS";
prefix = "(325)";
} }
326 326
{ {
title = "De-NiGHTSerize - Once"; title = "De-NiGHTSerize - Once";
prefix = "(326)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags8text = "[3] Run if anyone is NiGHTS"; flags8text = "[3] Run if anyone is NiGHTS";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
@ -1878,13 +1910,14 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags32768text = "[15] Run if no one is NiGHTS"; flags32768text = "[15] Run if no one is NiGHTS";
prefix = "(326)";
} }
327 327
{ {
title = "NiGHTS Lap - Each Time"; title = "NiGHTS Lap - Each Time";
prefix = "(327)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
flags32text = "[5] Lap <= Front Y Offset"; flags32text = "[5] Lap <= Front Y Offset";
@ -1892,12 +1925,13 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
prefix = "(327)"; flags1024text = "[10] Use faster, unordered execution";
} }
328 328
{ {
title = "NiGHTS Lap - Once"; title = "NiGHTS Lap - Once";
prefix = "(328)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
flags32text = "[5] Lap <= Front Y Offset"; flags32text = "[5] Lap <= Front Y Offset";
@ -1905,12 +1939,13 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
prefix = "(328)"; flags1024text = "[10] Use faster, unordered execution";
} }
329 329
{ {
title = "Ideya Capture Touch - Each Time"; title = "Ideya Capture Touch - Each Time";
prefix = "(329)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags8text = "[3] Run regardless of spheres"; flags8text = "[3] Run regardless of spheres";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
@ -1919,14 +1954,15 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Only if not enough spheres"; flags16384text = "[14] Only if not enough spheres";
flags32768text = "[15] Run when entering Capture"; flags32768text = "[15] Run when entering Capture";
prefix = "(329)";
} }
330 330
{ {
title = "Ideya Capture Touch - Once"; title = "Ideya Capture Touch - Once";
prefix = "(330)";
flags2text = "[1] Mare >= Front X Offset"; flags2text = "[1] Mare >= Front X Offset";
flags8text = "[3] Run regardless of spheres"; flags8text = "[3] Run regardless of spheres";
flags16text = "[4] Count from lowest of players"; flags16text = "[4] Count from lowest of players";
@ -1935,57 +1971,64 @@ linedeftypes
flags128text = "[7] Lap >= Front Y Offset"; flags128text = "[7] Lap >= Front Y Offset";
flags256text = "[8] Count laps from Bonus Time"; flags256text = "[8] Count laps from Bonus Time";
flags512text = "[9] Count from triggering player"; flags512text = "[9] Count from triggering player";
flags1024text = "[10] Use faster, unordered execution";
flags16384text = "[14] Only if not enough spheres"; flags16384text = "[14] Only if not enough spheres";
flags32768text = "[15] Run when entering Capture"; flags32768text = "[15] Run when entering Capture";
prefix = "(330)";
} }
331 331
{ {
title = "Player Skin - Continuous"; title = "Player Skin - Continuous";
flags64text = "[6] Disable for this skin";
prefix = "(331)"; prefix = "(331)";
flags64text = "[6] Disable for this skin";
flags1024text = "[10] Use faster, unordered execution";
} }
332 332
{ {
title = "Player Skin - Each Time"; title = "Player Skin - Each Time";
flags64text = "[6] Disable for this skin";
prefix = "(332)"; prefix = "(332)";
flags64text = "[6] Disable for this skin";
flags1024text = "[10] Use faster, unordered execution";
} }
333 333
{ {
title = "Player Skin - Once"; title = "Player Skin - Once";
flags64text = "[6] Disable for this skin";
prefix = "(333)"; prefix = "(333)";
flags64text = "[6] Disable for this skin";
flags1024text = "[10] Use faster, unordered execution";
} }
334 334
{ {
title = "Object Dye - Continuous"; title = "Object Dye - Continuous";
flags64text = "[6] Disable for this color";
prefix = "(334)"; prefix = "(334)";
flags64text = "[6] Disable for this color";
flags1024text = "[10] Use faster, unordered execution";
} }
335 335
{ {
title = "Object Dye - Each Time"; title = "Object Dye - Each Time";
flags64text = "[6] Disable for this color";
prefix = "(335)"; prefix = "(335)";
flags64text = "[6] Disable for this color";
flags1024text = "[10] Use faster, unordered execution";
} }
336 336
{ {
title = "Object Dye - Once"; title = "Object Dye - Once";
flags64text = "[6] Disable for this color";
prefix = "(336)"; prefix = "(336)";
flags64text = "[6] Disable for this color";
flags1024text = "[10] Use faster, unordered execution";
} }
399 399
{ {
title = "Level Load"; title = "Level Load";
prefix = "(399)"; prefix = "(399)";
flags1024text = "[10] Use faster, unordered execution";
} }
} }
@ -2676,7 +2719,7 @@ linedeftypes
502 502
{ {
title = "Scroll Tagged Wall"; title = "Scroll Tagged Walls";
prefix = "(502)"; prefix = "(502)";
flags128text = "[7] Use texture offsets"; flags128text = "[7] Use texture offsets";
flags256text = "[8] Scroll back side"; flags256text = "[8] Scroll back side";
@ -2684,7 +2727,7 @@ linedeftypes
503 503
{ {
title = "Scroll Tagged Wall (Accelerative)"; title = "Scroll Tagged Walls (Accelerative)";
prefix = "(503)"; prefix = "(503)";
flags128text = "[7] Use texture offsets"; flags128text = "[7] Use texture offsets";
flags256text = "[8] Scroll back side"; flags256text = "[8] Scroll back side";
@ -2692,7 +2735,7 @@ linedeftypes
504 504
{ {
title = "Scroll Tagged Wall (Displacement)"; title = "Scroll Tagged Walls (Displacement)";
prefix = "(504)"; prefix = "(504)";
flags128text = "[7] Use texture offsets"; flags128text = "[7] Use texture offsets";
flags256text = "[8] Scroll back side"; flags256text = "[8] Scroll back side";
@ -3126,7 +3169,7 @@ linedeftypes
723 723
{ {
title = "Copy Backside Floor Slope from Line Tag"; title = "Copy Backside Floor Slope from Line Tag";
prefix = "(720)"; prefix = "(723)";
slope = "copy"; slope = "copy";
slopeargs = 4; slopeargs = 4;
} }
@ -3134,7 +3177,7 @@ linedeftypes
724 724
{ {
title = "Copy Backside Ceiling Slope from Line Tag"; title = "Copy Backside Ceiling Slope from Line Tag";
prefix = "(721)"; prefix = "(724)";
slope = "copy"; slope = "copy";
slopeargs = 8; slopeargs = 8;
} }
@ -3142,7 +3185,7 @@ linedeftypes
725 725
{ {
title = "Copy Backside Floor and Ceiling Slope from Line Tag"; title = "Copy Backside Floor and Ceiling Slope from Line Tag";
prefix = "(722)"; prefix = "(725)";
slope = "copy"; slope = "copy";
slopeargs = 12; slopeargs = 12;
} }
@ -3204,7 +3247,7 @@ linedeftypes
transwall transwall
{ {
title = "Translucent Wall"; title = "Translucent Walls";
900 900
{ {
@ -3265,6 +3308,192 @@ linedeftypes
title = "Fog Wall"; title = "Fog Wall";
prefix = "(909)"; prefix = "(909)";
} }
910
{
title = "100% Additive";
prefix = "(910)";
}
911
{
title = "90% Additive";
prefix = "(911)";
}
912
{
title = "80% Additive";
prefix = "(912)";
}
913
{
title = "70% Additive";
prefix = "(913)";
}
914
{
title = "60% Additive";
prefix = "(914)";
}
915
{
title = "50% Additive";
prefix = "(915)";
}
916
{
title = "40% Additive";
prefix = "(916)";
}
917
{
title = "30% Additive";
prefix = "(917)";
}
918
{
title = "20% Additive";
prefix = "(918)";
}
919
{
title = "10% Additive";
prefix = "(919)";
}
920
{
title = "100% Subtractive";
prefix = "(920)";
}
921
{
title = "90% Subtractive";
prefix = "(921)";
}
922
{
title = "80% Subtractive";
prefix = "(922)";
}
923
{
title = "70% Subtractive";
prefix = "(923)";
}
924
{
title = "60% Subtractive";
prefix = "(924)";
}
925
{
title = "50% Subtractive";
prefix = "(925)";
}
926
{
title = "40% Subtractive";
prefix = "(926)";
}
927
{
title = "30% Subtractive";
prefix = "(927)";
}
928
{
title = "20% Subtractive";
prefix = "(928)";
}
929
{
title = "10% Subtractive";
prefix = "(929)";
}
930
{
title = "100% Reverse Subtractive";
prefix = "(930)";
}
931
{
title = "90% Reverse Subtractive";
prefix = "(931)";
}
932
{
title = "80% Reverse Subtractive";
prefix = "(932)";
}
933
{
title = "70% Reverse Subtractive";
prefix = "(933)";
}
934
{
title = "60% Reverse Subtractive";
prefix = "(934)";
}
935
{
title = "50% Reverse Subtractive";
prefix = "(935)";
}
936
{
title = "40% Reverse Subtractive";
prefix = "(936)";
}
937
{
title = "30% Reverse Subtractive";
prefix = "(937)";
}
938
{
title = "20% Reverse Subtractive";
prefix = "(938)";
}
939
{
title = "10% Reverse Subtractive";
prefix = "(939)";
}
940
{
title = "Modulate";
prefix = "(940)";
}
} }
} }
@ -3794,6 +4023,7 @@ thingtypes
sprite = "BUMBA1"; sprite = "BUMBA1";
width = 16; width = 16;
height = 32; height = 32;
flags8text = "[8] Cannot move";
} }
124 124
{ {
@ -3824,7 +4054,6 @@ thingtypes
width = 24; width = 24;
height = 76; height = 76;
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
flags8text = "[8] Alternate laser attack";
} }
201 201
{ {
@ -3859,6 +4088,7 @@ thingtypes
height = 60; height = 60;
flags1text = "[1] Grayscale mode"; flags1text = "[1] Grayscale mode";
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
flags8text = "[8] Skip intro";
} }
206 206
{ {
@ -5060,7 +5290,7 @@ thingtypes
width = 8; width = 8;
height = 16; height = 16;
hangs = 1; hangs = 1;
angletext = "Dripping interval"; angletext = "Dripping delay";
fixedrotation = 1; fixedrotation = 1;
} }
1003 1003
@ -5402,6 +5632,8 @@ thingtypes
width = 20; width = 20;
height = 72; height = 72;
arrow = 1; arrow = 1;
flags4text = "[4] Move right";
flags8text = "[8] Move left";
} }
1128 1128
{ {
@ -5554,6 +5786,7 @@ thingtypes
width = 24; width = 24;
height = 63; height = 63;
arrow = 1; arrow = 1;
flags8text = "[8] Not pushable";
} }
1217 1217
{ {
@ -5689,6 +5922,7 @@ thingtypes
height = 32; height = 32;
angletext = "Initial delay"; angletext = "Initial delay";
fixedrotation = 1; fixedrotation = 1;
hangs = 1;
flags8text = "[8] Double size"; flags8text = "[8] Double size";
} }
1305 1305

4
extras/conf/udb/Includes/SRB222_common.cfg
View file

@ -264,10 +264,10 @@ mapformat_udmf
} }
// LINEDEF RENDERSTYLES // LINEDEF RENDERSTYLES
/*linedefrenderstyles linedefrenderstyles
{ {
include("SRB222_misc.cfg", "linedefrenderstyles"); include("SRB222_misc.cfg", "linedefrenderstyles");
}*/ }
// THING FLAGS // THING FLAGS
thingflags thingflags

217
extras/conf/udb/Includes/SRB222_linedefs.cfg
View file

@ -1510,6 +1510,161 @@ doom
title = "Fog Wall"; title = "Fog Wall";
prefix = "(909)"; prefix = "(909)";
} }
910
{
title = "100% Additive";
prefix = "(910)";
}
911
{
title = "90% Additive";
prefix = "(911)";
}
912
{
title = "80% Additive";
prefix = "(912)";
}
913
{
title = "70% Additive";
prefix = "(913)";
}
914
{
title = "60% Additive";
prefix = "(914)";
}
915
{
title = "50% Additive";
prefix = "(915)";
}
916
{
title = "40% Additive";
prefix = "(916)";
}
917
{
title = "30% Additive";
prefix = "(917)";
}
918
{
title = "20% Additive";
prefix = "(918)";
}
919
{
title = "10% Additive";
prefix = "(919)";
}
920
{
title = "100% Subtractive";
prefix = "(920)";
}
921
{
title = "90% Subtractive";
prefix = "(921)";
}
922
{
title = "80% Subtractive";
prefix = "(922)";
}
923
{
title = "70% Subtractive";
prefix = "(923)";
}
924
{
title = "60% Subtractive";
prefix = "(924)";
}
925
{
title = "50% Subtractive";
prefix = "(925)";
}
926
{
title = "40% Subtractive";
prefix = "(926)";
}
927
{
title = "30% Subtractive";
prefix = "(927)";
}
928
{
title = "20% Subtractive";
prefix = "(928)";
}
929
{
title = "10% Subtractive";
prefix = "(929)";
}
930
{
title = "100% Reverse Subtractive";
prefix = "(930)";
}
931
{
title = "90% Reverse Subtractive";
prefix = "(931)";
}
932
{
title = "80% Reverse Subtractive";
prefix = "(932)";
}
933
{
title = "70% Reverse Subtractive";
prefix = "(933)";
}
934
{
title = "60% Reverse Subtractive";
prefix = "(934)";
}
935
{
title = "50% Reverse Subtractive";
prefix = "(935)";
}
936
{
title = "40% Reverse Subtractive";
prefix = "(936)";
}
937
{
title = "30% Reverse Subtractive";
prefix = "(937)";
}
938
{
title = "20% Reverse Subtractive";
prefix = "(938)";
}
939
{
title = "10% Reverse Subtractive";
prefix = "(939)";
}
940
{
title = "Modulate";
prefix = "(940)";
}
} }
} }
@ -1996,6 +2151,12 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Appearance"; title = "Appearance";
type = 12; type = 12;
@ -2009,7 +2170,7 @@ udmf
32 = "Cut cyan flat pixels"; 32 = "Cut cyan flat pixels";
} }
} }
arg3 arg4
{ {
title = "Tangibility"; title = "Tangibility";
type = 12; type = 12;
@ -2032,6 +2193,12 @@ udmf
default = 128; default = 128;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;
@ -2099,12 +2266,18 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Tangibility"; title = "Tangibility";
type = 12; type = 12;
enum = "tangibility"; enum = "tangibility";
} }
arg3 arg4
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;
@ -2134,6 +2307,12 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Appearance"; title = "Appearance";
type = 12; type = 12;
@ -2147,17 +2326,17 @@ udmf
32 = "Cut cyan flat pixels"; 32 = "Cut cyan flat pixels";
} }
} }
arg3 arg4
{ {
title = "Tangibility"; title = "Tangibility";
type = 12; type = 12;
enum = "tangibility"; enum = "tangibility";
} }
arg4 arg5
{ {
title = "Speed"; title = "Speed";
} }
arg5 arg6
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;
@ -2212,6 +2391,12 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Appearance"; title = "Appearance";
type = 12; type = 12;
@ -2298,6 +2483,12 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Bustable type"; title = "Bustable type";
type = 11; type = 11;
@ -2309,7 +2500,7 @@ udmf
3 = "Strong"; 3 = "Strong";
} }
} }
arg3 arg4
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;
@ -2321,7 +2512,7 @@ udmf
8 = "Cut cyan flat pixels"; 8 = "Cut cyan flat pixels";
} }
} }
arg4 arg5
{ {
title = "Linedef executor tag"; title = "Linedef executor tag";
type = 15; type = 15;
@ -2368,6 +2559,12 @@ udmf
default = 128; default = 128;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;
@ -2394,6 +2591,12 @@ udmf
default = 255; default = 255;
} }
arg2 arg2
{
title = "Blending mode";
type = 11;
enum = "blendmodes";
}
arg3
{ {
title = "Flags"; title = "Flags";
type = 12; type = 12;

74
extras/conf/udb/Includes/SRB222_misc.cfg
View file

@ -63,11 +63,15 @@ linedefflags_udmf
transfer = "Transfer Line"; transfer = "Transfer Line";
} }
/*linedefrenderstyles linedefrenderstyles
{ {
translucent = "Translucent"; translucent = "Translucent";
add = "Add";
subtract = "Subtract";
reversesubtract = "Reverse subtract";
modulate = "Modulate";
fog = "Fog"; fog = "Fog";
}*/ }
sectorflags sectorflags
{ {
@ -232,6 +236,26 @@ universalfields
type = 0; type = 0;
default = 0; default = 0;
} }
arg6
{
type = 0;
default = 0;
}
arg7
{
type = 0;
default = 0;
}
arg8
{
type = 0;
default = 0;
}
arg9
{
type = 0;
default = 0;
}
stringarg0 stringarg0
{ {
type = 2; type = 2;
@ -260,6 +284,41 @@ universalfields
thing thing
{ {
arg5
{
type = 0;
default = 0;
}
arg6
{
type = 0;
default = 0;
}
arg7
{
type = 0;
default = 0;
}
arg8
{
type = 0;
default = 0;
}
arg9
{
type = 0;
default = 0;
}
stringarg0
{
type = 2;
default = "";
}
stringarg1
{
type = 2;
default = "";
}
} }
} }
@ -478,6 +537,15 @@ enums
1 = "Accelerative"; 1 = "Accelerative";
2 = "Displacement"; 2 = "Displacement";
} }
blendmodes
{
0 = "Translucent";
1 = "Add";
2 = "Subtract";
3 = "Reverse subtract";
4 = "Modulate";
}
} }
//Default things filters //Default things filters
@ -656,4 +724,4 @@ flats
start = "F_START"; start = "F_START";
end = "FF_END"; end = "FF_END";
} }
} }

9
src/b_bot.c
View file

@ -29,11 +29,16 @@ void B_UpdateBotleader(player_t *player)
{ {
if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo) if (players[i].bot || players[i].playerstate != PST_LIVE || players[i].spectator || !players[i].mo)
continue; continue;
if (!player->mo) //Can't do distance calculations if there's no player object, so we'll just take the first we find
if (!player->botleader)
{ {
player->botleader = &players[i]; player->botleader = &players[i]; // set default
return; return;
} }
if (!player->mo)
return;
//Update best candidate based on nearest distance //Update best candidate based on nearest distance
dist = R_PointToDist2(player->mo->x, player->mo->y, players[i].mo->x, players[i].mo->y); dist = R_PointToDist2(player->mo->x, player->mo->y, players[i].mo->x, players[i].mo->y);
if (neardist > dist) if (neardist > dist)

2
src/d_netcmd.c
View file

@ -3763,7 +3763,7 @@ static void Command_ListWADS_f(void)
nameonly(tempname = va("%s", wadfiles[i]->filename)); nameonly(tempname = va("%s", wadfiles[i]->filename));
if (!i) if (!i)
CONS_Printf("\x82 IWAD\x80: %s\n", tempname); CONS_Printf("\x82 IWAD\x80: %s\n", tempname);
else if (i <= mainwads) else if (i < mainwads)
CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname); CONS_Printf("\x82 * %.2d\x80: %s\n", i, tempname);
else if (!wadfiles[i]->important) else if (!wadfiles[i]->important)
CONS_Printf("\x86 %.2d: %s\n", i, tempname); CONS_Printf("\x86 %.2d: %s\n", i, tempname);

5
src/deh_lua.c
View file

@ -260,6 +260,11 @@ static inline int lib_getenum(lua_State *L)
lua_pushinteger(L, ((lua_Integer)1<<i)); lua_pushinteger(L, ((lua_Integer)1<<i));
return 1; return 1;
} }
if (fastcmp(p, "REVERSESUPER"))
{
lua_pushinteger(L, (lua_Integer)MFE_REVERSESUPER);
return 1;
}
if (mathlib) return luaL_error(L, "mobjeflag '%s' could not be found.\n", word); if (mathlib) return luaL_error(L, "mobjeflag '%s' could not be found.\n", word);
return 0; return 0;
} }

29
src/deh_tables.c
View file

@ -4354,6 +4354,8 @@ const char *const MOBJEFLAG_LIST[] = {
"SPRUNG", // Mobj was already sprung this tic "SPRUNG", // Mobj was already sprung this tic
"APPLYPMOMZ", // Platform movement "APPLYPMOMZ", // Platform movement
"TRACERANGLE", // Compute and trigger on mobj angle relative to tracer "TRACERANGLE", // Compute and trigger on mobj angle relative to tracer
"FORCESUPER", // Forces an object to use super sprites with SPR_PLAY.
"FORCENOSUPER", // Forces an object to NOT use super sprites with SPR_PLAY.
NULL NULL
}; };
@ -4841,9 +4843,18 @@ struct int_const_s const INT_CONST[] = {
{"FF_RANDOMANIM",FF_RANDOMANIM}, {"FF_RANDOMANIM",FF_RANDOMANIM},
{"FF_GLOBALANIM",FF_GLOBALANIM}, {"FF_GLOBALANIM",FF_GLOBALANIM},
{"FF_FULLBRIGHT",FF_FULLBRIGHT}, {"FF_FULLBRIGHT",FF_FULLBRIGHT},
{"FF_SEMIBRIGHT",FF_SEMIBRIGHT},
{"FF_FULLDARK",FF_FULLDARK},
{"FF_VERTICALFLIP",FF_VERTICALFLIP}, {"FF_VERTICALFLIP",FF_VERTICALFLIP},
{"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP}, {"FF_HORIZONTALFLIP",FF_HORIZONTALFLIP},
{"FF_PAPERSPRITE",FF_PAPERSPRITE}, {"FF_PAPERSPRITE",FF_PAPERSPRITE},
{"FF_FLOORSPRITE",FF_FLOORSPRITE},
{"FF_BLENDMASK",FF_BLENDMASK},
{"FF_BLENDSHIFT",FF_BLENDSHIFT},
{"FF_ADD",FF_ADD},
{"FF_SUBTRACT",FF_SUBTRACT},
{"FF_REVERSESUBTRACT",FF_REVERSESUBTRACT},
{"FF_MODULATE",FF_MODULATE},
{"FF_TRANSMASK",FF_TRANSMASK}, {"FF_TRANSMASK",FF_TRANSMASK},
{"FF_TRANSSHIFT",FF_TRANSSHIFT}, {"FF_TRANSSHIFT",FF_TRANSSHIFT},
// new preshifted translucency (used in source) // new preshifted translucency (used in source)
@ -4887,6 +4898,7 @@ struct int_const_s const INT_CONST[] = {
{"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT}, {"AST_REVERSESUBTRACT",AST_REVERSESUBTRACT},
{"AST_MODULATE",AST_MODULATE}, {"AST_MODULATE",AST_MODULATE},
{"AST_OVERLAY",AST_OVERLAY}, {"AST_OVERLAY",AST_OVERLAY},
{"AST_FOG",AST_FOG},
// Render flags // Render flags
{"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP}, {"RF_HORIZONTALFLIP",RF_HORIZONTALFLIP},
@ -4898,9 +4910,10 @@ struct int_const_s const INT_CONST[] = {
{"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT}, {"RF_OBJECTSLOPESPLAT",RF_OBJECTSLOPESPLAT},
{"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD}, {"RF_NOSPLATBILLBOARD",RF_NOSPLATBILLBOARD},
{"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE}, {"RF_NOSPLATROLLANGLE",RF_NOSPLATROLLANGLE},
{"RF_BLENDMASK",RF_BLENDMASK}, {"RF_BRIGHTMASK",RF_BRIGHTMASK},
{"RF_FULLBRIGHT",RF_FULLBRIGHT}, {"RF_FULLBRIGHT",RF_FULLBRIGHT},
{"RF_FULLDARK",RF_FULLDARK}, {"RF_FULLDARK",RF_FULLDARK},
{"RF_SEMIBRIGHT",RF_SEMIBRIGHT},
{"RF_NOCOLORMAPS",RF_NOCOLORMAPS}, {"RF_NOCOLORMAPS",RF_NOCOLORMAPS},
{"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK}, {"RF_SPRITETYPEMASK",RF_SPRITETYPEMASK},
{"RF_PAPERSPRITE",RF_PAPERSPRITE}, {"RF_PAPERSPRITE",RF_PAPERSPRITE},
@ -5086,6 +5099,7 @@ struct int_const_s const INT_CONST[] = {
{"PAL_MIXUP",PAL_MIXUP}, {"PAL_MIXUP",PAL_MIXUP},
{"PAL_RECYCLE",PAL_RECYCLE}, {"PAL_RECYCLE",PAL_RECYCLE},
{"PAL_NUKE",PAL_NUKE}, {"PAL_NUKE",PAL_NUKE},
{"PAL_INVERT",PAL_INVERT},
// for P_DamageMobj // for P_DamageMobj
//// Damage types //// Damage types
{"DMG_WATER",DMG_WATER}, {"DMG_WATER",DMG_WATER},
@ -5397,9 +5411,12 @@ struct int_const_s const INT_CONST[] = {
{"V_HUDTRANSHALF",V_HUDTRANSHALF}, {"V_HUDTRANSHALF",V_HUDTRANSHALF},
{"V_HUDTRANS",V_HUDTRANS}, {"V_HUDTRANS",V_HUDTRANS},
{"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE}, {"V_HUDTRANSDOUBLE",V_HUDTRANSDOUBLE},
{"V_AUTOFADEOUT",V_AUTOFADEOUT}, {"V_BLENDSHIFT",V_BLENDSHIFT},
{"V_RETURN8",V_RETURN8}, {"V_BLENDMASK",V_BLENDMASK},
{"V_OFFSET",V_OFFSET}, {"V_ADD",V_ADD},
{"V_SUBTRACT",V_SUBTRACT},
{"V_REVERSESUBTRACT",V_REVERSESUBTRACT},
{"V_MODULATE",V_MODULATE},
{"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE}, {"V_ALLOWLOWERCASE",V_ALLOWLOWERCASE},
{"V_FLIP",V_FLIP}, {"V_FLIP",V_FLIP},
{"V_CENTERNAMETAG",V_CENTERNAMETAG}, {"V_CENTERNAMETAG",V_CENTERNAMETAG},
@ -5407,8 +5424,8 @@ struct int_const_s const INT_CONST[] = {
{"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM}, {"V_SNAPTOBOTTOM",V_SNAPTOBOTTOM},
{"V_SNAPTOLEFT",V_SNAPTOLEFT}, {"V_SNAPTOLEFT",V_SNAPTOLEFT},
{"V_SNAPTORIGHT",V_SNAPTORIGHT}, {"V_SNAPTORIGHT",V_SNAPTORIGHT},
{"V_WRAPX",V_WRAPX}, {"V_AUTOFADEOUT",V_AUTOFADEOUT},
{"V_WRAPY",V_WRAPY}, {"V_RETURN8",V_RETURN8},
{"V_NOSCALESTART",V_NOSCALESTART}, {"V_NOSCALESTART",V_NOSCALESTART},
{"V_PERPLAYER",V_PERPLAYER}, {"V_PERPLAYER",V_PERPLAYER},

2
src/doomdata.h
View file

@ -196,7 +196,7 @@ typedef struct
#pragma pack() #pragma pack()
#endif #endif
#define NUMMAPTHINGARGS 6 #define NUMMAPTHINGARGS 10
#define NUMMAPTHINGSTRINGARGS 2 #define NUMMAPTHINGSTRINGARGS 2
// Thing definition, position, orientation and type, // Thing definition, position, orientation and type,

51
src/g_game.c
View file

@ -346,8 +346,8 @@ consvar_t cv_analog[2] = {
CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange), CVAR_INIT ("sessionanalog2", "Off", CV_CALL|CV_NOSHOWHELP, CV_OnOff, Analog2_OnChange),
}; };
consvar_t cv_useranalog[2] = { consvar_t cv_useranalog[2] = {
CVAR_INIT ("configanalog", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange), CVAR_INIT ("configanalog", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog_OnChange),
CVAR_INIT ("configanalog2", "Off", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange), CVAR_INIT ("configanalog2", "On", CV_SAVE|CV_CALL|CV_NOSHOWHELP, CV_OnOff, UserAnalog2_OnChange),
}; };
// deez New User eXperiences // deez New User eXperiences
@ -362,8 +362,8 @@ consvar_t cv_autobrake2 = CVAR_INIT ("autobrake2", "On", CV_SAVE|CV_CALL, CV_OnO
// hi here's some new controls // hi here's some new controls
static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}}; static CV_PossibleValue_t zerotoone_cons_t[] = {{0, "MIN"}, {FRACUNIT, "MAX"}, {0, NULL}};
consvar_t cv_cam_shiftfacing[2] = { consvar_t cv_cam_shiftfacing[2] = {
CVAR_INIT ("cam_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_shiftfacingchar", "0.33", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam2_shiftfacingchar", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
}; };
consvar_t cv_cam_turnfacing[2] = { consvar_t cv_cam_turnfacing[2] = {
CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam_turnfacingchar", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
@ -374,12 +374,12 @@ consvar_t cv_cam_turnfacingability[2] = {
CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam2_turnfacingability", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
}; };
consvar_t cv_cam_turnfacingspindash[2] = { consvar_t cv_cam_turnfacingspindash[2] = {
CVAR_INIT ("cam_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacingspindash", "0.5", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam2_turnfacingspindash", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
}; };
consvar_t cv_cam_turnfacinginput[2] = { consvar_t cv_cam_turnfacinginput[2] = {
CVAR_INIT ("cam_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
CVAR_INIT ("cam2_turnfacinginput", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL), CVAR_INIT ("cam2_turnfacinginput", "0.375", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL),
}; };
static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}}; static CV_PossibleValue_t centertoggle_cons_t[] = {{0, "Hold"}, {1, "Toggle"}, {2, "Sticky Hold"}, {0, NULL}};
@ -403,28 +403,28 @@ static CV_PossibleValue_t lockedassist_cons_t[] = {
{0, NULL} {0, NULL}
}; };
consvar_t cv_cam_lockonboss[2] = { consvar_t cv_cam_lockonboss[2] = {
CVAR_INIT ("cam_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL), CVAR_INIT ("cam_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
CVAR_INIT ("cam2_lockaimassist", "Bosses", CV_SAVE, lockedassist_cons_t, NULL), CVAR_INIT ("cam2_lockaimassist", "Full", CV_SAVE, lockedassist_cons_t, NULL),
}; };
consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_moveaxis = CVAR_INIT ("joyaxis_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_sideaxis = CVAR_INIT ("joyaxis_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_lookaxis = CVAR_INIT ("joyaxis_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_turnaxis = CVAR_INIT ("joyaxis_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_jumpaxis = CVAR_INIT ("joyaxis_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_spinaxis = CVAR_INIT ("joyaxis_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_fireaxis = CVAR_INIT ("joyaxis_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_firenaxis = CVAR_INIT ("joyaxis_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_deadzone = CVAR_INIT ("joy_deadzone", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_digitaldeadzone = CVAR_INIT ("joy_digdeadzone", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_moveaxis2 = CVAR_INIT ("joyaxis2_move", "Y-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_sideaxis2 = CVAR_INIT ("joyaxis2_side", "X-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_lookaxis2 = CVAR_INIT ("joyaxis2_look", "Y-Rudder-", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_turnaxis2 = CVAR_INIT ("joyaxis2_turn", "X-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_jumpaxis2 = CVAR_INIT ("joyaxis2_jump", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_spinaxis2 = CVAR_INIT ("joyaxis2_spin", "None", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Axis-", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_fireaxis2 = CVAR_INIT ("joyaxis2_fire", "Z-Rudder", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL); consvar_t cv_firenaxis2 = CVAR_INIT ("joyaxis2_firenormal", "Z-Axis", CV_SAVE, joyaxis_cons_t, NULL);
consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_deadzone2 = CVAR_INIT ("joy_deadzone2", "0.125", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL); consvar_t cv_digitaldeadzone2 = CVAR_INIT ("joy_digdeadzone2", "0.25", CV_FLOAT|CV_SAVE, zerotoone_cons_t, NULL);
@ -1551,8 +1551,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
{ {
// Fix offset angle for P2-controlled Tailsbot when P2's controls are set to non-Strafe // Fix offset angle for P2-controlled Tailsbot when P2's controls are set to non-Strafe
cmd->angleturn = (INT16)((localangle - *myangle) >> 16); cmd->angleturn = (INT16)((localangle - *myangle) >> 16);
} }
*myangle += (cmd->angleturn<<16); *myangle += (cmd->angleturn<<16);
if (controlstyle == CS_LMAOGALOG) { if (controlstyle == CS_LMAOGALOG) {
@ -2335,7 +2335,7 @@ void G_Ticker(boolean run)
else if (players[i].bot == BOT_MPAI) { else if (players[i].bot == BOT_MPAI) {
B_BuildTiccmd(&players[i], &players[i].cmd); B_BuildTiccmd(&players[i], &players[i].cmd);
} }
// Do angle adjustments. // Do angle adjustments.
if (players[i].bot == BOT_NONE || players[i].bot == BOT_2PHUMAN) if (players[i].bot == BOT_NONE || players[i].bot == BOT_2PHUMAN)
{ {
@ -2350,7 +2350,7 @@ void G_Ticker(boolean run)
P_ForceLocalAngle(&players[i], players[i].angleturn << 16); P_ForceLocalAngle(&players[i], players[i].angleturn << 16);
else else
players[i].cmd.angleturn = players[i].angleturn; players[i].cmd.angleturn = players[i].angleturn;
players[i].cmd.angleturn &= ~TICCMD_RECEIVED; players[i].cmd.angleturn &= ~TICCMD_RECEIVED;
// Use the leveltime sent in the player's ticcmd to determine control lag // Use the leveltime sent in the player's ticcmd to determine control lag
players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1); players[i].cmd.latency = min(((leveltime & 0xFF) - players[i].cmd.latency) & 0xFF, MAXPREDICTTICS-1);
@ -3056,15 +3056,15 @@ void G_DoReborn(INT32 playernum)
return; return;
} }
// Additional players (e.g. independent bots) in Single Player // Additional players (e.g. independent bots) in Single Player
if (playernum != consoleplayer && !(netgame || multiplayer)) if (playernum != consoleplayer && !(netgame || multiplayer))
{ {
mobj_t *oldmo = NULL; mobj_t *oldmo = NULL;
// Do nothing if out of lives // Do nothing if out of lives
if (player->lives <= 0) if (player->lives <= 0)
return; return;
// Otherwise do respawn, starting by removing the player object // Otherwise do respawn, starting by removing the player object
if (player->mo) if (player->mo)
{ {
@ -3075,7 +3075,7 @@ void G_DoReborn(INT32 playernum)
G_SpawnPlayer(playernum); G_SpawnPlayer(playernum);
if (oldmo) if (oldmo)
G_ChangePlayerReferences(oldmo, players[playernum].mo); G_ChangePlayerReferences(oldmo, players[playernum].mo);
return; //Exit function to avoid proccing other SP related mechanics return; //Exit function to avoid proccing other SP related mechanics
} }
@ -3300,7 +3300,7 @@ boolean G_EnoughPlayersFinished(void)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) if (!playeringame[i] || players[i].spectator || players[i].bot)
continue; continue;
if (players[i].quittime > 30 * TICRATE) if (players[i].quittime > 30 * TICRATE)
continue; continue;
@ -3926,6 +3926,9 @@ static void G_DoCompleted(void)
if (metalrecording) if (metalrecording)
G_StopMetalRecording(false); G_StopMetalRecording(false);
G_SetGamestate(GS_NULL);
wipegamestate = GS_NULL;
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i]) if (playeringame[i])
G_PlayerFinishLevel(i); // take away cards and stuff G_PlayerFinishLevel(i); // take away cards and stuff

60
src/g_input.c
View file

@ -684,14 +684,18 @@ void G_DefineDefaultControls(void)
gamecontroldefault[gcs_fps][GC_LOOKDOWN ][0] = KEY_DOWNARROW; gamecontroldefault[gcs_fps][GC_LOOKDOWN ][0] = KEY_DOWNARROW;
gamecontroldefault[gcs_fps][GC_TURNLEFT ][0] = KEY_LEFTARROW; gamecontroldefault[gcs_fps][GC_TURNLEFT ][0] = KEY_LEFTARROW;
gamecontroldefault[gcs_fps][GC_TURNRIGHT ][0] = KEY_RIGHTARROW; gamecontroldefault[gcs_fps][GC_TURNRIGHT ][0] = KEY_RIGHTARROW;
gamecontroldefault[gcs_fps][GC_CENTERVIEW ][0] = KEY_END; gamecontroldefault[gcs_fps][GC_CENTERVIEW ][0] = KEY_LCTRL;
gamecontroldefault[gcs_fps][GC_JUMP ][0] = KEY_SPACE; gamecontroldefault[gcs_fps][GC_JUMP ][0] = KEY_SPACE;
gamecontroldefault[gcs_fps][GC_SPIN ][0] = KEY_LSHIFT; gamecontroldefault[gcs_fps][GC_SPIN ][0] = KEY_LSHIFT;
gamecontroldefault[gcs_fps][GC_FIRE ][0] = KEY_RCTRL; gamecontroldefault[gcs_fps][GC_FIRE ][0] = KEY_RCTRL;
gamecontroldefault[gcs_fps][GC_FIRE ][1] = KEY_MOUSE1+0; gamecontroldefault[gcs_fps][GC_FIRE ][1] = KEY_MOUSE1+0;
gamecontroldefault[gcs_fps][GC_FIRENORMAL ][0] = 'c'; gamecontroldefault[gcs_fps][GC_FIRENORMAL ][0] = KEY_RALT;
gamecontroldefault[gcs_fps][GC_FIRENORMAL ][1] = KEY_MOUSE1+1;
gamecontroldefault[gcs_fps][GC_CUSTOM1 ][0] = 'z';
gamecontroldefault[gcs_fps][GC_CUSTOM2 ][0] = 'x';
gamecontroldefault[gcs_fps][GC_CUSTOM3 ][0] = 'c';
// Platform game controls (arrow keys) // Platform game controls (arrow keys), currently unused
gamecontroldefault[gcs_platform][GC_FORWARD ][0] = KEY_UPARROW; gamecontroldefault[gcs_platform][GC_FORWARD ][0] = KEY_UPARROW;
gamecontroldefault[gcs_platform][GC_BACKWARD ][0] = KEY_DOWNARROW; gamecontroldefault[gcs_platform][GC_BACKWARD ][0] = KEY_DOWNARROW;
gamecontroldefault[gcs_platform][GC_STRAFELEFT ][0] = 'a'; gamecontroldefault[gcs_platform][GC_STRAFELEFT ][0] = 'a';
@ -734,34 +738,36 @@ void G_DefineDefaultControls(void)
gamecontroldefault[i][GC_VIEWPOINT ][0] = KEY_F12; gamecontroldefault[i][GC_VIEWPOINT ][0] = KEY_F12;
// Gamepad controls -- same for both schemes // Gamepad controls -- same for both schemes
gamecontroldefault[i][GC_WEAPONNEXT ][1] = KEY_JOY1+1; // B gamecontroldefault[i][GC_JUMP ][1] = KEY_JOY1+0; // A
gamecontroldefault[i][GC_WEAPONPREV ][1] = KEY_JOY1+2; // X gamecontroldefault[i][GC_SPIN ][1] = KEY_JOY1+2; // X
gamecontroldefault[i][GC_TOSSFLAG ][1] = KEY_JOY1+0; // A gamecontroldefault[i][GC_CUSTOM1 ][1] = KEY_JOY1+1; // B
gamecontroldefault[i][GC_SPIN ][1] = KEY_JOY1+4; // LB gamecontroldefault[i][GC_CUSTOM2 ][1] = KEY_JOY1+3; // Y
gamecontroldefault[i][GC_CAMTOGGLE ][1] = KEY_HAT1+0; // D-Pad Up gamecontroldefault[i][GC_CUSTOM3 ][1] = KEY_JOY1+8; // Left Stick
gamecontroldefault[i][GC_CAMRESET ][1] = KEY_JOY1+3; // Y
gamecontroldefault[i][GC_CENTERVIEW ][1] = KEY_JOY1+9; // Right Stick gamecontroldefault[i][GC_CENTERVIEW ][1] = KEY_JOY1+9; // Right Stick
gamecontroldefault[i][GC_TALKKEY ][1] = KEY_HAT1+2; // D-Pad Left gamecontroldefault[i][GC_WEAPONPREV ][1] = KEY_JOY1+4; // LB
gamecontroldefault[i][GC_SCORES ][1] = KEY_HAT1+3; // D-Pad Right gamecontroldefault[i][GC_WEAPONNEXT ][1] = KEY_JOY1+5; // RB
gamecontroldefault[i][GC_JUMP ][1] = KEY_JOY1+5; // RB gamecontroldefault[i][GC_SCREENSHOT ][1] = KEY_JOY1+6; // Back
gamecontroldefault[i][GC_PAUSE ][1] = KEY_JOY1+6; // Back
gamecontroldefault[i][GC_SCREENSHOT ][1] = KEY_HAT1+1; // D-Pad Down
gamecontroldefault[i][GC_SYSTEMMENU ][0] = KEY_JOY1+7; // Start gamecontroldefault[i][GC_SYSTEMMENU ][0] = KEY_JOY1+7; // Start
gamecontroldefault[i][GC_CAMTOGGLE ][1] = KEY_HAT1+0; // D-Pad Up
gamecontroldefault[i][GC_VIEWPOINT ][1] = KEY_HAT1+1; // D-Pad Down
gamecontroldefault[i][GC_TOSSFLAG ][1] = KEY_HAT1+2; // D-Pad Left
gamecontroldefault[i][GC_SCORES ][1] = KEY_HAT1+3; // D-Pad Right
// Second player controls only have joypad defaults // Second player controls only have joypad defaults
gamecontrolbisdefault[i][GC_WEAPONNEXT][0] = KEY_2JOY1+1; // B gamecontrolbisdefault[i][GC_JUMP ][1] = KEY_2JOY1+0; // A
gamecontrolbisdefault[i][GC_WEAPONPREV][0] = KEY_2JOY1+2; // X gamecontrolbisdefault[i][GC_SPIN ][1] = KEY_2JOY1+2; // X
gamecontrolbisdefault[i][GC_TOSSFLAG ][0] = KEY_2JOY1+0; // A gamecontrolbisdefault[i][GC_CUSTOM1 ][1] = KEY_2JOY1+1; // B
gamecontrolbisdefault[i][GC_SPIN ][0] = KEY_2JOY1+4; // LB gamecontrolbisdefault[i][GC_CUSTOM2 ][1] = KEY_2JOY1+3; // Y
gamecontrolbisdefault[i][GC_CAMRESET ][0] = KEY_2JOY1+3; // Y gamecontrolbisdefault[i][GC_CUSTOM3 ][1] = KEY_2JOY1+8; // Left Stick
gamecontrolbisdefault[i][GC_CENTERVIEW][0] = KEY_2JOY1+9; // Right Stick gamecontrolbisdefault[i][GC_CENTERVIEW ][1] = KEY_2JOY1+9; // Right Stick
gamecontrolbisdefault[i][GC_JUMP ][0] = KEY_2JOY1+5; // RB gamecontrolbisdefault[i][GC_WEAPONPREV ][1] = KEY_2JOY1+4; // LB
//gamecontrolbisdefault[i][GC_PAUSE ][0] = KEY_2JOY1+6; // Back gamecontrolbisdefault[i][GC_WEAPONNEXT ][1] = KEY_2JOY1+5; // RB
//gamecontrolbisdefault[i][GC_SYSTEMMENU][0] = KEY_2JOY1+7; // Start gamecontrolbisdefault[i][GC_SCREENSHOT ][1] = KEY_2JOY1+6; // Back
gamecontrolbisdefault[i][GC_CAMTOGGLE ][0] = KEY_2HAT1+0; // D-Pad Up //gamecontrolbisdefault[i][GC_SYSTEMMENU ][0] = KEY_2JOY1+7; // Start
gamecontrolbisdefault[i][GC_SCREENSHOT][0] = KEY_2HAT1+1; // D-Pad Down gamecontrolbisdefault[i][GC_CAMTOGGLE ][1] = KEY_2HAT1+0; // D-Pad Up
//gamecontrolbisdefault[i][GC_TALKKEY ][0] = KEY_2HAT1+2; // D-Pad Left gamecontrolbisdefault[i][GC_VIEWPOINT ][1] = KEY_2HAT1+1; // D-Pad Down
//gamecontrolbisdefault[i][GC_SCORES ][0] = KEY_2HAT1+3; // D-Pad Right gamecontrolbisdefault[i][GC_TOSSFLAG ][1] = KEY_2HAT1+2; // D-Pad Left
//gamecontrolbisdefault[i][GC_SCORES ][1] = KEY_2HAT1+3; // D-Pad Right
} }
} }

60
src/hardware/hw_draw.c
View file

@ -119,11 +119,6 @@ void HWR_DrawPatch(patch_t *gpatch, INT32 x, INT32 y, INT32 option)
flags = PF_Translucent|PF_NoDepthTest; flags = PF_Translucent|PF_NoDepthTest;
if (option & V_WRAPX)
flags |= PF_ForceWrapX;
if (option & V_WRAPY)
flags |= PF_ForceWrapY;
// clip it since it is used for bunny scroll in doom I // clip it since it is used for bunny scroll in doom I
HWD.pfnDrawPolygon(NULL, v, 4, flags); HWD.pfnDrawPolygon(NULL, v, 4, flags);
} }
@ -135,6 +130,7 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
float cx = FIXED_TO_FLOAT(x); float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y); float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT);
GLPatch_t *hwrPatch; GLPatch_t *hwrPatch;
// 3--2 // 3--2
@ -145,9 +141,6 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
UINT8 perplayershuffle = 0; UINT8 perplayershuffle = 0;
if (alphalevel >= 10 && alphalevel < 13)
return;
// make patch ready in hardware cache // make patch ready in hardware cache
if (!colormap) if (!colormap)
HWR_GetPatch(gpatch); HWR_GetPatch(gpatch);
@ -191,15 +184,9 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
offsetx = (float)(gpatch->leftoffset) * fscalew; offsetx = (float)(gpatch->leftoffset) * fscalew;
// top offset // top offset
// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!? // TODO: make some kind of vertical version of V_FLIP
offsety = (float)(gpatch->topoffset) * fscaleh; offsety = (float)(gpatch->topoffset) * fscaleh;
if ((option & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
{
offsetx *= dupx;
offsety *= dupy;
}
cx -= offsetx; cx -= offsetx;
cy -= offsety; cy -= offsety;
} }
@ -359,21 +346,20 @@ void HWR_DrawStretchyFixedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t p
v[0].t = v[1].t = 0.0f; v[0].t = v[1].t = 0.0f;
v[2].t = v[3].t = hwrPatch->max_t; v[2].t = v[3].t = hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
if (option & V_WRAPX)
flags |= PF_ForceWrapX;
if (option & V_WRAPY)
flags |= PF_ForceWrapY;
// clip it since it is used for bunny scroll in doom I // clip it since it is used for bunny scroll in doom I
if (blendmode)
flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest;
else
flags = PF_Translucent|PF_NoDepthTest;
if (alphalevel) if (alphalevel)
{ {
FSurfaceInfo Surf; FSurfaceInfo Surf;
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency];
else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency];
else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
flags |= PF_Modulated; flags |= PF_Modulated;
HWD.pfnDrawPolygon(&Surf, v, 4, flags); HWD.pfnDrawPolygon(&Surf, v, 4, flags);
@ -389,6 +375,7 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
float cx = FIXED_TO_FLOAT(x); float cx = FIXED_TO_FLOAT(x);
float cy = FIXED_TO_FLOAT(y); float cy = FIXED_TO_FLOAT(y);
UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT); UINT8 alphalevel = ((option & V_ALPHAMASK) >> V_ALPHASHIFT);
UINT8 blendmode = ((option & V_BLENDMASK) >> V_BLENDSHIFT);
GLPatch_t *hwrPatch; GLPatch_t *hwrPatch;
// 3--2 // 3--2
@ -399,9 +386,6 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
UINT8 perplayershuffle = 0; UINT8 perplayershuffle = 0;
if (alphalevel >= 10 && alphalevel < 13)
return;
// make patch ready in hardware cache // make patch ready in hardware cache
if (!colormap) if (!colormap)
HWR_GetPatch(gpatch); HWR_GetPatch(gpatch);
@ -589,13 +573,6 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
else else
v[2].t = v[3].t = (FIXED_TO_FLOAT(sy+h)/(float)(gpatch->height))*hwrPatch->max_t; v[2].t = v[3].t = (FIXED_TO_FLOAT(sy+h)/(float)(gpatch->height))*hwrPatch->max_t;
flags = PF_Translucent|PF_NoDepthTest;
if (option & V_WRAPX)
flags |= PF_ForceWrapX;
if (option & V_WRAPY)
flags |= PF_ForceWrapY;
// Auto-crop at splitscreen borders! // Auto-crop at splitscreen borders!
if (splitscreen && (option & V_PERPLAYER)) if (splitscreen && (option & V_PERPLAYER))
{ {
@ -667,14 +644,21 @@ void HWR_DrawCroppedPatch(patch_t *gpatch, fixed_t x, fixed_t y, fixed_t pscale,
} }
// clip it since it is used for bunny scroll in doom I // clip it since it is used for bunny scroll in doom I
if (blendmode)
flags = HWR_GetBlendModeFlag(blendmode+1)|PF_NoDepthTest;
else
flags = PF_Translucent|PF_NoDepthTest;
if (alphalevel) if (alphalevel)
{ {
FSurfaceInfo Surf; FSurfaceInfo Surf;
Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff; Surf.PolyColor.s.red = Surf.PolyColor.s.green = Surf.PolyColor.s.blue = 0xff;
if (alphalevel == 13) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
else if (alphalevel == 14) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency]; if (alphalevel == 10) Surf.PolyColor.s.alpha = softwaretranstogl_lo[st_translucency];
else if (alphalevel == 15) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency]; else if (alphalevel == 11) Surf.PolyColor.s.alpha = softwaretranstogl[st_translucency];
else if (alphalevel == 12) Surf.PolyColor.s.alpha = softwaretranstogl_hi[st_translucency];
else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel]; else Surf.PolyColor.s.alpha = softwaretranstogl[10-alphalevel];
flags |= PF_Modulated; flags |= PF_Modulated;
HWD.pfnDrawPolygon(&Surf, v, 4, flags); HWD.pfnDrawPolygon(&Surf, v, 4, flags);
} }

101
src/hardware/hw_main.c
View file

@ -556,7 +556,7 @@ static void HWR_RenderPlane(subsector_t *subsector, extrasubsector_t *xsub, bool
HWR_Lighting(&Surf, lightlevel, planecolormap); HWR_Lighting(&Surf, lightlevel, planecolormap);
if (PolyFlags & (PF_Translucent|PF_Fog)) if (PolyFlags & (PF_Translucent|PF_Fog|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
{ {
Surf.PolyColor.s.alpha = (UINT8)alpha; Surf.PolyColor.s.alpha = (UINT8)alpha;
PolyFlags |= PF_Modulated; PolyFlags |= PF_Modulated;
@ -980,8 +980,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
if (cutflag & FF_FOG) if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap); HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
else if (cutflag & FF_TRANSLUCENT) else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap); HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap);
else else
HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap); HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
@ -1009,8 +1009,8 @@ static void HWR_SplitWall(sector_t *sector, FOutVector *wallVerts, INT32 texnum,
if (cutflag & FF_FOG) if (cutflag & FF_FOG)
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap); HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Fog|PF_NoTexture|polyflags, true, lightnum, colormap);
else if (cutflag & FF_TRANSLUCENT) else if (polyflags & (PF_Translucent|PF_Additive|PF_Subtractive|PF_ReverseSubtract|PF_Multiplicative|PF_Environment))
HWR_AddTransparentWall(wallVerts, Surf, texnum, PF_Translucent|polyflags, false, lightnum, colormap); HWR_AddTransparentWall(wallVerts, Surf, texnum, polyflags, false, lightnum, colormap);
else else
HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap); HWR_ProjectWall(wallVerts, Surf, PF_Masked|polyflags, lightnum, colormap);
} }
@ -1264,6 +1264,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
else else
HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap); HWR_ProjectWall(wallVerts, &Surf, PF_Masked, lightnum, colormap);
} }
gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture); gl_midtexture = R_GetTextureNum(gl_sidedef->midtexture);
if (gl_midtexture) if (gl_midtexture)
{ {
@ -1434,7 +1435,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
// set alpha for transparent walls // set alpha for transparent walls
// ooops ! this do not work at all because render order we should render it in backtofront order // ooops ! this do not work at all because render order we should render it in backtofront order
if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT) if (gl_linedef->blendmode && gl_linedef->blendmode != AST_FOG)
{
if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
blendmode = HWR_SurfaceBlend(gl_linedef->blendmode, R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
else
blendmode = HWR_GetBlendModeFlag(gl_linedef->blendmode);
}
else if (gl_linedef->alpha >= 0 && gl_linedef->alpha < FRACUNIT)
blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf); blendmode = HWR_TranstableToAlpha(R_GetLinedefTransTable(gl_linedef->alpha), &Surf);
else else
blendmode = PF_Masked; blendmode = PF_Masked;
@ -1457,11 +1465,9 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
if (gl_frontsector->numlights) if (gl_frontsector->numlights)
{ {
if (!(blendmode & PF_Masked)) if (!(blendmode & PF_Masked))
HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, PF_Decal); HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_TRANSLUCENT, NULL, blendmode);
else else
{ HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, blendmode);
HWR_SplitWall(gl_frontsector, wallVerts, gl_midtexture, &Surf, FF_CUTLEVEL, NULL, PF_Decal);
}
} }
else if (!(blendmode & PF_Masked)) else if (!(blendmode & PF_Masked))
HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, blendmode, false, lightnum, colormap); HWR_AddTransparentWall(wallVerts, &Surf, gl_midtexture, blendmode, false, lightnum, colormap);
@ -1721,7 +1727,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap); Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_frontsector->numlights) if (gl_frontsector->numlights)
HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, 0); HWR_SplitWall(gl_frontsector, wallVerts, 0, &Surf, rover->flags, rover, blendmode);
else else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap); HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
} }
@ -1729,14 +1735,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{ {
FBITFIELD blendmode = PF_Masked; FBITFIELD blendmode = PF_Masked;
if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{ {
blendmode = PF_Translucent; blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent;
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1; Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
} }
if (gl_frontsector->numlights) if (gl_frontsector->numlights)
HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, 0); HWR_SplitWall(gl_frontsector, wallVerts, texnum, &Surf, rover->flags, rover, blendmode);
else else
{ {
if (blendmode != PF_Masked) if (blendmode != PF_Masked)
@ -1844,7 +1850,7 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap); Surf.PolyColor.s.alpha = HWR_FogBlockAlpha(rover->master->frontsector->lightlevel, rover->master->frontsector->extra_colormap);
if (gl_backsector->numlights) if (gl_backsector->numlights)
HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, 0); HWR_SplitWall(gl_backsector, wallVerts, 0, &Surf, rover->flags, rover, blendmode);
else else
HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap); HWR_AddTransparentWall(wallVerts, &Surf, 0, blendmode, true, lightnum, colormap);
} }
@ -1852,14 +1858,14 @@ static void HWR_ProcessSeg(void) // Sort of like GLWall::Process in GZDoom
{ {
FBITFIELD blendmode = PF_Masked; FBITFIELD blendmode = PF_Masked;
if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{ {
blendmode = PF_Translucent; blendmode = rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent;
Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1; Surf.PolyColor.s.alpha = (UINT8)rover->alpha-1 > 255 ? 255 : rover->alpha-1;
} }
if (gl_backsector->numlights) if (gl_backsector->numlights)
HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, 0); HWR_SplitWall(gl_backsector, wallVerts, texnum, &Surf, rover->flags, rover, blendmode);
else else
{ {
if (blendmode != PF_Masked) if (blendmode != PF_Masked)
@ -2936,6 +2942,13 @@ static void HWR_AddPolyObjectPlanes(void)
} }
} }
static FBITFIELD HWR_RippleBlend(sector_t *sector, ffloor_t *rover, boolean ceiling)
{
(void)sector;
(void)ceiling;
return /*R_IsRipplePlane(sector, rover, ceiling)*/ (rover->flags & FF_RIPPLE) ? PF_Ripple : 0;
}
// -----------------+ // -----------------+
// HWR_Subsector : Determine floor/ceiling planes. // HWR_Subsector : Determine floor/ceiling planes.
// : Add sprites of things in sector. // : Add sprites of things in sector.
@ -3126,7 +3139,7 @@ static void HWR_Subsector(size_t num)
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap); true, rover->master->frontsector->extra_colormap);
} }
else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) // SoM: Flags are more efficient else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend) // SoM: Flags are more efficient
{ {
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
@ -3135,14 +3148,15 @@ static void HWR_Subsector(size_t num)
false, false,
*rover->bottomheight, *rover->bottomheight,
*gl_frontsector->lightlist[light].lightlevel, *gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector,
HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
false, *gl_frontsector->lightlist[light].extra_colormap); false, *gl_frontsector->lightlist[light].extra_colormap);
} }
else else
{ {
HWR_GetLevelFlat(&levelflats[*rover->bottompic]); HWR_GetLevelFlat(&levelflats[*rover->bottompic]);
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic], HWR_RenderPlane(sub, &extrasubsectors[num], false, *rover->bottomheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->bottompic],
rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap); rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
} }
} }
@ -3171,7 +3185,7 @@ static void HWR_Subsector(size_t num)
alpha, rover->master->frontsector, PF_Fog|PF_NoTexture, alpha, rover->master->frontsector, PF_Fog|PF_NoTexture,
true, rover->master->frontsector->extra_colormap); true, rover->master->frontsector->extra_colormap);
} }
else if (rover->flags & FF_TRANSLUCENT && rover->alpha < 256) else if ((rover->flags & FF_TRANSLUCENT && rover->alpha < 256) || rover->blend)
{ {
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
@ -3180,14 +3194,15 @@ static void HWR_Subsector(size_t num)
true, true,
*rover->topheight, *rover->topheight,
*gl_frontsector->lightlist[light].lightlevel, *gl_frontsector->lightlist[light].lightlevel,
rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Translucent, rover->alpha-1 > 255 ? 255 : rover->alpha-1, rover->master->frontsector,
HWR_RippleBlend(gl_frontsector, rover, false) | (rover->blend ? HWR_GetBlendModeFlag(rover->blend) : PF_Translucent),
false, *gl_frontsector->lightlist[light].extra_colormap); false, *gl_frontsector->lightlist[light].extra_colormap);
} }
else else
{ {
HWR_GetLevelFlat(&levelflats[*rover->toppic]); HWR_GetLevelFlat(&levelflats[*rover->toppic]);
light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false); light = R_GetPlaneLight(gl_frontsector, centerHeight, dup_viewz < cullHeight ? true : false);
HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, (rover->flags & FF_RIPPLE ? PF_Ripple : 0)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic], HWR_RenderPlane(sub, &extrasubsectors[num], true, *rover->topheight, HWR_RippleBlend(gl_frontsector, rover, false)|PF_Occlude, *gl_frontsector->lightlist[light].lightlevel, &levelflats[*rover->toppic],
rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap); rover->master->frontsector, 255, *gl_frontsector->lightlist[light].extra_colormap);
} }
} }
@ -3829,6 +3844,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else else
occlusion = PF_Occlude; occlusion = PF_Occlude;
INT32 blendmode;
if (spr->mobj->frame & FF_BLENDMASK)
blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
else
blendmode = spr->mobj->blendmode;
if (!cv_translucency.value) // translucency disabled if (!cv_translucency.value) // translucency disabled
{ {
Surf.PolyColor.s.alpha = 0xFF; Surf.PolyColor.s.alpha = 0xFF;
@ -3838,12 +3859,12 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW) else if (spr->mobj->flags2 & MF2_SHADOW)
{ {
Surf.PolyColor.s.alpha = 0x40; Surf.PolyColor.s.alpha = 0x40;
blend = HWR_GetBlendModeFlag(spr->mobj->blendmode); blend = HWR_GetBlendModeFlag(blendmode);
} }
else if (spr->mobj->frame & FF_TRANSMASK) else if (spr->mobj->frame & FF_TRANSMASK)
{ {
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf); blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
} }
else else
{ {
@ -3852,7 +3873,7 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix // Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before // the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF; Surf.PolyColor.s.alpha = 0xFF;
blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion; blend = HWR_GetBlendModeFlag(blendmode)|occlusion;
if (!occlusion) use_linkdraw_hack = true; if (!occlusion) use_linkdraw_hack = true;
} }
@ -3892,6 +3913,9 @@ static void HWR_SplitSprite(gl_vissprite_t *spr)
} }
} }
if (R_ThingIsSemiBright(spr->mobj))
lightlevel = 128 + (lightlevel>>1);
for (i = 0; i < sector->numlights; i++) for (i = 0; i < sector->numlights; i++)
{ {
if (endtop < endrealbot && top < realbot) if (endtop < endrealbot && top < realbot)
@ -4245,6 +4269,9 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (!lightset) else if (!lightset)
lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel; lightlevel = sector->lightlevel > 255 ? 255 : sector->lightlevel;
if (R_ThingIsSemiBright(spr->mobj))
lightlevel = 128 + (lightlevel>>1);
HWR_Lighting(&Surf, lightlevel, colormap); HWR_Lighting(&Surf, lightlevel, colormap);
} }
@ -4261,6 +4288,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else else
occlusion = PF_Occlude; occlusion = PF_Occlude;
INT32 blendmode;
if (spr->mobj->frame & FF_BLENDMASK)
blendmode = ((spr->mobj->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
else
blendmode = spr->mobj->blendmode;
if (!cv_translucency.value) // translucency disabled if (!cv_translucency.value) // translucency disabled
{ {
Surf.PolyColor.s.alpha = 0xFF; Surf.PolyColor.s.alpha = 0xFF;
@ -4270,12 +4303,12 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
else if (spr->mobj->flags2 & MF2_SHADOW) else if (spr->mobj->flags2 & MF2_SHADOW)
{ {
Surf.PolyColor.s.alpha = 0x40; Surf.PolyColor.s.alpha = 0x40;
blend = HWR_GetBlendModeFlag(spr->mobj->blendmode); blend = HWR_GetBlendModeFlag(blendmode);
} }
else if (spr->mobj->frame & FF_TRANSMASK) else if (spr->mobj->frame & FF_TRANSMASK)
{ {
INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT; INT32 trans = (spr->mobj->frame & FF_TRANSMASK)>>FF_TRANSSHIFT;
blend = HWR_SurfaceBlend(spr->mobj->blendmode, trans, &Surf); blend = HWR_SurfaceBlend(blendmode, trans, &Surf);
} }
else else
{ {
@ -4284,7 +4317,7 @@ static void HWR_DrawSprite(gl_vissprite_t *spr)
// Hurdler: PF_Environement would be cool, but we need to fix // Hurdler: PF_Environement would be cool, but we need to fix
// the issue with the fog before // the issue with the fog before
Surf.PolyColor.s.alpha = 0xFF; Surf.PolyColor.s.alpha = 0xFF;
blend = HWR_GetBlendModeFlag(spr->mobj->blendmode)|occlusion; blend = HWR_GetBlendModeFlag(blendmode)|occlusion;
if (!occlusion) use_linkdraw_hack = true; if (!occlusion) use_linkdraw_hack = true;
} }
@ -4979,10 +5012,16 @@ static void HWR_ProjectSprite(mobj_t *thing)
if (thing->spritexscale < 1 || thing->spriteyscale < 1) if (thing->spritexscale < 1 || thing->spriteyscale < 1)
return; return;
INT32 blendmode;
if (thing->frame & FF_BLENDMASK)
blendmode = ((thing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
else
blendmode = thing->blendmode;
// Visibility check by the blend mode. // Visibility check by the blend mode.
if (thing->frame & FF_TRANSMASK) if (thing->frame & FF_TRANSMASK)
{ {
if (!R_BlendLevelVisible(thing->blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT)) if (!R_BlendLevelVisible(blendmode, (thing->frame & FF_TRANSMASK)>>FF_TRANSSHIFT))
return; return;
} }

40
src/hu_stuff.c
View file

@ -1869,7 +1869,7 @@ static void HU_DrawChat_Old(void)
static inline void HU_DrawCrosshair(void) static inline void HU_DrawCrosshair(void)
{ {
INT32 i, y; INT32 i, y, dupz;
i = cv_crosshair.value & 3; i = cv_crosshair.value & 3;
if (!i) if (!i)
@ -1885,12 +1885,14 @@ static inline void HU_DrawCrosshair(void)
#endif #endif
y = viewwindowy + (viewheight>>1); y = viewwindowy + (viewheight>>1);
V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
V_DrawFixedPatch(vid.width<<(FRACBITS-1), y<<FRACBITS, FRACUNIT/dupz, V_TRANSLUCENT, crosshair[i - 1], NULL);
} }
static inline void HU_DrawCrosshair2(void) static inline void HU_DrawCrosshair2(void)
{ {
INT32 i, y; INT32 i, y, dupz;
i = cv_crosshair2.value & 3; i = cv_crosshair2.value & 3;
if (!i) if (!i)
@ -1906,17 +1908,19 @@ static inline void HU_DrawCrosshair2(void)
#endif #endif
y = viewwindowy + (viewheight>>1); y = viewwindowy + (viewheight>>1);
if (splitscreen) if (!splitscreen)
{ return;
#ifdef HWRENDER
#ifdef HWRENDER
if (rendermode != render_soft) if (rendermode != render_soft)
y += (INT32)gl_viewheight; y += (INT32)gl_viewheight;
else else
#endif #endif
y += viewheight; y += viewheight;
V_DrawScaledPatch(vid.width>>1, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); dupz = (vid.dupx < vid.dupy ? vid.dupx : vid.dupy);
}
V_DrawFixedPatch(vid.width<<(FRACBITS-1), y<<FRACBITS, FRACUNIT/dupz, V_TRANSLUCENT, crosshair[i - 1], NULL);
} }
static void HU_DrawCEcho(void) static void HU_DrawCEcho(void)
@ -2472,7 +2476,7 @@ static void HU_Draw32TeamTabRankings(playersort_t *tab, INT32 whiteplayer)
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1)) if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y, V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0) ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
| (greycheck ? 0 : V_TRANSLUCENT) | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name); | V_ALLOWLOWERCASE, name);
if (gametyperules & GTR_TEAMFLAGS) if (gametyperules & GTR_TEAMFLAGS)
@ -2733,12 +2737,12 @@ void HU_DrawDualTabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scoreline
if (circuitmap) if (circuitmap)
{ {
if (players[tab[i].num].exiting) if (players[tab[i].num].exiting)
V_DrawRightAlignedThinString(x+146, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime))); V_DrawRightAlignedThinString(x+100, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else else
V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
} }
else else
V_DrawRightAlignedThinString(x+146, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
} }
else else
V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count)); V_DrawRightAlignedThinString(x+100, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
@ -2786,7 +2790,7 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1)) if (!players[tab[i].num].quittime || (leveltime / (TICRATE/2) & 1))
V_DrawString(x + 10, y, V_DrawString(x + 10, y,
((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0) ((tab[i].num == whiteplayer) ? V_YELLOWMAP : 0)
| (greycheck ? 0 : V_TRANSLUCENT) | (greycheck ? V_TRANSLUCENT : 0)
| V_ALLOWLOWERCASE, name); | V_ALLOWLOWERCASE, name);
if (G_GametypeUsesLives()) //show lives if (G_GametypeUsesLives()) //show lives
@ -2846,13 +2850,13 @@ static void HU_Draw32TabRankings(INT32 x, INT32 y, playersort_t *tab, INT32 scor
if (players[tab[i].num].exiting) if (players[tab[i].num].exiting)
V_DrawRightAlignedThinString(x+128, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime))); V_DrawRightAlignedThinString(x+128, y, 0, va("%i:%02i.%02i", G_TicsToMinutes(players[tab[i].num].realtime,true), G_TicsToSeconds(players[tab[i].num].realtime), G_TicsToCentiseconds(players[tab[i].num].realtime)));
else else
V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count)); V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
} }
else else
V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count))); V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%i:%02i.%02i", G_TicsToMinutes(tab[i].count,true), G_TicsToSeconds(tab[i].count), G_TicsToCentiseconds(tab[i].count)));
} }
else else
V_DrawRightAlignedThinString(x+128, y, (greycheck ? 0 : V_TRANSLUCENT), va("%u", tab[i].count)); V_DrawRightAlignedThinString(x+128, y, (greycheck ? V_TRANSLUCENT : 0), va("%u", tab[i].count));
y += 9; y += 9;
if (i == 16) if (i == 16)
@ -3091,7 +3095,7 @@ static void HU_DrawRankings(void)
HU_DrawTeamTabRankings(tab, whiteplayer); HU_DrawTeamTabRankings(tab, whiteplayer);
else if (scorelines <= 9 && !cv_compactscoreboard.value) else if (scorelines <= 9 && !cv_compactscoreboard.value)
HU_DrawTabRankings(40, 32, tab, scorelines, whiteplayer); HU_DrawTabRankings(40, 32, tab, scorelines, whiteplayer);
else if (scorelines <= 20 && !cv_compactscoreboard.value) else if (scorelines <= 18 && !cv_compactscoreboard.value)
HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer); HU_DrawDualTabRankings(32, 32, tab, scorelines, whiteplayer);
else else
HU_Draw32TabRankings(14, 28, tab, scorelines, whiteplayer); HU_Draw32TabRankings(14, 28, tab, scorelines, whiteplayer);

10
src/info.c
View file

@ -5198,11 +5198,11 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // speed 0, // speed
24*FRACUNIT, // radius 24*FRACUNIT, // radius
34*FRACUNIT, // height 34*FRACUNIT, // height
0, // display offset 1, // display offset
DMG_FIRE, // mass DMG_FIRE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOGRAVITY|MF_NOBLOCKMAP|MF_FIRE|MF_PAIN, // flags MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOCLIPHEIGHT|MF_FIRE|MF_PAIN, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -7977,7 +7977,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
DMG_SPIKE, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_SCENERY|MF_NOCLIPHEIGHT, // flags MF_SOLID|MF_SCENERY, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -8004,7 +8004,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
DMG_SPIKE, // mass DMG_SPIKE, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIPHEIGHT|MF_PAPERCOLLISION, // flags MF_SOLID|MF_NOGRAVITY|MF_SCENERY|MF_PAPERCOLLISION, // flags
S_NULL // raisestate S_NULL // raisestate
}, },
@ -8031,7 +8031,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4, // mass 4, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPTHING, // flags MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY|MF_NOCLIP|MF_NOCLIPTHING, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

2
src/lua_hooklib.c
View file

@ -1117,7 +1117,7 @@ int LUA_HookMusicChange(const char *oldname, struct MusicChange *param)
lua_pushstring(gL, oldname);/* the only constant value */ lua_pushstring(gL, oldname);/* the only constant value */
lua_pushstring(gL, param->newname);/* semi constant */ lua_pushstring(gL, param->newname);/* semi constant */
for (k = 0; k <= map->numHooks; ++k) for (k = 0; k < map->numHooks; ++k)
{ {
get_hook(&hook, map->ids, k); get_hook(&hook, map->ids, k);

8
src/lua_maplib.c
View file

@ -196,6 +196,7 @@ enum ffloor_e {
ffloor_next, ffloor_next,
ffloor_prev, ffloor_prev,
ffloor_alpha, ffloor_alpha,
ffloor_blend,
ffloor_bustflags, ffloor_bustflags,
ffloor_busttype, ffloor_busttype,
ffloor_busttag, ffloor_busttag,
@ -220,6 +221,7 @@ static const char *const ffloor_opt[] = {
"next", "next",
"prev", "prev",
"alpha", "alpha",
"blend",
"bustflags", "bustflags",
"busttype", "busttype",
"busttag", "busttag",
@ -1837,6 +1839,9 @@ static int ffloor_get(lua_State *L)
case ffloor_bouncestrength: case ffloor_bouncestrength:
lua_pushfixed(L, ffloor->bouncestrength); lua_pushfixed(L, ffloor->bouncestrength);
return 1; return 1;
case ffloor_blend:
lua_pushinteger(L, ffloor->blend);
return 1;
} }
return 0; return 0;
} }
@ -1915,6 +1920,9 @@ static int ffloor_set(lua_State *L)
case ffloor_alpha: case ffloor_alpha:
ffloor->alpha = (INT32)luaL_checkinteger(L, 3); ffloor->alpha = (INT32)luaL_checkinteger(L, 3);
break; break;
case ffloor_blend:
ffloor->blend = (INT32)luaL_checkinteger(L, 3);
break;
} }
return 0; return 0;
} }

7
src/lua_mathlib.c
View file

@ -88,6 +88,12 @@ static int lib_finetangent(lua_State *L)
return 1; return 1;
} }
static int lib_fixedasin(lua_State *L)
{
lua_pushangle(L, -FixedAcos(luaL_checkfixed(L, 1)) + ANGLE_90);
return 1;
}
static int lib_fixedacos(lua_State *L) static int lib_fixedacos(lua_State *L)
{ {
lua_pushangle(L, FixedAcos(luaL_checkfixed(L, 1))); lua_pushangle(L, FixedAcos(luaL_checkfixed(L, 1)));
@ -199,6 +205,7 @@ static luaL_Reg lib_math[] = {
{"sin", lib_finesine}, {"sin", lib_finesine},
{"cos", lib_finecosine}, {"cos", lib_finecosine},
{"tan", lib_finetangent}, {"tan", lib_finetangent},
{"asin", lib_fixedasin},
{"acos", lib_fixedacos}, {"acos", lib_fixedacos},
{"FixedAngle", lib_fixedangle}, {"FixedAngle", lib_fixedangle},
{"fixangle" , lib_fixedangle}, {"fixangle" , lib_fixedangle},

43
src/m_menu.c
View file

@ -4036,7 +4036,7 @@ static void M_DrawThermo(INT32 x, INT32 y, consvar_t *cv)
xx += p->width - p->leftoffset; xx += p->width - p->leftoffset;
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
V_DrawScaledPatch(xx, y, V_WRAPX, W_CachePatchNum(centerlump[i & 1], PU_PATCH)); V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(centerlump[i & 1], PU_PATCH));
xx += 8; xx += 8;
} }
V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_PATCH)); V_DrawScaledPatch(xx, y, 0, W_CachePatchNum(rightlump, PU_PATCH));
@ -4134,7 +4134,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
p = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH); p = W_CachePatchNum(viewborderlump[BRDR_L], PU_PATCH);
for (n = 0; n < boxlines; n++) for (n = 0; n < boxlines; n++)
{ {
V_DrawScaledPatch(cx, cy, V_WRAPY, p); V_DrawScaledPatch(cx, cy, 0, p);
cy += step; cy += step;
} }
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BL], PU_PATCH)); V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BL], PU_PATCH));
@ -4146,8 +4146,8 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
cy = y; cy = y;
while (width > 0) while (width > 0)
{ {
V_DrawScaledPatch(cx, cy, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH)); V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_T], PU_PATCH));
V_DrawScaledPatch(cx, y + boff + boxlines*step, V_WRAPX, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH)); V_DrawScaledPatch(cx, y + boff + boxlines*step, 0, W_CachePatchNum(viewborderlump[BRDR_B], PU_PATCH));
width--; width--;
cx += step; cx += step;
} }
@ -4159,7 +4159,7 @@ void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
p = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH); p = W_CachePatchNum(viewborderlump[BRDR_R], PU_PATCH);
for (n = 0; n < boxlines; n++) for (n = 0; n < boxlines; n++)
{ {
V_DrawScaledPatch(cx, cy, V_WRAPY, p); V_DrawScaledPatch(cx, cy, 0, p);
cy += step; cy += step;
} }
V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BR], PU_PATCH)); V_DrawScaledPatch(cx, cy, 0, W_CachePatchNum(viewborderlump[BRDR_BR], PU_PATCH));
@ -4438,22 +4438,21 @@ static void M_DrawGenericMenu(void)
} }
} }
const char *PlaystyleNames[4] = {"Strafe", "Standard", "Simple", "Old Analog??"}; const char *PlaystyleNames[4] = {"\x86Strafe\x80", "Manual", "Automatic", "Old Analog??"};
const char *PlaystyleDesc[4] = { const char *PlaystyleDesc[4] = {
// Legacy // Strafe (or Legacy)
"The play style used for\n" "A play style resembling\n"
"old-school SRB2.\n" "old-school SRB2 gameplay.\n"
"\n" "\n"
"This play style is identical\n" "This play style is identical\n"
"to Standard, except that the\n" "to Manual, except that the\n"
"player always looks in the\n" "player always looks in the\n"
"direction of the camera." "direction of the camera."
, ,
// Standard // Manual (formerly Standard)
"The default play style,\n" "A play style made for full control,\n"
"designed for full control\n" "using a keyboard and mouse.\n"
"with a keyboard and mouse.\n"
"\n" "\n"
"The camera rotates only when\n" "The camera rotates only when\n"
"you tell it to. The player\n" "you tell it to. The player\n"
@ -4465,8 +4464,8 @@ const char *PlaystyleDesc[4] = {
"open up the highest level of play!" "open up the highest level of play!"
, ,
// Simple // Automatic (formerly Simple)
"A play style designed for\n" "The default play style, designed for\n"
"gamepads and hassle-free play.\n" "gamepads and hassle-free play.\n"
"\n" "\n"
"The camera rotates automatically\n" "The camera rotates automatically\n"
@ -4475,7 +4474,8 @@ const char *PlaystyleDesc[4] = {
"they're moving.\n" "they're moving.\n"
"\n" "\n"
"Hold \x82" "Center View\x80 to lock the\n" "Hold \x82" "Center View\x80 to lock the\n"
"camera behind the player!\n" "camera behind the player, or target\n"
"enemies, bosses and monitors!\n"
, ,
// Old Analog // Old Analog
@ -4486,7 +4486,7 @@ const char *PlaystyleDesc[4] = {
"your config file and brought it back.\n" "your config file and brought it back.\n"
"\n" "\n"
"That's absolutely valid, but I implore\n" "That's absolutely valid, but I implore\n"
"you to try the new Simple play style\n" "you to try the new Automatic play style\n"
"instead!" "instead!"
}; };
@ -9062,7 +9062,7 @@ static void M_LoadGame(INT32 choice)
if (tutorialmap && cv_tutorialprompt.value) if (tutorialmap && cv_tutorialprompt.value)
{ {
M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress 'Y' or 'Enter' to go\nPress 'N' or any key to skip\n", M_StartMessage("Do you want to \x82play a brief Tutorial\x80?\n\nWe highly recommend this because \nthe controls are slightly different \nfrom other games.\n\nPress the\x82 Y\x80 key or the\x83 A button\x80 to go\nPress the\x82 N\x80 key or the\x83 Y button\x80 to skip\n",
M_FirstTimeResponse, MM_YESNO); M_FirstTimeResponse, MM_YESNO);
return; return;
} }
@ -11588,9 +11588,7 @@ static void M_ServerOptions(INT32 choice)
OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[ 2].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[ 3].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[ 4].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[36].status = (netgame OP_ServerOptionsMenu[36].status = IT_STRING | IT_CVAR | IT_CV_STRING;
? IT_GRAYEDOUT
: (IT_STRING | IT_CVAR | IT_CV_STRING));
OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[37].status = IT_STRING | IT_CVAR;
OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR; OP_ServerOptionsMenu[38].status = IT_STRING | IT_CVAR;
} }
@ -13010,6 +13008,7 @@ static void M_DrawPlaystyleMenu(void)
if (i == playstyle_currentchoice) if (i == playstyle_currentchoice)
{ {
V_DrawFill(20, 40, 280, 150, 159);
V_DrawScaledPatch((i+1)*BASEVIDWIDTH/4 - 8, 10, 0, W_CachePatchName("M_CURSOR", PU_CACHE)); V_DrawScaledPatch((i+1)*BASEVIDWIDTH/4 - 8, 10, 0, W_CachePatchName("M_CURSOR", PU_CACHE));
V_DrawString(30, 50, V_ALLOWLOWERCASE, PlaystyleDesc[i]); V_DrawString(30, 50, V_ALLOWLOWERCASE, PlaystyleDesc[i]);
} }

4
src/p_floor.c
View file

@ -1462,8 +1462,8 @@ void T_EachTimeThinker(eachtime_t *eachtime)
{ {
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (P_IsPlayerValid(i) && playersArea[i]) if (P_IsPlayerValid(i) && !playersArea[i])
continue; return;
} }
} }

1
src/p_local.h
View file

@ -349,6 +349,7 @@ void P_FlashPal(player_t *pl, UINT16 type, UINT16 duration);
#define PAL_MIXUP 2 #define PAL_MIXUP 2
#define PAL_RECYCLE 3 #define PAL_RECYCLE 3
#define PAL_NUKE 4 #define PAL_NUKE 4
#define PAL_INVERT 5
// //
// P_ENEMY // P_ENEMY

166
src/p_map.c
View file

@ -1152,9 +1152,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath return true; // underneath
if (tmthing->eflags & MFE_VERTICALFLIP) if (tmthing->eflags & MFE_VERTICALFLIP)
thing->z = tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale); P_TeleportMove(thing, thing->x, thing->y, tmthing->z - thing->height - FixedMul(FRACUNIT, tmthing->scale));
else else
thing->z = tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale); P_TeleportMove(thing, thing->x, thing->y, tmthing->z + tmthing->height + FixedMul(FRACUNIT, tmthing->scale));
if (thing->flags & MF_SHOOTABLE) if (thing->flags & MF_SHOOTABLE)
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE); P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
return true; return true;
@ -1465,86 +1465,6 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; return true;
} }
// Sprite Spikes!
// Do not return because solidity code comes below.
if (tmthing->type == MT_SPIKE && tmthing->flags & MF_SOLID && thing->player) // moving spike rams into player?!
{
if (tmthing->eflags & MFE_VERTICALFLIP)
{
if (thing->z + thing->height <= tmthing->z + FixedMul(FRACUNIT, tmthing->scale)
&& thing->z + thing->height + thing->momz >= tmthing->z + FixedMul(FRACUNIT, tmthing->scale) + tmthing->momz
&& !(thing->player->charability == CA_BOUNCE && thing->player->panim == PA_ABILITY && thing->eflags & MFE_VERTICALFLIP))
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
}
else if (thing->z >= tmthing->z + tmthing->height - FixedMul(FRACUNIT, tmthing->scale)
&& thing->z + thing->momz <= tmthing->z + tmthing->height - FixedMul(FRACUNIT, tmthing->scale) + tmthing->momz
&& !(thing->player->charability == CA_BOUNCE && thing->player->panim == PA_ABILITY && !(thing->eflags & MFE_VERTICALFLIP)))
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
}
else if (thing->type == MT_SPIKE && thing->flags & MF_SOLID && tmthing->player) // unfortunate player falls into spike?!
{
if (thing->eflags & MFE_VERTICALFLIP)
{
if (tmthing->z + tmthing->height <= thing->z - FixedMul(FRACUNIT, thing->scale)
&& tmthing->z + tmthing->height + tmthing->momz >= thing->z - FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && tmthing->eflags & MFE_VERTICALFLIP))
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
else if (tmthing->z >= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
&& tmthing->z + tmthing->momz <= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && !(tmthing->eflags & MFE_VERTICALFLIP)))
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
if (tmthing->type == MT_WALLSPIKE && tmthing->flags & MF_SOLID && thing->player) // wall spike impales player
{
fixed_t bottomz, topz;
bottomz = tmthing->z;
topz = tmthing->z + tmthing->height;
if (tmthing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, tmthing->scale);
else
topz += FixedMul(FRACUNIT, tmthing->scale);
if (thing->z + thing->height > bottomz // above bottom
&& thing->z < topz) // below top
// don't check angle, the player was clearly in the way in this case
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
}
else if (thing->type == MT_WALLSPIKE && thing->flags & MF_SOLID && tmthing->player)
{
fixed_t bottomz, topz;
angle_t touchangle = R_PointToAngle2(thing->tracer->x, thing->tracer->y, tmthing->x, tmthing->y);
if (P_PlayerInPain(tmthing->player) && (tmthing->momx || tmthing->momy))
{
angle_t playerangle = R_PointToAngle2(0, 0, tmthing->momx, tmthing->momy) - touchangle;
if (playerangle > ANGLE_180)
playerangle = InvAngle(playerangle);
if (playerangle < ANGLE_90)
return true; // Yes, this is intentionally outside the z-height check. No standing on spikes whilst moving away from them.
}
bottomz = thing->z;
topz = thing->z + thing->height;
if (thing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, thing->scale);
else
topz += FixedMul(FRACUNIT, thing->scale);
if (tmthing->z + tmthing->height > bottomz // above bottom
&& tmthing->z < topz // below top
&& !P_MobjWasRemoved(thing->tracer)) // this probably wouldn't work if we didn't have a tracer
{ // use base as a reference point to determine what angle you touched the spike at
touchangle = thing->angle - touchangle;
if (touchangle > ANGLE_180)
touchangle = InvAngle(touchangle);
if (touchangle <= ANGLE_22h) // if you touched it at this close an angle, you get poked!
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
}
if (thing->flags & MF_PUSHABLE) if (thing->flags & MF_PUSHABLE)
{ {
if (tmthing->type == MT_FAN || tmthing->type == MT_STEAM) if (tmthing->type == MT_FAN || tmthing->type == MT_STEAM)
@ -1623,6 +1543,22 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (thing->player) if (thing->player)
{ {
if (tmthing->type == MT_WALLSPIKE && (tmthing->flags & MF_SOLID)) // wall spike impales player
{
fixed_t bottomz, topz;
bottomz = tmthing->z;
topz = tmthing->z + tmthing->height;
if (tmthing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, tmthing->scale);
else
topz += FixedMul(FRACUNIT, tmthing->scale);
if (thing->z + thing->height > bottomz // above bottom
&& thing->z < topz) // below top
// don't check angle, the player was clearly in the way in this case
P_DamageMobj(thing, tmthing, tmthing, 1, DMG_SPIKE);
}
// Doesn't matter what gravity player's following! Just do your stuff in YOUR direction only // Doesn't matter what gravity player's following! Just do your stuff in YOUR direction only
if (tmthing->eflags & MFE_VERTICALFLIP if (tmthing->eflags & MFE_VERTICALFLIP
&& (tmthing->z + tmthing->height + tmthing->momz < thing->z && (tmthing->z + tmthing->height + tmthing->momz < thing->z
@ -1657,6 +1593,55 @@ static boolean PIT_CheckThing(mobj_t *thing)
if (!tmthing->health) if (!tmthing->health)
return true; return true;
if (thing->type == MT_SPIKE && (thing->flags & MF_SOLID)) // unfortunate player falls into spike?!
{
if (thing->eflags & MFE_VERTICALFLIP)
{
if (tmthing->z + tmthing->height <= thing->z - FixedMul(FRACUNIT, thing->scale)
&& tmthing->z + tmthing->height + tmthing->momz >= thing->z - FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && tmthing->eflags & MFE_VERTICALFLIP))
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
else if (tmthing->z >= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
&& tmthing->z + tmthing->momz <= thing->z + thing->height + FixedMul(FRACUNIT, thing->scale)
&& !(tmthing->player->charability == CA_BOUNCE && tmthing->player->panim == PA_ABILITY && !(tmthing->eflags & MFE_VERTICALFLIP)))
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
if (thing->type == MT_WALLSPIKE && (thing->flags & MF_SOLID))
{
fixed_t bottomz, topz;
angle_t touchangle = R_PointToAngle2(thing->tracer->x, thing->tracer->y, tmthing->x, tmthing->y);
if (P_PlayerInPain(tmthing->player) && (tmthing->momx || tmthing->momy))
{
angle_t playerangle = R_PointToAngle2(0, 0, tmthing->momx, tmthing->momy) - touchangle;
if (playerangle > ANGLE_180)
playerangle = InvAngle(playerangle);
if (playerangle < ANGLE_90)
return true; // Yes, this is intentionally outside the z-height check. No standing on spikes whilst moving away from them.
}
bottomz = thing->z;
topz = thing->z + thing->height;
if (thing->eflags & MFE_VERTICALFLIP)
bottomz -= FixedMul(FRACUNIT, thing->scale);
else
topz += FixedMul(FRACUNIT, thing->scale);
if (tmthing->z + tmthing->height > bottomz // above bottom
&& tmthing->z < topz // below top
&& !P_MobjWasRemoved(thing->tracer)) // this probably wouldn't work if we didn't have a tracer
{ // use base as a reference point to determine what angle you touched the spike at
touchangle = thing->angle - touchangle;
if (touchangle > ANGLE_180)
touchangle = InvAngle(touchangle);
if (touchangle <= ANGLE_22h) // if you touched it at this close an angle, you get poked!
P_DamageMobj(tmthing, thing, thing, 1, DMG_SPIKE);
}
}
if (thing->type == MT_FAN || thing->type == MT_STEAM) if (thing->type == MT_FAN || thing->type == MT_STEAM)
P_DoFanAndGasJet(thing, tmthing); P_DoFanAndGasJet(thing, tmthing);
else if (thing->flags & MF_SPRING && tmthing->player->powers[pw_carry] != CR_MINECART) else if (thing->flags & MF_SPRING && tmthing->player->powers[pw_carry] != CR_MINECART)
@ -1721,8 +1706,8 @@ static boolean PIT_CheckThing(mobj_t *thing)
} }
} }
if ((tmthing->flags & MF_SPRING || tmthing->type == MT_STEAM || tmthing->type == MT_SPIKE || tmthing->type == MT_WALLSPIKE) && (thing->player)) if ((thing->player) && (tmthing->flags & MF_SPRING || tmthing->type == MT_STEAM))
; // springs, gas jets and springs should never be able to step up onto a player ; // springs and gas jets should never be able to step up onto a player
// z checking at last // z checking at last
// Treat noclip things as non-solid! // Treat noclip things as non-solid!
else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID else if ((thing->flags & (MF_SOLID|MF_NOCLIP)) == MF_SOLID
@ -1730,6 +1715,9 @@ static boolean PIT_CheckThing(mobj_t *thing)
{ {
fixed_t topz, tmtopz; fixed_t topz, tmtopz;
if (tmthing->type == MT_SPIKE || tmthing->type == MT_WALLSPIKE) // do not run height checks if you are a spike
return true;
if (tmthing->eflags & MFE_VERTICALFLIP) if (tmthing->eflags & MFE_VERTICALFLIP)
{ {
// pass under // pass under
@ -2727,6 +2715,16 @@ boolean P_TryMove(mobj_t *thing, fixed_t x, fixed_t y, boolean allowdropoff)
&& P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale)) && P_MobjFlip(thing)*thing->momz > FixedMul(FRACUNIT, thing->scale))
maxstep = 0; maxstep = 0;
} }
else if (thing->flags & MF_PUSHABLE)
{
// If using type Section1:13, double the maxstep.
if (GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 13)
maxstep <<= 1;
// If using type Section1:14, no maxstep.
if (GETSECSPECIAL(R_PointInSubsector(x, y)->sector->special, 1) == 14)
maxstep = 0;
}
if (thing->type == MT_SKIM) if (thing->type == MT_SKIM)
maxstep = 0; maxstep = 0;

154
src/p_mobj.c
View file

@ -325,9 +325,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
mobj->tics = st->tics; mobj->tics = st->tics;
// Adjust the player's animation speed to match their velocity. // Adjust the player's animation speed to match their velocity.
if (state == S_PLAY_STND && player->powers[pw_super] && skins[player->skin].sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0) // if no super wait, don't wait at all if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
mobj->tics = -1;
else if (player->panim == PA_EDGE && (player->charflags & SF_FASTEDGE))
mobj->tics = 2; mobj->tics = 2;
else if (!(disableSpeedAdjust || player->charflags & SF_NOSPEEDADJUST)) else if (!(disableSpeedAdjust || player->charflags & SF_NOSPEEDADJUST))
{ {
@ -396,8 +394,28 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
if (skin) if (skin)
{ {
spr2 = P_GetSkinSprite2(skin, (((player->powers[pw_super] && !(player->charflags & SF_NOSUPERSPRITES)) ? FF_SPR2SUPER : 0)|st->frame) & FF_FRAMEMASK, mobj->player); UINT16 stateframe = st->frame;
// Add/Remove FF_SPR2SUPER based on certain conditions
if (player->charflags & SF_NOSUPERSPRITES)
stateframe = stateframe & ~FF_SPR2SUPER;
else if (player->powers[pw_super])
stateframe = stateframe | FF_SPR2SUPER;
if (stateframe & FF_SPR2SUPER)
{
if (mobj->eflags & MFE_FORCENOSUPER)
stateframe = stateframe & ~FF_SPR2SUPER;
}
else if (mobj->eflags & MFE_FORCESUPER)
stateframe = stateframe | FF_SPR2SUPER;
// Get the sprite2 and frame number
spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), mobj->player);
numframes = skin->sprites[spr2].numframes; numframes = skin->sprites[spr2].numframes;
if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0)
mobj->tics = -1; // If no super wait, don't wait at all
} }
else else
{ {
@ -522,8 +540,23 @@ boolean P_SetMobjState(mobj_t *mobj, statenum_t state)
if (skin) if (skin)
{ {
spr2 = P_GetSkinSprite2(skin, st->frame & FF_FRAMEMASK, mobj->player); UINT16 stateframe = st->frame;
// Add/Remove FF_SPR2SUPER based on certain conditions
if (stateframe & FF_SPR2SUPER)
{
if (mobj->eflags & MFE_FORCENOSUPER)
stateframe = stateframe & ~FF_SPR2SUPER;
}
else if (mobj->eflags & MFE_FORCESUPER)
stateframe = stateframe | FF_SPR2SUPER;
// Get the sprite2 and frame number
spr2 = P_GetSkinSprite2(skin, (stateframe & FF_FRAMEMASK), NULL);
numframes = skin->sprites[spr2].numframes; numframes = skin->sprites[spr2].numframes;
if (state == S_PLAY_STND && (spr2 & FF_SPR2SUPER) && skin->sprites[SPR2_WAIT|FF_SPR2SUPER].numframes == 0)
mobj->tics = -1; // If no super wait, don't wait at all
} }
else else
{ {
@ -1844,7 +1877,7 @@ void P_XYMovement(mobj_t *mo)
// blocked move // blocked move
moved = false; moved = false;
if (player) if (player)
B_MoveBlocked(player); B_MoveBlocked(player);
if (LUA_HookMobjMoveBlocked(mo, tmhitthing, blockingline)) if (LUA_HookMobjMoveBlocked(mo, tmhitthing, blockingline))
@ -2494,7 +2527,7 @@ boolean P_ZMovement(mobj_t *mo)
{ {
P_KillMobj(mo, NULL, NULL, 0); P_KillMobj(mo, NULL, NULL, 0);
} }
return false; return !P_MobjWasRemoved(mo); // allows explosion states to run
} }
else else
{ {
@ -3295,7 +3328,7 @@ void P_MobjCheckWater(mobj_t *mobj)
{ // Water removes electric and non-water fire shields... { // Water removes electric and non-water fire shields...
if (electric) if (electric)
P_FlashPal(p, PAL_WHITE, 1); P_FlashPal(p, PAL_WHITE, 1);
p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK; p->powers[pw_shield] = p->powers[pw_shield] & SH_STACK;
} }
} }
@ -7031,6 +7064,8 @@ static void P_PyreFlyBurn(mobj_t *mobj, fixed_t hoffs, INT16 vrange, mobjtype_t
fixed_t zoffs = P_RandomRange(-vrange, vrange)*FRACUNIT; fixed_t zoffs = P_RandomRange(-vrange, vrange)*FRACUNIT;
mobj_t *particle = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, zoffs, mobjtype); mobj_t *particle = P_SpawnMobjFromMobj(mobj, xoffs, yoffs, zoffs, mobjtype);
particle->momz = momz; particle->momz = momz;
particle->flags2 |= MF2_LINKDRAW;
P_SetTarget(&particle->tracer, mobj);
} }
static void P_MobjScaleThink(mobj_t *mobj) static void P_MobjScaleThink(mobj_t *mobj)
@ -7710,7 +7745,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
break; break;
case MT_WATERDROP: case MT_WATERDROP:
P_SceneryCheckWater(mobj); P_SceneryCheckWater(mobj);
if ((mobj->z <= mobj->floorz || mobj->z <= mobj->watertop) if (((!(mobj->eflags & MFE_VERTICALFLIP) && (mobj->z <= mobj->floorz || mobj->z <= mobj->watertop))
|| (mobj->eflags & MFE_VERTICALFLIP && mobj->z + mobj->height >= mobj->ceilingz))
&& mobj->health > 0) && mobj->health > 0)
{ {
mobj->health = 0; mobj->health = 0;
@ -7814,6 +7850,48 @@ static void P_MobjSceneryThink(mobj_t *mobj)
if (P_MobjFlip(mobj)*mobj->momz < mobj->info->speed) if (P_MobjFlip(mobj)*mobj->momz < mobj->info->speed)
mobj->momz = P_MobjFlip(mobj)*mobj->info->speed; mobj->momz = P_MobjFlip(mobj)*mobj->info->speed;
break; break;
case MT_SPIKE:
if (mobj->fuse)
{
mobj->fuse--;
break;
}
P_SetMobjState(mobj, mobj->state->nextstate);
mobj->fuse = mobj->info->speed;
if (mobj->spawnpoint)
mobj->fuse += mobj->spawnpoint->angle;
break;
case MT_WALLSPIKE:
if (mobj->fuse)
{
mobj->fuse--;
break;
}
P_SetMobjState(mobj, mobj->state->nextstate);
mobj->fuse = mobj->info->speed;
if (mobj->spawnpoint)
mobj->fuse += (mobj->spawnpoint->angle / 360);
break;
case MT_WALLSPIKEBASE:
if (!mobj->target)
{
P_RemoveMobj(mobj);
return;
}
mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|(mobj->target->frame & FF_FRAMEMASK);
#if 0
if (mobj->angle != mobj->target->angle + ANGLE_90) // reposition if not the correct angle
{
mobj_t* target = mobj->target; // shortcut
const fixed_t baseradius = target->radius - (target->scale/2); //FixedMul(FRACUNIT/2, target->scale);
P_UnsetThingPosition(mobj);
mobj->x = target->x - P_ReturnThrustX(target, target->angle, baseradius);
mobj->y = target->y - P_ReturnThrustY(target, target->angle, baseradius);
P_SetThingPosition(mobj);
mobj->angle = target->angle + ANGLE_90;
}
#endif
break;
case MT_ROCKCRUMBLE1: case MT_ROCKCRUMBLE1:
case MT_ROCKCRUMBLE2: case MT_ROCKCRUMBLE2:
case MT_ROCKCRUMBLE3: case MT_ROCKCRUMBLE3:
@ -9210,25 +9288,6 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
switch (mobj->type) switch (mobj->type)
{ {
case MT_WALLSPIKEBASE:
if (!mobj->target) {
P_RemoveMobj(mobj);
return false;
}
mobj->frame = (mobj->frame & ~FF_FRAMEMASK)|(mobj->target->frame & FF_FRAMEMASK);
#if 0
if (mobj->angle != mobj->target->angle + ANGLE_90) // reposition if not the correct angle
{
mobj_t* target = mobj->target; // shortcut
const fixed_t baseradius = target->radius - (target->scale/2); //FixedMul(FRACUNIT/2, target->scale);
P_UnsetThingPosition(mobj);
mobj->x = target->x - P_ReturnThrustX(target, target->angle, baseradius);
mobj->y = target->y - P_ReturnThrustY(target, target->angle, baseradius);
P_SetThingPosition(mobj);
mobj->angle = target->angle + ANGLE_90;
}
#endif
break;
case MT_FALLINGROCK: case MT_FALLINGROCK:
// Despawn rocks here in case zmovement code can't do so (blame slopes) // Despawn rocks here in case zmovement code can't do so (blame slopes)
if (!mobj->momx && !mobj->momy && !mobj->momz if (!mobj->momx && !mobj->momy && !mobj->momz
@ -9914,18 +9973,6 @@ static boolean P_FuseThink(mobj_t *mobj)
break; break;
case MT_METALSONIC_BATTLE: case MT_METALSONIC_BATTLE:
break; // don't remove break; // don't remove
case MT_SPIKE:
P_SetMobjState(mobj, mobj->state->nextstate);
mobj->fuse = mobj->info->speed;
if (mobj->spawnpoint)
mobj->fuse += mobj->spawnpoint->angle;
break;
case MT_WALLSPIKE:
P_SetMobjState(mobj, mobj->state->nextstate);
mobj->fuse = mobj->info->speed;
if (mobj->spawnpoint)
mobj->fuse += (mobj->spawnpoint->angle / 360);
break;
case MT_NIGHTSCORE: case MT_NIGHTSCORE:
P_RemoveMobj(mobj); P_RemoveMobj(mobj);
return false; return false;
@ -10394,7 +10441,7 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing)
case MT_RING: case MT_RING:
case MT_FLINGRING: case MT_FLINGRING:
case MT_COIN: case MT_COIN:
case MT_FLINGCOIN: case MT_FLINGCOIN:
@ -12928,17 +12975,18 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
// Pop up spikes! // Pop up spikes!
if (mthing->options & MTF_OBJECTSPECIAL) if (mthing->options & MTF_OBJECTSPECIAL)
{ {
mobj->flags &= ~MF_SCENERY;
mobj->fuse = (16 - mthing->extrainfo)*(mthing->angle + mobj->info->speed)/16; mobj->fuse = (16 - mthing->extrainfo)*(mthing->angle + mobj->info->speed)/16;
if (mthing->options & MTF_EXTRA) if (mthing->options & MTF_EXTRA)
P_SetMobjState(mobj, mobj->info->meleestate); P_SetMobjState(mobj, mobj->info->meleestate);
} }
// Use per-thing collision for spikes if the deaf flag isn't checked. else
if (!(mthing->options & MTF_AMBUSH) && !metalrecording) mobj->flags |= MF_NOTHINK;
// no collision for spikes if the ambush flag is checked
if ((mthing->options & MTF_AMBUSH) || metalrecording)
{ {
P_UnsetThingPosition(mobj); P_UnsetThingPosition(mobj);
mobj->flags &= ~(MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT); mobj->flags |= (MF_NOBLOCKMAP|MF_NOCLIPHEIGHT);
mobj->flags |= MF_SOLID; mobj->flags &= ~MF_SOLID;
P_SetThingPosition(mobj); P_SetThingPosition(mobj);
} }
break; break;
@ -12946,20 +12994,20 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
// Pop up spikes! // Pop up spikes!
if (mthing->options & MTF_OBJECTSPECIAL) if (mthing->options & MTF_OBJECTSPECIAL)
{ {
mobj->flags &= ~MF_SCENERY;
mobj->fuse = (16 - mthing->extrainfo)*((mthing->angle/360) + mobj->info->speed)/16; mobj->fuse = (16 - mthing->extrainfo)*((mthing->angle/360) + mobj->info->speed)/16;
if (mthing->options & MTF_EXTRA) if (mthing->options & MTF_EXTRA)
P_SetMobjState(mobj, mobj->info->meleestate); P_SetMobjState(mobj, mobj->info->meleestate);
} }
// Use per-thing collision for spikes if the deaf flag isn't checked. else
if (!(mthing->options & MTF_AMBUSH) && !metalrecording) mobj->flags |= MF_NOTHINK;
// no collision for spikes if the ambush flag is checked
if ((mthing->options & MTF_AMBUSH) || metalrecording)
{ {
P_UnsetThingPosition(mobj); P_UnsetThingPosition(mobj);
mobj->flags &= ~(MF_NOBLOCKMAP | MF_NOCLIPHEIGHT); mobj->flags |= (MF_NOBLOCKMAP|MF_NOCLIPHEIGHT);
mobj->flags |= MF_SOLID; mobj->flags &= ~MF_SOLID;
P_SetThingPosition(mobj); P_SetThingPosition(mobj);
} }
// spawn base // spawn base
{ {
const angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS); // the mobj's own angle hasn't been set quite yet so... const angle_t mobjangle = FixedAngle(mthing->angle << FRACBITS); // the mobj's own angle hasn't been set quite yet so...
@ -12973,6 +13021,8 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
P_SetScale(base, mobj->scale); P_SetScale(base, mobj->scale);
P_SetTarget(&base->target, mobj); P_SetTarget(&base->target, mobj);
P_SetTarget(&mobj->tracer, base); P_SetTarget(&mobj->tracer, base);
if (!(mthing->options & MTF_OBJECTSPECIAL))
base->flags |= MF_NOTHINK;
} }
break; break;
case MT_RING_BOX: case MT_RING_BOX:

31
src/p_mobj.h
View file

@ -218,33 +218,40 @@ typedef enum
typedef enum typedef enum
{ {
// The mobj stands on solid floor (not on another mobj or in air) // The mobj stands on solid floor (not on another mobj or in air)
MFE_ONGROUND = 1, MFE_ONGROUND = 1,
// The mobj just hit the floor while falling, this is cleared on next frame // The mobj just hit the floor while falling, this is cleared on next frame
// (instant damage in lava/slime sectors to prevent jump cheat..) // (instant damage in lava/slime sectors to prevent jump cheat..)
MFE_JUSTHITFLOOR = 1<<1, MFE_JUSTHITFLOOR = 1<<1,
// The mobj stands in a sector with water, and touches the surface // The mobj stands in a sector with water, and touches the surface
// this bit is set once and for all at the start of mobjthinker // this bit is set once and for all at the start of mobjthinker
MFE_TOUCHWATER = 1<<2, MFE_TOUCHWATER = 1<<2,
// The mobj stands in a sector with water, and his waist is BELOW the water surface // The mobj stands in a sector with water, and his waist is BELOW the water surface
// (for player, allows swimming up/down) // (for player, allows swimming up/down)
MFE_UNDERWATER = 1<<3, MFE_UNDERWATER = 1<<3,
// used for ramp sectors // used for ramp sectors
MFE_JUSTSTEPPEDDOWN = 1<<4, MFE_JUSTSTEPPEDDOWN = 1<<4,
// Vertically flip sprite/allow upside-down physics // Vertically flip sprite/allow upside-down physics
MFE_VERTICALFLIP = 1<<5, MFE_VERTICALFLIP = 1<<5,
// Goo water // Goo water
MFE_GOOWATER = 1<<6, MFE_GOOWATER = 1<<6,
// The mobj is touching a lava block // The mobj is touching a lava block
MFE_TOUCHLAVA = 1<<7, MFE_TOUCHLAVA = 1<<7,
// Mobj was already pushed this tic // Mobj was already pushed this tic
MFE_PUSHED = 1<<8, MFE_PUSHED = 1<<8,
// Mobj was already sprung this tic // Mobj was already sprung this tic
MFE_SPRUNG = 1<<9, MFE_SPRUNG = 1<<9,
// Platform movement // Platform movement
MFE_APPLYPMOMZ = 1<<10, MFE_APPLYPMOMZ = 1<<10,
// Compute and trigger on mobj angle relative to tracer // Compute and trigger on mobj angle relative to tracer
// See Linedef Exec 457 (Track mobj angle to point) // See Linedef Exec 457 (Track mobj angle to point)
MFE_TRACERANGLE = 1<<11, MFE_TRACERANGLE = 1<<11,
// Forces an object to use super sprites with SPR_PLAY.
MFE_FORCESUPER = 1<<12,
// Forces an object to NOT use super sprites with SPR_PLAY.
MFE_FORCENOSUPER = 1<<13,
// Makes an object use super sprites where they wouldn't have otherwise and vice-versa
MFE_REVERSESUPER = MFE_FORCESUPER|MFE_FORCENOSUPER
// free: to and including 1<<15 // free: to and including 1<<15
} mobjeflag_t; } mobjeflag_t;

47
src/p_pspr.h
View file

@ -41,9 +41,20 @@
/// \brief Frame flags - SPR2: Super sprite2 /// \brief Frame flags - SPR2: Super sprite2
#define FF_SPR2SUPER 0x80 #define FF_SPR2SUPER 0x80
/// \brief Frame flags - SPR2: A change of state at the end of Sprite2 animation /// \brief Frame flags - SPR2: A change of state at the end of Sprite2 animation
#define FF_SPR2ENDSTATE 0x1000 #define FF_SPR2ENDSTATE 0x100
/// \brief Frame flags - SPR2: 50% of starting in middle of Sprite2 animation /// \brief Frame flags - SPR2: 50% of starting in middle of Sprite2 animation
#define FF_SPR2MIDSTART 0x2000 #define FF_SPR2MIDSTART 0x200
/// \brief Frame flags: blend types
#define FF_BLENDMASK 0x7000
/// \brief shift for FF_BLENDMASK
#define FF_BLENDSHIFT 12
/// \brief preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
#define FF_ADD ((AST_ADD-1)<<FF_BLENDSHIFT)
#define FF_SUBTRACT ((AST_SUBTRACT-1)<<FF_BLENDSHIFT)
#define FF_REVERSESUBTRACT ((AST_REVERSESUBTRACT-1)<<FF_BLENDSHIFT)
#define FF_MODULATE ((AST_MODULATE-1)<<FF_BLENDSHIFT)
#define FF_OVERLAY ((AST_OVERLAY-1)<<FF_BLENDSHIFT)
/// \brief Frame flags: 0 = no trans(opaque), 1-15 = transl. table /// \brief Frame flags: 0 = no trans(opaque), 1-15 = transl. table
#define FF_TRANSMASK 0xf0000 #define FF_TRANSMASK 0xf0000
@ -60,21 +71,31 @@
#define FF_TRANS80 (tr_trans80<<FF_TRANSSHIFT) #define FF_TRANS80 (tr_trans80<<FF_TRANSSHIFT)
#define FF_TRANS90 (tr_trans90<<FF_TRANSSHIFT) #define FF_TRANS90 (tr_trans90<<FF_TRANSSHIFT)
/// \brief Frame flags: brightness mask
#define FF_BRIGHTMASK 0x00300000
/// \brief Frame flags: frame always appears full bright /// \brief Frame flags: frame always appears full bright
#define FF_FULLBRIGHT 0x00100000 #define FF_FULLBRIGHT 0x00100000
/// \brief Frame flags: Flip sprite vertically (relative to what it should be for its gravity) /// \brief Frame flags: frame always appears full darkness
#define FF_VERTICALFLIP 0x00200000 #define FF_FULLDARK 0x00200000
/// \brief Frame flags: Flip sprite horizontally /// \brief Frame flags: frame appears between sector bright and full bright
#define FF_HORIZONTALFLIP 0x00400000 #define FF_SEMIBRIGHT (FF_FULLBRIGHT|FF_FULLDARK)
/// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION) /// \brief Frame flags: Thin, paper-like sprite (for collision equivalent, see MF_PAPERCOLLISION)
#define FF_PAPERSPRITE 0x00800000 #define FF_PAPERSPRITE 0x00400000
/// \brief Frame flags: Splat!
#define FF_FLOORSPRITE 0x00800000
/// \brief Frame flags: Flip sprite vertically (relative to what it should be for its gravity)
#define FF_VERTICALFLIP 0x01000000
/// \brief Frame flags: Flip sprite horizontally
#define FF_HORIZONTALFLIP 0x02000000
/// \brief Frame flags - Animate: Simple stateless animation /// \brief Frame flags - Animate: Simple stateless animation
#define FF_ANIMATE 0x01000000 #define FF_ANIMATE 0x10000000
/// \brief Frame flags - Animate: Start at a random place in the animation (mutually exclusive with below) /// \brief Frame flags - Animate: Sync animation to global timer (mutually exclusive with below, currently takes priority)
#define FF_RANDOMANIM 0x02000000 #define FF_GLOBALANIM 0x20000000
/// \brief Frame flags - Animate: Sync animation to global timer (mutually exclusive with above) /// \brief Frame flags - Animate: Start at a random place in the animation (mutually exclusive with above)
#define FF_GLOBALANIM 0x04000000 #define FF_RANDOMANIM 0x40000000
/** \brief translucency tables /** \brief translucency tables

4
src/p_saveg.c
View file

@ -1604,7 +1604,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
diff2 = 0; diff2 = 0;
// not the default but the most probable // not the default but the most probable
if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0) if (mobj->momx != 0 || mobj->momy != 0 || mobj->momz != 0 || mobj->pmomz !=0)
diff |= MD_MOM; diff |= MD_MOM;
if (mobj->radius != mobj->info->radius) if (mobj->radius != mobj->info->radius)
diff |= MD_RADIUS; diff |= MD_RADIUS;
@ -1779,6 +1779,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
WRITEFIXED(save_p, mobj->momx); WRITEFIXED(save_p, mobj->momx);
WRITEFIXED(save_p, mobj->momy); WRITEFIXED(save_p, mobj->momy);
WRITEFIXED(save_p, mobj->momz); WRITEFIXED(save_p, mobj->momz);
WRITEFIXED(save_p, mobj->pmomz);
} }
if (diff & MD_RADIUS) if (diff & MD_RADIUS)
WRITEFIXED(save_p, mobj->radius); WRITEFIXED(save_p, mobj->radius);
@ -2791,6 +2792,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
mobj->momx = READFIXED(save_p); mobj->momx = READFIXED(save_p);
mobj->momy = READFIXED(save_p); mobj->momy = READFIXED(save_p);
mobj->momz = READFIXED(save_p); mobj->momz = READFIXED(save_p);
mobj->pmomz = READFIXED(save_p);
} // otherwise they're zero, and the memset took care of it } // otherwise they're zero, and the memset took care of it
if (diff & MD_RADIUS) if (diff & MD_RADIUS)

333
src/p_setup.c
View file

@ -1350,8 +1350,11 @@ static void P_LoadSidedefs(UINT8 *data)
if (msd->toptexture[0] == '#') if (msd->toptexture[0] == '#')
{ {
char *col = msd->toptexture; char *col = msd->toptexture;
sd->toptexture = sd->bottomtexture = sd->toptexture =
((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0') + 1; ((col[1]-'0')*100 + (col[2]-'0')*10 + col[3]-'0')+1;
if (col[4]) // extra num for blendmode
sd->toptexture += (col[4]-'0')*1000;
sd->bottomtexture = sd->toptexture;
sd->midtexture = R_TextureNumForName(msd->midtexture); sd->midtexture = R_TextureNumForName(msd->midtexture);
} }
else else
@ -1698,6 +1701,21 @@ static void ParseTextmapLinedefParameter(UINT32 i, char *param, char *val)
lines[i].sidenum[1] = atol(val); lines[i].sidenum[1] = atol(val);
else if (fastcmp(param, "alpha")) else if (fastcmp(param, "alpha"))
lines[i].alpha = FLOAT_TO_FIXED(atof(val)); lines[i].alpha = FLOAT_TO_FIXED(atof(val));
else if (fastcmp(param, "blendmode") || fastcmp(param, "renderstyle"))
{
if (fastcmp(val, "translucent"))
lines[i].blendmode = AST_COPY;
else if (fastcmp(val, "add"))
lines[i].blendmode = AST_ADD;
else if (fastcmp(val, "subtract"))
lines[i].blendmode = AST_SUBTRACT;
else if (fastcmp(val, "reversesubtract"))
lines[i].blendmode = AST_REVERSESUBTRACT;
else if (fastcmp(val, "modulate"))
lines[i].blendmode = AST_MODULATE;
if (fastcmp(val, "fog"))
lines[i].blendmode = AST_FOG;
}
else if (fastcmp(param, "executordelay")) else if (fastcmp(param, "executordelay"))
lines[i].executordelay = atol(val); lines[i].executordelay = atol(val);
@ -3046,52 +3064,77 @@ static void P_AddBinaryMapTags(void)
{ {
size_t i; size_t i;
for (i = 0; i < numlines; i++) for (i = 0; i < numlines; i++) {
{
// 96: Apply Tag to Tagged Sectors
// 97: Apply Tag to Front Sector // 97: Apply Tag to Front Sector
// 98: Apply Tag to Back Sector // 98: Apply Tag to Back Sector
// 99: Apply Tag to Front and Back Sectors // 99: Apply Tag to Front and Back Sectors
if (lines[i].special == 96) { if (lines[i].special == 97 || lines[i].special == 99)
size_t j; P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]);
mtag_t tag = Tag_FGet(&lines[i].frontsector->tags); if (lines[i].special == 98 || lines[i].special == 99)
mtag_t target_tag = Tag_FGet(&lines[i].tags); P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
mtag_t offset_tags[4]; }
memset(offset_tags, 0, sizeof(mtag_t)*4);
if (lines[i].flags & ML_EFFECT6) {
offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT;
offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT;
}
if (lines[i].flags & ML_TFERLINE) {
offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT;
offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT;
}
for (j = 0; j < numsectors; j++) { // Run this loop after the 97-99 loop to ensure that 96 can search through all of the
boolean matches_target_tag = target_tag && Tag_Find(&sectors[j].tags, target_tag); // 97-99-applied tags.
size_t k; for (k = 0; k < 4; k++) { for (i = 0; i < numlines; i++) {
if (lines[i].flags & ML_EFFECT5) { size_t j;
if (matches_target_tag || (offset_tags[k] && Tag_Find(&sectors[j].tags, offset_tags[k]))) { mtag_t tag, target_tag;
Tag_Add(&sectors[j].tags, tag); mtag_t offset_tags[4];
break;
} // 96: Apply Tag to Tagged Sectors
} else if (matches_target_tag) { if (lines[i].special != 96)
if (k == 0) continue;
Tag_Add(&sectors[j].tags, tag);
if (offset_tags[k]) tag = Tag_FGet(&lines[i].frontsector->tags);
Tag_Add(&sectors[j].tags, offset_tags[k]); target_tag = Tag_FGet(&lines[i].tags);
memset(offset_tags, 0, sizeof(mtag_t)*4);
if (lines[i].flags & ML_EFFECT6) {
offset_tags[0] = (INT32)sides[lines[i].sidenum[0]].textureoffset / FRACUNIT;
offset_tags[1] = (INT32)sides[lines[i].sidenum[0]].rowoffset / FRACUNIT;
}
if (lines[i].flags & ML_TFERLINE) {
offset_tags[2] = (INT32)sides[lines[i].sidenum[1]].textureoffset / FRACUNIT;
offset_tags[3] = (INT32)sides[lines[i].sidenum[1]].rowoffset / FRACUNIT;
}
for (j = 0; j < numsectors; j++) {
boolean matches_target_tag = target_tag && Tag_Find(&sectors[j].tags, target_tag);
size_t k;
for (k = 0; k < 4; k++) {
if (lines[i].flags & ML_EFFECT5) {
if (matches_target_tag || (offset_tags[k] && Tag_Find(&sectors[j].tags, offset_tags[k]))) {
Tag_Add(&sectors[j].tags, tag);
break;
} }
} else if (matches_target_tag) {
if (k == 0)
Tag_Add(&sectors[j].tags, tag);
if (offset_tags[k])
Tag_Add(&sectors[j].tags, offset_tags[k]);
} }
} }
} else {
if (lines[i].special == 97 || lines[i].special == 99)
P_AddBinaryMapTagsFromLine(lines[i].frontsector, &lines[i]);
if (lines[i].special == 98 || lines[i].special == 99)
P_AddBinaryMapTagsFromLine(lines[i].backsector, &lines[i]);
} }
} }
} }
static void P_SetBinaryFOFAlpha(line_t *line)
{
if (sides[line->sidenum[0]].toptexture > 0)
{
line->args[1] = sides[line->sidenum[0]].toptexture;
if (sides[line->sidenum[0]].toptexture >= 1001)
{
line->args[2] = (sides[line->sidenum[0]].toptexture/1000);
line->args[1] %= 1000;
}
}
else
{
line->args[1] = 128;
line->args[2] = TMB_TRANSLUCENT;
}
}
//For maps in binary format, converts setup of specials to UDMF format. //For maps in binary format, converts setup of specials to UDMF format.
static void P_ConvertBinaryMap(void) static void P_ConvertBinaryMap(void)
{ {
@ -3251,36 +3294,33 @@ static void P_ConvertBinaryMap(void)
if (lines[i].special == 102) if (lines[i].special == 102)
{ {
if (lines[i].flags & ML_NOCLIMB) if (lines[i].flags & ML_NOCLIMB)
lines[i].args[2] |= TMFA_INSIDES; lines[i].args[3] |= TMFA_INSIDES;
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
//Appearance //Appearance
if (lines[i].special == 105) if (lines[i].special == 105)
lines[i].args[2] |= TMFA_NOPLANES|TMFA_NOSIDES; lines[i].args[3] |= TMFA_NOPLANES|TMFA_NOSIDES;
else if (lines[i].special == 104) else if (lines[i].special == 104)
lines[i].args[2] |= TMFA_NOSIDES; lines[i].args[3] |= TMFA_NOSIDES;
else if (lines[i].special == 103) else if (lines[i].special == 103)
lines[i].args[2] |= TMFA_NOPLANES; lines[i].args[3] |= TMFA_NOPLANES;
if (lines[i].special != 100 && (lines[i].special != 104 || !(lines[i].flags & ML_NOCLIMB))) if (lines[i].special != 100 && (lines[i].special != 104 || !(lines[i].flags & ML_NOCLIMB)))
lines[i].args[2] |= TMFA_NOSHADE; lines[i].args[3] |= TMFA_NOSHADE;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
//Tangibility //Tangibility
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[3] |= TMFT_DONTBLOCKOTHERS; lines[i].args[4] |= TMFT_DONTBLOCKOTHERS;
if (lines[i].flags & ML_EFFECT2) if (lines[i].flags & ML_EFFECT2)
lines[i].args[3] |= TMFT_DONTBLOCKPLAYER; lines[i].args[4] |= TMFT_DONTBLOCKPLAYER;
lines[i].special = 100; lines[i].special = 100;
break; break;
@ -3297,35 +3337,32 @@ static void P_ConvertBinaryMap(void)
lines[i].args[1] = 255; lines[i].args[1] = 255;
else else
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= TMFW_SPLAT; lines[i].args[3] |= TMFW_SPLAT;
} }
//No sides? //No sides?
if (lines[i].special == 122 || lines[i].special == 123 || lines[i].special == 125) if (lines[i].special == 122 || lines[i].special == 123 || lines[i].special == 125)
lines[i].args[2] |= TMFW_NOSIDES; lines[i].args[3] |= TMFW_NOSIDES;
//Flags //Flags
if (lines[i].flags & ML_NOCLIMB) if (lines[i].flags & ML_NOCLIMB)
lines[i].args[2] |= TMFW_DOUBLESHADOW; lines[i].args[3] |= TMFW_DOUBLESHADOW;
if (lines[i].flags & ML_EFFECT4) if (lines[i].flags & ML_EFFECT4)
lines[i].args[2] |= TMFW_COLORMAPONLY; lines[i].args[3] |= TMFW_COLORMAPONLY;
if (!(lines[i].flags & ML_EFFECT5)) if (!(lines[i].flags & ML_EFFECT5))
lines[i].args[2] |= TMFW_NORIPPLE; lines[i].args[3] |= TMFW_NORIPPLE;
//Goo? //Goo?
if (lines[i].special >= 124) if (lines[i].special >= 124)
lines[i].args[2] |= TMFW_GOOWATER; lines[i].args[3] |= TMFW_GOOWATER;
//Splat rendering? //Splat rendering?
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= TMFW_SPLAT; lines[i].args[3] |= TMFW_SPLAT;
lines[i].special = 120; lines[i].special = 120;
break; break;
@ -3342,41 +3379,38 @@ static void P_ConvertBinaryMap(void)
if (lines[i].special == 141 || lines[i].special == 142 || lines[i].special == 144 || lines[i].special == 145) if (lines[i].special == 141 || lines[i].special == 142 || lines[i].special == 144 || lines[i].special == 145)
{ {
if (lines[i].flags & ML_NOCLIMB) if (lines[i].flags & ML_NOCLIMB)
lines[i].args[2] |= TMFA_INSIDES; lines[i].args[3] |= TMFA_INSIDES;
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
//Appearance //Appearance
if (lines[i].special == 142 || lines[i].special == 145) if (lines[i].special == 142 || lines[i].special == 145)
lines[i].args[2] |= TMFA_NOSIDES; lines[i].args[3] |= TMFA_NOSIDES;
else if (lines[i].special == 146) else if (lines[i].special == 146)
lines[i].args[2] |= TMFA_NOPLANES; lines[i].args[3] |= TMFA_NOPLANES;
if (lines[i].special != 146 && (lines[i].flags & ML_NOCLIMB)) if (lines[i].special != 146 && (lines[i].flags & ML_NOCLIMB))
lines[i].args[2] |= TMFA_NOSHADE; lines[i].args[3] |= TMFA_NOSHADE;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
//Tangibility //Tangibility
if (lines[i].special <= 142) if (lines[i].special <= 142)
lines[i].args[3] |= TMFT_INTANGIBLEBOTTOM; lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM;
else if (lines[i].special <= 145) else if (lines[i].special <= 145)
lines[i].args[3] |= TMFT_INTANGIBLETOP; lines[i].args[4] |= TMFT_INTANGIBLETOP;
else else
lines[i].args[3] |= TMFT_INTANGIBLEBOTTOM|TMFT_INTANGIBLETOP; lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM|TMFT_INTANGIBLETOP;
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[3] |= TMFT_DONTBLOCKOTHERS; lines[i].args[4] |= TMFT_DONTBLOCKOTHERS;
if (lines[i].flags & ML_EFFECT2) if (lines[i].flags & ML_EFFECT2)
lines[i].args[3] |= TMFT_DONTBLOCKPLAYER; lines[i].args[4] |= TMFT_DONTBLOCKPLAYER;
lines[i].special = 100; lines[i].special = 100;
break; break;
@ -3416,38 +3450,35 @@ static void P_ConvertBinaryMap(void)
//Alpha //Alpha
if (lines[i].special >= 174 && lines[i].special <= 175) if (lines[i].special >= 174 && lines[i].special <= 175)
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[3] |= TMFC_SPLAT; lines[i].args[4] |= TMFC_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
if (lines[i].special >= 172 && lines[i].special <= 175) if (lines[i].special >= 172 && lines[i].special <= 175)
{ {
lines[i].args[2] |= TMFT_INTANGIBLEBOTTOM; lines[i].args[3] |= TMFT_INTANGIBLEBOTTOM;
if (lines[i].flags & ML_NOCLIMB) if (lines[i].flags & ML_NOCLIMB)
lines[i].args[3] |= TMFC_NOSHADE; lines[i].args[4] |= TMFC_NOSHADE;
} }
if (lines[i].special % 2 == 1) if (lines[i].special % 2 == 1)
lines[i].args[3] |= TMFC_NORETURN; lines[i].args[4] |= TMFC_NORETURN;
if (lines[i].special == 176 || lines[i].special == 177 || lines[i].special == 180) if (lines[i].special == 176 || lines[i].special == 177 || lines[i].special == 180)
lines[i].args[3] |= TMFC_AIRBOB; lines[i].args[4] |= TMFC_AIRBOB;
if (lines[i].special >= 176 && lines[i].special <= 179) if (lines[i].special >= 176 && lines[i].special <= 179)
lines[i].args[3] |= TMFC_FLOATBOB; lines[i].args[4] |= TMFC_FLOATBOB;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[3] |= TMFC_SPLAT; lines[i].args[4] |= TMFC_SPLAT;
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[2] |= TMFT_DONTBLOCKOTHERS; lines[i].args[3] |= TMFT_DONTBLOCKOTHERS;
if (lines[i].flags & ML_EFFECT2) if (lines[i].flags & ML_EFFECT2)
lines[i].args[2] |= TMFT_DONTBLOCKPLAYER; lines[i].args[3] |= TMFT_DONTBLOCKPLAYER;
lines[i].special = 170; lines[i].special = 170;
break; break;
@ -3462,44 +3493,41 @@ static void P_ConvertBinaryMap(void)
//Translucency //Translucency
if (lines[i].special == 192 || lines[i].special == 195) if (lines[i].special == 192 || lines[i].special == 195)
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
//Appearance //Appearance
if (lines[i].special == 193) if (lines[i].special == 193)
lines[i].args[2] |= TMFA_NOPLANES|TMFA_NOSIDES; lines[i].args[3] |= TMFA_NOPLANES|TMFA_NOSIDES;
if (lines[i].special >= 194) if (lines[i].special >= 194)
lines[i].args[2] |= TMFA_INSIDES; lines[i].args[3] |= TMFA_INSIDES;
if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB)) if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB))
lines[i].args[2] |= TMFA_NOSHADE; lines[i].args[3] |= TMFA_NOSHADE;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
//Tangibility //Tangibility
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[3] |= TMFT_DONTBLOCKOTHERS; lines[i].args[4] |= TMFT_DONTBLOCKOTHERS;
if (lines[i].flags & ML_EFFECT2) if (lines[i].flags & ML_EFFECT2)
lines[i].args[3] |= TMFT_DONTBLOCKPLAYER; lines[i].args[4] |= TMFT_DONTBLOCKPLAYER;
if (lines[i].special >= 194) if (lines[i].special >= 194)
lines[i].args[3] |= TMFT_INTANGIBLEBOTTOM; lines[i].args[4] |= TMFT_INTANGIBLEBOTTOM;
//Speed //Speed
lines[i].args[4] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; lines[i].args[5] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
//Flags //Flags
if (lines[i].flags & ML_BLOCKMONSTERS) if (lines[i].flags & ML_BLOCKMONSTERS)
lines[i].args[5] |= TMFR_REVERSE; lines[i].args[6] |= TMFR_REVERSE;
if (lines[i].flags & ML_BLOCKMONSTERS) if (lines[i].flags & ML_BLOCKMONSTERS)
lines[i].args[5] |= TMFR_SPINDASH; lines[i].args[6] |= TMFR_SPINDASH;
lines[i].special = 190; lines[i].special = 190;
break; break;
@ -3522,27 +3550,24 @@ static void P_ConvertBinaryMap(void)
//Alpha //Alpha
if (lines[i].special == 221) if (lines[i].special == 221)
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
//Appearance //Appearance
if (lines[i].special == 222) if (lines[i].special == 222)
lines[i].args[2] |= TMFA_NOPLANES; lines[i].args[3] |= TMFA_NOPLANES;
if (lines[i].special == 221) if (lines[i].special == 221)
lines[i].args[2] |= TMFA_INSIDES; lines[i].args[3] |= TMFA_INSIDES;
if (lines[i].special != 220 && !(lines[i].flags & ML_NOCLIMB)) if (lines[i].special != 220 && !(lines[i].flags & ML_NOCLIMB))
lines[i].args[2] |= TMFA_NOSHADE; lines[i].args[3] |= TMFA_NOSHADE;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= TMFA_SPLAT; lines[i].args[3] |= TMFA_SPLAT;
lines[i].special = 220; lines[i].special = 220;
break; break;
@ -3583,40 +3608,37 @@ static void P_ConvertBinaryMap(void)
//Alpha //Alpha
if (lines[i].special == 253 || lines[i].special == 256) if (lines[i].special == 253 || lines[i].special == 256)
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[3] |= TMFB_SPLAT; lines[i].args[4] |= TMFB_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
//Bustable type //Bustable type
if (lines[i].special <= 253) if (lines[i].special <= 253)
lines[i].args[2] = TMFB_TOUCH; lines[i].args[3] = TMFB_TOUCH;
else if (lines[i].special >= 255) else if (lines[i].special >= 255)
lines[i].args[2] = TMFB_SPIN; lines[i].args[3] = TMFB_SPIN;
else if (lines[i].flags & ML_NOCLIMB) else if (lines[i].flags & ML_NOCLIMB)
lines[i].args[2] = TMFB_STRONG; lines[i].args[3] = TMFB_STRONG;
else else
lines[i].args[2] = TMFB_REGULAR; lines[i].args[3] = TMFB_REGULAR;
//Flags //Flags
if (lines[i].flags & ML_EFFECT4) if (lines[i].flags & ML_EFFECT4)
lines[i].args[3] |= TMFB_PUSHABLES; lines[i].args[4] |= TMFB_PUSHABLES;
if (lines[i].flags & ML_EFFECT5) if (lines[i].flags & ML_EFFECT5)
{ {
lines[i].args[3] |= TMFB_EXECUTOR; lines[i].args[4] |= TMFB_EXECUTOR;
lines[i].args[4] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS; lines[i].args[5] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
} }
if (lines[i].special == 252 && lines[i].flags & ML_NOCLIMB) if (lines[i].special == 252 && lines[i].flags & ML_NOCLIMB)
lines[i].args[3] |= TMFB_ONLYBOTTOM; lines[i].args[4] |= TMFB_ONLYBOTTOM;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[3] |= TMFB_SPLAT; lines[i].args[4] |= TMFB_SPLAT;
lines[i].special = 254; lines[i].special = 254;
break; break;
@ -3631,17 +3653,14 @@ static void P_ConvertBinaryMap(void)
lines[i].args[0] = tag; lines[i].args[0] = tag;
//Alpha //Alpha
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Flags //Flags
if (lines[i].flags & ML_EFFECT1) if (lines[i].flags & ML_EFFECT1)
lines[i].args[2] |= TMFL_NOBOSSES; lines[i].args[3] |= TMFL_NOBOSSES;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].flags & ML_EFFECT6 || lines[i].args[1] == 256) if (lines[i].flags & ML_EFFECT6 || lines[i].args[1] == 256)
lines[i].args[2] |= TMFL_SPLAT; lines[i].args[3] |= TMFL_SPLAT;
break; break;
case 259: //Custom FOF case 259: //Custom FOF
@ -3649,20 +3668,17 @@ static void P_ConvertBinaryMap(void)
I_Error("Custom FOF (tag %d) found without a linedef back side!", tag); I_Error("Custom FOF (tag %d) found without a linedef back side!", tag);
lines[i].args[0] = tag; lines[i].args[0] = tag;
lines[i].args[2] = sides[lines[i].sidenum[1]].toptexture; lines[i].args[3] = sides[lines[i].sidenum[1]].toptexture;
if (lines[i].flags & ML_EFFECT6) if (lines[i].flags & ML_EFFECT6)
lines[i].args[2] |= FF_SPLAT; lines[i].args[3] |= FF_SPLAT;
lines[i].args[3] = sides[lines[i].sidenum[1]].midtexture; lines[i].args[4] = sides[lines[i].sidenum[1]].midtexture;
if (lines[i].args[2] & FF_TRANSLUCENT) if (lines[i].args[3] & FF_TRANSLUCENT)
{ {
if (sides[lines[i].sidenum[0]].toptexture > 0) P_SetBinaryFOFAlpha(&lines[i]);
lines[i].args[1] = sides[lines[i].sidenum[0]].toptexture;
else
lines[i].args[1] = 128;
//Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels //Replicate old hack: Translucent FOFs set to full opacity cut cyan pixels
if (lines[i].args[1] == 256) if (lines[i].args[1] == 256)
lines[i].args[2] |= FF_SPLAT; lines[i].args[3] |= FF_SPLAT;
} }
else else
lines[i].args[1] = 255; lines[i].args[1] = 255;
@ -4100,20 +4116,31 @@ static void P_ConvertBinaryMap(void)
lines[i].args[4] |= TMSC_BACKTOFRONTCEILING; lines[i].args[4] |= TMSC_BACKTOFRONTCEILING;
lines[i].special = 720; lines[i].special = 720;
break; break;
case 909: //Fog wall
case 900: //Translucent wall (10%) lines[i].blendmode = AST_FOG;
case 901: //Translucent wall (20%)
case 902: //Translucent wall (30%)
case 903: //Translucent wall (40%)
case 904: //Translucent wall (50%)
case 905: //Translucent wall (60%)
case 906: //Translucent wall (70%)
case 907: //Translucent wall (80%)
case 908: //Translucent wall (90%)
lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10;
break; break;
} }
// Set alpha for translucent walls
if (lines[i].special >= 900 && lines[i].special < 909)
lines[i].alpha = ((909 - lines[i].special) << FRACBITS)/10;
// Set alpha for additive/subtractive/reverse subtractive walls
if (lines[i].special >= 910 && lines[i].special <= 939)
lines[i].alpha = ((10 - lines[i].special % 10) << FRACBITS)/10;
if (lines[i].special >= 910 && lines[i].special <= 919) // additive
lines[i].blendmode = AST_ADD;
if (lines[i].special >= 920 && lines[i].special <= 929) // subtractive
lines[i].blendmode = AST_SUBTRACT;
if (lines[i].special >= 930 && lines[i].special <= 939) // reverse subtractive
lines[i].blendmode = AST_REVERSESUBTRACT;
if (lines[i].special == 940) // modulate
lines[i].blendmode = AST_MODULATE;
//Linedef executor delay //Linedef executor delay
if (lines[i].special >= 400 && lines[i].special < 500) if (lines[i].special >= 400 && lines[i].special < 500)
{ {

246
src/p_spec.c
View file

@ -116,7 +116,7 @@ static void Add_ColormapFader(sector_t *sector, extracolormap_t *source_exc, ext
static void P_AddBlockThinker(sector_t *sec, line_t *sourceline); static void P_AddBlockThinker(sector_t *sec, line_t *sourceline);
static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline); static void P_AddFloatThinker(sector_t *sec, UINT16 tag, line_t *sourceline);
//static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec); //static void P_AddBridgeThinker(line_t *sourceline, sector_t *sec);
static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, ffloortype_e ffloorflags, thinkerlist_t *secthinkers); static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, UINT8 blendmode, ffloortype_e ffloorflags, thinkerlist_t *secthinkers);
static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec); static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec);
static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32 referrer); static void Add_Friction(INT32 friction, INT32 movefactor, INT32 affectee, INT32 referrer);
static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control, INT32 affectee, UINT8 reverse); static void P_AddPlaneDisplaceThinker(INT32 type, fixed_t speed, INT32 control, INT32 affectee, UINT8 reverse);
@ -5371,12 +5371,13 @@ static inline void P_AddFFloorToList(sector_t *sec, ffloor_t *fflr)
* \param sec2 Control sector. * \param sec2 Control sector.
* \param master Control linedef. * \param master Control linedef.
* \param alpha Alpha value (0-255). * \param alpha Alpha value (0-255).
* \param blendmode Blending mode.
* \param flags Options affecting this 3Dfloor. * \param flags Options affecting this 3Dfloor.
* \param secthinkers List of relevant thinkers sorted by sector. May be NULL. * \param secthinkers List of relevant thinkers sorted by sector. May be NULL.
* \return Pointer to the new 3Dfloor. * \return Pointer to the new 3Dfloor.
* \sa P_AddFFloor, P_AddFakeFloorsByLine, P_SpawnSpecials * \sa P_AddFFloor, P_AddFakeFloorsByLine, P_SpawnSpecials
*/ */
static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, INT32 alpha, ffloortype_e flags, thinkerlist_t *secthinkers) static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, INT32 alpha, UINT8 blendmode, ffloortype_e flags, thinkerlist_t *secthinkers)
{ {
ffloor_t *fflr; ffloor_t *fflr;
thinker_t *th; thinker_t *th;
@ -5513,6 +5514,26 @@ static ffloor_t *P_AddFakeFloor(sector_t *sec, sector_t *sec2, line_t *master, I
} }
fflr->spawnalpha = fflr->alpha; // save for netgames fflr->spawnalpha = fflr->alpha; // save for netgames
switch (blendmode)
{
case TMB_TRANSLUCENT:
default:
fflr->blend = AST_COPY;
break;
case TMB_ADD:
fflr->blend = AST_ADD;
break;
case TMB_SUBTRACT:
fflr->blend = AST_SUBTRACT;
break;
case TMB_REVERSESUBTRACT:
fflr->blend = AST_REVERSESUBTRACT;
break;
case TMB_MODULATE:
fflr->blend = AST_MODULATE;
break;
}
if (flags & FF_QUICKSAND) if (flags & FF_QUICKSAND)
CheckForQuicksand = true; CheckForQuicksand = true;
@ -6348,29 +6369,81 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL; ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL;
//Appearance settings //Appearance settings
if (lines[i].args[2] & TMFA_NOPLANES) if (lines[i].args[3] & TMFA_NOPLANES)
ffloorflags &= ~FF_RENDERPLANES; ffloorflags &= ~FF_RENDERPLANES;
if (lines[i].args[2] & TMFA_NOSIDES) if (lines[i].args[3] & TMFA_NOSIDES)
ffloorflags &= ~FF_RENDERSIDES; ffloorflags &= ~FF_RENDERSIDES;
if (lines[i].args[2] & TMFA_INSIDES) if (lines[i].args[3] & TMFA_INSIDES)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_BOTHPLANES; ffloorflags |= FF_BOTHPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_ALLSIDES; ffloorflags |= FF_ALLSIDES;
} }
if (lines[i].args[2] & TMFA_ONLYINSIDES) if (lines[i].args[3] & TMFA_ONLYINSIDES)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_INVERTPLANES; ffloorflags |= FF_INVERTPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_INVERTSIDES; ffloorflags |= FF_INVERTSIDES;
} }
if (lines[i].args[2] & TMFA_NOSHADE) if (lines[i].args[3] & TMFA_NOSHADE)
ffloorflags |= FF_NOSHADE; ffloorflags |= FF_NOSHADE;
if (lines[i].args[2] & TMFA_SPLAT) if (lines[i].args[3] & TMFA_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
//Tangibility settings
if (lines[i].args[4] & TMFT_INTANGIBLETOP)
ffloorflags |= FF_REVERSEPLATFORM;
if (lines[i].args[4] & TMFT_INTANGIBLEBOTTOM)
ffloorflags |= FF_PLATFORM;
if (lines[i].args[4] & TMFT_DONTBLOCKPLAYER)
ffloorflags &= ~FF_BLOCKPLAYER;
if (lines[i].args[4] & TMFT_DONTBLOCKOTHERS)
ffloorflags &= ~FF_BLOCKOTHERS;
//Cutting options
if (ffloorflags & FF_RENDERALL)
{
//If translucent or player can enter it, cut inner walls
if ((lines[i].args[1] < 255) || (lines[i].args[4] & TMFT_VISIBLEFROMINSIDE))
ffloorflags |= FF_CUTEXTRA|FF_EXTRA;
else
ffloorflags |= FF_CUTLEVEL;
}
P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
break;
case 120: // FOF (water)
ffloorflags = FF_EXISTS|FF_RENDERPLANES|FF_SWIMMABLE|FF_BOTHPLANES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES;
if (!(lines[i].args[3] & TMFW_NOSIDES))
ffloorflags |= FF_RENDERSIDES|FF_ALLSIDES;
if (lines[i].args[3] & TMFW_DOUBLESHADOW)
ffloorflags |= FF_DOUBLESHADOW;
if (lines[i].args[3] & TMFW_COLORMAPONLY)
ffloorflags |= FF_COLORMAPONLY;
if (!(lines[i].args[3] & TMFW_NORIPPLE))
ffloorflags |= FF_RIPPLE;
if (lines[i].args[3] & TMFW_GOOWATER)
ffloorflags |= FF_GOOWATER;
if (lines[i].args[3] & TMFW_SPLAT)
ffloorflags |= FF_SPLAT;
P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
break;
case 150: // FOF (Air bobbing)
P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FF_EXISTS|FF_SOLID|FF_RENDERALL, secthinkers);
P_AddAirbob(lines[i].frontsector, lines[i].args[0], lines[i].args[1] << FRACBITS, !!(lines[i].args[2] & TMFB_REVERSE), !!(lines[i].args[2] & TMFB_SPINDASH), !!(lines[i].args[2] & TMFB_DYNAMIC));
break;
case 160: // FOF (Water bobbing)
P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB, secthinkers);
break;
case 170: // FOF (Crumbling)
ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CRUMBLE;
//Tangibility settings //Tangibility settings
if (lines[i].args[3] & TMFT_INTANGIBLETOP) if (lines[i].args[3] & TMFT_INTANGIBLETOP)
ffloorflags |= FF_REVERSEPLATFORM; ffloorflags |= FF_REVERSEPLATFORM;
@ -6381,76 +6454,24 @@ void P_SpawnSpecials(boolean fromnetsave)
if (lines[i].args[3] & TMFT_DONTBLOCKOTHERS) if (lines[i].args[3] & TMFT_DONTBLOCKOTHERS)
ffloorflags &= ~FF_BLOCKOTHERS; ffloorflags &= ~FF_BLOCKOTHERS;
//Cutting options
if (ffloorflags & FF_RENDERALL)
{
//If translucent or player can enter it, cut inner walls
if ((lines[i].args[1] < 255) || (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE))
ffloorflags |= FF_CUTEXTRA|FF_EXTRA;
else
ffloorflags |= FF_CUTLEVEL;
}
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers);
break;
case 120: // FOF (water)
ffloorflags = FF_EXISTS|FF_RENDERPLANES|FF_SWIMMABLE|FF_BOTHPLANES|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES;
if (!(lines[i].args[2] & TMFW_NOSIDES))
ffloorflags |= FF_RENDERSIDES|FF_ALLSIDES;
if (lines[i].args[2] & TMFW_DOUBLESHADOW)
ffloorflags |= FF_DOUBLESHADOW;
if (lines[i].args[2] & TMFW_COLORMAPONLY)
ffloorflags |= FF_COLORMAPONLY;
if (!(lines[i].args[2] & TMFW_NORIPPLE))
ffloorflags |= FF_RIPPLE;
if (lines[i].args[2] & TMFW_GOOWATER)
ffloorflags |= FF_GOOWATER;
if (lines[i].args[2] & TMFW_SPLAT)
ffloorflags |= FF_SPLAT;
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers);
break;
case 150: // FOF (Air bobbing)
P_AddFakeFloorsByLine(i, 0xff, FF_EXISTS|FF_SOLID|FF_RENDERALL, secthinkers);
P_AddAirbob(lines[i].frontsector, lines[i].args[0], lines[i].args[1] << FRACBITS, !!(lines[i].args[2] & TMFB_REVERSE), !!(lines[i].args[2] & TMFB_SPINDASH), !!(lines[i].args[2] & TMFB_DYNAMIC));
break;
case 160: // FOF (Water bobbing)
P_AddFakeFloorsByLine(i, 0xff, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_FLOATBOB, secthinkers);
break;
case 170: // FOF (Crumbling)
ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CRUMBLE;
//Tangibility settings
if (lines[i].args[2] & TMFT_INTANGIBLETOP)
ffloorflags |= FF_REVERSEPLATFORM;
if (lines[i].args[2] & TMFT_INTANGIBLEBOTTOM)
ffloorflags |= FF_PLATFORM;
if (lines[i].args[2] & TMFT_DONTBLOCKPLAYER)
ffloorflags &= ~FF_BLOCKPLAYER;
if (lines[i].args[2] & TMFT_DONTBLOCKOTHERS)
ffloorflags &= ~FF_BLOCKOTHERS;
//Flags //Flags
if (lines[i].args[3] & TMFC_NOSHADE) if (lines[i].args[4] & TMFC_NOSHADE)
ffloorflags |= FF_NOSHADE; ffloorflags |= FF_NOSHADE;
if (lines[i].args[3] & TMFC_NORETURN) if (lines[i].args[4] & TMFC_NORETURN)
ffloorflags |= FF_NORETURN; ffloorflags |= FF_NORETURN;
if (lines[i].args[3] & TMFC_FLOATBOB) if (lines[i].args[4] & TMFC_FLOATBOB)
ffloorflags |= FF_FLOATBOB; ffloorflags |= FF_FLOATBOB;
if (lines[i].args[3] & TMFC_SPLAT) if (lines[i].args[4] & TMFC_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
//If translucent or player can enter it, cut inner walls //If translucent or player can enter it, cut inner walls
if (lines[i].args[1] < 0xff || (lines[i].args[2] & TMFT_VISIBLEFROMINSIDE)) if (lines[i].args[1] < 0xff || (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE))
ffloorflags |= FF_CUTEXTRA|FF_EXTRA; ffloorflags |= FF_CUTEXTRA|FF_EXTRA;
else else
ffloorflags |= FF_CUTLEVEL; ffloorflags |= FF_CUTLEVEL;
//If player can enter it, render insides //If player can enter it, render insides
if (lines[i].args[2] & TMFT_VISIBLEFROMINSIDE) if (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_BOTHPLANES; ffloorflags |= FF_BOTHPLANES;
@ -6458,8 +6479,8 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags |= FF_ALLSIDES; ffloorflags |= FF_ALLSIDES;
} }
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
if (lines[i].args[3] & TMFC_AIRBOB) if (lines[i].args[4] & TMFC_AIRBOB)
P_AddAirbob(lines[i].frontsector, lines[i].args[0], 16*FRACUNIT, false, false, false); P_AddAirbob(lines[i].frontsector, lines[i].args[0], 16*FRACUNIT, false, false, false);
break; break;
@ -6471,58 +6492,58 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL; ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL;
//Appearance settings //Appearance settings
if (lines[i].args[2] & TMFA_NOPLANES) if (lines[i].args[3] & TMFA_NOPLANES)
ffloorflags &= ~FF_RENDERPLANES; ffloorflags &= ~FF_RENDERPLANES;
if (lines[i].args[2] & TMFA_NOSIDES) if (lines[i].args[3] & TMFA_NOSIDES)
ffloorflags &= ~FF_RENDERSIDES; ffloorflags &= ~FF_RENDERSIDES;
if (lines[i].args[2] & TMFA_INSIDES) if (lines[i].args[3] & TMFA_INSIDES)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_BOTHPLANES; ffloorflags |= FF_BOTHPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_ALLSIDES; ffloorflags |= FF_ALLSIDES;
} }
if (lines[i].args[2] & TMFA_ONLYINSIDES) if (lines[i].args[3] & TMFA_ONLYINSIDES)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_INVERTPLANES; ffloorflags |= FF_INVERTPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_INVERTSIDES; ffloorflags |= FF_INVERTSIDES;
} }
if (lines[i].args[2] & TMFA_NOSHADE) if (lines[i].args[3] & TMFA_NOSHADE)
ffloorflags |= FF_NOSHADE; ffloorflags |= FF_NOSHADE;
if (lines[i].args[2] & TMFA_SPLAT) if (lines[i].args[3] & TMFA_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
//Tangibility settings //Tangibility settings
if (lines[i].args[3] & TMFT_INTANGIBLETOP) if (lines[i].args[4] & TMFT_INTANGIBLETOP)
ffloorflags |= FF_REVERSEPLATFORM; ffloorflags |= FF_REVERSEPLATFORM;
if (lines[i].args[3] & TMFT_INTANGIBLEBOTTOM) if (lines[i].args[4] & TMFT_INTANGIBLEBOTTOM)
ffloorflags |= FF_PLATFORM; ffloorflags |= FF_PLATFORM;
if (lines[i].args[3] & TMFT_DONTBLOCKPLAYER) if (lines[i].args[4] & TMFT_DONTBLOCKPLAYER)
ffloorflags &= ~FF_BLOCKPLAYER; ffloorflags &= ~FF_BLOCKPLAYER;
if (lines[i].args[3] & TMFT_DONTBLOCKOTHERS) if (lines[i].args[4] & TMFT_DONTBLOCKOTHERS)
ffloorflags &= ~FF_BLOCKOTHERS; ffloorflags &= ~FF_BLOCKOTHERS;
//Cutting options //Cutting options
if (ffloorflags & FF_RENDERALL) if (ffloorflags & FF_RENDERALL)
{ {
//If translucent or player can enter it, cut inner walls //If translucent or player can enter it, cut inner walls
if ((lines[i].args[1] < 255) || (lines[i].args[3] & TMFT_VISIBLEFROMINSIDE)) if ((lines[i].args[1] < 255) || (lines[i].args[4] & TMFT_VISIBLEFROMINSIDE))
ffloorflags |= FF_CUTEXTRA|FF_EXTRA; ffloorflags |= FF_CUTEXTRA|FF_EXTRA;
else else
ffloorflags |= FF_CUTLEVEL; ffloorflags |= FF_CUTLEVEL;
} }
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
P_AddRaiseThinker(lines[i].frontsector, lines[i].args[0], lines[i].args[4] << FRACBITS, ceilingtop, ceilingbottom, !!(lines[i].args[5] & TMFR_REVERSE), !!(lines[i].args[5] & TMFR_SPINDASH)); P_AddRaiseThinker(lines[i].frontsector, lines[i].args[0], lines[i].args[5] << FRACBITS, ceilingtop, ceilingbottom, !!(lines[i].args[6] & TMFR_REVERSE), !!(lines[i].args[6] & TMFR_SPINDASH));
break; break;
} }
case 200: // Light block case 200: // Light block
ffloorflags = FF_EXISTS|FF_CUTSPRITES; ffloorflags = FF_EXISTS|FF_CUTSPRITES;
if (!lines[i].args[1]) if (!lines[i].args[1])
ffloorflags |= FF_DOUBLESHADOW; ffloorflags |= FF_DOUBLESHADOW;
P_AddFakeFloorsByLine(i, 0xff, ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers);
break; break;
case 202: // Fog case 202: // Fog
@ -6531,41 +6552,41 @@ void P_SpawnSpecials(boolean fromnetsave)
// SoM: Because it's fog, check for an extra colormap and set the fog flag... // SoM: Because it's fog, check for an extra colormap and set the fog flag...
if (sectors[sec].extra_colormap) if (sectors[sec].extra_colormap)
sectors[sec].extra_colormap->flags = CMF_FOG; sectors[sec].extra_colormap->flags = CMF_FOG;
P_AddFakeFloorsByLine(i, 0xff, ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers);
break; break;
case 220: //Intangible case 220: //Intangible
ffloorflags = FF_EXISTS|FF_RENDERALL|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES; ffloorflags = FF_EXISTS|FF_RENDERALL|FF_CUTEXTRA|FF_EXTRA|FF_CUTSPRITES;
//Appearance settings //Appearance settings
if (lines[i].args[2] & TMFA_NOPLANES) if (lines[i].args[3] & TMFA_NOPLANES)
ffloorflags &= ~FF_RENDERPLANES; ffloorflags &= ~FF_RENDERPLANES;
if (lines[i].args[2] & TMFA_NOSIDES) if (lines[i].args[3] & TMFA_NOSIDES)
ffloorflags &= ~FF_RENDERSIDES; ffloorflags &= ~FF_RENDERSIDES;
if (!(lines[i].args[2] & TMFA_INSIDES)) if (!(lines[i].args[3] & TMFA_INSIDES))
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_BOTHPLANES; ffloorflags |= FF_BOTHPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_ALLSIDES; ffloorflags |= FF_ALLSIDES;
} }
if (lines[i].args[2] & TMFA_ONLYINSIDES) if (lines[i].args[3] & TMFA_ONLYINSIDES)
{ {
if (ffloorflags & FF_RENDERPLANES) if (ffloorflags & FF_RENDERPLANES)
ffloorflags |= FF_INVERTPLANES; ffloorflags |= FF_INVERTPLANES;
if (ffloorflags & FF_RENDERSIDES) if (ffloorflags & FF_RENDERSIDES)
ffloorflags |= FF_INVERTSIDES; ffloorflags |= FF_INVERTSIDES;
} }
if (lines[i].args[2] & TMFA_NOSHADE) if (lines[i].args[3] & TMFA_NOSHADE)
ffloorflags |= FF_NOSHADE; ffloorflags |= FF_NOSHADE;
if (lines[i].args[2] & TMFA_SPLAT) if (lines[i].args[3] & TMFA_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
break; break;
case 223: // FOF (intangible, invisible) - for combining specials in a sector case 223: // FOF (intangible, invisible) - for combining specials in a sector
P_AddFakeFloorsByLine(i, 0xff, FF_EXISTS|FF_NOSHADE, secthinkers); P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FF_EXISTS|FF_NOSHADE, secthinkers);
break; break;
case 250: // Mario Block case 250: // Mario Block
@ -6575,14 +6596,14 @@ void P_SpawnSpecials(boolean fromnetsave)
if (lines[i].args[1] & TMFM_INVISIBLE) if (lines[i].args[1] & TMFM_INVISIBLE)
ffloorflags &= ~(FF_SOLID|FF_RENDERALL|FF_CUTLEVEL); ffloorflags &= ~(FF_SOLID|FF_RENDERALL|FF_CUTLEVEL);
P_AddFakeFloorsByLine(i, 0xff, ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers);
break; break;
case 251: // A THWOMP! case 251: // A THWOMP!
{ {
UINT16 sound = (lines[i].stringargs[0]) ? get_number(lines[i].stringargs[0]) : sfx_thwomp; UINT16 sound = (lines[i].stringargs[0]) ? get_number(lines[i].stringargs[0]) : sfx_thwomp;
P_AddThwompThinker(lines[i].frontsector, &lines[i], lines[i].args[1] << (FRACBITS - 3), lines[i].args[2] << (FRACBITS - 3), sound); P_AddThwompThinker(lines[i].frontsector, &lines[i], lines[i].args[1] << (FRACBITS - 3), lines[i].args[2] << (FRACBITS - 3), sound);
P_AddFakeFloorsByLine(i, 0xff, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers); P_AddFakeFloorsByLine(i, 0xff, TMB_TRANSLUCENT, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
break; break;
} }
@ -6594,7 +6615,7 @@ void P_SpawnSpecials(boolean fromnetsave)
ffloorflags = FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP; ffloorflags = FF_EXISTS|FF_BLOCKOTHERS|FF_RENDERALL|FF_BUSTUP;
//Bustable type //Bustable type
switch (lines[i].args[2]) switch (lines[i].args[3])
{ {
case TMFB_TOUCH: case TMFB_TOUCH:
busttype = BT_TOUCH; busttype = BT_TOUCH;
@ -6611,13 +6632,13 @@ void P_SpawnSpecials(boolean fromnetsave)
} }
//Flags //Flags
if (lines[i].args[3] & TMFB_PUSHABLES) if (lines[i].args[4] & TMFB_PUSHABLES)
bustflags |= FB_PUSHABLES; bustflags |= FB_PUSHABLES;
if (lines[i].args[3] & TMFB_EXECUTOR) if (lines[i].args[4] & TMFB_EXECUTOR)
bustflags |= FB_EXECUTOR; bustflags |= FB_EXECUTOR;
if (lines[i].args[3] & TMFB_ONLYBOTTOM) if (lines[i].args[4] & TMFB_ONLYBOTTOM)
bustflags |= FB_ONLYBOTTOM; bustflags |= FB_ONLYBOTTOM;
if (lines[i].args[3] & TMFB_SPLAT) if (lines[i].args[4] & TMFB_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
if (busttype != BT_TOUCH || bustflags & FB_ONLYBOTTOM) if (busttype != BT_TOUCH || bustflags & FB_ONLYBOTTOM)
@ -6625,12 +6646,12 @@ void P_SpawnSpecials(boolean fromnetsave)
TAG_ITER_SECTORS(lines[i].args[0], s) TAG_ITER_SECTORS(lines[i].args[0], s)
{ {
ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], ffloorflags, secthinkers); ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
if (!fflr) if (!fflr)
continue; continue;
fflr->bustflags = bustflags; fflr->bustflags = bustflags;
fflr->busttype = busttype; fflr->busttype = busttype;
fflr->busttag = lines[i].args[4]; fflr->busttag = lines[i].args[5];
} }
break; break;
} }
@ -6641,7 +6662,7 @@ void P_SpawnSpecials(boolean fromnetsave)
TAG_ITER_SECTORS(lines[i].args[0], s) TAG_ITER_SECTORS(lines[i].args[0], s)
{ {
ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, 0xff, ffloorflags, secthinkers); ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, 0xff, TMB_TRANSLUCENT, ffloorflags, secthinkers);
if (!fflr) if (!fflr)
continue; continue;
fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1); fflr->sinkspeed = abs(lines[i].args[2]) << (FRACBITS - 1);
@ -6651,28 +6672,28 @@ void P_SpawnSpecials(boolean fromnetsave)
case 258: // Laser block case 258: // Laser block
ffloorflags = FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT; ffloorflags = FF_EXISTS|FF_RENDERALL|FF_NOSHADE|FF_EXTRA|FF_CUTEXTRA|FF_TRANSLUCENT;
P_AddLaserThinker(lines[i].args[0], lines + i, !!(lines[i].args[2] & TMFL_NOBOSSES)); P_AddLaserThinker(lines[i].args[0], lines + i, !!(lines[i].args[3] & TMFL_NOBOSSES));
if (lines[i].args[2] & TMFL_SPLAT) if (lines[i].args[3] & TMFL_SPLAT)
ffloorflags |= FF_SPLAT; ffloorflags |= FF_SPLAT;
P_AddFakeFloorsByLine(i, lines[i].args[1], ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, lines[i].args[1], lines[i].args[2], ffloorflags, secthinkers);
break; break;
case 259: // Custom FOF case 259: // Custom FOF
TAG_ITER_SECTORS(lines[i].args[0], s) TAG_ITER_SECTORS(lines[i].args[0], s)
{ {
ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], lines[i].args[2], secthinkers); ffloor_t *fflr = P_AddFakeFloor(&sectors[s], lines[i].frontsector, lines + i, lines[i].args[1], lines[i].args[2], lines[i].args[3], secthinkers);
if (!fflr) if (!fflr)
continue; continue;
if (!udmf) // Ugly backwards compatibility stuff if (!udmf) // Ugly backwards compatibility stuff
{ {
if (lines[i].args[2] & FF_QUICKSAND) if (lines[i].args[3] & FF_QUICKSAND)
{ {
fflr->sinkspeed = abs(lines[i].dx) >> 1; fflr->sinkspeed = abs(lines[i].dx) >> 1;
fflr->friction = abs(lines[i].dy) >> 6; fflr->friction = abs(lines[i].dy) >> 6;
} }
if (lines[i].args[2] & FF_BUSTUP) if (lines[i].args[3] & FF_BUSTUP)
{ {
switch (lines[i].args[3] % TMFB_ONLYBOTTOM) switch (lines[i].args[4] % TMFB_ONLYBOTTOM)
{ {
case TMFB_TOUCH: case TMFB_TOUCH:
fflr->busttype = BT_TOUCH; fflr->busttype = BT_TOUCH;
@ -6688,7 +6709,7 @@ void P_SpawnSpecials(boolean fromnetsave)
break; break;
} }
if (lines[i].args[3] & TMFB_ONLYBOTTOM) if (lines[i].args[4] & TMFB_ONLYBOTTOM)
fflr->bustflags |= FB_ONLYBOTTOM; fflr->bustflags |= FB_ONLYBOTTOM;
if (lines[i].flags & ML_EFFECT4) if (lines[i].flags & ML_EFFECT4)
fflr->bustflags |= FB_PUSHABLES; fflr->bustflags |= FB_PUSHABLES;
@ -6763,7 +6784,7 @@ void P_SpawnSpecials(boolean fromnetsave)
} }
} }
P_AddFakeFloorsByLine(i, dopacity, ffloorflags, secthinkers); P_AddFakeFloorsByLine(i, dopacity, TMB_TRANSLUCENT, ffloorflags, secthinkers);
} }
break; break;
@ -7169,12 +7190,13 @@ void P_SpawnSpecials(boolean fromnetsave)
* *
* \param line Control linedef to use. * \param line Control linedef to use.
* \param alpha Alpha value (0-255). * \param alpha Alpha value (0-255).
* \param blendmode Blending mode.
* \param ffloorflags 3Dfloor flags to use. * \param ffloorflags 3Dfloor flags to use.
* \param secthkiners Lists of thinkers sorted by sector. May be NULL. * \param secthkiners Lists of thinkers sorted by sector. May be NULL.
* \sa P_SpawnSpecials, P_AddFakeFloor * \sa P_SpawnSpecials, P_AddFakeFloor
* \author Graue <graue@oceanbase.org> * \author Graue <graue@oceanbase.org>
*/ */
static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, ffloortype_e ffloorflags, thinkerlist_t *secthinkers) static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, UINT8 blendmode, ffloortype_e ffloorflags, thinkerlist_t *secthinkers)
{ {
INT32 s; INT32 s;
mtag_t tag = lines[line].args[0]; mtag_t tag = lines[line].args[0];
@ -7182,7 +7204,7 @@ static void P_AddFakeFloorsByLine(size_t line, INT32 alpha, ffloortype_e ffloorf
line_t* li = lines + line; line_t* li = lines + line;
TAG_ITER_SECTORS(tag, s) TAG_ITER_SECTORS(tag, s)
P_AddFakeFloor(&sectors[s], &sectors[sec], li, alpha, ffloorflags, secthinkers); P_AddFakeFloor(&sectors[s], &sectors[sec], li, alpha, blendmode, ffloorflags, secthinkers);
} }
/* /*

9
src/p_spec.h
View file

@ -141,6 +141,15 @@ typedef enum
TMPF_NONEXCLUSIVE = 1<<1, TMPF_NONEXCLUSIVE = 1<<1,
} textmappusherflags_t; } textmappusherflags_t;
typedef enum
{
TMB_TRANSLUCENT = 0,
TMB_ADD = 1,
TMB_SUBTRACT = 2,
TMB_REVERSESUBTRACT = 3,
TMB_MODULATE = 4,
} textmapblendmodes_t;
// GETSECSPECIAL (specialval, section) // GETSECSPECIAL (specialval, section)
// //
// Pulls out the special # from a particular section. // Pulls out the special # from a particular section.

50
src/p_user.c
View file

@ -1189,8 +1189,8 @@ void P_GivePlayerRings(player_t *player, INT32 num_rings)
if (!player) if (!player)
return; return;
if (player->bot) if ((player->bot == BOT_2PAI || player->bot == BOT_2PHUMAN) && player->botleader)
player = &players[consoleplayer]; player = player->botleader;
if (!player->mo) if (!player->mo)
return; return;
@ -9628,7 +9628,7 @@ consvar_t cv_cam_still = CVAR_INIT ("cam_still", "Off", 0, CV_OnOff, NULL);
consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL); consvar_t cv_cam_speed = CVAR_INIT ("cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange); consvar_t cv_cam_rotate = CVAR_INIT ("cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange);
consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL); consvar_t cv_cam_rotspeed = CVAR_INIT ("cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL); consvar_t cv_cam_turnmultiplier = CVAR_INIT ("cam_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL); consvar_t cv_cam_orbit = CVAR_INIT ("cam_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL); consvar_t cv_cam_adjust = CVAR_INIT ("cam_adjust", "On", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL); consvar_t cv_cam2_dist = CVAR_INIT ("cam2_curdist", "160", CV_FLOAT, NULL, NULL);
@ -9637,30 +9637,30 @@ consvar_t cv_cam2_still = CVAR_INIT ("cam2_still", "Off", 0, CV_OnOff, NULL);
consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL); consvar_t cv_cam2_speed = CVAR_INIT ("cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL);
consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange); consvar_t cv_cam2_rotate = CVAR_INIT ("cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange);
consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL); consvar_t cv_cam2_rotspeed = CVAR_INIT ("cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL);
consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "1.0", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL); consvar_t cv_cam2_turnmultiplier = CVAR_INIT ("cam2_turnmultiplier", "0.75", CV_FLOAT|CV_SAVE, multiplier_cons_t, NULL);
consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL); consvar_t cv_cam2_orbit = CVAR_INIT ("cam2_orbit", "Off", CV_SAVE, CV_OnOff, NULL);
consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL); consvar_t cv_cam2_adjust = CVAR_INIT ("cam2_adjust", "On", CV_SAVE, CV_OnOff, NULL);
// [standard vs simple][p1 or p2] // [standard vs simple][p1 or p2]
consvar_t cv_cam_savedist[2][2] = { consvar_t cv_cam_savedist[2][2] = {
{ // standard { // standard
CVAR_INIT ("cam_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), CVAR_INIT ("cam_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
CVAR_INIT ("cam2_dist", "160", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), CVAR_INIT ("cam2_dist", "192", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}, },
{ // simple { // simple
CVAR_INIT ("cam_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), CVAR_INIT ("cam_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
CVAR_INIT ("cam2_simpledist", "224", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), CVAR_INIT ("cam2_simpledist", "256", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
} }
}; };
consvar_t cv_cam_saveheight[2][2] = { consvar_t cv_cam_saveheight[2][2] = {
{ // standard { // standard
CVAR_INIT ("cam_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), CVAR_INIT ("cam_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
CVAR_INIT ("cam2_height", "25", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), CVAR_INIT ("cam2_height", "40", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
}, },
{ // simple { // simple
CVAR_INIT ("cam_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist), CVAR_INIT ("cam_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCamDist),
CVAR_INIT ("cam2_simpleheight", "48", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist), CVAR_INIT ("cam2_simpleheight", "60", CV_FLOAT|CV_SAVE|CV_CALL, NULL, CV_UpdateCam2Dist),
} }
}; };
@ -9842,17 +9842,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
if (P_CameraThinker(player, thiscam, resetcalled)) if (P_CameraThinker(player, thiscam, resetcalled))
return true; return true;
if (tutorialmode) if (thiscam == &camera)
{
// force defaults because we have a camera look section
camspeed = (INT32)(atof(cv_cam_speed.defaultvalue) * FRACUNIT);
camstill = (!stricmp(cv_cam_still.defaultvalue, "off")) ? false : true;
camorbit = (!stricmp(cv_cam_orbit.defaultvalue, "off")) ? false : true;
camrotate = atoi(cv_cam_rotate.defaultvalue);
camdist = FixedMul((INT32)(atof(cv_cam_dist.defaultvalue) * FRACUNIT), mo->scale);
camheight = FixedMul((INT32)(atof(cv_cam_height.defaultvalue) * FRACUNIT), mo->scale);
}
else if (thiscam == &camera)
{ {
camspeed = cv_cam_speed.value; camspeed = cv_cam_speed.value;
camstill = cv_cam_still.value; camstill = cv_cam_still.value;
@ -11592,7 +11582,7 @@ void P_PlayerThink(player_t *player)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) if (!playeringame[i] || players[i].spectator || players[i].bot)
continue; continue;
if (players[i].lives <= 0) if (players[i].lives <= 0)
continue; continue;
@ -11623,8 +11613,8 @@ void P_PlayerThink(player_t *player)
INT32 i, total = 0, exiting = 0; INT32 i, total = 0, exiting = 0;
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) if (!playeringame[i] || players[i].spectator || players[i].bot)
continue; continue;
if (players[i].quittime > 30 * TICRATE) if (players[i].quittime > 30 * TICRATE)
continue; continue;
@ -12210,7 +12200,7 @@ void P_PlayerThink(player_t *player)
player->losstime--; player->losstime--;
// Flash player after being hit. // Flash player after being hit.
if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1)) if (player->powers[pw_flashing] > 0 && player->powers[pw_flashing] < flashingtics && (leveltime & 1) && player->playerstate == PST_LIVE)
player->mo->flags2 |= MF2_DONTDRAW; player->mo->flags2 |= MF2_DONTDRAW;
else else
player->mo->flags2 &= ~MF2_DONTDRAW; player->mo->flags2 &= ~MF2_DONTDRAW;
@ -12564,7 +12554,7 @@ void P_PlayerAfterThink(player_t *player)
player->mo->momy = tails->momy; player->mo->momy = tails->momy;
player->mo->momz = tails->momz; player->mo->momz = tails->momz;
} }
if (G_CoopGametype() && tails->player && tails->player->bot != BOT_2PAI) if (G_CoopGametype() && tails->player && tails->player->bot != BOT_2PAI)
{ {
player->mo->angle = tails->angle; player->mo->angle = tails->angle;
@ -12748,12 +12738,12 @@ void P_PlayerAfterThink(player_t *player)
if (!ptera->movefactor) if (!ptera->movefactor)
goto dropoff; goto dropoff;
if (ptera->cusval >= 50) if (ptera->cusval >= 30)
{ {
player->powers[pw_carry] = CR_NONE; player->powers[pw_carry] = CR_NONE;
P_SetTarget(&player->mo->tracer, NULL); P_SetTarget(&player->mo->tracer, NULL);
P_KillMobj(ptera, player->mo, player->mo, 0); P_KillMobj(ptera, player->mo, player->mo, 0);
player->mo->momz = 9*FRACUNIT; P_SetObjectMomZ(player->mo, 12*FRACUNIT, false);
player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED; player->pflags |= PF_APPLYAUTOBRAKE|PF_JUMPED|PF_THOKKED;
P_SetMobjState(player->mo, S_PLAY_ROLL); P_SetMobjState(player->mo, S_PLAY_ROLL);
break; break;

3
src/r_data.h
View file

@ -30,9 +30,6 @@ typedef struct
size_t numlumps; size_t numlumps;
} lumplist_t; } lumplist_t;
// Possible alpha types for a patch.
enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY};
UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha); UINT32 ASTBlendPixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha); UINT32 ASTBlendTexturePixel(RGBA_t background, RGBA_t foreground, int style, UINT8 alpha);
UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha); UINT8 ASTBlendPaletteIndexes(UINT8 background, UINT8 foreground, int style, UINT8 alpha);

27
src/r_defs.h
View file

@ -197,6 +197,7 @@ typedef struct ffloor_s
INT32 lastlight; INT32 lastlight;
INT32 alpha; INT32 alpha;
UINT8 blend; // blendmode
tic_t norender; // for culling tic_t norender; // for culling
// Only relevant for FF_BUSTUP // Only relevant for FF_BUSTUP
@ -401,7 +402,7 @@ typedef enum
#define HORIZONSPECIAL 41 #define HORIZONSPECIAL 41
#define NUMLINEARGS 6 #define NUMLINEARGS 10
#define NUMLINESTRINGARGS 2 #define NUMLINESTRINGARGS 2
typedef struct line_s typedef struct line_s
@ -422,6 +423,7 @@ typedef struct line_s
// Visual appearance: sidedefs. // Visual appearance: sidedefs.
UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided UINT16 sidenum[2]; // sidenum[1] will be 0xffff if one-sided
fixed_t alpha; // translucency fixed_t alpha; // translucency
UINT8 blendmode; // blendmode
INT32 executordelay; INT32 executordelay;
fixed_t bbox[4]; // bounding box for the extent of the linedef fixed_t bbox[4]; // bounding box for the extent of the linedef
@ -738,6 +740,9 @@ typedef struct
#pragma pack() #pragma pack()
#endif #endif
// Possible alpha types for a patch.
enum patchalphastyle {AST_COPY, AST_TRANSLUCENT, AST_ADD, AST_SUBTRACT, AST_REVERSESUBTRACT, AST_MODULATE, AST_OVERLAY, AST_FOG};
typedef enum typedef enum
{ {
RF_HORIZONTALFLIP = 0x0001, // Flip sprite horizontally RF_HORIZONTALFLIP = 0x0001, // Flip sprite horizontally
@ -751,17 +756,19 @@ typedef enum
RF_NOSPLATBILLBOARD = 0x0040, // Don't billboard floor sprites (faces forward from the view angle) RF_NOSPLATBILLBOARD = 0x0040, // Don't billboard floor sprites (faces forward from the view angle)
RF_NOSPLATROLLANGLE = 0x0080, // Don't rotate floor sprites by the object's rollangle (uses rotated patches instead) RF_NOSPLATROLLANGLE = 0x0080, // Don't rotate floor sprites by the object's rollangle (uses rotated patches instead)
RF_BLENDMASK = 0x0F00, // --Blending modes RF_BRIGHTMASK = 0x00000300, // --Bright modes
RF_FULLBRIGHT = 0x0100, // Sprite is drawn at full brightness RF_FULLBRIGHT = 0x00000100, // Sprite is drawn at full brightness
RF_FULLDARK = 0x0200, // Sprite is drawn completely dark RF_FULLDARK = 0x00000200, // Sprite is drawn completely dark
RF_NOCOLORMAPS = 0x0400, // Sprite is not drawn with colormaps RF_SEMIBRIGHT = (RF_FULLBRIGHT | RF_FULLDARK), // between sector bright and full bright
RF_SPRITETYPEMASK = 0x7000, // ---Different sprite types RF_NOCOLORMAPS = 0x00000400, // Sprite is not drawn with colormaps
RF_PAPERSPRITE = 0x1000, // Paper sprite
RF_FLOORSPRITE = 0x2000, // Floor sprite
RF_SHADOWDRAW = 0x10000, // Stretches and skews the sprite like a shadow. RF_SPRITETYPEMASK = 0x00003000, // --Different sprite types
RF_SHADOWEFFECTS = 0x20000, // Scales and becomes transparent like a shadow. RF_PAPERSPRITE = 0x00001000, // Paper sprite
RF_FLOORSPRITE = 0x00002000, // Floor sprite
RF_SHADOWDRAW = 0x00004000, // Stretches and skews the sprite like a shadow.
RF_SHADOWEFFECTS = 0x00008000, // Scales and becomes transparent like a shadow.
RF_DROPSHADOW = (RF_SHADOWDRAW | RF_SHADOWEFFECTS | RF_FULLDARK), RF_DROPSHADOW = (RF_SHADOWDRAW | RF_SHADOWEFFECTS | RF_FULLDARK),
} renderflags_t; } renderflags_t;

3
src/r_draw.c
View file

@ -248,6 +248,9 @@ static void BlendTab_Subtractive(UINT8 *table, int style, UINT8 blendamt)
result.s.green = max(0, result.s.green - blendamt); result.s.green = max(0, result.s.green - blendamt);
result.s.blue = max(0, result.s.blue - blendamt); result.s.blue = max(0, result.s.blue - blendamt);
//probably incorrect, but does look better at lower opacity...
//result.rgba = ASTBlendPixel(result, frontrgba, AST_TRANSLUCENT, blendamt);
table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue); table[((bg * 0x100) + fg)] = GetColorLUT(&transtab_lut, result.s.red, result.s.green, result.s.blue);
} }
} }

6
src/r_patchrotation.c
View file

@ -227,10 +227,10 @@ void RotatedPatch_DoRotation(rotsprite_t *rotsprite, patch_t *patch, INT32 angle
ox = (newwidth / 2) + (leftoffset - xpivot); ox = (newwidth / 2) + (leftoffset - xpivot);
oy = (newheight / 2) + (patch->topoffset - ypivot); oy = (newheight / 2) + (patch->topoffset - ypivot);
width = (maxx+1 - minx); width = (maxx - minx);
height = (maxy+1 - miny); height = (maxy - miny);
if ((unsigned)(width * height) != size) if ((unsigned)(width * height) > size)
{ {
UINT16 *src, *dest; UINT16 *src, *dest;

32
src/r_plane.c
View file

@ -855,28 +855,16 @@ void R_DrawSinglePlane(visplane_t *pl)
spanfunctype = (pl->ffloor->flags & FF_SPLAT) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS; spanfunctype = (pl->ffloor->flags & FF_SPLAT) ? SPANDRAWFUNC_TRANSSPLAT : SPANDRAWFUNC_TRANS;
// Hacked up support for alpha value in software mode Tails 09-24-2002 // Hacked up support for alpha value in software mode Tails 09-24-2002
if (pl->ffloor->alpha < 12) // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
return; // Don't even draw it {
else if (pl->ffloor->alpha < 38) INT32 trans = (10*((256+12) - pl->ffloor->alpha))/255;
ds_transmap = R_GetTranslucencyTable(tr_trans90); if (trans >= 10)
else if (pl->ffloor->alpha < 64) return; // Don't even draw it
ds_transmap = R_GetTranslucencyTable(tr_trans80); if (pl->ffloor->blend) // additive, (reverse) subtractive, modulative
else if (pl->ffloor->alpha < 89) ds_transmap = R_GetBlendTable(pl->ffloor->blend, trans);
ds_transmap = R_GetTranslucencyTable(tr_trans70); else if (!(ds_transmap = R_GetTranslucencyTable(trans)) || trans == 0)
else if (pl->ffloor->alpha < 115) spanfunctype = SPANDRAWFUNC_SPLAT; // Opaque, but allow transparent flat pixels
ds_transmap = R_GetTranslucencyTable(tr_trans60); }
else if (pl->ffloor->alpha < 140)
ds_transmap = R_GetTranslucencyTable(tr_trans50);
else if (pl->ffloor->alpha < 166)
ds_transmap = R_GetTranslucencyTable(tr_trans40);
else if (pl->ffloor->alpha < 192)
ds_transmap = R_GetTranslucencyTable(tr_trans30);
else if (pl->ffloor->alpha < 217)
ds_transmap = R_GetTranslucencyTable(tr_trans20);
else if (pl->ffloor->alpha < 243)
ds_transmap = R_GetTranslucencyTable(tr_trans10);
else // Opaque, but allow transparent flat pixels
spanfunctype = SPANDRAWFUNC_SPLAT;
if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG))) if ((spanfunctype == SPANDRAWFUNC_SPLAT) || (pl->extra_colormap && (pl->extra_colormap->flags & CMF_FOG)))
light = (pl->lightlevel >> LIGHTSEGSHIFT); light = (pl->lightlevel >> LIGHTSEGSHIFT);

53
src/r_segs.c
View file

@ -155,18 +155,25 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
if (!ldef->alpha) if (!ldef->alpha)
return; return;
if (ldef->alpha > 0 && ldef->alpha < FRACUNIT) if (ldef->blendmode == AST_FOG)
{
dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
else if (ldef->special == 909)
{ {
colfunc = colfuncs[COLDRAWFUNC_FOG]; colfunc = colfuncs[COLDRAWFUNC_FOG];
windowtop = frontsector->ceilingheight; windowtop = frontsector->ceilingheight;
windowbottom = frontsector->floorheight; windowbottom = frontsector->floorheight;
} }
else if (ldef->blendmode)
{
if (ldef->alpha == NUMTRANSMAPS || ldef->blendmode == AST_MODULATE)
dc_transmap = R_GetBlendTable(ldef->blendmode, 0);
else
dc_transmap = R_GetBlendTable(ldef->blendmode, R_GetLinedefTransTable(ldef->alpha));
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
else if (ldef->alpha > 0 && ldef->alpha < FRACUNIT)
{
dc_transmap = R_GetTranslucencyTable(R_GetLinedefTransTable(ldef->alpha));
colfunc = colfuncs[COLDRAWFUNC_FUZZY];
}
else else
colfunc = colfuncs[BASEDRAWFUNC]; colfunc = colfuncs[BASEDRAWFUNC];
@ -600,28 +607,16 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
boolean fuzzy = true; boolean fuzzy = true;
// Hacked up support for alpha value in software mode Tails 09-24-2002 // Hacked up support for alpha value in software mode Tails 09-24-2002
if (pfloor->alpha < 12) // ...unhacked by toaster 04-01-2021, re-hacked a little by sphere 19-11-2021
return; // Don't even draw it {
else if (pfloor->alpha < 38) INT32 trans = (10*((256+12) - pfloor->alpha))/255;
dc_transmap = R_GetTranslucencyTable(tr_trans90); if (trans >= 10)
else if (pfloor->alpha < 64) return; // Don't even draw it
dc_transmap = R_GetTranslucencyTable(tr_trans80); if (pfloor->blend) // additive, (reverse) subtractive, modulative
else if (pfloor->alpha < 89) dc_transmap = R_GetBlendTable(pfloor->blend, trans);
dc_transmap = R_GetTranslucencyTable(tr_trans70); else if (!(dc_transmap = R_GetTranslucencyTable(trans)) || trans == 0)
else if (pfloor->alpha < 115) fuzzy = false; // Opaque
dc_transmap = R_GetTranslucencyTable(tr_trans60); }
else if (pfloor->alpha < 140)
dc_transmap = R_GetTranslucencyTable(tr_trans50);
else if (pfloor->alpha < 166)
dc_transmap = R_GetTranslucencyTable(tr_trans40);
else if (pfloor->alpha < 192)
dc_transmap = R_GetTranslucencyTable(tr_trans30);
else if (pfloor->alpha < 217)
dc_transmap = R_GetTranslucencyTable(tr_trans20);
else if (pfloor->alpha < 243)
dc_transmap = R_GetTranslucencyTable(tr_trans10);
else
fuzzy = false; // Opaque
if (fuzzy) if (fuzzy)
colfunc = colfuncs[COLDRAWFUNC_FUZZY]; colfunc = colfuncs[COLDRAWFUNC_FUZZY];

32
src/r_things.c
View file

@ -1110,6 +1110,10 @@ static void R_SplitSprite(vissprite_t *sprite)
if (lindex >= MAXLIGHTSCALE) if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1; lindex = MAXLIGHTSCALE-1;
if (newsprite->cut & SC_SEMIBRIGHT)
lindex = (MAXLIGHTSCALE/2) + (lindex >>1);
newsprite->colormap = spritelights[lindex]; newsprite->colormap = spritelights[lindex];
} }
} }
@ -1798,13 +1802,19 @@ static void R_ProjectSprite(mobj_t *thing)
return; return;
} }
INT32 blendmode;
if (oldthing->frame & FF_BLENDMASK)
blendmode = ((oldthing->frame & FF_BLENDMASK) >> FF_BLENDSHIFT) + 1;
else
blendmode = oldthing->blendmode;
// Determine the translucency value. // Determine the translucency value.
if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility) if (oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) // actually only the player should use this (temporary invisibility)
trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK trans = tr_trans80; // because now the translucency is set through FF_TRANSMASK
else if (oldthing->frame & FF_TRANSMASK) else if (oldthing->frame & FF_TRANSMASK)
{ {
trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT; trans = (oldthing->frame & FF_TRANSMASK) >> FF_TRANSSHIFT;
if (!R_BlendLevelVisible(oldthing->blendmode, trans)) if (!R_BlendLevelVisible(blendmode, trans))
return; return;
} }
else else
@ -2016,13 +2026,15 @@ static void R_ProjectSprite(mobj_t *thing)
vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1); vis->scale += FixedMul(scalestep, spriteyscale) * (vis->x1 - x1);
} }
if ((oldthing->blendmode != AST_COPY) && cv_translucency.value) if ((blendmode != AST_COPY) && cv_translucency.value)
vis->transmap = R_GetBlendTable(oldthing->blendmode, trans); vis->transmap = R_GetBlendTable(blendmode, trans);
else else
vis->transmap = NULL; vis->transmap = NULL;
if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW) if (R_ThingIsFullBright(oldthing) || oldthing->flags2 & MF2_SHADOW || thing->flags2 & MF2_SHADOW)
vis->cut |= SC_FULLBRIGHT; vis->cut |= SC_FULLBRIGHT;
else if (R_ThingIsSemiBright(oldthing))
vis->cut |= SC_SEMIBRIGHT;
else if (R_ThingIsFullDark(oldthing)) else if (R_ThingIsFullDark(oldthing))
vis->cut |= SC_FULLDARK; vis->cut |= SC_FULLDARK;
@ -2045,6 +2057,9 @@ static void R_ProjectSprite(mobj_t *thing)
if (lindex >= MAXLIGHTSCALE) if (lindex >= MAXLIGHTSCALE)
lindex = MAXLIGHTSCALE-1; lindex = MAXLIGHTSCALE-1;
if (vis->cut & SC_SEMIBRIGHT)
lindex = (MAXLIGHTSCALE/2) + (lindex >> 1);
vis->colormap = spritelights[lindex]; vis->colormap = spritelights[lindex];
} }
@ -3073,17 +3088,22 @@ boolean R_ThingIsPaperSprite(mobj_t *thing)
boolean R_ThingIsFloorSprite(mobj_t *thing) boolean R_ThingIsFloorSprite(mobj_t *thing)
{ {
return (thing->flags2 & MF2_SPLAT || thing->renderflags & RF_FLOORSPRITE); return (thing->flags2 & MF2_SPLAT || thing->frame & FF_FLOORSPRITE || thing->renderflags & RF_FLOORSPRITE);
} }
boolean R_ThingIsFullBright(mobj_t *thing) boolean R_ThingIsFullBright(mobj_t *thing)
{ {
return (thing->frame & FF_FULLBRIGHT || thing->renderflags & RF_FULLBRIGHT); return ((thing->frame & FF_BRIGHTMASK) == FF_FULLBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLBRIGHT);
}
boolean R_ThingIsSemiBright(mobj_t *thing)
{
return ((thing->frame & FF_BRIGHTMASK) == FF_SEMIBRIGHT || (thing->renderflags & RF_BRIGHTMASK) == RF_SEMIBRIGHT);
} }
boolean R_ThingIsFullDark(mobj_t *thing) boolean R_ThingIsFullDark(mobj_t *thing)
{ {
return (thing->renderflags & RF_FULLDARK); return ((thing->frame & FF_BRIGHTMASK) == FF_FULLDARK || (thing->renderflags & RF_BRIGHTMASK) == RF_FULLDARK);
} }
// //

16
src/r_things.h
View file

@ -82,6 +82,7 @@ boolean R_ThingIsPaperSprite (mobj_t *thing);
boolean R_ThingIsFloorSprite (mobj_t *thing); boolean R_ThingIsFloorSprite (mobj_t *thing);
boolean R_ThingIsFullBright (mobj_t *thing); boolean R_ThingIsFullBright (mobj_t *thing);
boolean R_ThingIsSemiBright (mobj_t *thing);
boolean R_ThingIsFullDark (mobj_t *thing); boolean R_ThingIsFullDark (mobj_t *thing);
// -------------- // --------------
@ -123,13 +124,14 @@ typedef enum
SC_PRECIP = 1<<2, SC_PRECIP = 1<<2,
SC_LINKDRAW = 1<<3, SC_LINKDRAW = 1<<3,
SC_FULLBRIGHT = 1<<4, SC_FULLBRIGHT = 1<<4,
SC_FULLDARK = 1<<5, SC_SEMIBRIGHT = 1<<5,
SC_VFLIP = 1<<6, SC_FULLDARK = 1<<6,
SC_ISSCALED = 1<<7, SC_VFLIP = 1<<7,
SC_ISROTATED = 1<<8, SC_ISSCALED = 1<<8,
SC_SHADOW = 1<<9, SC_ISROTATED = 1<<9,
SC_SHEAR = 1<<10, SC_SHADOW = 1<<10,
SC_SPLAT = 1<<11, SC_SHEAR = 1<<11,
SC_SPLAT = 1<<12,
// masks // masks
SC_CUTMASK = SC_TOP|SC_BOTTOM, SC_CUTMASK = SC_TOP|SC_BOTTOM,
SC_FLAGMASK = ~SC_CUTMASK SC_FLAGMASK = ~SC_CUTMASK

6
src/s_sound.c
View file

@ -74,9 +74,9 @@ consvar_t stereoreverse = CVAR_INIT ("stereoreverse", "Off", CV_SAVE, CV_OnOff,
static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL); static consvar_t precachesound = CVAR_INIT ("precachesound", "Off", CV_SAVE, CV_OnOff, NULL);
// actual general (maximum) sound & music volume, saved into the config // actual general (maximum) sound & music volume, saved into the config
consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); consvar_t cv_soundvolume = CVAR_INIT ("soundvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); consvar_t cv_digmusicvolume = CVAR_INIT ("digmusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "18", CV_SAVE, soundvolume_cons_t, NULL); consvar_t cv_midimusicvolume = CVAR_INIT ("midimusicvolume", "16", CV_SAVE, soundvolume_cons_t, NULL);
static void Captioning_OnChange(void) static void Captioning_OnChange(void)
{ {

5
src/sdl/Srb2SDL-vc10.vcxproj
View file

@ -245,6 +245,7 @@
<ClInclude Include="..\i_sound.h" /> <ClInclude Include="..\i_sound.h" />
<ClInclude Include="..\i_system.h" /> <ClInclude Include="..\i_system.h" />
<ClInclude Include="..\i_tcp.h" /> <ClInclude Include="..\i_tcp.h" />
<ClInclude Include="..\i_threads.h" />
<ClInclude Include="..\i_video.h" /> <ClInclude Include="..\i_video.h" />
<ClInclude Include="..\keys.h" /> <ClInclude Include="..\keys.h" />
<ClInclude Include="..\libdivide.h" /> <ClInclude Include="..\libdivide.h" />
@ -304,6 +305,7 @@
<ClInclude Include="..\st_stuff.h" /> <ClInclude Include="..\st_stuff.h" />
<ClInclude Include="..\s_sound.h" /> <ClInclude Include="..\s_sound.h" />
<ClInclude Include="..\tables.h" /> <ClInclude Include="..\tables.h" />
<ClInclude Include="..\taglist.h" />
<ClInclude Include="..\v_video.h" /> <ClInclude Include="..\v_video.h" />
<ClInclude Include="..\w_wad.h" /> <ClInclude Include="..\w_wad.h" />
<ClInclude Include="..\y_inter.h" /> <ClInclude Include="..\y_inter.h" />
@ -415,6 +417,7 @@
<ClCompile Include="..\lua_polyobjlib.c" /> <ClCompile Include="..\lua_polyobjlib.c" />
<ClCompile Include="..\lua_script.c" /> <ClCompile Include="..\lua_script.c" />
<ClCompile Include="..\lua_skinlib.c" /> <ClCompile Include="..\lua_skinlib.c" />
<ClCompile Include="..\lua_taglib.c" />
<ClCompile Include="..\lua_thinkerlib.c" /> <ClCompile Include="..\lua_thinkerlib.c" />
<ClCompile Include="..\lzf.c" /> <ClCompile Include="..\lzf.c" />
<ClCompile Include="..\md5.c" /> <ClCompile Include="..\md5.c" />
@ -475,10 +478,12 @@
<ClCompile Include="..\r_things.c" /> <ClCompile Include="..\r_things.c" />
<ClCompile Include="..\screen.c" /> <ClCompile Include="..\screen.c" />
<ClCompile Include="..\sounds.c" /> <ClCompile Include="..\sounds.c" />
<ClCompile Include="..\strcasestr.c" />
<ClCompile Include="..\string.c" /> <ClCompile Include="..\string.c" />
<ClCompile Include="..\st_stuff.c" /> <ClCompile Include="..\st_stuff.c" />
<ClCompile Include="..\s_sound.c" /> <ClCompile Include="..\s_sound.c" />
<ClCompile Include="..\tables.c" /> <ClCompile Include="..\tables.c" />
<ClCompile Include="..\taglist.c" />
<ClCompile Include="..\t_facon.c"> <ClCompile Include="..\t_facon.c">
<ExcludedFromBuild>true</ExcludedFromBuild> <ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile> </ClCompile>

35
src/sdl/Srb2SDL-vc10.vcxproj.filters
View file

@ -135,6 +135,16 @@
<ClInclude Include="..\dehacked.h"> <ClInclude Include="..\dehacked.h">
<Filter>D_Doom</Filter> <Filter>D_Doom</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\deh_lua.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\deh_soc.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\deh_tables.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomdata.h"> <ClInclude Include="..\doomdata.h">
<Filter>D_Doom</Filter> <Filter>D_Doom</Filter>
</ClInclude> </ClInclude>
@ -288,6 +298,9 @@
<ClInclude Include="..\i_tcp.h"> <ClInclude Include="..\i_tcp.h">
<Filter>I_Interface</Filter> <Filter>I_Interface</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\i_threads.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_video.h"> <ClInclude Include="..\i_video.h">
<Filter>I_Interface</Filter> <Filter>I_Interface</Filter>
</ClInclude> </ClInclude>
@ -402,6 +415,9 @@
<ClInclude Include="..\tables.h"> <ClInclude Include="..\tables.h">
<Filter>P_Play</Filter> <Filter>P_Play</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\taglist.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\libdivide.h"> <ClInclude Include="..\libdivide.h">
<Filter>R_Rend</Filter> <Filter>R_Rend</Filter>
</ClInclude> </ClInclude>
@ -600,6 +616,16 @@
<ClCompile Include="..\dehacked.c"> <ClCompile Include="..\dehacked.c">
<Filter>D_Doom</Filter> <Filter>D_Doom</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\deh_lua.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\deh_soc.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\deh_tables.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_clisrv.c"> <ClCompile Include="..\d_clisrv.c">
<Filter>D_Doom</Filter> <Filter>D_Doom</Filter>
</ClCompile> </ClCompile>
@ -747,6 +773,9 @@
<ClCompile Include="..\lua_skinlib.c"> <ClCompile Include="..\lua_skinlib.c">
<Filter>LUA</Filter> <Filter>LUA</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\lua_taglib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_thinkerlib.c"> <ClCompile Include="..\lua_thinkerlib.c">
<Filter>LUA</Filter> <Filter>LUA</Filter>
</ClCompile> </ClCompile>
@ -792,6 +821,9 @@
<ClCompile Include="..\string.c"> <ClCompile Include="..\string.c">
<Filter>M_Misc</Filter> <Filter>M_Misc</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\strcasestr.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\comptime.c"> <ClCompile Include="..\comptime.c">
<Filter>O_Other</Filter> <Filter>O_Other</Filter>
</ClCompile> </ClCompile>
@ -852,6 +884,9 @@
<ClCompile Include="..\tables.c"> <ClCompile Include="..\tables.c">
<Filter>P_Play</Filter> <Filter>P_Play</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\taglist.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_facon.c"> <ClCompile Include="..\t_facon.c">
<Filter>P_Play</Filter> <Filter>P_Play</Filter>
</ClCompile> </ClCompile>

4
src/sdl/ogl_sdl.c
View file

@ -177,7 +177,9 @@ boolean OglSdlSurface(INT32 w, INT32 h)
// Also set the renderer variable back to software so the next launch won't // Also set the renderer variable back to software so the next launch won't
// repeat this error. // repeat this error.
CV_StealthSet(&cv_renderer, "Software"); CV_StealthSet(&cv_renderer, "Software");
I_Error("OpenGL Error: Failed to access the GPU. There may be an issue with your graphics drivers."); I_Error("OpenGL Error: Failed to access the GPU. Possible reasons include:\n"
"- GPU vendor has dropped OpenGL support on your GPU and OS. (Old GPU?)\n"
"- GPU drivers are missing or broken. You may need to update your drivers.");
} }
} }
first_init = true; first_init = true;

14
src/st_stuff.c
View file

@ -1176,7 +1176,17 @@ static void ST_drawInput(void)
break; break;
case CS_SIMPLE: case CS_SIMPLE:
V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "SIMPLE"); V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "AUTOMATIC");
y -= 8;
break;
case CS_STANDARD:
V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "MANUAL");
y -= 8;
break;
case CS_LEGACY:
V_DrawThinString(x, y, hudinfo[HUD_LIVES].f, "STRAFE");
y -= 8; y -= 8;
break; break;
@ -2291,7 +2301,7 @@ static void ST_drawTextHUD(void)
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (!playeringame[i] || players[i].spectator) if (!playeringame[i] || players[i].spectator || players[i].bot)
continue; continue;
if (players[i].lives <= 0) if (players[i].lives <= 0)
continue; continue;

38
src/taglist.c
View file

@ -191,6 +191,38 @@ void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id)
group->elements[i] = id; group->elements[i] = id;
} }
static void Taggroup_Add_Init(taggroup_t *garray[], const mtag_t tag, size_t id)
{
taggroup_t *group;
if (tag == MTAG_GLOBAL)
return;
group = garray[(UINT16)tag];
if (! in_bit_array(tags_available, tag))
{
num_tags++;
set_bit_array(tags_available, tag);
}
// Create group if empty.
if (!group)
group = garray[(UINT16)tag] = Z_Calloc(sizeof(taggroup_t), PU_LEVEL, NULL);
else if (group->elements[group->count - 1] == id)
return; // Don't add duplicates
group->count++;
if (group->count > group->capacity)
{
group->capacity = 2 * group->count;
group->elements = Z_Realloc(group->elements, group->capacity * sizeof(size_t), PU_LEVEL, NULL);
}
group->elements[group->count - 1] = id;
}
static size_t total_elements_with_tag (const mtag_t tag) static size_t total_elements_with_tag (const mtag_t tag)
{ {
return return
@ -250,17 +282,17 @@ void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id)
static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid) static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
{ {
Taggroup_Add(tags_sectors, tag, itemid); Taggroup_Add_Init(tags_sectors, tag, itemid);
} }
static void Taglist_AddToLines (const mtag_t tag, const size_t itemid) static void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
{ {
Taggroup_Add(tags_lines, tag, itemid); Taggroup_Add_Init(tags_lines, tag, itemid);
} }
static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid) static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
{ {
Taggroup_Add(tags_mapthings, tag, itemid); Taggroup_Add_Init(tags_mapthings, tag, itemid);
} }
/// After all taglists have been built for each element (sectors, lines, things), /// After all taglists have been built for each element (sectors, lines, things),

1
src/taglist.h
View file

@ -41,6 +41,7 @@ typedef struct
{ {
size_t *elements; size_t *elements;
size_t count; size_t count;
size_t capacity;
} taggroup_t; } taggroup_t;
extern bitarray_t tags_available[]; extern bitarray_t tags_available[];

51
src/v_video.c
View file

@ -511,7 +511,8 @@ static inline UINT8 transmappedpdraw(const UINT8 *dest, const UINT8 *source, fix
void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap) void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap)
{ {
UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t); UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
UINT32 alphalevel = 0; UINT32 alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT);
UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT);
fixed_t col, ofs, colfrac, rowfrac, fdup, vdup; fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
INT32 dupx, dupy; INT32 dupx, dupy;
@ -538,13 +539,13 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
patchdrawfunc = standardpdraw; patchdrawfunc = standardpdraw;
v_translevel = NULL; v_translevel = NULL;
if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT))) if (alphalevel)
{ {
if (alphalevel == 13) if (alphalevel == 10)
alphalevel = hudminusalpha[st_translucency]; alphalevel = hudminusalpha[st_translucency];
else if (alphalevel == 14) else if (alphalevel == 11)
alphalevel = 10 - st_translucency; alphalevel = 10 - st_translucency;
else if (alphalevel == 15) else if (alphalevel == 12)
alphalevel = hudplusalpha[st_translucency]; alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10) if (alphalevel >= 10)
@ -552,7 +553,11 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
if (alphalevel) if (alphalevel)
{ {
v_translevel = R_GetTranslucencyTable(alphalevel); if (blendmode)
v_translevel = R_GetBlendTable(blendmode+1, alphalevel);
else
v_translevel = R_GetTranslucencyTable(alphalevel);
patchdrawfunc = translucentpdraw; patchdrawfunc = translucentpdraw;
} }
} }
@ -591,10 +596,6 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
colfrac = FixedDiv(FRACUNIT, fdup); colfrac = FixedDiv(FRACUNIT, fdup);
rowfrac = FixedDiv(FRACUNIT, vdup); rowfrac = FixedDiv(FRACUNIT, vdup);
// So it turns out offsets aren't scaled in V_NOSCALESTART unless V_OFFSET is applied ...poo, that's terrible
// For now let's just at least give V_OFFSET the ability to support V_FLIP
// I'll probably make a better fix for 2.2 where I don't have to worry about breaking existing support for stuff
// -- Monster Iestyn 29/10/18
{ {
fixed_t offsetx = 0, offsety = 0; fixed_t offsetx = 0, offsety = 0;
@ -605,15 +606,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
offsetx = FixedMul(patch->leftoffset<<FRACBITS, pscale); offsetx = FixedMul(patch->leftoffset<<FRACBITS, pscale);
// top offset // top offset
// TODO: make some kind of vertical version of V_FLIP, maybe by deprecating V_OFFSET in future?!?
offsety = FixedMul(patch->topoffset<<FRACBITS, vscale); offsety = FixedMul(patch->topoffset<<FRACBITS, vscale);
if ((scrn & (V_NOSCALESTART|V_OFFSET)) == (V_NOSCALESTART|V_OFFSET)) // Multiply by dupx/dupy for crosshairs
{
offsetx = FixedMul(offsetx, dupx<<FRACBITS);
offsety = FixedMul(offsety, dupy<<FRACBITS);
}
// Subtract the offsets from x/y positions // Subtract the offsets from x/y positions
x -= offsetx; x -= offsetx;
y -= offsety; y -= offsety;
@ -812,7 +806,8 @@ void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vsca
void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h) void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h)
{ {
UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t); UINT8 (*patchdrawfunc)(const UINT8*, const UINT8*, fixed_t);
UINT32 alphalevel = 0; UINT32 alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT);
UINT32 blendmode = ((scrn & V_BLENDMASK) >> V_BLENDSHIFT);
// boolean flip = false; // boolean flip = false;
fixed_t col, ofs, colfrac, rowfrac, fdup, vdup; fixed_t col, ofs, colfrac, rowfrac, fdup, vdup;
@ -838,13 +833,13 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
patchdrawfunc = standardpdraw; patchdrawfunc = standardpdraw;
v_translevel = NULL; v_translevel = NULL;
if ((alphalevel = ((scrn & V_ALPHAMASK) >> V_ALPHASHIFT))) if (alphalevel)
{ {
if (alphalevel == 13) if (alphalevel == 10)
alphalevel = hudminusalpha[st_translucency]; alphalevel = hudminusalpha[st_translucency];
else if (alphalevel == 14) else if (alphalevel == 11)
alphalevel = 10 - st_translucency; alphalevel = 10 - st_translucency;
else if (alphalevel == 15) else if (alphalevel == 12)
alphalevel = hudplusalpha[st_translucency]; alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10) if (alphalevel >= 10)
@ -852,7 +847,11 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
if (alphalevel) if (alphalevel)
{ {
v_translevel = R_GetTranslucencyTable(alphalevel); if (blendmode)
v_translevel = R_GetBlendTable(blendmode+1, alphalevel);
else
v_translevel = R_GetTranslucencyTable(alphalevel);
patchdrawfunc = translucentpdraw; patchdrawfunc = translucentpdraw;
} }
} }
@ -1411,11 +1410,11 @@ void V_DrawFillConsoleMap(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT))) if ((alphalevel = ((c & V_ALPHAMASK) >> V_ALPHASHIFT)))
{ {
if (alphalevel == 13) if (alphalevel == 10)
alphalevel = hudminusalpha[st_translucency]; alphalevel = hudminusalpha[st_translucency];
else if (alphalevel == 14) else if (alphalevel == 11)
alphalevel = 10 - st_translucency; alphalevel = 10 - st_translucency;
else if (alphalevel == 15) else if (alphalevel == 12)
alphalevel = hudplusalpha[st_translucency]; alphalevel = hudplusalpha[st_translucency];
if (alphalevel >= 10) if (alphalevel >= 10)

22
src/v_video.h
View file

@ -122,17 +122,23 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_70TRANS 0x00070000 #define V_70TRANS 0x00070000
#define V_80TRANS 0x00080000 // used to be V_8020TRANS #define V_80TRANS 0x00080000 // used to be V_8020TRANS
#define V_90TRANS 0x00090000 #define V_90TRANS 0x00090000
#define V_HUDTRANSHALF 0x000D0000 #define V_HUDTRANSHALF 0x000A0000
#define V_HUDTRANS 0x000E0000 // draw the hud translucent #define V_HUDTRANS 0x000B0000 // draw the hud translucent
#define V_HUDTRANSDOUBLE 0x000F0000 #define V_HUDTRANSDOUBLE 0x000C0000
// Macros follow // Macros follow
#define V_USERHUDTRANSHALF ((10-(cv_translucenthud.value/2))<<V_ALPHASHIFT) #define V_USERHUDTRANSHALF ((10-(cv_translucenthud.value/2))<<V_ALPHASHIFT)
#define V_USERHUDTRANS ((10-cv_translucenthud.value)<<V_ALPHASHIFT) #define V_USERHUDTRANS ((10-cv_translucenthud.value)<<V_ALPHASHIFT)
#define V_USERHUDTRANSDOUBLE ((10-min(cv_translucenthud.value*2, 10))<<V_ALPHASHIFT) #define V_USERHUDTRANSDOUBLE ((10-min(cv_translucenthud.value*2, 10))<<V_ALPHASHIFT)
#define V_AUTOFADEOUT 0x00100000 // used by CECHOs, automatic fade out when almost over // use bits 21-23 for blendmodes
#define V_RETURN8 0x00200000 // 8 pixel return instead of 12 #define V_BLENDSHIFT 20
#define V_OFFSET 0x00400000 // account for offsets in patches #define V_BLENDMASK 0x00700000
// preshifted blend flags minus 1 as effects don't distinguish between AST_COPY and AST_TRANSLUCENT
#define V_ADD ((AST_ADD-1)<<V_BLENDSHIFT) // Additive
#define V_SUBTRACT ((AST_SUBTRACT-1)<<V_BLENDSHIFT) // Subtractive
#define V_REVERSESUBTRACT ((AST_REVERSESUBTRACT-1)<<V_BLENDSHIFT) // Reverse subtractive
#define V_MODULATE ((AST_MODULATE-1)<<V_BLENDSHIFT) // Modulate
#define V_ALLOWLOWERCASE 0x00800000 // (strings only) allow fonts that have lowercase letters to use them #define V_ALLOWLOWERCASE 0x00800000 // (strings only) allow fonts that have lowercase letters to use them
#define V_FLIP 0x00800000 // (patches only) Horizontal flip #define V_FLIP 0x00800000 // (patches only) Horizontal flip
#define V_CENTERNAMETAG 0x00800000 // (nametag only) center nametag lines #define V_CENTERNAMETAG 0x00800000 // (nametag only) center nametag lines
@ -142,8 +148,8 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_SNAPTOLEFT 0x04000000 // for centering #define V_SNAPTOLEFT 0x04000000 // for centering
#define V_SNAPTORIGHT 0x08000000 // for centering #define V_SNAPTORIGHT 0x08000000 // for centering
#define V_WRAPX 0x10000000 // Don't clamp texture on X (for HW mode) #define V_AUTOFADEOUT 0x10000000 // used by CECHOs, automatic fade out when almost over
#define V_WRAPY 0x20000000 // Don't clamp texture on Y (for HW mode) #define V_RETURN8 0x20000000 // 8 pixel return instead of 12
#define V_NOSCALESTART 0x40000000 // don't scale x, y, start coords #define V_NOSCALESTART 0x40000000 // don't scale x, y, start coords
#define V_PERPLAYER 0x80000000 // automatically adjust coordinates/scaling for splitscreen mode #define V_PERPLAYER 0x80000000 // automatically adjust coordinates/scaling for splitscreen mode

4
src/y_inter.c
View file

@ -2023,7 +2023,7 @@ static void Y_AwardCoopBonuses(void)
for (i = 0; i < MAXPLAYERS; ++i) for (i = 0; i < MAXPLAYERS; ++i)
{ {
if (!playeringame[i] || players[i].lives < 1) // not active or game over if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot
bonusnum = 0; // all null bonusnum = 0; // all null
else else
bonusnum = mapheaderinfo[prevmap]->bonustype + 1; // -1 is none bonusnum = mapheaderinfo[prevmap]->bonustype + 1; // -1 is none
@ -2073,7 +2073,7 @@ static void Y_AwardSpecialStageBonus(void)
{ {
oldscore = players[i].score; oldscore = players[i].score;
if (!playeringame[i] || players[i].lives < 1) // not active or game over if (!playeringame[i] || players[i].lives < 1 || players[i].bot == BOT_2PAI || players[i].bot == BOT_2PHUMAN) // not active, game over or tails bot
{ {
Y_SetNullBonus(&players[i], &localbonuses[0]); Y_SetNullBonus(&players[i], &localbonuses[0]);
Y_SetNullBonus(&players[i], &localbonuses[1]); Y_SetNullBonus(&players[i], &localbonuses[1]);