games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

Compile fix. Keep StdInc consistent.

Browse Source
This commit is contained in:
DjWarmonger
2012-11-21 09:13:33 +00:00
parent 53169abea7
commit 9d68b9d58d
9 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/CBattleCallback.cpp
View File

@@ -1289,6 +1289,7 @@ AttackableTiles CBattleInfoCallback::getPotentiallyAttackableHexes(const CStack*
const int WN = GameConstants::BFIELD_WIDTH; const int WN = GameConstants::BFIELD_WIDTH;
ui16 hex = (attackerPos != BattleHex::INVALID) ? attackerPos.hex : attacker->position.hex; //real or hypothetical (cursor) position ui16 hex = (attackerPos != BattleHex::INVALID) ? attackerPos.hex : attacker->position.hex; //real or hypothetical (cursor) position
//FIXME: dragons or cerbers can rotate before attack, making their base hex different (#1124)
if (attacker->hasBonusOfType(Bonus::ATTACKS_ALL_ADJACENT)) if (attacker->hasBonusOfType(Bonus::ATTACKS_ALL_ADJACENT))
{ {
boost::copy(attacker->getSurroundingHexes(attackerPos), vstd::set_inserter(at.hostileCreaturePositions)); boost::copy(attacker->getSurroundingHexes(attackerPos), vstd::set_inserter(at.hostileCreaturePositions));

1
lib/Map/CMap.cpp
View File

@@ -1,3 +1,4 @@
#include "StdInc.h"
#include "CMap.h" #include "CMap.h"
#include "../CArtHandler.h" #include "../CArtHandler.h"

2
lib/Map/CMap.h
View File

@@ -11,8 +11,6 @@
#pragma once #pragma once
#include "StdInc.h"
#include "../ConstTransitivePtr.h" #include "../ConstTransitivePtr.h"
#include "../CObjectHandler.h" #include "../CObjectHandler.h"
#include "../ResourceSet.h" #include "../ResourceSet.h"

1
lib/Map/CMapInfo.cpp
View File

@@ -1,3 +1,4 @@
#include "StdInc.h"
#include "CMapInfo.h" #include "CMapInfo.h"
#include "../StartInfo.h" #include "../StartInfo.h"

2
lib/Map/CMapInfo.h
View File

@@ -1,7 +1,5 @@
#pragma once #pragma once
#include "StdInc.h"
// Forward class declarations aren't enough here. The compiler // Forward class declarations aren't enough here. The compiler
// generated CMapInfo d-tor, generates the unique_ptr d-tor as well here // generated CMapInfo d-tor, generates the unique_ptr d-tor as well here
// as a inline method. The unique_ptr d-tor requires a complete type. Defining // as a inline method. The unique_ptr d-tor requires a complete type. Defining

1
lib/Map/CMapService.cpp
View File

@@ -1,3 +1,4 @@
#include "StdInc.h"
#include "CMapService.h" #include "CMapService.h"
#include "../Filesystem/CResourceLoader.h" #include "../Filesystem/CResourceLoader.h"

2
lib/Map/CMapService.h
View File

@@ -11,8 +11,6 @@
#pragma once #pragma once
#include "StdInc.h"
class CMap; class CMap;
class CMapHeader; class CMapHeader;
class CInputStream; class CInputStream;

1
lib/RMG/CMapGenOptions.cpp
View File

@@ -1,3 +1,4 @@
#include "StdInc.h"
#include "CMapGenOptions.h" #include "CMapGenOptions.h"
CMapGenOptions::CMapGenOptions() : width(72), height(72), hasTwoLevels(true), CMapGenOptions::CMapGenOptions() : width(72), height(72), hasTwoLevels(true),

2
lib/RMG/CMapGenOptions.h
View File

@@ -11,8 +11,6 @@
#pragma once #pragma once
#include "StdInc.h"
namespace EWaterContent namespace EWaterContent
{ {
enum EWaterContent enum EWaterContent