~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/immovable.cc

Committer: fios at foramnagaidhlig
Date: 2015-11-11 09:52:55 UTC
mto: This revision was merged to the branch mainline in revision 7621.
Revision ID: fios@foramnagaidhlig.net-20151111095255-i2zzpgjv5qw3yart

Renamed WareIndex to DescriptionIndex.

files modified:
src/ai/ai_help_structs.h

src/ai/defaultai.cc

src/ai/defaultai.h

src/economy/economy.cc

src/economy/economy.h

src/economy/economy_data_packet.cc

src/economy/flag.cc

src/economy/flag.h

src/economy/idleworkersupply.cc

src/economy/idleworkersupply.h

src/economy/portdock.cc

src/economy/portdock.h

src/economy/request.cc

src/economy/request.h

src/economy/road.cc

src/economy/road.h

src/economy/supply.h

src/economy/ware_instance.cc

src/economy/ware_instance.h

src/economy/warehousesupply.h

src/economy/wares_queue.cc

src/economy/wares_queue.h

src/logic/bill_of_materials.h

src/logic/buildcost.cc

src/logic/buildcost.h

src/logic/building.cc

src/logic/building.h

src/logic/constructionsite.cc

src/logic/constructionsite.h

src/logic/description_maintainer.h

src/logic/dismantlesite.cc

src/logic/dismantlesite.h

src/logic/editor_game_base.cc

src/logic/expedition_bootstrap.cc

src/logic/expedition_bootstrap.h

src/logic/game.cc

src/logic/game.h

src/logic/immovable.cc

src/logic/immovable.h

src/logic/militarysite.cc

src/logic/militarysite.h

src/logic/partially_finished_building.cc

src/logic/partially_finished_building.h

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/production_program.cc

src/logic/production_program.h

src/logic/productionsite.cc

src/logic/productionsite.h

src/logic/ship.cc

src/logic/trainingsite.cc

src/logic/trainingsite.h

src/logic/tribes/tribe_descr.cc

src/logic/tribes/tribe_descr.h

src/logic/tribes/tribes.cc

src/logic/tribes/tribes.h

src/logic/ware_descr.cc

src/logic/ware_descr.h

src/logic/warehouse.cc

src/logic/warehouse.h

src/logic/warelist.cc

src/logic/warelist.h

src/logic/widelands.h

src/logic/worker.cc

src/logic/worker.h

src/logic/worker_descr.cc

src/logic/worker_descr.h

src/logic/worker_program.cc

src/logic/world/world.cc

src/logic/world/world.h

src/map_io/map_allowed_worker_types_packet.cc

src/map_io/map_building_packet.cc

src/map_io/map_buildingdata_packet.cc

src/map_io/map_players_view_packet.cc

src/map_io/s2map.cc

src/scripting/lua_bases.cc

src/scripting/lua_game.cc

src/scripting/lua_map.cc

src/wui/buildingwindow.cc

src/wui/encyclopedia_window.cc

src/wui/encyclopedia_window.h

src/wui/itemwaresdisplay.cc

src/wui/itemwaresdisplay.h

src/wui/portdockwaresdisplay.cc

src/wui/transport_ui.cc

src/wui/ware_statistics_menu.cc

src/wui/ware_statistics_menu.h

src/wui/warehousewindow.cc

src/wui/waresdisplay.cc

src/wui/waresdisplay.h

src/wui/waresqueuedisplay.h

Show diffs side-by-side

added added

removed removed

src/logic/immovable.cc

693

if (packet_version < 7) {

694

name = tribes_lookup_table.lookup_immovable(owner_type, name);

695

}

696

const WareIndex idx = egbase.tribes().immovable_index(name);

696

const DescriptionIndex idx = egbase.tribes().immovable_index(name);

697

if (idx != Widelands::INVALID_INDEX) {

698

imm = new Immovable(*egbase.tribes().get_immovable_descr(idx));

699

} else {

703

} else { // world immovable

704

const World & world = egbase.world();

705

name = world_lookup_table.lookup_immovable(name);

706

const WareIndex idx = world.get_immovable_index(name.c_str());

706

const DescriptionIndex idx = world.get_immovable_index(name.c_str());

707

if (idx == Widelands::INVALID_INDEX) {

708

throw GameDataError

709

("world does not define immovable type \"%s\"", name.c_str());

1172

1173

* If the immovable is not currently in construction mode, return \c false.

1174

1175

bool Immovable::construct_ware(Game & game, WareIndex index)

1175

bool Immovable::construct_ware(Game & game, DescriptionIndex index)

1176

{

1177

ActConstructionData * d = get_action_data<ActConstructionData>();

1178

if (!d)

1325

* We are the destination of the given ware's transfer, which is not associated

1326

* with any request.

1327

1328

void PlayerImmovable::receive_ware(Game &, WareIndex ware)

1328

void PlayerImmovable::receive_ware(Game &, DescriptionIndex ware)

1329

{

1330

throw wexception

1331

("MO(%u): Received a ware(%u), do not know what to do with it",

Older »