浏览代码

Merge pull request #383 from Azaezel/alpha40_shapeAssetTransmissionFix

get shapeassetID read. TODO: find further flaws and unrem the filter
Brian Roberts 4 年之前
父节点
当前提交
9f802fa23f
共有 1 个文件被更改,包括 8 次插入5 次删除
  1. 8 5
      Engine/source/T3D/shapeBase.cpp

+ 8 - 5
Engine/source/T3D/shapeBase.cpp

@@ -803,8 +803,10 @@ void ShapeBaseData::packData(BitStream* stream)
    stream->write(shadowSphereAdjust);
 
 
-   stream->writeString(shapeName);
-   stream->writeString(shapeAsset.getAssetId());
+   //if (stream->writeFlag(shapeAsset.notNull()))
+      stream->writeString(shapeAsset.getAssetId());
+   //else
+      stream->writeString(shapeName);
 
    stream->writeString(cloakTexName);
    if(stream->writeFlag(mass != gShapeBaseDataProto.mass))
@@ -882,10 +884,11 @@ void ShapeBaseData::unpackData(BitStream* stream)
    stream->read(&shadowProjectionDistance);
    stream->read(&shadowSphereAdjust);
 
-   shapeName = stream->readSTString();
 
-   char buffer[256];
-   stream->readString(buffer);
+   //if (stream->readFlag())
+      shapeAssetId = stream->readSTString();
+   //else
+      shapeName = stream->readSTString();
 
    cloakTexName = stream->readSTString();
    if(stream->readFlag())