games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

Browse Source
This commit is contained in:
DjWarmonger 2014-05-16 19:27:34 +02:00
commit 52f92a0190
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/CMessage.cpp
View File

@ -1,3 +1,13 @@
/*
* CMessage.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "CMessage.h"
@ -13,17 +23,6 @@
#include "CBitmapHandler.h"
#include "gui/CIntObjectClasses.h"
/*
* CMessage.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
const int COMPONENT_TO_SUBTITLE = 17;
const int BETWEEN_COMPS_ROWS = 10;
const int BEFORE_COMPONENTS = 30;
const int BETWEEN_COMPS = 30;

23
client/mapHandler.cpp
View File

@ -1,3 +1,13 @@
/*
* mapHandler.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
#include "StdInc.h"
#include "mapHandler.h"
@ -19,19 +29,6 @@
#include "CMT.h"
#include "../lib/CRandomGenerator.h"
/*
* mapHandler.cpp, part of VCMI engine
*
* Authors: listed in file AUTHORS in main folder
*
* License: GNU General Public License v2.0 or later
* Full text of license available in license.txt file, in main folder
*
*/
const bool MARK_BLOCKED_POSITIONS = false;
const bool MARK_VISITABLE_POSITIONS = false;
#define ADVOPT (conf.go()->ac)
std::string nameFromType (int typ)

3
client/mapHandler.h
View File

@ -102,9 +102,6 @@ public:
mutable std::map<const CGObjectInstance*, ui8> animationPhase;
static const bool MARK_BLOCKED_POSITIONS;
static const bool MARK_VISITABLE_POSITIONS;
CMapHandler(); //c-tor
~CMapHandler(); //d-tor