mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-06 09:09:40 +02:00
Merged most of the changes from trunk.
Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
#include <list>
|
||||
#include <set>
|
||||
const int Woff = 12; //width of map's frame
|
||||
const int Hoff = 8;
|
||||
const int Hoff = 8;
|
||||
|
||||
class CGObjectInstance;
|
||||
class CGHeroInstance;
|
||||
@@ -105,4 +105,4 @@ public:
|
||||
|
||||
};
|
||||
|
||||
#endif //MAPHANDLER_H
|
||||
#endif //MAPHANDLER_H
|
||||
|
||||
Reference in New Issue
Block a user