Mercurial > mm7

comparison Game.cpp @ 2358:23192f5b41d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Thu, 10 Apr 2014 17:35:26 +0600
parents 08c4f1799ca1 7c10dfb6d802
children bddcaf5d5db2
comparison
equal deleted inserted replaced
2357:44c91cec72ad 2358:23192f5b41d4
42 #include "GUIProgressBar.h" 42 #include "GUIProgressBar.h"
43 #include "ObjectList.h" 43 #include "ObjectList.h"
44 #include "Level/Decoration.h" 44 #include "Level/Decoration.h"
45 #include "PaletteManager.h" 45 #include "PaletteManager.h"
46 #include "UI\UIHouses.h" 46 #include "UI\UIHouses.h"
47 #include "UI\UIShops.h"
48 #include "UI\UIPartyCreation.h"
47 #include "SaveLoad.h" 49 #include "SaveLoad.h"
48 #include "SpriteObject.h" 50 #include "SpriteObject.h"
49 #include "mm7.h" 51 #include "mm7.h"
50 #include "Sprites.h" 52 #include "Sprites.h"
51 #include "Registry.h" 53 #include "Registry.h"
52 #include "Chest.h" 54 #include "Chest.h"
53 55
56 #include "UI\UIGame.h"
54 57
55 58
56 59
57 60
58 Game *pGame; 61 Game *pGame;