Author: sveinung
Date: Sat Mar 21 21:47:08 2015
New Revision: 28596

URL: http://svn.gna.org/viewcvs/freeciv?rev=28596&view=rev
Log:
Make founding and joining cities action enabler controlled.

To keep the size of this patch manageable all it does is to introduce the
action enablers and move the unit type flags "Cities" and "AddToCity" to the
rule set. All other rules, explanations and consequences remain hard coded.

Requested by Marko Lindqvist <cazfi>

See patch #5606

Modified:
    trunk/ai/default/advdomestic.c
    trunk/ai/default/aidiplomat.c
    trunk/ai/default/aisettler.c
    trunk/client/control.c
    trunk/client/gui-gtk-2.0/action_dialog.c
    trunk/client/gui-gtk-2.0/menu.c
    trunk/client/gui-gtk-3.0/action_dialog.c
    trunk/client/gui-gtk-3.0/menu.c
    trunk/client/gui-qt/dialogs.cpp
    trunk/client/gui-qt/menu.cpp
    trunk/client/gui-sdl/action_dialog.c
    trunk/client/gui-sdl2/action_dialog.c
    trunk/client/gui-xaw/action_dialog.c
    trunk/client/helpdata.c
    trunk/client/mapview_common.c
    trunk/client/packhand.c
    trunk/common/actions.c
    trunk/common/actions.h
    trunk/common/aicore/aisupport.c
    trunk/common/packets.def
    trunk/common/unit.c
    trunk/common/unitlist.c
    trunk/common/unittype.c
    trunk/common/unittype.h
    trunk/data/Freeciv.in
    trunk/data/alien/game.ruleset
    trunk/data/alien/units.ruleset
    trunk/data/civ1/game.ruleset
    trunk/data/civ1/units.ruleset
    trunk/data/civ2/game.ruleset
    trunk/data/civ2/units.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/actiontools.c
    trunk/server/cityhand.c
    trunk/server/report.c
    trunk/server/rscompat.c
    trunk/server/ruleset.c
    trunk/server/unithand.c
    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/advdomestic.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/advdomestic.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/ai/default/aidiplomat.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aidiplomat.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/ai/default/aisettler.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aisettler.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/client/control.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=28596&r1=28595&r2=28596&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=28596&r1=28595&r2=28596&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=28596&r1=28595&r2=28596&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=28596&r1=28595&r2=28596&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=28596&r1=28595&r2=28596&view=diff

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

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

Modified: trunk/client/gui-sdl/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/action_dialog.c?rev=28596&r1=28595&r2=28596&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=28596&r1=28595&r2=28596&view=diff

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

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

Modified: trunk/client/mapview_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/mapview_common.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=28596&r1=28595&r2=28596&view=diff

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

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

Modified: trunk/common/aicore/aisupport.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/aisupport.c?rev=28596&r1=28595&r2=28596&view=diff

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

Modified: trunk/common/unit.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/common/unitlist.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unitlist.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/common/unittype.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/common/unittype.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/data/Freeciv.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/Freeciv.in?rev=28596&r1=28595&r2=28596&view=diff

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

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

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

Modified: trunk/data/civ1/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=28596&r1=28595&r2=28596&view=diff

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

Modified: trunk/data/civ2/units.ruleset
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/units.ruleset?rev=28596&r1=28595&r2=28596&view=diff

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/server/actiontools.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/actiontools.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/server/cityhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityhand.c?rev=28596&r1=28595&r2=28596&view=diff

Modified: trunk/server/report.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/report.c?rev=28596&r1=28595&r2=28596&view=diff

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

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

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

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

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


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

Reply via email to