diff Items.cpp @ 2358:23192f5b41d4

Merge
author Ritor1
date Thu, 10 Apr 2014 17:35:26 +0600
parents a574a80e7012
children bddcaf5d5db2
line wrap: on
line diff
--- a/Items.cpp	Thu Apr 10 17:35:10 2014 +0600
+++ b/Items.cpp	Thu Apr 10 17:35:26 2014 +0600
@@ -1,6 +1,8 @@
 #define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <string>
+#include "UI\UIHouses.h"
+#include "GUIButton.h"
 #include "mm7_unsorted_subs.h"
 #include "ErrorHandling.h"
 
@@ -461,7 +463,7 @@
 			pSpecialEnchantmentsSumm[i]+=pSpecialEnchantments[j].to_item_apply[i];
 		}
 
-	Initialize2DA();
+	InitializeBuildingResidents();
 
 	pItemsTXT_Raw = NULL;
 	pItemsTXT_Raw = (char*) pEvents_LOD->LoadRaw("items.txt", 0);