zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-17 01:01:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fixed CollisionData export."

Browse source 
This reverts commit fe02190604.
This commit is contained in:
Christoph Oelckers 2023-10-03 13:36:19 +02:00
parent b068a19ed9
commit 09754467ee
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/core/thingdef_data.cpp
View file

@ -439,11 +439,8 @@ void InitThingdef()
}
);
auto collstruct = NewStruct("CollisionData", nullptr, true);
collstruct->Size = sizeof(CollisionBase);
collstruct->Align = alignof(CollisionBase);
auto sidestruct = NewStruct("tspritetype", nullptr, true);
auto sidestruct = NewStruct("TSprite", nullptr, true);
sidestruct->Size = sizeof(tspritetype);
sidestruct->Align = alignof(tspritetype);
// This may not be serialized

2
source/core/vmexports.cpp
View file

@ -1041,8 +1041,6 @@ DEFINE_ACTION_FUNCTION_NATIVE(DCoreActor, spritetexture, CoreActor_spritetexture
DEFINE_FIELD_X(CollisionData, CollisionBase, type)
DEFINE_FIELD_X(CollisionData, CollisionBase, exbits)
walltype* collision_getwall(CollisionBase* coll)
{

5
wadsrc/static/zscript/games/razebase.zs
View file

@ -175,8 +175,9 @@ struct SummaryInfo native
// this only allows function getters to enable validation on the target.
struct CollisionData
{
native readonly int type;
native readonly int exbits;
int type;
int exbits;
voidptr hit; // do not access!
native walltype hitWall();
native sectortype hitSector();
native CoreActor hitActor();