Mercurial > mm7

changeset 796:14beae4f1723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Last observable issues with walking in dragon cave fixed.
author Nomad
date Mon, 25 Mar 2013 14:56:50 +0200
parents 472ca68386d4
children a49b8df4de89 f5156b8c61ad 9d2b911ef526
files mm7_4.cpp stru6.cpp
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mm7_4.cpp	Mon Mar 25 14:23:40 2013 +0200
+++ b/mm7_4.cpp	Mon Mar 25 14:56:50 2013 +0200
@@ -285,7 +285,7 @@
       v50 = word_721390_ys[0] >= y;
       v53 = 0;
 
-      for (uint j = 0; j < 2 * pFloor->uNumVertices - 1; ++j)
+      for (uint j = 0; j < 2 * pFloor->uNumVertices; ++j)
       {
         if (v53 >= 2)
           break;
--- a/stru6.cpp	Mon Mar 25 14:23:40 2013 +0200
+++ b/stru6.cpp	Mon Mar 25 14:56:50 2013 +0200
@@ -783,6 +783,15 @@
 
   switch (a2->uType)
   {
+    case 500:   // blue rat bolt for example
+    case 530:
+      _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0x00AAAFF, uTextureID_effpar1);
+    return false;
+
+    case 510:   // dragon fire for example
+      _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0xFF3C1E, uTextureID_effpar1);
+    return false;
+
     case 545:
     case 550:
     case 555: return true;
@@ -867,10 +876,6 @@
       result -= 500;
       switch ( result )
       {
-        case 0:
-        case 30:
-          _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0xAAAFF, uTextureID_effpar1);
-          return false;
         case 1:
         case 31:
           _4A75CC_single_spell_collision_particle(a2, 0xAAAFF, uTextureID_effpar1);
@@ -878,9 +883,6 @@
         case 5:
           _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0x5C310E, uTextureID_effpar1);
           return false;
-        case 10:
-          _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0xFF3C1E, uTextureID_effpar1);
-          return false;
         case 15:
           _4A73AA_hanging_trace_particles___like_fire_strike_ice_blast_etc(a2, 0x0062D0, uTextureID_effpar1);
           return false;