From 4cf0ef7e3f8ac0ae4b9a6b016fdf9215a630e087 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 21 Aug 2013 22:38:05 -0500
Subject: [PATCH] Minor PField changes.

- Rename FieldOffset and FieldType so they no longer have the "Field" prefix
- Add a Flags field.
---
 src/dobjtype.cpp | 6 +++---
 src/dobjtype.h   | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index 22dec47a8a..4d6056c3a4 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -1099,10 +1099,10 @@ PField *PStruct::AddField(FName name, PType *type)
 	PField *field = new PField(name, type);
 
 	// The new field is added to the end of this struct, alignment permitting.
-	field->FieldOffset = (Size + (type->Align - 1)) & ~(type->Align - 1);
+	field->Offset = (Size + (type->Align - 1)) & ~(type->Align - 1);
 
 	// Enlarge this struct to enclose the new field.
-	Size = field->FieldOffset + type->Size;
+	Size = field->Offset + type->Size;
 
 	// This struct's alignment is the same as the largest alignment of any of
 	// its fields.
@@ -1161,7 +1161,7 @@ IMPLEMENT_CLASS(PField)
 //==========================================================================
 
 PField::PField()
-: PSymbol(NAME_None)
+: PSymbol(NAME_None), Offset(0), Type(NULL), Flags(0)
 {
 }
 
diff --git a/src/dobjtype.h b/src/dobjtype.h
index beab897124..aa96942d93 100644
--- a/src/dobjtype.h
+++ b/src/dobjtype.h
@@ -325,10 +325,12 @@ class PField : public PSymbol
 	DECLARE_CLASS(PField, PSymbol);
 	HAS_OBJECT_POINTERS
 public:
-	PField(FName name, PType *type) : PSymbol(name), FieldOffset(0), FieldType(type) {}
+	PField(FName name, PType *type) : PSymbol(name), Offset(0), Type(type), Flags(0) {}
+	PField(FName name, PType *type, DWORD flags) : PSymbol(name), Offset(0), Type(type), Flags(flags) {}
 
-	unsigned int FieldOffset;
-	PType *FieldType;
+	unsigned int Offset;
+	PType *Type;
+	DWORD Flags;
 protected:
 	PField();
 };