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

Fixed clang warnings.

Browse Source
This commit is contained in:
Frank Zago
2012-06-07 03:08:38 +00:00
parent bc4f856bfc
commit 9fc459b5c8
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CGameState.cpp
View File

@@ -2812,7 +2812,6 @@ void CPathfinder::calculatePaths(int3 src /*= int3(-1,-1,-1)*/, int movement /*=
useEmbarkCost = 0; //0 - usual movement; 1 - embark; 2 - disembark useEmbarkCost = 0; //0 - usual movement; 1 - embark; 2 - disembark
int moveAtNextTile = movement;
int turnAtNextTile = turn; int turnAtNextTile = turn;
@@ -2846,7 +2845,7 @@ void CPathfinder::calculatePaths(int3 src /*= int3(-1,-1,-1)*/, int movement /*=
{ {
//occurs rarely, when hero with low movepoints tries to leave the road //occurs rarely, when hero with low movepoints tries to leave the road
turnAtNextTile++; turnAtNextTile++;
moveAtNextTile = hero->maxMovePoints(cp->land); int moveAtNextTile = hero->maxMovePoints(cp->land);
cost = gs->getMovementCost(hero, cp->coord, dp->coord, moveAtNextTile); //cost must be updated, movement points changed :( cost = gs->getMovementCost(hero, cp->coord, dp->coord, moveAtNextTile); //cost must be updated, movement points changed :(
remains = moveAtNextTile - cost; remains = moveAtNextTile - cost;
} }

4
lib/map.cpp
View File

@@ -958,7 +958,7 @@ void Mapa::readRumors( const ui8 * bufor, int &i)
void Mapa::readHeader( const ui8 * bufor, int &i) void Mapa::readHeader( const ui8 * bufor, int &i)
{ {
//reading allowed heroes (20 bytes) //reading allowed heroes (20 bytes)
int ist = i; //starting i for loop int ist;
ui8 disp = 0; ui8 disp = 0;
if(version>=SoD) if(version>=SoD)
@@ -2209,4 +2209,4 @@ bool TerrainTile::hasFavourableWinds() const
bool TerrainTile::isWater() const bool TerrainTile::isWater() const
{ {
return tertype == water; return tertype == water;
} }