OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into asmjit

Browse source
This commit is contained in:
Magnus Norddahl 2018-11-15 22:02:11 +01:00
commit 3b2faf5397
6 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/backend/codegen.cpp
View file

@ -48,8 +48,6 @@
#include "w_wad.h"
#include "doomstat.h"
inline PClass *PObjectPointer::PointedClass() const { return static_cast<PClassType*>(PointedType)->Descriptor; }
extern FRandom pr_exrandom;
FMemArena FxAlloc(65536);
int utf8_decode(const char *src, int *size);

1
src/scripting/thingdef_data.cpp
View file

@ -359,6 +359,7 @@ static FFlagDef ActorFlagDefs[]=
DEFINE_FLAG2(BOUNCE_AutoOffFloorOnly, BOUNCEAUTOOFFFLOORONLY, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_UseBounceState, USEBOUNCESTATE, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_NotOnShootables, DONTBOUNCEONSHOOTABLES, AActor, BounceFlags),
DEFINE_FLAG2(BOUNCE_BounceOnUnrips, BOUNCEONUNRIPPABLES, AActor, BounceFlags),
};
// These won't be accessible through bitfield variables

4
src/scripting/types.h
View file

@ -575,6 +575,10 @@ public:
};
inline PClass *PObjectPointer::PointedClass() const
{
return static_cast<PClassType*>(PointedType)->Descriptor;
}
// Returns a type from the TypeTable. Will create one if it isn't present.
PMap *NewMap(PType *keytype, PType *valuetype);