Author: sveinung
Date: Mon Jun 6 06:43:25 2016
New Revision: 32795
URL: http://svn.gna.org/viewcvs/freeciv?rev=32795&view=rev
Log:
Forced actions as data (internally).
Add the new bit vector blocked_by to the action structure. It lists all
actions that, if legal, will make the action illegal. This replaces the old
force action semantics internally.
Populate each action's blocked_by with the actions that, when forced, blocks
it. Some actions are forced depending on ruleset settings. Others are hard
coded to always be forced. This data replaces the checks hard coded for each
potentially blocked action.
Some actions can block regular attacks. Regular attacks aren't action
enabler controlled yet. Leave code and data required to keep this working
alone.
The ruleset format remains unchanged. One reason for this is that
generalized actions aren't done yet. Action definitions would give a false
impression to ruleset authors. Another is that the regular attack action
isn't action enabler controlled. A third reason is to limit the scope of
this patch.
See patch #7242
Modified:
trunk/client/packhand.c
trunk/common/actions.c
trunk/common/actions.h
trunk/common/packets.def
trunk/fc_version
trunk/server/rssanity.c
trunk/server/ruleset.c
trunk/tools/ruleutil/rulesave.c
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/client/packhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/packhand.c?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/common/actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/common/actions.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/common/packets.def
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=32795&r1=32794&r2=32795&view=diff
Modified: trunk/tools/ruleutil/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/rulesave.c?rev=32795&r1=32794&r2=32795&view=diff
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
