Mercurial > mm7
changeset 402:74205b91647b
Слияние
| author | Ritor1 |
|---|---|
| date | Sat, 23 Feb 2013 15:10:34 +0600 |
| parents | 787b2c441840 (diff) 35a62d1948d4 (current diff) |
| children | a05e12cac518 |
| files | Actor.cpp AudioPlayer.cpp mm7_5.cpp |
| diffstat | 5 files changed, 0 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Actor.cpp Sat Feb 23 08:27:32 2013 +0200 +++ b/Actor.cpp Sat Feb 23 15:10:34 2013 +0600 @@ -3291,7 +3291,6 @@ } } - //----- (00402AD7) -------------------------------------------------------- void Actor::_402AD7(unsigned int uActorID, unsigned int a2, signed int arg0, signed int uActionLength, AIDirection *pDir) {
--- a/AudioPlayer.cpp Sat Feb 23 08:27:32 2013 +0200 +++ b/AudioPlayer.cpp Sat Feb 23 15:10:34 2013 +0600 @@ -1795,7 +1795,6 @@ } - //----- (004AB66C) -------------------------------------------------------- int __fastcall sub_4AB66C(int a1, int a2) {
--- a/Party.cpp Sat Feb 23 08:27:32 2013 +0200 +++ b/Party.cpp Sat Feb 23 15:10:34 2013 +0600 @@ -780,7 +780,6 @@ } - //----- (0043AD34) -------------------------------------------------------- void Party::Yell() {
--- a/mm7_4.cpp Sat Feb 23 08:27:32 2013 +0200 +++ b/mm7_4.cpp Sat Feb 23 15:10:34 2013 +0600 @@ -14990,7 +14990,6 @@ - //----- (0044622E) -------------------------------------------------------- bool __fastcall EnterHouse(HOUSE_TYPE uHouseID) {
--- a/mm7_5.cpp Sat Feb 23 08:27:32 2013 +0200 +++ b/mm7_5.cpp Sat Feb 23 15:10:34 2013 +0600 @@ -14859,7 +14859,6 @@ - //----- (004151D9) -------------------------------------------------------- void __fastcall DrawPopupWindow(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight) {