Changeset 21834 for ps

Timestamp:

06/03/18 13:49:55 (7 years ago)

Author:

elexis

Message:

Fix an OOS on rejoin on Danubius following rP20957, refs #4855, fixes #5198.

Vectors are still deserialized as objects without their prototype functions, so doing math on these obejcts fails upon rejoin, refs #4698.
This patch doesn't add any version incompatibilities and players with the patched version can successfully rejoin unpatched games.

Differential Revision: ​https://code.wildfiregames.com/D1548
Reviewed By: temple

File:

• ps/trunk/binaries/data/mods/public/maps/random/danubius_triggers.js (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/maps/random/danubius_triggers.js

@@ -487 +487 @@
 Trigger.prototype.IsLeftRiverside = function(ent)
 {
-    return this.riverDirection.cross(Vector2D.sub(TriggerHelper.GetEntityPosition2D(ent), this.mapCenter)) > 0;
+    return Vector2D.sub(TriggerHelper.GetEntityPosition2D(ent), this.mapCenter).cross(this.riverDirection) < 0;
 };
 
@@ -616 +616 @@
 
     // Be able to distinguish between the left and right riverside
+    // TODO: The Vector2D types don't survive deserialization, so use an object with x and y properties only!
     let mapSize = TriggerHelper.GetMapSizeTerrain();
-    this.mapCenter = new Vector2D(mapSize / 2, mapSize / 2);
-    this.riverDirection = Vector2D.sub(
+    this.mapCenter = clone(new Vector2D(mapSize / 2, mapSize / 2));
+
+    this.riverDirection = clone(Vector2D.sub(
         TriggerHelper.GetEntityPosition2D(this.GetTriggerPoints(triggerPointRiverDirection)[0]),
-        this.mapCenter);
+        this.mapCenter));
 
     this.StartCelticRitual();