Commit graph

3661 commits

Author SHA1 Message Date
Christoph Oelckers
8c35224fe1 - Duke: removed all t-pointers to temp_data in actors.cpp. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
bd47f56a5c - x() is gone entirely. 2021-12-30 09:57:22 +01:00
Christoph Oelckers
e940fe1931 - the rest of nnexts.cpp 2021-12-30 09:57:22 +01:00
Christoph Oelckers
4177c31deb - next batch of nnexts.cpp 2021-12-30 09:57:22 +01:00
Christoph Oelckers
d3e4f591f2 - third x() batch in nnexts.cpp. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
60382d9992 - all pXCond's. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
fd234984f5 - first batch of x() in nnexts.cpp. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
a291364606 - the big 'pXSprite = &actor->x()' replacement. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
8d8e0550df - got rid of PLAYER::pXSprite.
Now the player references its actor through ONE pointer only.
2021-12-30 09:57:21 +01:00
Christoph Oelckers
b848a9c980 - some more. 2021-12-30 09:57:21 +01:00
Christoph Oelckers
0d5ea0f314 - handle most of PLAYER::pXSprite 2021-12-30 09:57:20 +01:00
Christoph Oelckers
aa3b930a4d - several x()'s in nnexts.cpp. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
812a4ccd7b - handle sourceactor->x() in nnexts.cpp.
Almost exclusively done with search & replace.
2021-12-30 09:57:20 +01:00
Christoph Oelckers
5699488bea - get rid of spritetype in inactive code. (Search noise removal) 2021-12-30 09:57:20 +01:00
Christoph Oelckers
2254dacdf1 - forgot to save the last change. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
5ad43256cc - the final s()'s in Blood. 2021-12-30 09:57:20 +01:00
Christoph Oelckers
582b83601d - targets in weapon.cpp, plus removal of the now redundant spritetype variants of IsTargetTeammate. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
bf25428225 - upper/lower in CheckLink. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
c67c6ed3da - the rest of triggers.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
06d8db1470 - deal with the markers in triggers.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
8d66c8468d - the remaining s()'s of nnexts.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
46320aabac - third batch of nnexts.cpp. 2021-12-30 09:57:19 +01:00
Christoph Oelckers
b8bee4dfe5 - upper/lower stuff in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
929fd7be99 - another block in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
e460d90f37 - several s() in nnexts.cpp. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
c4c6c1def1 - fix GCC warning. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
6766a5922a - pass actors to calcChaseCamPos. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
87894a5640 - deleted PLAYER::pSprite. 2021-12-30 09:57:18 +01:00
Christoph Oelckers
648537a96b - deal with most of PLAYER::pSprite. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
f59af2cc2d - deal with most of PLAYER::pSprite in weapon.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
b7ee813712 - global search & replace for many uses of PLAYER's pSprite pointer. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
8dac94326a - s() stuff in player.cpp and gib.cpp 2021-12-30 09:57:17 +01:00
Christoph Oelckers
0a1184b388 - the last one in gameutil.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
2f9848a459 - deal with pSource in nnexts.cpp. 2021-12-30 09:57:17 +01:00
Christoph Oelckers
5623832b17 - deleted the pSprite definitions from last commit. 2021-12-30 09:57:16 +01:00
Christoph Oelckers
6b8ec17017 - the ultimate 'replace pSprite-> with actor->spr. commit.
This takes care of the majority of s() uses in Blood with a single search&replace action after ensuring that pSprite never gets used for other things.
(There were two small functions in nnexts.cpp left that still did.)
2021-12-30 09:57:16 +01:00
Christoph Oelckers
1f11eb24dd - use actor pointers in preload.cpp 2021-12-30 09:57:16 +01:00
Christoph Oelckers
d8134c3fe8 - handle a few pSprite assignments which are not &actor->s(). 2021-12-30 09:57:16 +01:00
Christoph Oelckers
91214b5350 - xsprite in animatesprite.cpp. 2021-12-30 09:57:16 +01:00
Christoph Oelckers
773d7d118f - pXSprite in callback.cpp 2021-12-30 09:57:16 +01:00
Christoph Oelckers
a0b6873446 - handle s() in callback.cpp. 2021-12-30 09:57:15 +01:00
Christoph Oelckers
a1f6b363fb - asound.cpp, blood.cpp, db.cpp and parts of callback.cpp 2021-12-30 09:57:15 +01:00
Christoph Oelckers
ed0c27b240 - Duke: deleted unused spritetype* variants of badguy() and bossguy() 2021-12-30 09:57:15 +01:00
Christoph Oelckers
09634c4993 - use actors instead of sprites in the new renderer's API. 2021-12-30 09:57:15 +01:00
Christoph Oelckers
1f57322d56 - the last one in aiunicult.cpp which the search did not show. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
627318c39b - handle pXSprite in aiunicult.cpp 2021-12-30 09:57:14 +01:00
Christoph Oelckers
be9d71ca6b - non-pXSprite x()'s in aiunicult.cpp. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
49c43297cd - pXSprite in AI... code. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
f678e55daa - pSprite in aiunicult.cpp. 2021-12-30 09:57:14 +01:00
Christoph Oelckers
ff0b8ac5a9 - handle the hitactor parts missed in the last commit. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
b1bd8f3eef - non-pSprite occurences of s() in aiunicult.cpp. 2021-12-30 09:57:13 +01:00
Mitchell Richters
c01fab8c6c - Fix compilation. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
d0143db8fe - got rid of sx() and sm() inlines. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
f67e39450e - deal with a handful of s() uses that do not match the more common patterns. 2021-12-30 09:57:13 +01:00
Christoph Oelckers
723e22743e - handle all x() calls in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
389933fe3a - missed two... 2021-12-30 09:57:12 +01:00
Christoph Oelckers
1ebdb81e13 - deleted the actor->s() calls in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
e123e61f99 - quick replace of 'pSprite->' with 'actor->spr.' in AI files. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
612167cbf1 - handle all non- "pSprite = actor->s();" calls of s() in Blood AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
bff3bbea73 - handle all target sprites in AI code. 2021-12-30 09:57:12 +01:00
Christoph Oelckers
18c32d8fe9 - eliminated all x() in ai.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
9e6943ec83 - eliminated all s() in ai.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
41e003c831 - the remaining x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
bc42978295 - x() in actor.cpp callbacks. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
bd07313017 - almost the last x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
692a269d92 - still more x() in actor.cpp. 2021-12-30 09:57:11 +01:00
Christoph Oelckers
3f65aee70b - even more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
3201f85ab9 - yet more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
a1b2d4a21e - more x() in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
ffeb52198a - lots of ->x() calls removed in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
6e0128eb4c - handle the remaining uses of s() in actor.cpp 2021-12-30 09:57:10 +01:00
Christoph Oelckers
b91fe45fc3 - handled all pSprite-> in actor.cpp. 2021-12-30 09:57:10 +01:00
Christoph Oelckers
27e9894ece - handled all parts of actor.cpp which are not "pSprite = &actor->s();" 2021-12-30 09:57:10 +01:00
Christoph Oelckers
88c77ec71a - some pSprite2's plus CheckSector. 2021-12-30 09:57:09 +01:00
Christoph Oelckers
fbb8f1ee70 - pSprite replacements in blood/src/actor.cpp 2021-12-30 09:57:09 +01:00
Christoph Oelckers
a87948677a - globally replaced ->x(). with ->xspr. 2021-12-30 09:57:09 +01:00
Christoph Oelckers
a2fc415b30 - fixed Exhumed panning setup.
Converted it to floating point and removed the nonsensical & with the texture size that was clearing significant bits.
2021-12-30 09:57:09 +01:00
Mitchell Richters
6423684bfb - SW: Replace PLAYERstruct oposz with opos.Z calls. 2021-12-30 09:57:09 +01:00
Mitchell Richters
a2f2cc489a - SW: Replace PLAYERstruct oposy with opos.Y calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
ae50767c70 - SW: Replace PLAYERstruct oposx with opos.X calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
05a4ad4729 - SW: Replace PLAYERstruct posz with pos.Z calls and eliminate PLAYERstruct pos union. 2021-12-30 09:57:08 +01:00
Mitchell Richters
ae3369d2a3 - SW: Replace PLAYERstruct posy with pos.Y calls. 2021-12-30 09:57:08 +01:00
Mitchell Richters
3a0ee322ae - SW: Replace PLAYERstruct posx with pos.X calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
3adf81e4f9 - Duke: Replace player_struct oposz with opos.Z calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
111aa16e64 - Duke: Replace player_struct oposy with opos.Y calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
0e897c29b0 - Duke: Replace player_struct oposx with opos.X calls. 2021-12-30 09:57:07 +01:00
Mitchell Richters
dd0ff465b0 - Replace spritetypebase oz with opos.Z calls and eliminate spritetypebase opos union. 2021-12-30 09:57:07 +01:00
Mitchell Richters
a79b4b5ffc - Replace spritetypebase oy with opos.Y calls. 2021-12-30 09:57:06 +01:00
Mitchell Richters
e0fb92bb01 - Replace spritetypebase ox with opos.X calls. 2021-12-30 09:57:06 +01:00
Mitchell Richters
baf78848eb - Replace spritetypebase z with pos.Z calls and eliminate spritetypebase pos union. 2021-12-30 09:57:06 +01:00
Mitchell Richters
cecb8dc48e - Replace spritetypebase y with pos.Y calls. 2021-12-30 09:57:05 +01:00
Mitchell Richters
33ca55023f - Replace spritetypebase x with pos.X calls. 2021-12-30 09:57:05 +01:00
Mitchell Richters
09e00a69fe - Replace walltype y with pos.Y calls and eliminate walltype pos union. 2021-12-30 09:57:04 +01:00
Mitchell Richters
51b647da87 - Replace walltype x with pos.X calls. 2021-12-30 09:57:04 +01:00
Mitchell Richters
b2ab64bb62 - Capitalise vec3_t z variable. 2021-12-30 09:57:03 +01:00
Mitchell Richters
68e2691be7 - Capitalise vec3_t y variable. 2021-12-30 09:57:03 +01:00
Mitchell Richters
c549cc5276 - Capitalise vec3_t x variable. 2021-12-30 09:57:02 +01:00
Mitchell Richters
118ceb18ca - Capitalise vec2_t y variable. 2021-12-30 09:57:02 +01:00
Mitchell Richters
3c9cd926ba - Capitalise vec2_t x variable. 2021-12-30 09:57:02 +01:00
Christoph Oelckers
e0e6efe0a0 - Exhumed: fixed some sound source issues. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
3221ecf800 - refactored xsprite use in aibat.cpp. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
6f9484a9ee - fixed compilation on GCC.
error: operands to ?: have different types ‘std::nullptr_t’ and ‘TObjPtr<Duke3d::DDukeActor*>’
2021-12-30 09:57:01 +01:00
Christoph Oelckers
33a00869d8 - shortened the name of DBloodActor::xsprite to xspr. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
f8171ac5d9 - eliminate pSprite pointers in aibat.cpp. 2021-12-30 09:57:01 +01:00
Christoph Oelckers
d9d05e90b5 - globally replaced all occurences of '->s().' with '->spr.' 2021-12-30 09:57:00 +01:00
Christoph Oelckers
1240818122 - getting rid of DDukeActor::s, final part. 2021-12-30 09:57:00 +01:00
Christoph Oelckers
f216857f55 - Getting rid of DDukeActor::s, part 1. 2021-12-30 09:57:00 +01:00
Christoph Oelckers
99507ed048 - spawn_d.cpp 2021-12-30 09:57:00 +01:00
Christoph Oelckers
df2fc596f9 - spawn.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
45a2b9766e - sectors_r.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
d532c496f1 - sectors_d.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
f816f2fb22 - ->s in non-gameplay files. 2021-12-30 09:56:59 +01:00
Christoph Oelckers
edf3fd0f82 - premap_r.cpp + dependencies. 2021-12-30 09:56:59 +01:00
Christoph Oelckers
1f40dfa411 - premap.cpp + premap_d.cpp 2021-12-30 09:56:59 +01:00
Christoph Oelckers
e76e28cdea - the rest of player_r.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
0768c9e8b6 - non 'actor' parts of player_r.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
de22c8ca26 - 's->' in player_d.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
6b675cc849 - non 'actor' parts of player_d.cpp 2021-12-30 09:56:58 +01:00
Christoph Oelckers
b55e04d455 - game_misc.cpp + gameexec.cpp. 2021-12-30 09:56:58 +01:00
Christoph Oelckers
a982c7e590 - player.cpp + noise.cpp. 2021-12-30 09:56:58 +01:00
Christoph Oelckers
c0ea208ba3 - animatesprites_d.cpp and animatesprites_r.cpp. 2021-12-30 09:56:57 +01:00
Christoph Oelckers
9eb7c536ab - the rest of actors_r.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
7d5cf6e631 - first third of actors_r.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
8ff53eae7d - second half of actors_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
f1e608685e - more parts of actor_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
b7a4c484e9 - large block of s = actor->s; in actors_d.cpp 2021-12-30 09:56:57 +01:00
Christoph Oelckers
44895411b9 - a large block of 'act->s' in actors_r.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
8dcc128697 - deal with 'spri = actor->s;' 2021-12-30 09:56:56 +01:00
Christoph Oelckers
0df97f00ec - the remaining 's's in actor.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
f5151e31a5 - globally replaced all 's->' with 'actor->spr.' in duke/src/actors.cpp. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
55cb5aaac6 - global search & replace of ->s-> with ->spr.
This is the largest part of uses of DDukeActor's 's' pointer.
2021-12-30 09:56:56 +01:00
Christoph Oelckers
0284ec1cb0 - replacement of DDukeActor::s and pointers to DCoreActor::spr, part 3. 2021-12-30 09:56:56 +01:00
Christoph Oelckers
0f7024e70e - replacement of DDukeActor::s and pointers to DCoreActor::spr, part 2. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
997c12f67a - replacement of DDukeActor::s and pointers to DCoreActor::spr. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
c16b090fbe - Exhumed: clear lasthitsect when starting a new level. 2021-12-30 09:56:55 +01:00
Christoph Oelckers
e42c3afbea - Exhumed: fixed trap setup.
Must clear the structure before the first return and iterate over the walls by reference, otherwise bad pointers will get copied.
2021-12-30 09:56:55 +01:00
Christoph Oelckers
6fd4d6d550 - ported slope sorite support from NBlood.
For Polymost only so far.
2021-12-30 09:56:54 +01:00
Christoph Oelckers
156369ac8a - Blood: don't crash when cultists accidentally target themselves. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
785c7d4ceb - removed numsectors and numwalls entirely.
With Blood's Polymost mirror hack the risk of getting out of sync with the arrays was a genuine issue, so now only the array size counts.
2021-12-30 09:56:54 +01:00
Christoph Oelckers
df0c577cf4 - replaced most of numsectors, too. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
f1c0298825 - replaced numwalls with wall.Size in several places. 2021-12-30 09:56:54 +01:00
Christoph Oelckers
65bc6e6aef - removed the now redundant wall() and sector() interator helper functions.
With both wall and sector now being TArrays they are not needed anymore.
2021-12-30 09:56:53 +01:00
Christoph Oelckers
4904466fd6 - SW: forgot to enable the extended sector parts in CallbackSOsink.
That bit had somehow gone MiA.
2021-12-30 09:56:53 +01:00
Christoph Oelckers
b021aa9a02 - SW: don't try to render non-existent mirrors with Polymost.
We got a counter variable, WTF did this code not use it?
2021-12-30 09:56:53 +01:00
Christoph Oelckers
68c87db6ec - SW: fixed crash in Polymost with badly set up cameras. 2021-12-30 09:56:52 +01:00
Mitchell Richters
1e63c8305b - Fix build issues under GCC. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
986fccfddc - use symbolic constants for all places where globalorientation is checked for the alignment bits. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
5ff36f491e - fixed the remaining places where the compiler complained about cstat. 2021-12-30 09:56:51 +01:00
Christoph Oelckers
8b427e35c2 - stuff that needs FromInt 2021-12-30 09:56:51 +01:00
Christoph Oelckers
955996dddc - the rest of Blood's flags, part II 2021-12-30 09:56:50 +01:00