changeset 196:d5a0f3576577

Слияние
author Ritor1
date Wed, 26 Dec 2012 10:33:08 +0600
parents b7f43ecfb3a3 (diff) 1f1de8a1e988 (current diff)
children 6109a4e23903
files Player.cpp
diffstat 2 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/GameUIs.cpp	Tue Dec 25 22:30:07 2012 +0600
+++ b/GameUIs.cpp	Wed Dec 26 10:33:08 2012 +0600
@@ -158,7 +158,6 @@
   v16 = -1;
   //ptr_69BD58 = v7;
 }
-
 //----- (0045E93E) --------------------------------------------------------
 void __cdecl GameUI_DrawSaveMenu()
 {
--- a/Player.cpp	Tue Dec 25 22:30:07 2012 +0600
+++ b/Player.cpp	Wed Dec 26 10:33:08 2012 +0600
@@ -740,7 +740,6 @@
   return v3;
 }
 
-
 //----- (0049327B) --------------------------------------------------------
 int Player::_49327B(unsigned int uClass, int a3)
 {