瀏覽代碼

use _set<assetname> for all network recipts of shapes, sounds, images and materials to ensure we at least try and fill that out whichever way is ghosted to us

AzaezelX 4 年之前
父節點
當前提交
ad0c141189

+ 9 - 3
Engine/source/T3D/assets/ImageAsset.h

@@ -345,7 +345,6 @@ if (m##name##AssetId != StringTable->EmptyString())\
    if (stream->writeFlag(m##name##Asset.notNull()))\
    {\
       stream->writeString(m##name##Asset.getAssetId());\
-      _set##name(m##name##AssetId);\
    }\
    else\
       stream->writeString(m##name##Name);
@@ -354,9 +353,13 @@ if (m##name##AssetId != StringTable->EmptyString())\
    if (stream->readFlag())\
    {\
       m##name##AssetId = stream->readSTString();\
+      _set##name(m##name##AssetId);\
    }\
    else\
-      m##name##Name = stream->readSTString();
+   {\
+      m##name##Name = stream->readSTString();\
+      _set##name(m##name##Name);\
+   }\
 
 #define PACK_IMAGEASSET(netconn, name)\
    if (stream->writeFlag(m##name##Asset.notNull()))\
@@ -591,7 +594,10 @@ if (m##name##AssetId[index] != StringTable->EmptyString())\
       _set##name(m##name##AssetId[index], index);\
    }\
    else\
-      m##name##Name[index] = stream->readSTString();
+   {\
+      m##name##Name[index] = stream->readSTString();\
+      _set##name(m##name##Name[index], index);\
+   }\
 
 #define PACK_IMAGEASSET_ARRAY(netconn, name, index)\
    if (stream->writeFlag(m##name##Asset[index].notNull()))\

+ 4 - 1
Engine/source/T3D/assets/MaterialAsset.h

@@ -346,7 +346,10 @@ if (m##name##AssetId != StringTable->EmptyString())\
       _set##name(m##name##AssetId);\
    }\
    else\
-      m##name##Name = stream->readSTString();
+   {\
+      m##name##Name = stream->readSTString();\
+      _set##name(m##name##Name);\
+   }\
 
 #define PACK_MATERIALASSET(netconn, name)\
    if (stream->writeFlag(m##name##Asset.notNull()))\

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

@@ -397,7 +397,10 @@ DefineEngineMethod(className, set##name, bool, (const char*  shape), , assetText
       _set##name(m##name##AssetId);\
    }\
    else\
-      m##name##Name = stream->readSTString();
+   {\
+      m##name##Name = stream->readSTString();\
+      _set##name(m##name##Name);\
+   }
 
 #define PACK_SHAPEASSET(netconn, name)\
    if (stream->writeFlag(m##name##Asset.notNull()))\
@@ -609,7 +612,10 @@ DefineEngineMethod(className, set##name, bool, (const char*  shape, S32 index),
       _set##name(m##name##AssetId[index], index);\
    }\
    else\
-      m##name##Name[index] = stream->readSTString();
+   {\
+      m##name##Name[index] = stream->readSTString();\
+      _set##name(m##name##Name[index], index);\
+   }
 
 #define PACK_SHAPEASSET_ARRAY(netconn, name, index)\
    if (stream->writeFlag(m##name##Asset[index].notNull()))\

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

@@ -344,7 +344,10 @@ DefineEngineMethod(className, set##name, bool, (const char*  shape), , assetText
       _set##name(m##name##AssetId);\
    }\
    else\
-      m##name##Name = stream->readSTString();
+   {\
+      m##name##Name = stream->readSTString();\
+      _set##name(m##name##Name);\
+   }
 
 #define PACK_SOUNDASSET(netconn, name)\
    if (stream->writeFlag(m##name##Asset.notNull()))\