Freeciv

There's an even better -- but more sweeping -- change which could be done: use the govt+ruleset+buildings to decide if the diplomat actually poses a threat. Attached is a patch which does that arguably more correct enhancement, but I can see a very good argument that first we fix the bug back to the original's intent, which is the first patch.

Sweet Tea Dorminy wrote in #note-1:

There's an even better -- but more sweeping -- change which could be done: use the govt+ruleset+buildings to decide if the diplomat actually poses a threat. Attached is a patch which does that arguably more correct enhancement, but I can see a very good argument that first we fix the bug back to the original's intent, which is the first patch.

I doubt the original intent was to rely on UTYF_DIPLOMAT, which we sort of should be getting rid of now that we have (action) enablers. In the contrary, the intention (causing the bug) likely was to generalize away from UTYF_DIPLOMAT towards depending on action enablers. So, I'd work with the second patch.

- Function header starts from the same line the previous function ends ( "}/***" )
- There's extra empty lines in the end

Bleh. Sorry about the formatting. Anyway, makes sense, fixed up the second version (also See RM etc.) -- thanks!

Ugh, apologies, attached exactly the same thing in #3. Actually fixed this time.