Merge branch 'master' into master

1 files changed, 11 insertions, 11 deletions

diff --git a/src/particles.cpp b/src/particles.cpp
index fd81238dc..03373590e 100644
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -41,23 +41,23 @@ void ParticleParameters::serialize(std::ostream &os, u16 protocol_ver) const
 
 void ParticleParameters::deSerialize(std::istream &is, u16 protocol_ver)
 {
-	pos                = readV3F32(is);
-	vel                = readV3F32(is);
-	acc                = readV3F32(is);
-	expirationtime     = readF32(is);
-	size               = readF32(is);
+	pos = readV3F32(is);
+	vel = readV3F32(is);
+	acc = readV3F32(is);
+	expirationtime = readF32(is);
+	size = readF32(is);
 	collisiondetection = readU8(is);
-	texture            = deSerializeLongString(is);
-	vertical           = readU8(is);
-	collision_removal  = readU8(is);
+	texture = deSerializeLongString(is);
+	vertical = readU8(is);
+	collision_removal = readU8(is);
 	animation.deSerialize(is, 6); /* NOT the protocol ver */
-	glow               = readU8(is);
-	object_collision   = readU8(is);
+	glow = readU8(is);
+	object_collision = readU8(is);
 	// This is kinda awful
 	u16 tmp_param0 = readU16(is);
 	if (is.eof())
 		return;
 	node.param0 = tmp_param0;
 	node.param2 = readU8(is);
-	node_tile   = readU8(is);
+	node_tile = readU8(is);
 }