Mercurial > mm7
diff Game.cpp @ 2358:23192f5b41d4
Merge
author | Ritor1 |
---|---|
date | Thu, 10 Apr 2014 17:35:26 +0600 |
parents | 08c4f1799ca1 7c10dfb6d802 |
children | bddcaf5d5db2 |
line wrap: on
line diff
--- a/Game.cpp Thu Apr 10 17:35:10 2014 +0600 +++ b/Game.cpp Thu Apr 10 17:35:26 2014 +0600 @@ -44,6 +44,8 @@ #include "Level/Decoration.h" #include "PaletteManager.h" #include "UI\UIHouses.h" +#include "UI\UIShops.h" +#include "UI\UIPartyCreation.h" #include "SaveLoad.h" #include "SpriteObject.h" #include "mm7.h" @@ -51,6 +53,7 @@ #include "Registry.h" #include "Chest.h" +#include "UI\UIGame.h"