# HG changeset patch
# User Ritor1
# Date 1376201373 -21600
# Node ID b330df6a2183231ad51fedaea75e18c0d40cd814
# Parent  f682c853200d5761a75e6f55fec877bcd909d347# Parent  bfe342ae0c1f2a60bc53fb2fd25359b1f18c537f
Слияние

diff -r bfe342ae0c1f -r b330df6a2183 UI/UICharacter.cpp
--- a/UI/UICharacter.cpp	Fri Aug 09 17:30:33 2013 +0600
+++ b/UI/UICharacter.cpp	Sun Aug 11 12:09:33 2013 +0600
@@ -2907,12 +2907,12 @@
     dword_507CC0_activ_ch = 0;
     for ( i = pGUIWindow_CurrentMenu->pControlsHead; i; i = j )
     {
-	  j=i->pNext;
-	  if ( BYTE1(i->field_1C) & 0x80 )
-	  {
+      j = i->pNext;
+      if ( BYTE1(i->field_1C) & 0x80 )
+      {
         i->Release();
-		pAllocator->FreeChunk(i);
-	  }
+        pAllocator->FreeChunk(i);
+      }
     }
     for ( j = pGUIWindow_CurrentMenu->pControlsHead; j; j = j->pNext )
     {