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
175	QByteArray serializedActionArguments;	175	QByteArray serializedActionArguments;
176	QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly);	176	QDataStream dataStream(&serializedActionArguments, QIODevice::WriteOnly);
177		177
178	dataStream << getType();	178	dataStream << ACTION_TYPE_SPRING;
179	dataStream << getID();	179	dataStream << getID();
180	dataStream << ObjectActionSpring::springVersion;	180	dataStream << ObjectActionSpring::springVersion;
181		181
@@ -195,7 +195,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) { · 13 unmodified lines
195		195
196	EntityActionType type;	196	EntityActionType type;
197	dataStream >> type;	197	dataStream >> type;
198	assert(type == getType());	198	assert(type == ACTION_TYPE_SPRING);
199		199
200	QUuid id;	200	QUuid id;
201	dataStream >> id;	201	dataStream >> id;