Selaa lähdekoodia

Merge pull request #820 from Azaezel/alpha40/shapeErrcodes

fix shape errorcodes
Brian Roberts 3 vuotta sitten
vanhempi
commit
c8ef1c5c85

+ 1 - 1
Engine/source/T3D/assets/ShapeAsset.cpp

@@ -117,7 +117,7 @@ ConsoleSetType(TypeShapeAssetId)
 
 //-----------------------------------------------------------------------------
 
-const String ShapeAsset::mErrCodeStrings[] =
+const String ShapeAsset::mShapeErrCodeStrings[] =
 {
    "TooManyVerts",
    "TooManyBones",

+ 2 - 2
Engine/source/T3D/assets/ShapeAsset.h

@@ -104,7 +104,7 @@ public:
 
    static StringTableEntry smNoShapeAssetFallback;
 
-   static const String mErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1];
+   static const String mShapeErrCodeStrings[ShapeAssetErrCode::Extended - Parent::Extended + 1];
 
    static U32 getAssetErrCode(AssetPtr<ShapeAsset> shapeAsset) { if (shapeAsset) return shapeAsset->mLoadedState; else return 0; }
 
@@ -112,7 +112,7 @@ public:
    {
       if (errCode < Parent::Extended) return Parent::getAssetErrstrn(errCode);
       if (errCode > ShapeAssetErrCode::Extended) return "undefined error";
-      return mErrCodeStrings[errCode];
+      return mShapeErrCodeStrings[errCode - Parent::Extended];
    };
 
    ShapeAsset();