# HG changeset patch
# User Ritor1
# Date 1371976077 -21600
# Node ID 13b7be8b06a02db958738199d98a6ce113325f90
# Parent  1ab9bff65f010f3622211349af1bcc78655e0a62# Parent  bedc304ab6177672d4395903a79cdd5d204ab62d
Слияние

diff -r bedc304ab617 -r 13b7be8b06a0 Actor.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 Arcomage.cpp
--- a/Arcomage.cpp	Thu Jun 20 15:24:09 2013 +0600
+++ b/Arcomage.cpp	Sun Jun 23 14:27:57 2013 +0600
@@ -4140,3 +4140,31 @@
     {
     sprintf(pOut, "%d", val);
     }
+
+void set_stru1_field_8_InArcomage(int inValue)
+{
+  switch(inValue)
+  {
+  case 91:LOBYTE(pArcomageGame->stru1.field_8) = 123;break;
+  case 92:LOBYTE(pArcomageGame->stru1.field_8) = 124;break;
+  case 93:LOBYTE(pArcomageGame->stru1.field_8) = 125;break;
+  case 96:LOBYTE(pArcomageGame->stru1.field_8) = 126;break;
+  case 61:LOBYTE(pArcomageGame->stru1.field_8) = 43;break;
+  case 55:LOBYTE(pArcomageGame->stru1.field_8) = 38;break;
+  case 56:LOBYTE(pArcomageGame->stru1.field_8) = 42;break;
+  case 57:LOBYTE(pArcomageGame->stru1.field_8) = 40;break;
+  case 59:LOBYTE(pArcomageGame->stru1.field_8) = 58;break;
+  case 54:LOBYTE(pArcomageGame->stru1.field_8) = 94;break;
+  case 50:LOBYTE(pArcomageGame->stru1.field_8) = 64;break;
+  case 51:LOBYTE(pArcomageGame->stru1.field_8) = 35;break;
+  case 52:LOBYTE(pArcomageGame->stru1.field_8) = 36;break;
+  case 53:LOBYTE(pArcomageGame->stru1.field_8) = 37;break;
+  case 49:LOBYTE(pArcomageGame->stru1.field_8) = 33;break;
+  case 39:LOBYTE(pArcomageGame->stru1.field_8) = 34;break;
+  case 44:LOBYTE(pArcomageGame->stru1.field_8) = 60;break;
+  case 46:LOBYTE(pArcomageGame->stru1.field_8) = 62;break;
+  case 47:LOBYTE(pArcomageGame->stru1.field_8) = 63;break;
+  case 48:LOBYTE(pArcomageGame->stru1.field_8) = 41;break;
+  default:LOBYTE(pArcomageGame->stru1.field_8) = inValue;break;
+  }
+}
\ No newline at end of file
diff -r bedc304ab617 -r 13b7be8b06a0 Arcomage.h
--- a/Arcomage.h	Thu Jun 20 15:24:09 2013 +0600
+++ b/Arcomage.h	Sun Jun 23 14:27:57 2013 +0600
@@ -188,6 +188,7 @@
 
 extern ArcomageGame *pArcomageGame;
 extern ArcomageCard pCards[87];
+extern void set_stru1_field_8_InArcomage(int inValue);
 
 
 
diff -r bedc304ab617 -r 13b7be8b06a0 DecorationList.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 GUIWindow.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 Indoor.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 LevelDecoration.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 ObjectList.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 Outdoor.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 SaveLoad.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 Spells.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 SpriteObject.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 Texture.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 UI/UIHouses.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 UIHouses.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 mm7_1.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 mm7_2.cpp
diff -r bedc304ab617 -r 13b7be8b06a0 mm7_3.cpp