# HG changeset patch
# User Ritor1
# Date 1364227479 -21600
# Node ID a49b8df4de8997b94e5f269338b2e0b141ead2a6
# Parent  37a2472e0f1818a47de2922f903731c08f7f81ad# Parent  14beae4f17238fecd5a3b5579e17b984b1862d88
Слияние

diff -r 37a2472e0f18 -r a49b8df4de89 mm7_4.cpp
--- a/mm7_4.cpp	Mon Mar 25 22:04:30 2013 +0600
+++ b/mm7_4.cpp	Mon Mar 25 22:04:39 2013 +0600
@@ -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;
diff -r 37a2472e0f18 -r a49b8df4de89 stru6.cpp
--- a/stru6.cpp	Mon Mar 25 22:04:30 2013 +0600
+++ b/stru6.cpp	Mon Mar 25 22:04:39 2013 +0600
@@ -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;