# HG changeset patch
# User Ritor1
# Date 1363011079 -21600
# Node ID 748f5c7e4012afc800cab44560b7c187e3ec369f
# Parent  24a6c161d79ba9edf435d9498c240cdcb200bec5# Parent  d7b14091e434b720c91af50b2f0b94eaf8e0e577
Слияние

diff -r 24a6c161d79b -r 748f5c7e4012 Render.cpp
--- a/Render.cpp	Mon Mar 11 20:11:12 2013 +0600
+++ b/Render.cpp	Mon Mar 11 20:11:19 2013 +0600
@@ -3609,6 +3609,8 @@
 
                 default: assert(pParty->uCurrentMonth >= 0 && pParty->uCurrentMonth < 12);
               }
+            else
+              v8 = pSpriteFrameTable->GetFrame(v1->uSpriteID, v6 + v7);
             #pragma endregion
             //v8 = pSpriteFrameTable->GetFrame(v1->uSpriteID, v6 + v7);