Forráskód Böngészése

ironically, overly paranoid checks were tripping warnings

AzaezelX 4 éve
szülő
commit
ee3ef531e2

+ 1 - 1
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 (bool(m##name) == NULL)\
+      else if (m##name)\
       {\
          Con::errorf("%s(%s)::_set%s() - Couldn't load image \"%s\"", macroText(className), getName(), macroText(name), _in);\
          return false;\

+ 1 - 1
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 (bool(m##name) == NULL)\
+      else if (m##name)\
       {\
          Con::errorf("%s::_set%s() - Couldn't load material \"%s\"", macroText(className), macroText(name), _in);\
          return false;\

+ 1 - 1
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 (bool(m##name) == NULL)\
+      else if (m##name)\
       {\
          Con::errorf("%s(%s)::_set%s() - Couldn't load shape \"%s\"", macroText(className), getName(), macroText(name), _in);\
          return false;\

+ 1 - 1
Engine/source/T3D/assets/SoundAsset.h

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