~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/playercommand.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/playercommand.cc

1124

CmdSetWarePriority::CmdSetWarePriority

1125

(const int32_t _duetime, const PlayerNumber _sender,

1126

PlayerImmovable & imm,

1127

const int32_t type, const WareIndex index, const int32_t priority)

1127

const int32_t type, const DescriptionIndex index, const int32_t priority)

1128

1129

PlayerCommand(_duetime, _sender),

1130

m_serial (imm.serial()),

1203

CmdSetWareMaxFill::CmdSetWareMaxFill

1204

(const int32_t _duetime, const PlayerNumber _sender,

1205

PlayerImmovable & imm,

1206

const WareIndex index, const uint32_t max_fill)

1206

const DescriptionIndex index, const uint32_t max_fill)

1207

1208

PlayerCommand(_duetime, _sender),

1209

m_serial (imm.serial()),

1275

1276

CmdChangeTargetQuantity::CmdChangeTargetQuantity

1277

(const int32_t _duetime, const PlayerNumber _sender,

1278

const uint32_t _economy, const WareIndex _ware_type)

1278

const uint32_t _economy, const DescriptionIndex _ware_type)

1279

1280

PlayerCommand(_duetime, _sender),

1281

m_economy (_economy), m_ware_type(_ware_type)

1321

CmdSetWareTargetQuantity::CmdSetWareTargetQuantity

1322

(const int32_t _duetime, const PlayerNumber _sender,

1323

const uint32_t _economy,

1324

const WareIndex _ware_type,

1324

const DescriptionIndex _ware_type,

1325

const uint32_t _permanent)

1326

1327

CmdChangeTargetQuantity(_duetime, _sender, _economy, _ware_type),

1383

CmdResetWareTargetQuantity::CmdResetWareTargetQuantity

1384

(const int32_t _duetime, const PlayerNumber _sender,

1385

const uint32_t _economy,

1386

const WareIndex _ware_type)

1386

const DescriptionIndex _ware_type)

1387

1388

CmdChangeTargetQuantity(_duetime, _sender, _economy, _ware_type)

1389

{}

1439

CmdSetWorkerTargetQuantity::CmdSetWorkerTargetQuantity

1440

(const int32_t _duetime, const PlayerNumber _sender,

1441

const uint32_t _economy,

1442

const WareIndex _ware_type,

1442

const DescriptionIndex _ware_type,

1443

const uint32_t _permanent)

1444

1445

CmdChangeTargetQuantity(_duetime, _sender, _economy, _ware_type),

1501

CmdResetWorkerTargetQuantity::CmdResetWorkerTargetQuantity

1502

(const int32_t _duetime, const PlayerNumber _sender,

1503

const uint32_t _economy,

1504

const WareIndex _ware_type)

1504

const DescriptionIndex _ware_type)

1505

1506

CmdChangeTargetQuantity(_duetime, _sender, _economy, _ware_type)

1507

{}

1895

/*** struct Cmd_SetStockPolicy ***/

1896

CmdSetStockPolicy::CmdSetStockPolicy

1897

(int32_t time, PlayerNumber p,

1898

Warehouse & wh, bool isworker, WareIndex ware,

1898

Warehouse & wh, bool isworker, DescriptionIndex ware,

1899

Warehouse::StockPolicy policy)

1900

: PlayerCommand(time, p)

1901

{

1967

{

1968

m_warehouse = des.unsigned_32();

1969

m_isworker = des.unsigned_8();

1970

m_ware = WareIndex(des.unsigned_8());

1970

m_ware = DescriptionIndex(des.unsigned_8());

1971

m_policy = static_cast<Warehouse::StockPolicy>(des.unsigned_8());

1972

}

1973

1992

PlayerCommand::read(fr, egbase, mol);

1993

m_warehouse = fr.unsigned_32();

1994

m_isworker = fr.unsigned_8();

1995

m_ware = WareIndex(fr.unsigned_8());

1995

m_ware = DescriptionIndex(fr.unsigned_8());

1996

m_policy = static_cast<Warehouse::StockPolicy>(fr.unsigned_8());

1997

} else {

1998

throw UnhandledVersionError("CmdSetStockPolicy",

Older »