From 05a34fb417f8ac5ddc9c222bd1ef9c39fd2ff2cd Mon Sep 17 00:00:00 2001 From: ArseniyShestakov Date: Sun, 6 Dec 2015 02:23:41 +0300 Subject: [PATCH] Use "Favorable" instead of "Favourable" everywhere for consistency Original game of course used american english version so we stick to it. --- client/mapHandler.cpp | 2 +- lib/BattleState.cpp | 2 +- lib/CGameState.cpp | 2 +- lib/CPathfinder.cpp | 2 +- lib/GameConstants.h | 4 ++-- lib/mapping/CMap.cpp | 2 +- lib/mapping/CMapDefines.h | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/mapHandler.cpp b/client/mapHandler.cpp index e50d4a959..28ae41067 100644 --- a/client/mapHandler.cpp +++ b/client/mapHandler.cpp @@ -1576,7 +1576,7 @@ void CMapHandler::getTerrainDescr( const int3 &pos, std::string & out, bool terN } } - if(t.hasFavourableWinds()) + if(t.hasFavorableWinds()) out = CGI->objtypeh->getObjectName(Obj::FAVORABLE_WINDS); else if(terName) { diff --git a/lib/BattleState.cpp b/lib/BattleState.cpp index e0cf02c99..e7a0d4783 100644 --- a/lib/BattleState.cpp +++ b/lib/BattleState.cpp @@ -719,7 +719,7 @@ BattlefieldBI::BattlefieldBI BattleInfo::battlefieldTypeToBI(BFieldType bfieldTy {BFieldType::CLOVER_FIELD, BattlefieldBI::CLOVER_FIELD}, {BFieldType::CURSED_GROUND, BattlefieldBI::CURSED_GROUND}, {BFieldType::EVIL_FOG, BattlefieldBI::EVIL_FOG}, - {BFieldType::FAVOURABLE_WINDS, BattlefieldBI::NONE}, + {BFieldType::FAVORABLE_WINDS, BattlefieldBI::NONE}, {BFieldType::FIERY_FIELDS, BattlefieldBI::FIERY_FIELDS}, {BFieldType::HOLY_GROUND, BattlefieldBI::HOLY_GROUND}, {BFieldType::LUCID_POOLS, BattlefieldBI::LUCID_POOLS}, diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp index 505b78133..1fb50596d 100644 --- a/lib/CGameState.cpp +++ b/lib/CGameState.cpp @@ -1939,7 +1939,7 @@ BFieldType CGameState::battleGetBattlefieldType(int3 tile) case Obj::EVIL_FOG: return BFieldType::EVIL_FOG; case Obj::FAVORABLE_WINDS: - return BFieldType::FAVOURABLE_WINDS; + return BFieldType::FAVORABLE_WINDS; case Obj::FIERY_FIELDS: return BFieldType::FIERY_FIELDS; case Obj::HOLY_GROUNDS: diff --git a/lib/CPathfinder.cpp b/lib/CPathfinder.cpp index 2af70b48a..b59e30e00 100644 --- a/lib/CPathfinder.cpp +++ b/lib/CPathfinder.cpp @@ -987,7 +987,7 @@ int CPathfinderHelper::getMovementCost(const CGHeroInstance * h, const int3 & sr } else if(dt->terType == ETerrainType::WATER) { - if(h->boat && ct->hasFavourableWinds() && dt->hasFavourableWinds()) //Favourable Winds + if(h->boat && ct->hasFavorableWinds() && dt->hasFavorableWinds()) ret *= 0.666; else if(!h->boat && ti->hasBonusOfType(Bonus::WATER_WALKING)) { diff --git a/lib/GameConstants.h b/lib/GameConstants.h index ad13b9a7c..6756e6689 100644 --- a/lib/GameConstants.h +++ b/lib/GameConstants.h @@ -837,10 +837,10 @@ public: // 1. sand/shore 2. sand/mesas 3. dirt/birches 4. dirt/hills 5. dirt/pines 6. grass/hills 7. grass/pines //8. lava 9. magic plains 10. snow/mountains 11. snow/trees 12. subterranean 13. swamp/trees 14. fiery fields //15. rock lands 16. magic clouds 17. lucid pools 18. holy ground 19. clover field 20. evil fog - //21. "favourable winds" text on magic plains background 22. cursed ground 23. rough 24. ship to ship 25. ship + //21. "favorable winds" text on magic plains background 22. cursed ground 23. rough 24. ship to ship 25. ship enum EBFieldType {NONE = -1, NONE2, SAND_SHORE, SAND_MESAS, DIRT_BIRCHES, DIRT_HILLS, DIRT_PINES, GRASS_HILLS, GRASS_PINES, LAVA, MAGIC_PLAINS, SNOW_MOUNTAINS, SNOW_TREES, SUBTERRANEAN, SWAMP_TREES, FIERY_FIELDS, - ROCKLANDS, MAGIC_CLOUDS, LUCID_POOLS, HOLY_GROUND, CLOVER_FIELD, EVIL_FOG, FAVOURABLE_WINDS, CURSED_GROUND, + ROCKLANDS, MAGIC_CLOUDS, LUCID_POOLS, HOLY_GROUND, CLOVER_FIELD, EVIL_FOG, FAVORABLE_WINDS, CURSED_GROUND, ROUGH, SHIP_TO_SHIP, SHIP }; diff --git a/lib/mapping/CMap.cpp b/lib/mapping/CMap.cpp index ddc620332..cdf968035 100644 --- a/lib/mapping/CMap.cpp +++ b/lib/mapping/CMap.cpp @@ -158,7 +158,7 @@ EDiggingStatus TerrainTile::getDiggingStatus(const bool excludeTop) const return EDiggingStatus::CAN_DIG; } -bool TerrainTile::hasFavourableWinds() const +bool TerrainTile::hasFavorableWinds() const { return extTileFlags & 128; } diff --git a/lib/mapping/CMapDefines.h b/lib/mapping/CMapDefines.h index 77f9bf0be..aff08b444 100644 --- a/lib/mapping/CMapDefines.h +++ b/lib/mapping/CMapDefines.h @@ -72,7 +72,7 @@ struct DLL_LINKAGE TerrainTile bool isWater() const; bool isCoastal() const; EDiggingStatus getDiggingStatus(const bool excludeTop = true) const; - bool hasFavourableWinds() const; + bool hasFavorableWinds() const; ETerrainType terType; ui8 terView; @@ -81,7 +81,7 @@ struct DLL_LINKAGE TerrainTile ERoadType::ERoadType roadType; ui8 roadDir; /// first two bits - how to rotate terrain graphic (next two - river graphic, next two - road); - /// 7th bit - whether tile is coastal (allows disembarking if land or block movement if water); 8th bit - Favourable Winds effect + /// 7th bit - whether tile is coastal (allows disembarking if land or block movement if water); 8th bit - Favorable Winds effect ui8 extTileFlags; bool visitable; bool blocked;