Mercurial > mm7
diff mm7_6.cpp @ 921:3696848c0413
meteorite rain and other spells fix
| author | Ritor1 |
|---|---|
| date | Tue, 30 Apr 2013 20:08:42 +0600 |
| parents | f3ccfc765502 |
| children | d4ca429eecd4 a78f08dbeb88 |
line wrap: on
line diff
--- a/mm7_6.cpp Sun Apr 28 19:11:36 2013 +0600 +++ b/mm7_6.cpp Tue Apr 30 20:08:42 2013 +0600 @@ -1110,7 +1110,7 @@ || (v2 = 300.0 < p[1].vWorldViewPosition.x, v3 = 0, v4 = 300.0 == p[1].vWorldViewPosition.x, - BYTE1(result) = HIBYTE(v1), + //BYTE1(result) = HIBYTE(v1), !(v2 | v4)) ) { if ( p->vWorldViewPosition.x < 300.0 ) @@ -1118,17 +1118,17 @@ v6 = 300.0 < p[1].vWorldViewPosition.x; v7 = 0; v8 = 300.0 == p[1].vWorldViewPosition.x; - BYTE1(result) = HIBYTE(v1); + //BYTE1(result) = HIBYTE(v1); if ( !(v6 | v8) ) { - LOBYTE(result) = 0; - return result; + //LOBYTE(result) = 0; + return false; } } v9 = 300.0 < p->vWorldViewPosition.x; v10 = 0; v11 = 300.0 == p->vWorldViewPosition.x; - BYTE1(result) = HIBYTE(v1); + //BYTE1(result) = HIBYTE(v1); if ( v9 | v11 ) { v16 = 1.0 / (p->vWorldViewPosition.x - p[1].vWorldViewPosition.x); @@ -1150,8 +1150,8 @@ p->vWorldViewPosition.z = v15 * v14 + p->vWorldViewPosition.z; } } - LOBYTE(result) = 1; - return result; + //LOBYTE(result) = 1; + return true; } //----- (004268E3) -------------------------------------------------------- @@ -4747,7 +4747,7 @@ a1.uSpriteFrameID = 0; a1.spell_caster_pid = PID(OBJECT_Player, v3->uPlayerID); a1.spell_target_pid = v730; - __debugbreak(); + //__debugbreak();//звездопад a1.field_60_distance_related_prolly_lod = stru_50C198._427546((int)&_this[69].uNumCharges); a1.uFacing = v685; a1.uSoundID = LOWORD(v3->sound_id);