# HG changeset patch
# User Ritor1
# Date 1379907263 -21600
# Node ID cc1d68c17e19c4e6245d425a7a54d938d022fa14
# Parent  ffef0fe0b59d1ef3358e4fb39a25d7604899ceb3# Parent  5cbd88f8a2ebe5f8d5c18b9d5934f3778305da46
Слияние

diff -r 5cbd88f8a2eb -r cc1d68c17e19 UI/UIGuilds.cpp
--- a/UI/UIGuilds.cpp	Sun Sep 22 19:48:02 2013 +0200
+++ b/UI/UIGuilds.cpp	Mon Sep 23 09:34:23 2013 +0600
@@ -26,9 +26,7 @@
   const char *statusbar_string; // ecx@26
   POINT *v12; // esi@30
   int v13; // ecx@30
-  //void *v14; // ST1C_4@31
   ItemGen *v15; // ST18_4@31
-  //int v16; // ST10_4@31
   int v17; // eax@31
   char *v18; // edx@31
   int pActiveItem; // esi@35
@@ -59,7 +57,6 @@
   int pColorWhite; // [sp+2CCh] [bp-20h]@1
   int pColorYellow; // [sp+2D0h] [bp-1Ch]@1
   int v58; // [sp+2D4h] [bp-18h]@1
-  //unsigned __int8 uPlayerID; // [sp+2DBh] [bp-11h]@31
   bool pSkillFlag; // [sp+2DCh] [bp-10h]@35
   int v61; // [sp+2E0h] [bp-Ch]@35
   unsigned int v62; // [sp+2E4h] [bp-8h]@13