Mercurial > hg > openttd

diff src/ship_cmd.cpp @ 9628:f1d95c5d5553 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r13691) -Codechange: make it easier to determine whether a command is ran in the context of autoreplace or not
author smatz <smatz@openttd.org>
date Wed, 09 Jul 2008 20:55:47 +0000 (2008-07-09)
parents 8622c9315e8c
children 29d461128c75
line wrap: on
line diff
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -748,7 +748,7 @@
  * @param tile tile of depot where ship is built
  * @param flags type of operation
  * @param p1 ship type being built (engine)
- * @param p2 bit 0 when set, the unitnumber will be 0, otherwise it will be a free number
+ * @param p2 unused
  */
 CommandCost CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
 {
@@ -766,7 +766,7 @@
 	if (!IsShipDepotTile(tile)) return CMD_ERROR;
 	if (!IsTileOwner(tile, _current_player)) return CMD_ERROR;
 
-	unit_num = HasBit(p2, 0) ? 0 : GetFreeUnitNumber(VEH_SHIP);
+	unit_num = (flags & DC_AUTOREPLACE) ? 0 : GetFreeUnitNumber(VEH_SHIP);
 
 	if (!Vehicle::AllocateList(NULL, 1) || unit_num > _settings_game.vehicle.max_ships)
 		return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);