diff --git a/Engine/source/console/consoleObject.cpp b/Engine/source/console/consoleObject.cpp index 6e828065f..1db5f14a3 100644 --- a/Engine/source/console/consoleObject.cpp +++ b/Engine/source/console/consoleObject.cpp @@ -646,14 +646,13 @@ void ConsoleObject::addProtectedFieldV(const char* in_pFieldname, f.offset = in_fieldOffset; f.elementCount = in_elementCount; f.validator = v; + f.validator->fieldIndex = sg_tempFieldList.size(); f.flag = flags; f.setDataFn = in_setDataFn; f.getDataFn = in_getDataFn; f.writeDataFn = in_writeDataFn; f.networkMask = 0; - - v->fieldIndex = sg_tempFieldList.size(); sg_tempFieldList.push_back(f); } @@ -723,8 +722,8 @@ void ConsoleObject::addFieldV(const char* in_pFieldname, f.writeDataFn = &defaultProtectedWriteFn; f.elementCount = in_elementCount; f.validator = v; + f.validator->fieldIndex = sg_tempFieldList.size(); f.networkMask = 0; - v->fieldIndex = sg_tempFieldList.size(); sg_tempFieldList.push_back(f); } diff --git a/Engine/source/console/consoleTypes.h b/Engine/source/console/consoleTypes.h index ff7281d10..e91a51817 100644 --- a/Engine/source/console/consoleTypes.h +++ b/Engine/source/console/consoleTypes.h @@ -66,7 +66,7 @@ DefineConsoleType( TypeBoolVector, Vector) DefineConsoleType( TypeS8, S8 ) DefineConsoleType( TypeS16, S16) DefineConsoleType( TypeS32, S32 ) -DefineConsoleType(TypeRangedS32, S32) +DefineConsoleType( TypeRangedS32, S32) DefineConsoleType( TypeS32Vector, Vector ) DefineConsoleType( TypeF64, F64 ) DefineConsoleType( TypeF32, F32 ) diff --git a/Engine/source/gui/core/guiTypes.cpp b/Engine/source/gui/core/guiTypes.cpp index f8a6c544a..09e88659a 100644 --- a/Engine/source/gui/core/guiTypes.cpp +++ b/Engine/source/gui/core/guiTypes.cpp @@ -371,7 +371,7 @@ void GuiControlProfile::initPersistFields() addField("fillColorNA", TypeColorI, Offset(mFillColorNA, GuiControlProfile)); addField("fillColorERR", TypeColorI, Offset(mFillColorERR, GuiControlProfile)); addField("fillColorSEL", TypeColorI, Offset(mFillColorSEL, GuiControlProfile)); - addFieldV("border", TypeRangedS32, Offset(mBorder, GuiControlProfile), &CommonValidators::PositiveInt, + addFieldV("border", TypeRangedS32, Offset(mBorder, GuiControlProfile), &CommonValidators::S32Range, "Border type (0=no border)." ); addFieldV("borderThickness", TypeRangedS32, Offset(mBorderThickness, GuiControlProfile), &CommonValidators::PositiveInt, "Thickness of border in pixels." );