Skip to content
Permalink
Browse files

Enable string & float user_ properties in UDMF things

  • Loading branch information...
Jason Francis authored and coelckers committed Mar 19, 2018
1 parent 2951476 commit 4494b18e8a6c825b1d661796d61afa5b766fb35e
Showing with 47 additions and 55 deletions.
  1. +19 −8 src/p_setup.cpp
  2. +2 −7 src/p_setup.h
  3. +25 −40 src/p_udmf.cpp
  4. +1 −0 src/scripting/types.h
@@ -167,7 +167,7 @@ bool hasglnodes;

TArray<FMapThing> MapThingsConverted;
TMap<unsigned,unsigned> MapThingsUserDataIndex; // from mapthing idx -> user data idx
TArray<FMapThingUserData> MapThingsUserData;
TArray<FUDMFKey> MapThingsUserData;

int sidecount;
sidei_t *sidetemp;
@@ -1645,23 +1645,34 @@ static void SetMapThingUserData(AActor *actor, unsigned udi)
{
return;
}
while (MapThingsUserData[udi].Property != NAME_None)
while (MapThingsUserData[udi].Key != NAME_None)
{
FName varname = MapThingsUserData[udi].Property;
int value = MapThingsUserData[udi].Value;
FName varname = MapThingsUserData[udi].Key;
PField *var = dyn_cast<PField>(actor->GetClass()->FindSymbol(varname, true));

udi++;

if (var == NULL || (var->Flags & (VARF_Native|VARF_Private|VARF_Protected|VARF_Static)) || !var->Type->isScalar())
{
DPrintf(DMSG_WARNING, "%s is not a user variable in class %s\n", varname.GetChars(),
DPrintf(DMSG_WARNING, "%s is not a writable user variable in class %s\n", varname.GetChars(),
actor->GetClass()->TypeName.GetChars());
}
else
{ // Set the value of the specified user variable.
var->Type->SetValue(reinterpret_cast<uint8_t *>(actor) + var->Offset, value);
void *addr = reinterpret_cast<uint8_t *>(actor) + var->Offset;
if (var->Type->isString())
{
var->Type->InitializeValue(addr, &MapThingsUserData[udi].StringVal);
}
else if (var->Type->isFloat())
{
var->Type->SetValue(addr, MapThingsUserData[udi].FloatVal);
}
else if (var->Type->isIntCompatible())
{
var->Type->SetValue(addr, MapThingsUserData[udi].IntVal);
}
}

udi++;
}
}

@@ -30,6 +30,7 @@

#include "resourcefiles/resourcefile.h"
#include "doomdata.h"
#include "r_defs.h"


struct MapData
@@ -180,14 +181,8 @@ struct FMissingCount
};
typedef TMap<FString,FMissingCount> FMissingTextureTracker;

// Record of user data for UDMF maps
struct FMapThingUserData
{
FName Property;
int Value;
};
extern TMap<unsigned,unsigned> MapThingsUserDataIndex; // from mapthing idx -> user data idx
extern TArray<FMapThingUserData> MapThingsUserData;
extern TArray<FUDMFKey> MapThingsUserData;


#endif
@@ -476,38 +476,7 @@ class UDMFParser : public UDMFParserBase
fogMap = normMap = NULL;
}

void AddUserKey(FName key, int kind, int index)
{
FUDMFKeys &keyarray = UDMFKeys[kind][index];

for(unsigned i=0; i < keyarray.Size(); i++)
{
if (keyarray[i].Key == key)
{
switch (sc.TokenType)
{
case TK_IntConst:
keyarray[i] = sc.Number;
break;
case TK_FloatConst:
keyarray[i] = sc.Float;
break;
default:
case TK_StringConst:
keyarray[i] = parsedString;
break;
case TK_True:
keyarray[i] = 1;
break;
case TK_False:
keyarray[i] = 0;
break;
}
return;
}
}
FUDMFKey ukey;
ukey.Key = key;
void ReadUserKey(FUDMFKey &ukey) {
switch (sc.TokenType)
{
case TK_IntConst:
@@ -527,6 +496,22 @@ class UDMFParser : public UDMFParserBase
ukey = 0;
break;
}
}
void AddUserKey(FName key, int kind, int index)
{
FUDMFKeys &keyarray = UDMFKeys[kind][index];

for(unsigned i=0; i < keyarray.Size(); i++)
{
if (keyarray[i].Key == key)
{
ReadUserKey(keyarray[i]);
return;
}
}
FUDMFKey ukey;
ukey.Key = key;
ReadUserKey(ukey);
keyarray.Push(ukey);
}

@@ -809,10 +794,10 @@ class UDMFParser : public UDMFParserBase
CHECK_N(Zd | Zdt)
if (0 == strnicmp("user_", key.GetChars(), 5))
{ // Custom user key - Sets an actor's user variable directly
FMapThingUserData ud;
ud.Property = key;
ud.Value = CheckInt(key);
MapThingsUserData.Push(ud);
FUDMFKey ukey;
ukey.Key = key;
ReadUserKey(ukey);
MapThingsUserData.Push(ukey);
}
break;
}
@@ -2111,10 +2096,10 @@ class UDMFParser : public UDMFParserBase
{ // User data added
MapThingsUserDataIndex[MapThingsConverted.Size()-1] = userdatastart;
// Mark end of the user data for this map thing
FMapThingUserData ud;
ud.Property = NAME_None;
ud.Value = 0;
MapThingsUserData.Push(ud);
FUDMFKey ukey;
ukey.Key = NAME_None;
ukey = 0;
MapThingsUserData.Push(ukey);
}
}
else if (sc.Compare("linedef"))
@@ -200,6 +200,7 @@ class PType : public PTypeBase
bool isStruct() const { return TypeTableType == NAME_Struct; }
bool isClass() const { return TypeTableType == NAME_Object; }
bool isPrototype() const { return TypeTableType == NAME_Prototype; }
bool isString() const { return TypeTableType == NAME_String; }

PContainerType *toContainer() { return isContainer() ? (PContainerType*)this : nullptr; }
PPointer *toPointer() { return isPointer() ? (PPointer*)this : nullptr; }

0 comments on commit 4494b18

Please sign in to comment.
You can’t perform that action at this time.