TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
AzaezelX 2021-09-27 21:12:27 -05:00
parent 0595a88345
commit ad0c141189
4 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/T3D/assets/ImageAsset.h
View file

@ -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()))\

5
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -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()))\

10
Engine/source/T3D/assets/ShapeAsset.h
View file

@ -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()))\

5
Engine/source/T3D/assets/SoundAsset.h
View file

@ -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()))\