Fix a group of situational collision bugs

wareya · Apr 3, 2013 · bb66c87 · bb66c87
1 parent 1118307
commit bb66c87
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml b/Source/gg2/Objects/InGameElements/Character.events/Begin Step.xml
@@ -198,6 +198,15 @@ if(abs(hspeed)&lt;0.195 /*and not moveStatus = 3*/) { // Overweight carrying int
     animationImage=0;
 }
 
+with(IntelGate)
+    solid =  (team != other.team and other.intel and !global.mapchanging);
+with(TeamGate)
+    solid = ((team != other.team or other.intel) and !global.mapchanging);
+with(PlayerWall)
+    solid = true;
+with(PlayerWallHorizontal)
+    solid = true;
+
 if(place_free(x,y+1)) {
     vspeed += 0.6;
     if(vspeed&gt;10) {
@@ -210,6 +219,13 @@ if(place_free(x,y+1)) {
     }
 }
 
+with(Gate)
+    solid = false;
+with(PlayerWall)
+    solid = false;
+with(PlayerWallHorizontal)
+    solid = false;
+
 if (intel)
 { 
     if (random(1) &gt; 0.90 &amp;&amp; speed &gt; 0.195)

diff --git a/Source/gg2/Objects/InGameElements/Character.events/End Step.xml b/Source/gg2/Objects/InGameElements/Character.events/End Step.xml
@@ -14,6 +14,16 @@
       <appliesTo>.self</appliesTo>
       <arguments>
         <argument kind="STRING">// Climbing down stairs
+
+with(IntelGate)
+    solid =  (team != other.team and other.intel and !global.mapchanging);
+with(TeamGate)
+    solid = ((team != other.team or other.intel) and !global.mapchanging);
+with(PlayerWall)
+    solid = true;
+with(PlayerWallHorizontal)
+    solid = true;
+
 if(vspeed == 0) // if we aren't falling this frame
 { 
     if(place_free(x,y+6))
@@ -24,6 +34,13 @@ if(vspeed == 0) // if we aren't falling this frame
 }
 xprevious = x;
 yprevious = y;
+
+with(Gate)
+    solid = false;
+with(PlayerWall)
+    solid = false;
+with(PlayerWallHorizontal)
+    solid = false;
 
 if(global.isHost &amp;&amp; hp&lt;=0) {
     var assistant;

diff --git a/Source/gg2/Objects/InGameElements/Character.events/Step.xml b/Source/gg2/Objects/InGameElements/Character.events/Step.xml
@@ -16,25 +16,24 @@
         <argument kind="STRING">speed = min(speed, 15);
 timeUnscathed = min(timeUnscathed+1, 10*30);
 
+with(IntelGate)
+    solid =  (team != other.team and other.intel and !global.mapchanging);
+with(TeamGate)
+    solid = ((team != other.team or other.intel) and !global.mapchanging);
+with(PlayerWall)
+    solid = true;
+with(PlayerWallHorizontal)
+    solid = true;
+
 if (!place_free(x+hspeed, y+vspeed))
-{
-    with(IntelGate)
-        solid =  (team != other.team and other.intel and !global.mapchanging);
-    with(TeamGate)
-        solid = ((team != other.team or other.intel) and !global.mapchanging);
-    with(PlayerWall)
-        solid = true;
-    with(PlayerWallHorizontal)
-        solid = true;
     characterHitObstacle();
-    with(Gate)
-        solid = false;
-    with(PlayerWall)
-        solid = false;
-    with(PlayerWallHorizontal)
-        solid = false;
-}
-colliding = false;
+
+with(Gate)
+    solid = false;
+with(PlayerWall)
+    solid = false;
+with(PlayerWallHorizontal)
+    solid = false;
 
 // cleanup
 //x -= hspeed;