zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- dictionary can also go to 'common'.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 19:29:18 +02:00
parent f6bd2e4f76
commit 1ce11ff02a
4 changed files with 50 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -1037,7 +1037,6 @@ set (PCH_SOURCES
r_data/models/models_voxel.cpp r_data/models/models_voxel.cpp
r_data/models/models_ue1.cpp r_data/models/models_ue1.cpp
r_data/models/models_obj.cpp r_data/models/models_obj.cpp
scripting/dictionary.cpp
scripting/vmiterators.cpp scripting/vmiterators.cpp
scripting/vmthunks.cpp scripting/vmthunks.cpp
scripting/vmthunks_actors.cpp scripting/vmthunks_actors.cpp
@ -1151,6 +1150,7 @@ set (PCH_SOURCES
common/objects/dobject.cpp common/objects/dobject.cpp
common/objects/dobjgc.cpp common/objects/dobjgc.cpp
common/objects/dobjtype.cpp common/objects/dobjtype.cpp
common/scripting/core/dictionary.cpp
common/scripting/core/symbols.cpp common/scripting/core/symbols.cpp
common/scripting/core/types.cpp common/scripting/core/types.cpp
common/scripting/core/scopebarrier.cpp common/scripting/core/scopebarrier.cpp

0
src/scripting/dictionary.cpp → src/common/scripting/core/dictionary.cpp
View file

0
src/scripting/dictionary.h → src/common/scripting/core/dictionary.h
View file

94
src/common/scripting/core/types.cpp
View file

@ -39,8 +39,6 @@
#include "printf.h" #include "printf.h"
#include "textureid.h" #include "textureid.h"
#include "version.h" #include "version.h"
#include "info.h"
#include "serializer_doom.h"
FTypeTable TypeTable; FTypeTable TypeTable;
@ -1439,49 +1437,6 @@ PPointer *NewPointer(PClass *cls, bool isconst)
return static_cast<PPointer *>(ptype); return static_cast<PPointer *>(ptype);
} }
/* PStatePointer **********************************************************/
//==========================================================================
//
// PStatePointer Default Constructor
//
//==========================================================================
PStatePointer::PStatePointer()
{
mDescriptiveName = "Pointer<State>";
PointedType = NewStruct(NAME_State, nullptr, true);
IsConst = true;
}
//==========================================================================
//
// PStatePointer :: WriteValue
//
//==========================================================================
void PStatePointer::WriteValue(FSerializer &ar, const char *key, const void *addr) const
{
#ifdef GZDOOM
ar(key, *(FState **)addr);
#endif
}
//==========================================================================
//
// PStatePointer :: ReadValue
//
//==========================================================================
bool PStatePointer::ReadValue(FSerializer &ar, const char *key, void *addr) const
{
bool res = false;
#ifdef GZDOOM
::Serialize(ar, key, *(FState **)addr, nullptr, &res);
#endif
return res;
}
/* PClassPointer **********************************************************/ /* PClassPointer **********************************************************/
@ -2569,3 +2524,52 @@ CCMD(typetable)
DumpTypeTable(); DumpTypeTable();
} }
// fixme: The VM depends on this but it's engine specific. Needs a better solution.
/* PStatePointer **********************************************************/
#ifdef GZDOOM
#include "info.h"
#include "serializer_doom.h"
#endif
//==========================================================================
//
// PStatePointer Default Constructor
//
//==========================================================================
PStatePointer::PStatePointer()
{
mDescriptiveName = "Pointer<State>";
PointedType = NewStruct(NAME_State, nullptr, true);
IsConst = true;
}
//==========================================================================
//
// PStatePointer :: WriteValue
//
//==========================================================================
void PStatePointer::WriteValue(FSerializer& ar, const char* key, const void* addr) const
{
#ifdef GZDOOM
ar(key, *(FState**)addr);
#endif
}
//==========================================================================
//
// PStatePointer :: ReadValue
//
//==========================================================================
bool PStatePointer::ReadValue(FSerializer& ar, const char* key, void* addr) const
{
bool res = false;
#ifdef GZDOOM
::Serialize(ar, key, *(FState**)addr, nullptr, &res);
#endif
return res;
}