~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/map_objects/tribes/ship.cc

Committer: fios at foramnagaidhlig
Date: 2016-03-04 06:19:34 UTC
mfrom: (7850.1.3 bug-1395278-logic3)
Revision ID: fios@foramnagaidhlig.net-20160304061934-zdwvrpq7tjfi1yo6

Refactored remaining member variable names in src/logic.

Merged lp:~widelands-dev/widelands/bug-1395278-logic3

files modified:
src/game_io/game_cmd_queue_packet.cc

src/game_io/game_loader.cc

src/game_io/game_loader.h

src/game_io/game_saver.cc

src/game_io/game_saver.h

src/logic/game.cc

src/logic/map.cc

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_revision.cc

src/logic/map_revision.h

src/logic/mapastar.h

src/logic/mapdifferenceregion.cc

src/logic/mapdifferenceregion.h

src/logic/mapfringeregion.cc

src/logic/mapfringeregion.h

src/logic/maphollowregion.cc

src/logic/maphollowregion.h

src/logic/mapregion.h

src/logic/maptriangleregion.cc

src/logic/maptriangleregion.h

src/logic/message_queue.h

src/logic/path.cc

src/logic/player.cc

src/logic/replay.cc

src/map_io/map_version_packet.cc

Show diffs side-by-side

added added

removed removed

src/logic/map_objects/tribes/ship.cc

748

uint32_t Ship::calculate_sea_route(Game& game, PortDock& pd, Path* finalpath) {

749

Map& map = game.map();

750

StepEvalAStar se(pd.get_warehouse()->get_position());

751

se.m_swim = true;

752

se.m_conservative = false;

753

se.m_estimator_bias = -5 * map.calc_cost(0);

751

se.swim_ = true;

752

se.conservative_ = false;

753

se.estimator_bias_ = -5 * map.calc_cost(0);

754

755

MapAStar<StepEvalAStar> astar(map, se);

756

Older »