TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1923 from elfprince13/stringTableEmptyString

Browse source 
String table empty string
This commit is contained in:
Areloch 2017-01-25 21:06:44 -06:00 committed by GitHub
parent 08432978bf 6963d35145
commit 7185d9664d
57 changed files with 1732 additions and 1732 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fx/fxFoliageReplicator.h
View file

@ -325,7 +325,7 @@ public:
mUseDebugInfo = false;
mDebugBoxHeight = 1.0f;
mSeed = 1376312589;
mFoliageFile = StringTable->insert("");
mFoliageFile = StringTable->EmptyString();
mFoliageTexture = GFXTexHandle();
mFoliageCount = 10;
mFoliageRetries = 100;

2
Engine/source/T3D/fx/fxShapeReplicator.h
View file

@ -153,7 +153,7 @@ public:
{
// Set Defaults.
mSeed = 1376312589;
mShapeFile = StringTable->insert("");
mShapeFile = StringTable->EmptyString();
mShapeCount = 10;
mShapeRetries = 100;
mInnerRadiusX = 0;

8
Engine/source/T3D/fx/precipitation.cpp
View file

@ -129,10 +129,10 @@ PrecipitationData::PrecipitationData()
{
soundProfile = NULL;
mDropName = StringTable->insert("");
mDropShaderName = StringTable->insert("");
mSplashName = StringTable->insert("");
mSplashShaderName = StringTable->insert("");
mDropName = StringTable->EmptyString();
mDropShaderName = StringTable->EmptyString();
mSplashName = StringTable->EmptyString();
mSplashShaderName = StringTable->EmptyString();
mDropsPerSide = 4;
mSplashesPerSide = 2;

2
Engine/source/T3D/fx/ribbon.cpp
View file

@ -57,7 +57,7 @@ RibbonData::RibbonData()
mUseFadeOut = false;
mFadeAwayStep = 0.032f;
segmentsPerUpdate = 1;
mMatName = StringTable->insert("");
mMatName = StringTable->EmptyString();
mTileScale = 1.0f;
mFixedTexcoords = false;
mSegmentSkipAmount = 0;

8
Engine/source/T3D/missionMarker.cpp
View file

@ -225,7 +225,7 @@ ConsoleDocClass( WayPoint,
WayPoint::WayPoint()
{
mName = StringTable->insert("");
mName = StringTable->EmptyString();
}
void WayPoint::setHidden(bool hidden)
@ -256,7 +256,7 @@ void WayPoint::inspectPostApply()
{
Parent::inspectPostApply();
if(!mName || !mName[0])
mName = StringTable->insert("");
mName = StringTable->EmptyString();
setMaskBits(UpdateNameMask|UpdateTeamMask);
}
@ -527,7 +527,7 @@ ConsoleDocClass( CameraBookmark,
CameraBookmark::CameraBookmark()
{
mName = StringTable->insert("");
mName = StringTable->EmptyString();
}
bool CameraBookmark::onAdd()
@ -571,7 +571,7 @@ void CameraBookmark::inspectPostApply()
{
Parent::inspectPostApply();
if(!mName || !mName[0])
mName = StringTable->insert("");
mName = StringTable->EmptyString();
setMaskBits(UpdateNameMask);
if( isMethod("onInspectPostApply") )

8
Engine/source/T3D/player.cpp
View file

@ -257,15 +257,15 @@ PlayerData::PlayerData()
firstPersonShadows = false;
// Used for third person image rendering
imageAnimPrefix = StringTable->insert("");
imageAnimPrefix = StringTable->EmptyString();
allowImageStateAnimation = false;
// Used for first person image rendering
imageAnimPrefixFP = StringTable->insert("");
imageAnimPrefixFP = StringTable->EmptyString();
for (U32 i=0; i<ShapeBase::MaxMountedImages; ++i)
{
shapeNameFP[i] = StringTable->insert("");
shapeNameFP[i] = StringTable->EmptyString();
mCRCFP[i] = 0;
mValidShapeFP[i] = false;
}
@ -418,7 +418,7 @@ PlayerData::PlayerData()
jumpTowardsNormal = true;
physicsPlayerType = StringTable->insert("");
physicsPlayerType = StringTable->EmptyString();
dMemset( actionList, 0, sizeof(actionList) );
}

8
Engine/source/T3D/shapeBase.cpp
View file

@ -152,13 +152,13 @@ ShapeBaseData::ShapeBaseData()
shadowMaxVisibleDistance( 80.0f ),
shadowProjectionDistance( 10.0f ),
shadowSphereAdjust( 1.0f ),
shapeName( StringTable->insert("") ),
cloakTexName( StringTable->insert("") ),
shapeName( StringTable->EmptyString() ),
cloakTexName( StringTable->EmptyString() ),
cubeDescId( 0 ),
reflectorDesc( NULL ),
debris( NULL ),
debrisID( 0 ),
debrisShapeName( StringTable->insert("") ),
debrisShapeName( StringTable->EmptyString() ),
explosion( NULL ),
explosionID( 0 ),
underwaterExplosion( NULL ),
@ -1042,7 +1042,7 @@ bool ShapeBase::onAdd()
}
/*
if(mDataBlock->cloakTexName != StringTable->insert(""))
if(mDataBlock->cloakTexName != StringTable->EmptyString())
mCloakTexture = TextureHandle(mDataBlock->cloakTexName, MeshTexture, false);
*/
// Accumulation and environment mapping

30
Engine/source/console/SimXMLDocument.cpp
View file

@ -504,13 +504,13 @@ const char* SimXMLDocument::elementValue()
{
if(m_paNode.empty())
{
return StringTable->insert("");
return StringTable->EmptyString();
}
const S32 iLastElement = m_paNode.size() - 1;
TiXmlElement* pNode = m_paNode[iLastElement];
if(!pNode)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return pNode->Value();
@ -545,18 +545,18 @@ const char* SimXMLDocument::attribute(const char* rAttribute)
{
if(m_paNode.empty())
{
return StringTable->insert("");
return StringTable->EmptyString();
}
const S32 iLastElement = m_paNode.size() - 1;
TiXmlElement* pNode = m_paNode[iLastElement];
if(!pNode)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
if(!pNode->Attribute(rAttribute))
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return pNode->Attribute(rAttribute);
@ -629,20 +629,20 @@ const char* SimXMLDocument::firstAttribute()
// Get the current element
if(m_paNode.empty())
{
return StringTable->insert("");
return StringTable->EmptyString();
}
const S32 iLastElement = m_paNode.size() - 1;
TiXmlElement* pNode = m_paNode[iLastElement];
if(!pNode)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
// Gets its first attribute, if any
m_CurrentAttribute = pNode->FirstAttribute();
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return m_CurrentAttribute->Name();
@ -666,20 +666,20 @@ const char* SimXMLDocument::lastAttribute()
// Get the current element
if(m_paNode.empty())
{
return StringTable->insert("");
return StringTable->EmptyString();
}
const S32 iLastElement = m_paNode.size() - 1;
TiXmlElement* pNode = m_paNode[iLastElement];
if(!pNode)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
// Gets its last attribute, if any
m_CurrentAttribute = pNode->LastAttribute();
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return m_CurrentAttribute->Name();
@ -703,14 +703,14 @@ const char* SimXMLDocument::nextAttribute()
{
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
// Gets its next attribute, if any
m_CurrentAttribute = m_CurrentAttribute->Next();
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return m_CurrentAttribute->Name();
@ -734,14 +734,14 @@ const char* SimXMLDocument::prevAttribute()
{
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
// Gets its next attribute, if any
m_CurrentAttribute = m_CurrentAttribute->Previous();
if(!m_CurrentAttribute)
{
return StringTable->insert("");
return StringTable->EmptyString();
}
return m_CurrentAttribute->Name();

2
Engine/source/console/astAlloc.cpp
View file

@ -411,7 +411,7 @@ ObjectDeclNode *ObjectDeclNode::alloc( S32 lineNumber, ExprNode *classNameExpr,
if(parentObject)
ret->parentObject = parentObject;
else
ret->parentObject = StringTable->insert("");
ret->parentObject = StringTable->EmptyString();
return ret;
}

2
Engine/source/console/codeBlock.cpp
View file

@ -435,7 +435,7 @@ bool CodeBlock::read(StringTableEntry fileName, Stream &st)
if(offset < globalSize)
ste = StringTable->insert(globalStrings + offset);
else
ste = StringTable->insert("");
ste = StringTable->EmptyString();
U32 count;
st.read(&count);
while(count--)

4
Engine/source/console/fieldBrushObject.cpp
View file

@ -41,8 +41,8 @@ ConsoleDocClass( FieldBrushObject,
FieldBrushObject::FieldBrushObject()
{
// Reset Description.
mDescription = StringTable->insert("");
mSortName = StringTable->insert("");
mDescription = StringTable->EmptyString();
mSortName = StringTable->EmptyString();
}

2
Engine/source/console/persistenceManager.cpp
View file

@ -328,7 +328,7 @@ void PersistenceManager::parseObject()
if (mParser.tokenICmp(")"))
{
mCurrentObject->name = StringTable->insert("");
mCurrentObject->name = StringTable->EmptyString();
mCurrentObject->nameLine = mParser.getCurrentLine();
mCurrentObject->namePosition = mParser.getTokenLineOffset();

4
Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file

@ -85,7 +85,7 @@ ConsoleDocClass( GuiIconButtonCtrl,
GuiIconButtonCtrl::GuiIconButtonCtrl()
{
mBitmapName = StringTable->insert("");
mBitmapName = StringTable->EmptyString();
mTextLocation = TextLocLeft;
mIconLocation = IconLocLeft;
mTextMargin = 4;
@ -94,7 +94,7 @@ GuiIconButtonCtrl::GuiIconButtonCtrl()
mFitBitmapToButton = false;
mMakeIconSquare = false;
mErrorBitmapName = StringTable->insert("");
mErrorBitmapName = StringTable->EmptyString();
mErrorTextureHandle = NULL;
mAutoSize = false;

2
Engine/source/gui/buttons/guiToggleButtonCtrl.cpp
View file

@ -49,7 +49,7 @@ ConsoleDocClass( GuiToggleButtonCtrl,
GuiToggleButtonCtrl::GuiToggleButtonCtrl()
{
setExtent(140, 30);
mButtonText = StringTable->insert("");
mButtonText = StringTable->EmptyString();
mStateOn = false;
mButtonType = ButtonTypeCheck;
}

2
Engine/source/gui/buttons/guiToolboxButtonCtrl.cpp
View file

@ -43,7 +43,7 @@ ConsoleDocClass( GuiToolboxButtonCtrl,
//-------------------------------------
GuiToolboxButtonCtrl::GuiToolboxButtonCtrl()
{
mNormalBitmapName = StringTable->insert("");
mNormalBitmapName = StringTable->EmptyString();
mLoweredBitmapName = StringTable->insert("sceneeditor/client/images/buttondown");
mHoverBitmapName = StringTable->insert("sceneeditor/client/images/buttonup");
setMinExtent(Point2I(16,16));

6
Engine/source/gui/containers/guiFormCtrl.cpp
View file

@ -50,8 +50,8 @@ GuiFormCtrl::GuiFormCtrl()
mCaption = "[none]";
mUseSmallCaption = false;
mContentLibrary = StringTable->insert("");
mContent = StringTable->insert("");
mContentLibrary = StringTable->EmptyString();
mContent = StringTable->EmptyString();
mCanSaveFieldDictionary = true;
mIsContainer = true;
@ -213,7 +213,7 @@ bool GuiFormCtrl::resize(const Point2I &newPosition, const Point2I &newExtent)
static char buf[256];
mUseSmallCaption = true;
mSmallCaption = StringTable->insert("");
mSmallCaption = StringTable->EmptyString();
S32 strlen = dStrlen((const char*)mCaption);
for(S32 i=strlen; i>=0; --i)

2
Engine/source/gui/containers/guiPaneCtrl.cpp
View file

@ -68,7 +68,7 @@ GuiPaneControl::GuiPaneControl()
mMouseOver = false;
mDepressed = false;
mCaption = "A Pane";
mCaptionID = StringTable->insert("");
mCaptionID = StringTable->EmptyString();
mIsContainer = true;
mOriginalExtents.set(10,10);

2
Engine/source/gui/containers/guiWindowCtrl.cpp
View file

@ -1512,7 +1512,7 @@ void GuiWindowCtrl::setCloseCommand(const char *newCmd)
if (newCmd)
mCloseCommand = StringTable->insert(newCmd);
else
mCloseCommand = StringTable->insert("");
mCloseCommand = StringTable->EmptyString();
}
//-----------------------------------------------------------------------------

4
Engine/source/gui/controls/guiGameListMenuCtrl.cpp
View file

@ -38,7 +38,7 @@ GuiGameListMenuCtrl::GuiGameListMenuCtrl()
VECTOR_SET_ASSOCIATION(mRows);
// initialize the control callbacks
mCallbackOnA = StringTable->insert("");
mCallbackOnA = StringTable->EmptyString();
mCallbackOnB = mCallbackOnA;
mCallbackOnX = mCallbackOnA;
mCallbackOnY = mCallbackOnA;
@ -572,7 +572,7 @@ StringTableEntry GuiGameListMenuCtrl::getRowLabel(S32 rowIndex) const
if (! isValidRowIndex(rowIndex))
{
// not a valid row index, don't do anything
return StringTable->insert("");
return StringTable->EmptyString();
}
return mRows[rowIndex]->mLabel;
}

2
Engine/source/gui/controls/guiListBoxCtrl.cpp
View file

@ -1530,7 +1530,7 @@ void GuiListBoxCtrl::_mirror()
StringTableEntry GuiListBoxCtrl::_makeMirrorItemName( SimObject *inObj )
{
StringTableEntry outName = StringTable->insert("");
StringTableEntry outName = StringTable->EmptyString();
if ( mMakeNameCallback.isNotEmpty() )
{

4
Engine/source/gui/controls/guiMLTextCtrl.cpp
View file

@ -251,7 +251,7 @@ GuiMLTextCtrl::GuiMLTextCtrl()
mIsEditCtrl( false ),
mCursorPosition( false ),
mMaxBufferSize( -1 ),
mInitialText( StringTable->insert("") ),
mInitialText( StringTable->EmptyString() ),
mSelectionActive( false ),
mSelectionStart( 0 ),
mSelectionEnd( 0 ),
@ -267,7 +267,7 @@ GuiMLTextCtrl::GuiMLTextCtrl()
mFontList( NULL )
{
mActive = true;
//mInitialText = StringTable->insert("");
//mInitialText = StringTable->EmptyString();
Sim::findObject("InputDeniedSound", mDeniedSound);
}

2
Engine/source/gui/controls/guiPopUpCtrl.cpp
View file

@ -277,7 +277,7 @@ GuiPopUpMenuCtrl::GuiPopUpMenuCtrl(void)
mRenderScrollInNA = false; // Added
mBackgroundCancel = false; // Added
mReverseTextList = false; // Added - Don't reverse text list if displaying up
mBitmapName = StringTable->insert(""); // Added
mBitmapName = StringTable->EmptyString(); // Added
mBitmapBounds.set(16, 16); // Added
mIdMax = -1;
}

2
Engine/source/gui/controls/guiPopUpCtrlEx.cpp
View file

@ -328,7 +328,7 @@ GuiPopUpMenuCtrlEx::GuiPopUpMenuCtrlEx(void)
mRenderScrollInNA = false; // Added
mBackgroundCancel = false; // Added
mReverseTextList = false; // Added - Don't reverse text list if displaying up
mBitmapName = StringTable->insert(""); // Added
mBitmapName = StringTable->EmptyString(); // Added
mBitmapBounds.set(16, 16); // Added
mHotTrackItems = false;
mIdMax = -1;

4
Engine/source/gui/controls/guiTextCtrl.cpp
View file

@ -54,8 +54,8 @@ ConsoleDocClass( GuiTextCtrl,
GuiTextCtrl::GuiTextCtrl()
{
//default fonts
mInitialText = StringTable->insert("");
mInitialTextID = StringTable->insert("");
mInitialText = StringTable->EmptyString();
mInitialTextID = StringTable->EmptyString();
mText[0] = '\0';
mMaxStrLen = GuiTextCtrl::MAX_STRING_LENGTH;
}

2
Engine/source/gui/controls/guiTextEditCtrl.cpp
View file

@ -1684,7 +1684,7 @@ DefineEngineMethod( GuiTextEditCtrl, getText, const char*, (),,
"@see GuiControl")
{
if( !object->hasText() )
return StringTable->insert("");
return StringTable->EmptyString();
char *retBuffer = Con::getReturnBuffer( GuiTextEditCtrl::MAX_STRING_LENGTH );
object->getText( retBuffer );

6
Engine/source/gui/controls/guiTreeViewCtrl.cpp
View file

@ -845,7 +845,7 @@ GuiTreeViewCtrl::GuiTreeViewCtrl()
mClearAllOnSingleSelection = true;
mBitmapBase = StringTable->insert("");
mBitmapBase = StringTable->EmptyString();
mTexRollover = NULL;
mTexSelected = NULL;
@ -4746,13 +4746,13 @@ StringTableEntry GuiTreeViewCtrl::getTextToRoot( S32 itemId, const char * delimi
if(!item)
{
Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: invalid start item id!");
return StringTable->insert("");
return StringTable->EmptyString();
}
if(item->isInspectorData())
{
Con::errorf(ConsoleLogEntry::General, "GuiTreeViewCtrl::getTextToRoot: cannot get text to root of inspector data items");
return StringTable->insert("");
return StringTable->EmptyString();
}
char bufferOne[1024];

2
Engine/source/gui/editor/guiParticleGraphCtrl.cpp
View file

@ -50,7 +50,7 @@ GuiParticleGraphCtrl::GuiParticleGraphCtrl()
mPlots[i].mGraphMin.x = 0;
mPlots[i].mGraphMin.y = 0;
mPlots[i].mGraphType = Polyline;
mPlots[i].mGraphName = StringTable->insert("");
mPlots[i].mGraphName = StringTable->EmptyString();
mPlots[i].mHidden = false;
mPlots[i].mGraphScale = 0.05f;
}

2
Engine/source/gui/game/guiChunkedBitmapCtrl.cpp
View file

@ -86,7 +86,7 @@ DefineEngineMethod( GuiChunkedBitmapCtrl, setBitmap, void, (const char* filename
GuiChunkedBitmapCtrl::GuiChunkedBitmapCtrl()
{
mBitmapName = StringTable->insert("");
mBitmapName = StringTable->EmptyString();
mUseVariable = false;
mTile = false;
}

8
Engine/source/gui/worldEditor/undoActions.cpp
View file

@ -218,8 +218,8 @@ InspectorFieldUndoAction::InspectorFieldUndoAction()
{
mObjId = 0;
mField = NULL;
mSlotName = StringTable->insert("");
mArrayIdx = StringTable->insert("");
mSlotName = StringTable->EmptyString();
mArrayIdx = StringTable->EmptyString();
}
InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName )
@ -228,8 +228,8 @@ InspectorFieldUndoAction::InspectorFieldUndoAction( const UTF8 *actionName )
mInspector = NULL;
mObjId = 0;
mField = NULL;
mSlotName = StringTable->insert("");
mArrayIdx = StringTable->insert("");
mSlotName = StringTable->EmptyString();
mArrayIdx = StringTable->EmptyString();
}
void InspectorFieldUndoAction::initPersistFields()

4
Engine/source/navigation/navMesh.cpp
View file

@ -181,7 +181,7 @@ DefineConsoleFunction(NavMeshUpdateOne, void, (S32 meshid, S32 objid, bool remov
NavMesh::NavMesh()
{
mTypeMask |= StaticShapeObjectType | MarkerObjectType;
mFileName = StringTable->insert("");
mFileName = StringTable->EmptyString();
mNetFlags.clear(Ghostable);
mSaveIntermediates = false;
@ -211,7 +211,7 @@ NavMesh::NavMesh()
mLargeCharacters = false;
mVehicles = false;
mCoverSet = StringTable->insert("");
mCoverSet = StringTable->EmptyString();
mInnerCover = false;
mCoverDist = 1.0f;
mPeekDist = 0.7f;

4
Engine/source/navigation/navPath.cpp
View file

@ -170,7 +170,7 @@ const char *NavPath::getProtectedFrom(void *obj, const char *data)
if(object->mFromSet)
return data;
else
return StringTable->insert("");
return StringTable->EmptyString();
}
const char *NavPath::getProtectedTo(void *obj, const char *data)
@ -180,7 +180,7 @@ const char *NavPath::getProtectedTo(void *obj, const char *data)
if(object->mToSet)
return data;
else
return StringTable->insert("");
return StringTable->EmptyString();
}
IRangeValidator ValidIterations(1, S32_MAX);

2
Engine/source/platform/menus/popupMenu.cpp
View file

@ -51,7 +51,7 @@ PopupMenu::PopupMenu() : mCanvas(NULL)
mSubmenus = new SimSet;
mSubmenus->registerObject();
mBarTitle = StringTable->insert("");
mBarTitle = StringTable->EmptyString();
mIsPopup = false;
mPopupGUID = sMaxPopupGUID++;

8
Engine/source/platform/nativeDialogs/fileDialog.cpp
View file

@ -48,10 +48,10 @@ FileDialogData::FileDialogData()
if (mDefaultPath == StringTable->lookup("") || !Platform::isDirectory(mDefaultPath))
mDefaultPath = Platform::getCurrentDirectory();
mDefaultFile = StringTable->insert("");
mFilters = StringTable->insert("");
mFile = StringTable->insert("");
mTitle = StringTable->insert("");
mDefaultFile = StringTable->EmptyString();
mFilters = StringTable->EmptyString();
mFile = StringTable->EmptyString();
mTitle = StringTable->EmptyString();
mStyle = 0;