History

always serialize ACTION_TYPE_SPRING

Andrew Meadows committed 11 years ago

Commit 294c1ba1 parent 56f00a51 file · +2 −2Browse files

Showing the changes to libraries/physics/src/ObjectActionSpring.cpp (1 of 1 file). Show all

Unified · Split

libraries/physics/src/ObjectActionSpring.cpp+2−2
@@ -175,7 +175,7 @@ QByteArray ObjectActionSpring::serialize() const { · 174 unmodified lines
175175 QByteArray serializedActionArguments;
176176 QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly);
177177
178− dataStream << getType();
178+ dataStream << ACTION_TYPE_SPRING;
179179 dataStream << getID();
180180 dataStream << ObjectActionSpring::springVersion;
181181
@@ -195,7 +195,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 13 unmodified lines
195195
196196 EntityActionType type;
197197 dataStream >> type;
198− assert(type == getType());
198+ assert(type == ACTION_TYPE_SPRING);
199199
200200 QUuid id;
201201 dataStream >> id;