teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity
16848 commits 3 branches 0 tags 152 MiB
Commit graph

1936 commits

Author SHA1 Message Date
Christoph Oelckers
504bb08a64 - we do not really need the old rintersect function. 
Its only difference is using potentially overflowing 32 bit math for demo compatibility. Aside from that it has no real-life advantage.
 2021-12-26 23:10:07 +01:00
Christoph Oelckers
a23d2ae656 - fixed OOB access in pushmove. 
The backwards search loop starts at one element behind the data it is supposed to check. If this is the last wall in the map it accesses undefined memory.

This tripped the range check in TArray for wall[].
 2021-12-26 23:10:06 +01:00
Christoph Oelckers
d8ccfa1a5f - cleaned up nextsectorneighborz, added a safe variant and use this in all places where the sector pointer is not validated. 2021-12-26 23:10:05 +01:00
Mitchell Richters
1ee1c0c920 Revert "- fixed: updatesectorneighborz may not return -1." 
This reverts commit c074b0995648a4057c516e5646f5fe7a11719317.

* The commit notes talk about `updatesectorneighborz()`, but the change is applied to `nextsectorneighborz()`. Further to this, `nextsectorneighborz()` is only called from some ptr wrappers in `build.h` and they both test against `-1` return values.

```
inline sectortype* nextsectorneighborzptr(int16_t sectnum, int32_t refz, int16_t topbottom, int16_t direction)
{
	auto sect = nextsectorneighborz(sectnum, refz, topbottom, direction);
	return sect == -1? nullptr : &sector[sect];
}

inline sectortype* nextsectorneighborzptr(sectortype* sectp, int32_t refz, int16_t topbottom, int16_t direction)
{
	auto sect = nextsectorneighborz(sector.IndexOf(sectp), refz, topbottom, direction);
	return sect == -1? nullptr : &sector[sect];
}
```

* Also fixes broken Duke elevators and possibly a whole raft of issues.
 2021-12-26 23:10:04 +01:00
Christoph Oelckers
8e2d324e85 - fixed: updatesectorneighborz may not return -1. 
This value gets never validated by any caller and isn't really what is wanted in this situation.
 2021-12-26 23:10:03 +01:00
Christoph Oelckers
b8c4354691 - got rid of the MAX... constants and adjusted all places still using them. 2021-12-26 23:10:02 +01:00
Christoph Oelckers
1a3b9f8ac0 - made several arrays holding sector related data dynamic. 2021-12-26 23:10:02 +01:00
Christoph Oelckers
2a07159c8d - removed some unused and obsolete content from engine files. 2021-12-26 23:10:02 +01:00
Christoph Oelckers
923a2b6a79 - unlimit the number of sectors/walls for real. 
All remaining 16 bit values storing indices have been widened to 32 bit.
 2021-12-26 23:10:01 +01:00
Christoph Oelckers
838bed7800 - final cleanup of sectnum related stuff. 
Made sure that remaining uses of sector indices are safe to be kept and deleted a few redundant functions.
 2021-12-26 23:10:01 +01:00
Christoph Oelckers
6d432fca0a - made spritetype::sectnum a pointer. 2021-12-26 23:10:01 +01:00
Christoph Oelckers
2d913982da - changed map loader to work without relying on spritetype::sectnum. 
All access to this field is done through access functions now.
 2021-12-26 23:10:01 +01:00
Christoph Oelckers
0dd756fa32 - added GC handling for all backend pointers in the map data. 
GC is not active yet!
 2021-12-26 23:10:00 +01:00
Christoph Oelckers
30786360bb - derive spritetype and tspritetype from a common base class to consolidate their common content. 2021-12-26 23:09:57 +01:00
Christoph Oelckers
a2e280e188 - use wallsofsector in 4 more places. 
# Conflicts:
#	source/build/src/polymost.cpp
 2021-12-26 23:09:57 +01:00
Christoph Oelckers
d088ab05a9 - eliminate storage of actors in the sector's hitag for some of Duke's sector effectors. 
Also demoted Blood's upperLink and lowerLink to DCoreActor pointers and use static_cast for access to avoid savegame problems. The core code cannot safely serialize a DBloodActor anymore.
 2021-12-26 23:09:56 +01:00
Christoph Oelckers
d3b1e34d78 - moved sprite[], spriteext[] and spritesmooth[] into DCoreActor. 
Also removed the last remaining sprite pointer in saveable data.
 2021-12-26 23:09:55 +01:00
Christoph Oelckers
f855b1020f - actor lists refactored. 
No more shorts, no more static arrays.
This was one of the biggest blockers for unlimiting the engine.
 2021-12-26 23:09:54 +01:00
Christoph Oelckers
87ac9bee44 - refactored the owner index in tspritetype. 
This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.

# Conflicts:
#	source/build/src/polymost.cpp
 2021-12-26 23:09:54 +01:00
Christoph Oelckers
eaff9e359f - refactored the owner index in tspritetype. 
This is now a separate type from spritetype which contains an actor pointer instead so that sprite display can be handled without requiring a static sprite array.
 2021-12-26 23:09:53 +01:00
Christoph Oelckers
793dd032b0 - getzrange cleanup. 2021-12-26 23:09:53 +01:00
Christoph Oelckers
bcc532d36f - eliminated the getzrange wrapper. 2021-12-26 23:09:53 +01:00
Christoph Oelckers
2541425b9d - getzrange is free of hack values, too. 2021-12-26 23:09:53 +01:00
Christoph Oelckers
9d85859a80 - finally got rid of the 16 bit hack return value of clipmove. 2021-12-26 23:09:53 +01:00
Christoph Oelckers
d34a5179f1 - sprite cleanup in clip code. 
Just using already available data instead of the indices.
 2021-12-26 23:09:53 +01:00
Christoph Oelckers
19236b2526 - removed compatibility handling for the oldest level from hitscan. 
This stuff isn't even slope aware so the only legitimate reason for keeping it would be demo playback.
 2021-12-26 23:09:52 +01:00
Christoph Oelckers
183f554733 - hitscan cleanup. 
Also removed a bit of leftover TROR code.
 2021-12-26 23:09:52 +01:00
Christoph Oelckers
8c90f48b61 - cleanup of neartag, plus direct return of a HitInfoBase struct. 2021-12-26 23:09:52 +01:00
Christoph Oelckers
6600f55543 - separate map loading from actor spawning for the other games, too. 
It still uses the horribly messed up original spawn logic, though.
 2021-12-26 23:09:51 +01:00
Christoph Oelckers
a3493048e7 - refactoring of spawn code to prepare for the other games. 
Map hacks do not work in this commit!
 2021-12-26 23:09:51 +01:00
Christoph Oelckers
379c4f1a60 - merged the cansee wrapper into the actual function and added sector validation. 2021-12-26 23:09:50 +01:00
Christoph Oelckers
2654a19cfd - got rid of setspritez(x) and moved the implementation to SetActor(Z) without referencing the sprite array. 2021-12-26 23:09:49 +01:00
Christoph Oelckers
58cd933d74 - pass sprite array to map hack parser as parameter. 
This will later allow it to work on temporaries.
 2021-12-26 23:09:49 +01:00
Christoph Oelckers
f9b1164747 - use point2Wall wherever possible. 2021-12-26 23:09:48 +01:00
Christoph Oelckers
83cf2f3baf -more index stuff. 2021-12-26 23:09:48 +01:00
Christoph Oelckers
ee1b574830 - engine stuff 2021-12-26 23:09:48 +01:00
Christoph Oelckers
a22634f228 - sectnum reduction. 2021-12-26 23:09:47 +01:00
Christoph Oelckers
ed659df9d8 - pass sector pointer to Polymost's SectorVisibility function. 2021-12-26 23:09:47 +01:00
Christoph Oelckers
9213eae606 - deleted unused functions. 2021-12-26 23:09:46 +01:00
Christoph Oelckers
d33ae89c4a - minor backend cleanup. 2021-12-26 23:09:45 +01:00
Christoph Oelckers
befc4572e9 - minimal backend array removal. 2021-12-26 23:09:45 +01:00
Christoph Oelckers
12f6b05cbe - use access functions, all done by search & replace. 2021-12-26 23:09:44 +01:00
Christoph Oelckers
6748a39c8f - deprecate the sector index variant of pushmove 2021-12-26 23:09:43 +01:00
Christoph Oelckers
2aefe4398b - sector[tspr->sectnum] globally replaced. 2021-12-26 23:09:43 +01:00
Christoph Oelckers
70d7e81f4f - adapted getzrange to the new interface. 
This was mainly removing game side solutions in favor of a common one in the backend.
 2021-12-26 23:09:42 +01:00
Christoph Oelckers
91e2391911 - adapted neartag in Duke. 2021-12-26 23:09:42 +01:00
Christoph Oelckers
4788c7ba5e - made Collision derive from a common base class and refactored clipmove to a single engine-side entry point. 
Done for Doom so far.
 2021-12-26 23:08:57 +01:00
Christoph Oelckers
9380819e4e - initialize actorArray for all games. 
- the foundation for an actor aware backend.
 2021-12-26 23:08:56 +01:00
Christoph Oelckers
52c80f187a - added coreactor.h 2021-12-26 23:08:55 +01:00
Christoph Oelckers
a93dbaf5fe - SW: simplified rotation interpolation functions. 2021-12-26 23:08:40 +01:00
Christoph Oelckers
33c707c708 - Duke: getangle simplification 2021-12-26 23:08:40 +01:00
Christoph Oelckers
94671c5b05 - MoveMissile + GetZRangeXYZ 2021-12-25 21:29:13 +01:00
Christoph Oelckers
759a8428fa - dragPoint 2021-12-25 21:29:11 +01:00
Christoph Oelckers
7a7537961b - Blood: remove GetWallAngle variant with index parameter 2021-12-25 21:29:05 +01:00
Christoph Oelckers
40ae38c173 - calcChaseCamPos. 2021-12-25 21:29:03 +01:00
Christoph Oelckers
109ff8c3cb - Above and Below 2021-12-25 21:29:01 +01:00
Christoph Oelckers
0b254255e2 - sector ambience 2021-12-25 21:28:59 +01:00
Christoph Oelckers
38d64fc437 spritetype::setsector 2021-12-25 21:28:57 +01:00
Christoph Oelckers
69a7b4d0bc - final cleanup before replacement 2021-12-25 21:28:55 +01:00
Christoph Oelckers
312b1fd39f - cursectnum first half 2021-12-25 21:28:55 +01:00
Christoph Oelckers
323b5441d5 — New utilities for better abstraction added. 2021-12-25 21:28:54 +01:00
Christoph Oelckers
2979fb9e03 - new access methods for spritetype and DDukeActor. 2021-12-25 21:28:54 +01:00
Christoph Oelckers
d30bf8c8bb - fixed Blood's mirror render hack for Polymost. 
This adds 4 walls and 1 sector without counting them, so we must adjust allocations and array access to handle OOB access and temporarily increase the counter for the mirror render pass.

The new renderer does not need this stuff.
 2021-12-25 21:28:50 +01:00
Christoph Oelckers
8cca55c24a - made wall a TArray. 2021-12-25 21:28:50 +01:00
Christoph Oelckers
fded90c491 - SW: deleted SECT_USER. 2021-12-25 21:28:49 +01:00
Christoph Oelckers
7d2404ce76 - made sector a TArray. 2021-12-25 21:28:49 +01:00
Christoph Oelckers
e034635e12 - migrated Blood's xsector and got rid of the static global array. 2021-12-25 21:28:48 +01:00
Christoph Oelckers
993821b75f - migrated Blood's other non-X sector properties. 2021-12-25 21:28:48 +01:00
Christoph Oelckers
f7e61eeef7 - migrated Blood's portal links into sectortype. 2021-12-25 21:28:48 +01:00
Christoph Oelckers
14907a9a97 - sector extension basics. 2021-12-25 21:28:48 +01:00
Christoph Oelckers
94a37dfcdc - extended walltype to directly manage Blood's XWALL. 
Unfortunately this had to be done in the base class so that we can still maintain the walls in a global array.
The tradeoffs of better abstractions would be far too costly here than the added 16 bytes to the wall struct.
 2021-12-25 21:28:47 +01:00
Christoph Oelckers
5cda292d98 - lots of search& replace actions. 
This takes care of roughly 2/3 of the SectUser accesses.
 2021-12-25 21:28:46 +01:00
Christoph Oelckers
32f141ad39 - XSECTOR::reference is gone. 2021-12-25 21:28:42 +01:00
Christoph Oelckers
19f3365efc - Blood: add x-access functions to spritetype and walltype. 
This is merely a refactoring aid to get everything in a state that later allows merging these into one.
 2021-12-25 21:28:40 +01:00
Christoph Oelckers
47e207f158 - eliminated spritetype::index. 
# Conflicts:
#	source/games/sw/src/swactor.h
 2021-12-25 21:28:38 +01:00
Christoph Oelckers
999ec3c95a use validSectorIndex checks where appropriate. 
Let’s hope that this sloppiness doesn’t have negative effects with broken maps.

# Conflicts:
#	source/games/sw/src/sprite.cpp

# Conflicts:
#	source/games/duke/src/prediction.cpp
#	source/games/duke/src/render.cpp
 2021-12-25 21:28:37 +01:00
Christoph Oelckers
ae8e642785 - templated updatesectorneighborz to eliminate redundancy with updatesectorneighbor 2021-12-25 21:28:36 +01:00
Christoph Oelckers
0c83d299f2 - removed compat.h entirely, all that was left was redundant #includes. 2021-12-14 12:27:41 +01:00
Christoph Oelckers
4daad25e5c - use WORDS_BIGENDIAN directly in place of B_BIG_ENDIAN 2021-12-14 12:27:41 +01:00
Christoph Oelckers
7c4233bcf7 - replaced fallthrough__ with [[fallthrough]] as we are requiring C++17 and don't need workarounds for that. 2021-12-14 12:27:28 +01:00
Christoph Oelckers
7daa501a4d - removed all #include "compat.h" except the one in build.h 
Still all compiles fine.
 2021-12-14 12:24:10 +01:00
Christoph Oelckers
7e2431ebd8 - replaced the remaining content from compat.h 2021-12-14 10:15:58 +01:00
Christoph Oelckers
016a907c20 - replaced vec2_t with FVector2. 2021-12-14 10:07:06 +01:00
Christoph Oelckers
7546cf3a4b - replaced vec3f_t with FVector3. 2021-12-14 09:58:01 +01:00
Mitch Richters
63a19bbb15 - Port spritetype::insector() over from develop and use with sector nullptr checks in 6539d72663. 2021-12-07 19:56:50 +11:00
Christoph Oelckers
00d54fa11a - fixed return value of updatesector pointer variant. 2021-11-30 16:44:52 +01:00
Christoph Oelckers
64cad55d73 - fixed updatesector and changed updatesectorz to use the same search algorithm. 
The initial distance check in updatesectorneighbor had a far too low threshold which would skip the breadth-first search for relatively small distances already.
Exhumed's LEV1 and Duke's Lunatic Fringe were the most obvious candidates where this could cause problems.
Changed to use a mixture of the original updatesector with the revised algorithm so that all immediate neighbors of the start sector will get visited unconditionally.

updatesectorz was still the original function from Shadow Warrior, this also was changed to use the same algorithm as uodatesector.
 2021-11-30 00:15:25 +01:00
Christoph Oelckers
f765783437 - various small bits of cleanup. 2021-11-29 00:57:11 +01:00
Christoph Oelckers
35c2d6d14e - fixed translucent voxel rendering. 2021-11-29 00:57:10 +01:00
Christoph Oelckers
7d3b604361 - fixed sky rendering in paletted sectors for Polymost. 2021-11-29 00:57:10 +01:00
Mitchell Richters
5630fd8763 - Repair other possible OOB access issues with spriteext[]. 2021-11-29 00:57:09 +01:00
Mitchell Richters
8c679f2e17 - Repair OOB access to spriteext[] array accidentally introduced in d572e56839. This repairs stability issues with models enabled under Linux environments. 2021-11-29 00:57:09 +01:00
Christoph Oelckers
d5a6be3d96 - cleaned up Duke's spawn code. 
The paths for initializing a map placed sprite and spawning a new actor at run time are now fully separate aside from the actual initialization of the actor.
 2021-11-29 00:56:31 +01:00
Christoph Oelckers
baf36a321b - inside, haskey and removed unused processmove functions. 2021-11-29 00:56:30 +01:00
Christoph Oelckers
adf3133fdc - use sectnum and wallnum to get an index from pointers instead of subtracting the array base. 2021-11-29 00:56:26 +01:00
Christoph Oelckers
3a259c9c46 - use BFSSearch in cansee and deleted the old variant originally used by Exhumed. 
This old variant is only useful for demo compatibility, its main difference is that it does not handle slopes, which even for Exhumed is wrong with some custom maps.
 2021-11-29 00:56:25 +01:00
Christoph Oelckers
4e31360fe4 - cleaned up dragpoint 
This still contained some code for EDuke32's TROR and used a shared static global array.
It now uses the BFSSearch class to manage its bit array to unlimit the size of its working set and to avoid reallocation.
 2021-11-29 00:56:25 +01:00
Christoph Oelckers
7126aa22f4 - preparations in the map loader for dynamically sized data storage. 
This also consolidates these parts for Blood with the other games.
 2021-11-29 00:56:25 +01:00
Christoph Oelckers
7b1345d3e5 - Exhumed: wall stuff in AddFlash 2021-11-29 00:56:24 +01:00
Christoph Oelckers
c79dace730 - eliminated sector[] in position checkers 2021-11-29 00:56:24 +01:00