Permalink
Browse files

- moved a large part of the VM thunks out of p_mobj.cpp.

  • Loading branch information...
coelckers committed Dec 4, 2018
1 parent a3265c2 commit 33db5792b4c33159169917458f0d88b5d374cd0a
Showing with 662 additions and 624 deletions.
  1. +1 −0 src/CMakeLists.txt
  2. +0 −5 src/actor.h
  3. +9 −0 src/actorinlines.h
  4. +3 −538 src/p_mobj.cpp
  5. +0 −79 src/scripting/vmthunks.cpp
  6. +620 −0 src/scripting/vmthunks_actors.cpp
  7. +29 −2 wadsrc/static/zscript/actor.txt
@@ -1152,6 +1152,7 @@ set (PCH_SOURCES
scripting/symbols.cpp
scripting/vmiterators.cpp
scripting/vmthunks.cpp
scripting/vmthunks_actors.cpp
scripting/types.cpp
scripting/thingdef.cpp
scripting/thingdef_data.cpp
@@ -1010,11 +1010,6 @@ class AActor : public DThinker
void AttachLight(unsigned int count, const FLightDefaults *lightdef);
void SetDynamicLights();
// When was this actor spawned? (relative to the current level)
int GetLevelSpawnTime() const;
// How many ticks passed since this actor was spawned?
int GetAge() const;
// info for drawing
// NOTE: The first member variable *must* be snext.
AActor *snext, **sprev; // links in sector (if needed)
@@ -54,3 +54,12 @@ inline double sector_t::LowestFloorAt(AActor *a, sector_t **resultsec)
return ::LowestFloorAt(this, a->X(), a->Y(), resultsec);
}
inline double AActor::GetBobOffset(double ticfrac) const
{
if (!(flags2 & MF2_FLOATBOB))
{
return 0;
}
return BobSin(FloatBobPhase + level.maptime + ticfrac) * FloatBobStrength;
}
Oops, something went wrong.

0 comments on commit 33db579

Please sign in to comment.