Merge pull request #564 from Azaezel/alpha40/macrocleanup

macro cleanup

Engine/source/T3D/assets/ImageAsset.h

@@ -248,7 +248,7 @@ public: \
          Con::errorf("%s(%s)::_set%s() - image asset failure\"%s\" due to [%s]", macroText(className), getName(), macroText(name), _in, ImageAsset::getAssetErrstrn(m##name##Asset->getStatus()).c_str());\
          return false; \
       }\
-      else if (m##name)\
+      else if (!m##name)\
       {\
          Con::errorf("%s(%s)::_set%s() - Couldn't load image \"%s\"", macroText(className), getName(), macroText(name), _in);\
          return false;\
@@ -467,7 +467,7 @@ public: \
          Con::errorf("%s(%s)::_set%s(%i) - image asset failure\"%s\" due to [%s]", macroText(className), getName(), macroText(name), index, _in, ImageAsset::getAssetErrstrn(m##name##Asset[index]->getStatus()).c_str());\
          return false; \
       }\
-      else if (bool(m##name[index]) == NULL)\
+      else if (!m##name[index])\
       {\
          Con::errorf("%s(%s)::_set%s(%i) - Couldn't load image \"%s\"", macroText(className), getName(), macroText(name), index, _in);\
          return false; \

Engine/source/T3D/assets/MaterialAsset.h

@@ -231,7 +231,7 @@ public: \
          Con::errorf("%s::_set%s() - material asset failure\"%s\" due to [%s]", macroText(className), macroText(name), _in, MaterialAsset::getAssetErrstrn(m##name##Asset->getStatus()).c_str());\
          return false; \
       }\
-      else if (m##name)\
+      else if (!m##name)\
       {\
          Con::errorf("%s::_set%s() - Couldn't load material \"%s\"", macroText(className), macroText(name), _in);\
          return false;\

Engine/source/T3D/assets/ShapeAsset.h

@@ -299,7 +299,7 @@ public: \
          Con::errorf("%s(%s)::_set%s() - shape asset failure \"%s\" due to [%s]", macroText(className), getName(), macroText(name), _in, ShapeAsset::getAssetErrstrn(m##name##Asset->getStatus()).c_str());\
          return false; \
       }\
-      else if (m##name)\
+      else if (!m##name)\
       {\
          Con::errorf("%s(%s)::_set%s() - Couldn't load shape \"%s\"", macroText(className), getName(), macroText(name), _in);\
          return false;\
@@ -495,7 +495,7 @@ public: \
          Con::errorf("%s(%s)::_set%s(%i) - shape asset failure \"%s\" due to [%s]", macroText(className), getName(), macroText(name), index, _in, ShapeAsset::getAssetErrstrn(m##name##Asset[index]->getStatus()).c_str());\
          return false; \
       }\
-      else if (bool(m##name[index]) == NULL)\
+      else if (!m##name[index])\
       {\
          Con::errorf("%s(%s)::_set%s(%i) - Couldn't load shape \"%s\"", macroText(className), getName(), macroText(name), index, _in);\
          return false; \

Engine/source/T3D/assets/SoundAsset.h

@@ -240,7 +240,7 @@ public: \
          Con::errorf("%s(%s)::_set%s() - sound asset failure\"%s\" due to [%s]", macroText(className), getName(), macroText(name), _in, SoundAsset::getAssetErrstrn(m##name##Asset->getStatus()).c_str());\
          return false; \
       }\
-      else if (m##name)\
+      else if (!m##name)\
       {\
          Con::errorf("%s(%s)::_set%s() - Couldn't load sound \"%s\"", macroText(className), getName(), macroText(name), _in);\
          return false;\

Engine/source/T3D/rigidShape.cpp

@@ -263,6 +263,7 @@ RigidShapeData::RigidShapeData()
 
    dustTrailEmitter = NULL;
    dustTrailID = 0;
+   _setShape(ShapeAsset::smNoShapeAssetFallback);
 }
 
 RigidShapeData::~RigidShapeData()