# HG changeset patch
# User Ritor1
# Date 1361611393 -21600
# Node ID 9fb8fb53d5887db99096258271d612359e1527ff
# Parent  a05e12cac51838a926a906246b55cc21bd3c1e8e# Parent  86637e3f59a9bf7a339a9cfbcdb3dd0a7b3b8867
Слияние

diff -r 86637e3f59a9 -r 9fb8fb53d588 Actor.cpp
--- a/Actor.cpp	Sat Feb 23 08:46:50 2013 +0200
+++ b/Actor.cpp	Sat Feb 23 15:23:13 2013 +0600
@@ -3291,7 +3291,6 @@
   }
 }
 
-
 //----- (00402AD7) --------------------------------------------------------
 void Actor::_402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir)
 {
diff -r 86637e3f59a9 -r 9fb8fb53d588 AudioPlayer.cpp
--- a/AudioPlayer.cpp	Sat Feb 23 08:46:50 2013 +0200
+++ b/AudioPlayer.cpp	Sat Feb 23 15:23:13 2013 +0600
@@ -1795,7 +1795,6 @@
 }
 
 
-
 //----- (004AB66C) --------------------------------------------------------
 int __fastcall sub_4AB66C(int a1, int a2)
 {
diff -r 86637e3f59a9 -r 9fb8fb53d588 Party.cpp
--- a/Party.cpp	Sat Feb 23 08:46:50 2013 +0200
+++ b/Party.cpp	Sat Feb 23 15:23:13 2013 +0600
@@ -780,7 +780,6 @@
 }
 
 
-
 //----- (0043AD34) --------------------------------------------------------
 void Party::Yell()
 {
diff -r 86637e3f59a9 -r 9fb8fb53d588 mm7_4.cpp
--- a/mm7_4.cpp	Sat Feb 23 08:46:50 2013 +0200
+++ b/mm7_4.cpp	Sat Feb 23 15:23:13 2013 +0600
@@ -14990,7 +14990,6 @@
 
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool __fastcall EnterHouse(HOUSE_TYPE uHouseID)
 {
diff -r 86637e3f59a9 -r 9fb8fb53d588 mm7_5.cpp
--- a/mm7_5.cpp	Sat Feb 23 08:46:50 2013 +0200
+++ b/mm7_5.cpp	Sat Feb 23 15:23:13 2013 +0600
@@ -14858,8 +14858,6 @@
 }
 
 
-
-
 //----- (004151D9) --------------------------------------------------------
 void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight)
 {