Author: sveinung
Date: Thu Nov 12 15:53:52 2015
New Revision: 30568

URL: http://svn.gna.org/viewcvs/freeciv?rev=30568&view=rev
Log:
Make unit disbanding action enabler controlled

"Disband Unit" action enabler rules controls the player ordering a unit to
disband without getting anything in return. The unit type flag
Undisbandable still has hard coded control over who the game won't try to
auto disband to save a city and who it will work extra hard to save from
drowning.

Patch #6536 temporarily broke the client's ability to order a unit to
disband when Recycle Unit is illegal but the player don't have enough
information to know that it is. This patch makes it possible again.

Patch #6389 temporarily made it impossible to put a non "Recycle Unit"
disband order in a units orders. This patch makes it possible again.

See patch #6573

Modified:
    trunk/ai/default/aicity.c
    trunk/client/control.c
    trunk/client/gui-gtk-2.0/action_dialog.c
    trunk/client/gui-gtk-2.0/citydlg.c
    trunk/client/gui-gtk-2.0/dialogs.c
    trunk/client/gui-gtk-2.0/menu.c
    trunk/client/gui-gtk-3.0/action_dialog.c
    trunk/client/gui-gtk-3.0/citydlg.c
    trunk/client/gui-gtk-3.0/dialogs.c
    trunk/client/gui-gtk-3.0/menu.c
    trunk/client/gui-qt/citydlg.cpp
    trunk/client/gui-qt/dialogs.cpp
    trunk/client/gui-qt/menu.cpp
    trunk/client/gui-sdl2/action_dialog.c
    trunk/client/helpdata.c
    trunk/client/repodlgs_common.c
    trunk/client/text.c
    trunk/common/actions.c
    trunk/common/actions.h
    trunk/common/packets.def
    trunk/data/alien/game.ruleset
    trunk/data/alien/units.ruleset
    trunk/data/civ1/game.ruleset
    trunk/data/civ2/game.ruleset
    trunk/data/civ2civ3/game.ruleset
    trunk/data/civ2civ3/units.ruleset
    trunk/data/classic/game.ruleset
    trunk/data/classic/units.ruleset
    trunk/data/experimental/game.ruleset
    trunk/data/experimental/units.ruleset
    trunk/data/multiplayer/game.ruleset
    trunk/data/multiplayer/units.ruleset
    trunk/data/stub/units.ruleset
    trunk/doc/README.actions
    trunk/fc_version
    trunk/server/advisors/advdata.c
    trunk/server/rscompat.c
    trunk/server/ruleset.c
    trunk/server/unithand.c
    trunk/server/unithand.h
    trunk/server/unittools.c
    trunk/tools/ruledit/rulesave.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/ai/default/aicity.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/control.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/citydlg.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-2.0/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/dialogs.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-3.0/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/helpdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/repodlgs_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/repodlgs_common.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/client/text.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/text.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/common/actions.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/common/actions.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/common/packets.def
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/alien/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/alien/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/civ1/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/civ2/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/civ2civ3/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/civ2civ3/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/classic/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/classic/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/experimental/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/experimental/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/multiplayer/game.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/multiplayer/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/data/stub/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/stub/units.ruleset?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/doc/README.actions
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.actions?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/advisors/advdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/advdata.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/rscompat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/unithand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/unithand.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.h?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/server/unittools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=30568&r1=30567&r2=30568&view=diff

Modified: trunk/tools/ruledit/rulesave.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=30568&r1=30567&r2=30568&view=diff


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to