[Freeciv-Dev] [patch #1462] rename astr_cut_lines() to my_cut_lines()

2010-02-11 Thread Matthias Pfafferodt

Follow-up Comment #2, patch #1462 (project freeciv):

I should have done this yesterday after I dedded a comment to the wiki.
Search  replace patch attached ...

(file #8044)
___

Additional Item Attachment:

File name:
version2-trunk-rename-astr_cut_lines-to-fc_break_lines-and-use.patch Size:34
KB


___

Reply to this item at:

  http://gna.org/patch/?1462

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1464] cleanup ai_choice

2010-02-11 Thread Matthias Pfafferodt

Follow-up Comment #3, patch #1464 (project freeciv):

search  replace patch attached

(file #8045)
___

Additional Item Attachment:

File name: version2-trunk-cleanup-ai_choice.patch Size:26 KB


___

Reply to this item at:

  http://gna.org/patch/?1464

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #13848] [Patch] More detailed coding style guidelines

2010-02-11 Thread Matthias Pfafferodt

Follow-up Comment #7, bug #13848 (project freeciv):

update doc/CodingStyle

* based on patch by Madeline Book mbook
* including all comments since this patch:
  - no more than 2 empty lines
  - prefix 'fc_'
  - '_new' / '_destroy' to allocated / free pointer variables
  - '_init' / '_free' to (de)initialize static data
  - use macros defined in log.h; do not use assert() / die()
  - include the header corresponding to the current c source file last

for trunk (and S2_2?)

(file #8046)
___

Additional Item Attachment:

File name: 20100211-trunk-update-doc-CodingStyle.patch Size:20 KB


___

Reply to this item at:

  http://gna.org/bugs/?13848

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #13848] [Patch] More detailed coding style guidelines

2010-02-11 Thread Matthias Pfafferodt

Follow-up Comment #8, bug #13848 (project freeciv):

missed one comment wrt assert()

(file #8047)
___

Additional Item Attachment:

File name: version2-20100211-trunk-update-doc-CodingStyle.patch Size:20 KB


___

Reply to this item at:

  http://gna.org/bugs/?13848

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15324] Line feed not escaped in help text

2010-02-11 Thread Jacob Nevins

Update of bug #15324 (project freeciv):

  Status:None = In Progress


___

Reply to this item at:

  http://gna.org/bugs/?15324

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15324] Line feed not escaped in help text

2010-02-11 Thread Jacob Nevins

Update of bug #15324 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15324

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1459] Help: clarify which buildings/wonders help with military unhappiness

2010-02-11 Thread Jacob Nevins

Update of patch #1459 (project freeciv):

  Status:  Ready For Test = In Progress


___

Reply to this item at:

  http://gna.org/patch/?1459

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1459] Help: clarify which buildings/wonders help with military unhappiness

2010-02-11 Thread Jacob Nevins

Update of patch #1459 (project freeciv):

  Status: In Progress = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?1459

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15317] Confusing to refer to non-shield loss (e.g. corruption) as Waste

2010-02-11 Thread Jacob Nevins

Update of bug #15317 (project freeciv):

  Status:  Ready For Test = In Progress


___

Reply to this item at:

  http://gna.org/bugs/?15317

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15317] Confusing to refer to non-shield loss (e.g. corruption) as Waste

2010-02-11 Thread Jacob Nevins

Update of bug #15317 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15317

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15318] Confusion in UI between celebrating/rapture, disorder/revolt/revolution

2010-02-11 Thread Jacob Nevins

Update of bug #15318 (project freeciv):

  Status:  Ready For Test = In Progress
 Planned Release: = 2.2.0  


___

Reply to this item at:

  http://gna.org/bugs/?15318

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15318] Confusion in UI between celebrating/rapture, disorder/revolt/revolution

2010-02-11 Thread Jacob Nevins

Update of bug #15318 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15318

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15319] Military units don't make citizens quite unhappy enough

2010-02-11 Thread Jacob Nevins

Update of bug #15319 (project freeciv):

  Status:  Ready For Test = In Progress


___

Reply to this item at:

  http://gna.org/bugs/?15319

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15319] Military units don't make citizens quite unhappy enough

2010-02-11 Thread Jacob Nevins

Update of bug #15319 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 
 Release: = 2.1.11, 2.2.0-beta3


___

Reply to this item at:

  http://gna.org/bugs/?15319

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15319] Military units don't make citizens quite unhappy enough

2010-02-11 Thread Jacob Nevins

Update of bug #15319 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15319

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15319] Military units don't make citizens quite unhappy enough

2010-02-11 Thread Jacob Nevins

Update of bug #15319 (project freeciv):

 Release: = 2.1.11, 2.2.0-beta3


___

Reply to this item at:

  http://gna.org/bugs/?15319

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15332] missing initialization in send_city_info_at_tile() (found by valgrind)

2010-02-11 Thread Andreas

URL:
  http://gna.org/bugs/?15332

 Summary: missing initialization in send_city_info_at_tile()
(found by valgrind)
 Project: Freeciv
Submitted by: anbe
Submitted on: Thursday 02/11/2010 at 11:10
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_2
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

running freeciv-server (S2_2, r16785) in valgrind reveals the following
problem:

+verbose+
Conditional jump or move depends on uninitialised value(s)
   at 0x4C71A5: send_packet_city_info_100 (packets_gen.c:7176)
   by 0x4C811C: send_packet_city_info (packets_gen.c:7525)
   by 0x4C818C: lsend_packet_city_info (packets_gen.c:7533)
   by 0x446892: send_city_info_at_tile (citytools.c:1755)
   by 0x446696: send_all_known_cities (citytools.c:1666)
   by 0x407D5F: send_all_info (srv_main.c:414)
   by 0x40BFA6: srv_ready (srv_main.c:2384)
   by 0x40C1D9: srv_main (srv_main.c:2460)
   by 0x404867: main (civserver.c:359)
 Uninitialised value was created by a stack allocation
   at 0x4467D0: send_city_info_at_tile (citytools.c:1737)
-verbose-

This is caused by a missing initialization of
+verbose+
packet-migration_score
-verbose-
in the function send_city_info_at_tile() where this initialization should
occur between packet-turn_last_built and packet-changed_from_kind
(following the order of packets_gen.c)
(Also the order of initializing turn_founded and turn_last_built may be
swapped to better match packets_gen.c). 

If there is currently no real value available, the variable should be
initialized to some dummy (e.g. 0 or -1) for generating consistent packet
contents.

Andreas




___

Reply to this item at:

  http://gna.org/bugs/?15332

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15333] Natural city names should ignore hints for unknown terrain types

2010-02-11 Thread Jacob Nevins

URL:
  http://gna.org/bugs/?15333

 Summary: Natural city names should ignore hints for unknown
terrain types
 Project: Freeciv
Submitted by: jtn
Submitted on: Thursday 11/02/10 at 10:18
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

With the civ2 ruleset, the Aztec nation on S2_2 is currently giving the
following warning:

data/civ2/nations.ruleset [nation_aztec] cities: terrain lake not found;
skipping it.
last message repeated 2 times

This is presumably because some of its cities have lake as their terrain
hint (I think this came in in patch #1435), but that terrain doesn't exist in
the civ2 ruleset (only the default rules).

Since the terrain is only a hint, I think that terrain types unknown in the
current ruleset should just be ignored. This does mean that typos won't be
picked up, but the alternative is a continual source of warnings for
non-default rulesets and inability to add any new terrain types added to the
default ruleset.




___

Reply to this item at:

  http://gna.org/bugs/?15333

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1435] Aztec fixes

2010-02-11 Thread Jacob Nevins

Follow-up Comment #5, patch #1435 (project freeciv):

I've raised bug #15333 for dealing with the warnings. I'm unlikely to have
time to take a look myself soon.

___

Reply to this item at:

  http://gna.org/patch/?1435

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15332] missing initialization in send_city_info_at_tile() (found by valgrind)

2010-02-11 Thread Matthias Pfafferodt

Update of bug #15332 (project freeciv):

  Status:None = Ready For Test 
 Assigned to:None = syntron
 Planned Release: = 2.2.0  

___

Follow-up Comment #1:

Thanks for checking freeciv in valgrind!

As migration_score is only needed within the server, move it (and
mgr_score_calc_turn) to pcity-server. Patch attached.

(file #8048)
___

Additional Item Attachment:

File name: 20100211-trunk-S2_2-fix-uninitialized-migration_score.patch Size:3
KB


___

Reply to this item at:

  http://gna.org/bugs/?15332

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15323] server crash in tile_city() at common/tile.c:76

2010-02-11 Thread Andreas

Follow-up Comment #2, bug #15323 (project freeciv):

Tracking the bug further using valgrind reveals:


Conditional jump or move depends on uninitialised value(s)
   at 0x4334A6: aiferry_find_interested_city (aiferry.c:860)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
   by 0x4287E7: ai_manage_unit (aiunit.c:2256)
   by 0x428CDD: ai_manage_units (aiunit.c:2381)
   by 0x497491: ai_do_first_activities (aihand.c:436)
   by 0x408A43: ai_start_phase (srv_main.c:648)
   by 0x408ED2: begin_phase (srv_main.c:801)
   by 0x40B554: srv_running (srv_main.c:2049)
   by 0x40C1DE: srv_main (srv_main.c:2461)
   by 0x404867: main (civserver.c:359)
 Uninitialised value was created by a stack allocation
   at 0x433412: aiferry_find_interested_city (aiferry.c:838)


Use of uninitialised value of size 8
   at 0x511875: tile_city (tile.c:76)
   by 0x4334B7: aiferry_find_interested_city (aiferry.c:865)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
...

Conditional jump or move depends on uninitialised value(s)
   at 0x511882: tile_city (tile.c:78)
   by 0x4334B7: aiferry_find_interested_city (aiferry.c:865)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
...

Use of uninitialised value of size 8
   at 0x511888: tile_city (tile.c:78)
   by 0x4334B7: aiferry_find_interested_city (aiferry.c:865)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
...

Invalid read of size 8
   at 0x511888: tile_city (tile.c:78)
   by 0x4334B7: aiferry_find_interested_city (aiferry.c:865)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
...
 Address 0x70026 is not stack'd, malloc'd or (recently) free'd

Process terminating with default action of signal 11 (SIGSEGV): dumping core
 Access not within mapped region at address 0x70026
   at 0x511888: tile_city (tile.c:78)
   by 0x4334B7: aiferry_find_interested_city (aiferry.c:865)
   by 0x433C0F: ai_manage_ferryboat (aiferry.c:1077)
...


Another observation: the crash *only* occurs if the server is compiled with
--enable-debug=no otherwise also valgrind does not find any related
problems.

Looking in the code, it looks like the pf_map pfm in
aiferry_find_interested_city() is not properly initialized, because iterating
over the positions produces some invalid positions, the first valgrind error
corresponds to

if (pos.turn = turns_horizon)

in line 860 of aiferry.c where pos.turn was used but not initialized
previously.


Andreas


___

Reply to this item at:

  http://gna.org/bugs/?15323

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15336] Client allows observers to (try) initiate meeting

2010-02-11 Thread Marko Lindqvist

URL:
  http://gna.org/bugs/?15336

 Summary: Client allows observers to (try) initiate meeting
 Project: Freeciv
Submitted by: cazfi
Submitted on: Thursday 02/11/2010 at 16:48
Category: client
Severity: 2 - Minor
Priority: 1 - Later
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

From 2.2.0-beta2 server logs:
Received packet DIPLOMACY_INIT_MEETING_REQ from non-player connection xxx
from xxx (observer)





___

Reply to this item at:

  http://gna.org/bugs/?15336

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15337] Assertion `costwithout = costwith' failed

2010-02-11 Thread Marko Lindqvist

URL:
  http://gna.org/bugs/?15337

 Summary: Assertion `costwithout = costwith' failed
 Project: Freeciv
Submitted by: cazfi
Submitted on: Thursday 02/11/2010 at 16:54
Category: None
Severity: 3 - Normal
Priority: 1 - Later
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

From 2.2.0-beta2 server logs:
common/aicore/caravan.c:339:
wonder_benefit: Assertion `costwithout = costwith' failed.

This server was running with default ruleset.





___

Reply to this item at:

  http://gna.org/bugs/?15337

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15337] Assertion `costwithout = costwith' failed

2010-02-11 Thread Marko Lindqvist

Follow-up Comment #1, bug #15337 (project freeciv):

Got backtrace from another instance of the same assert failure:

(gdb) bt full
#0  0x7f4b9862d4b5 in *__GI_raise (sig=value optimized out)
at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
pid = value optimized out
selftid = value optimized out
#1  0x7f4b98630f50 in *__GI_abort () at abort.c:92
act = {__sigaction_handler = {sa_handler = 0x61df99, 
sa_sigaction = 0x61df99}, sa_mask = {__val = {139962656946408, 
  140736837226352, 339, 140736837226592, 139962656094662, 
  206158430232, 140736837226608, 140736837226384,
139962656005544, 
  206158430256, 140736837226632, 40063232, 2285632, 
  733634176081289574, 8607631710057668718, 140736837234106}}, 
  sa_flags = -1737303661, sa_restorer = 0x61de50}
sigs = {__val = {32, 0 repeats 15 times}}
#2  0x7f4b98626481 in *__GI___assert_fail (
assertion=0x61df99 costwithout = costwith, file=value optimized out,

line=339, function=0x61dfeb wonder_benefit) at assert.c:81
buf = 0x2635100 freeciv-server: common/aicore/caravan.c:339:
wonder_benefit: Assertion `costwithout = costwith' failed.\n
#3  0x0059650d in wonder_benefit (caravan=0x25a11d0, arrival_time=-1,

dest=0x233ca00, param=0x7fffd9309470)
at common/aicore/caravan.c:339
costwithout = 12
costwith = 16
shields_at_arrival = -1
__PRETTY_FUNCTION__ = wonder_benefit
#4  0x005966dd in get_discounted_reward (caravan=0x25a11d0, 
parameter=0x7fffd9309470, result=0x7fffd93091e0)
at common/aicore/caravan.c:396
trade = 0
windfall = 0
wonder = 1.607988422470021e-316
src = 0x1e383b0
dest = 0x233ca00
arrival_time = -1
discount = 0.94996
#5  0x00596bad in cfbdw_callback (vdata=0x7fffd93093a0, 
dest=0x233ca00, arrival_time=-1, moves_left=-1)
at common/aicore/caravan.c:538
data = 0x7fffd93093a0
current = {src = 0x1e383b0, dest = 0x233ca00, arrival_time = -1, 
  value = 0, help_wonder = false}
#6  0x0059615b in caravan_search_from (caravan=0x25a11d0, 
param=0x7fffd9309470, start_tile=0x1f0d660, turns_before=0, 
moves_left_before=3, callback=0x596b4f cfbdw_callback, 
callback_data=0x7fffd93093a0)
at common/aicore/caravan.c:195
pcity = 0x233ca00
__pf_map = 0x2634c00
pos = {tile = 0x1f09d00, turn = -1, moves_left = -1, fuel_left = -1,

  total_MC = 3, total_EC = 0, dir_to_next_pos = 4294967295, 
  dir_to_here = DIR8_NORTHEAST}
pfm = 0x2634c00
pfparam = {start_tile = 0x1f0d660, moves_left_initially = 3, 
  fuel_left_initially = 1, move_rate = 3, fuel = 1, owner = 0x9814f0,

  uclass = 0x979cb0, unit_flags = {
vec = \017\000\000\000\000\000\000}, omniscience = true, 
  turn_mode = TM_CAPPED, get_MC = 0x597f43 normal_move_unit, 
  unknown_MC = 6, get_TB = 0, get_EC = 0, can_invade_tile = 0, 
  get_zoc = 0, is_pos_dangerous = 0, get_moves_left_req = 0, 
  get_costs = 0, data = 0xaa}
end_time = 10
#7  0x00596cb6 in caravan_find_best_destination_withtransit (
caravan=0x25a11d0, param=0x7fffd9309470, src=0x1e383b0, turns_before=0, 
moves_left=3, result=0x7fffd9309440)
at common/aicore/caravan.c:571
start_tile = 0x1f0d660
data = {param = 0x7fffd9309470, caravan = 0x25a11d0, 
  best = 0x7fffd9309440}
#8  0x00596d36 in caravan_find_best_destination (caravan=0x25a11d0, 
parameter=0x7fffd9309470, result=0x7fffd9309440)
at common/aicore/caravan.c:590
src = 0x1e383b0
#9  0x0045a9a4 in ai_manage_caravan (pplayer=0x9814f0,
punit=0x25a11d0)
at ai/aiunit.c:1944
parameter = {horizon = 10, discount = 0.94996, 
  consider_windfall = true, consider_trade = true, 
  consider_wonders = true, account_for_broken_routes = true, 
  allow_foreign_trade = false, ignore_transit_time = false, 
  convert_trade = false, callback = 0, callback_data = 0xd93094b0}
result = {src = 0x1e383b0, dest = 0x1e383b0, arrival_time = -1, 
  value = 0, help_wonder = false}
__PRETTY_FUNCTION__ = ai_manage_caravan
#10 0x0045b718 in ai_manage_unit (pplayer=0x9814f0, punit=0x25a11d0)
at ai/aiunit.c:2245
bodyguard = 0x0
is_ferry = false
__PRETTY_FUNCTION__ = ai_manage_unit
#11 0x0045be07 in ai_manage_units (pplayer=0x9814f0)
at ai/aiunit.c:2381
punit = 0x25a11d0
punit_numbers = 0x7fffd9309510
punit_index = 0
punit_size = 34
#12 0x004e0557 in ai_do_first_activities (pplayer=0x9814f0)
at ai/aihand.c:436
No locals.
#13 0x00430110 in ai_start_phase ()
at server/srv_main.c:649
MY_i = 19
pplayer = 0x9814f0
#14 

[Freeciv-Dev] [bug #15339] expanding border changes ownership of occupied tile

2010-02-11 Thread Andreas

URL:
  http://gna.org/bugs/?15339

 Summary: expanding border changes ownership of occupied tile
 Project: Freeciv
Submitted by: anbe
Submitted on: Thursday 02/11/2010 at 16:58
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_2
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 

___

Details:

There are a few problems with the new border code:

 * the ownership of a tile where a unit (military, owned by me) resides may
be changed from Unclaimed Territory to an opponent
 * if you are at peace with the other player you have a military unit in his
territory which you usually couldn't have
 * if the enemy border grows by multiple tiles in one turn, the unit may even
be trapped inside his territory.

IMO a tile that is occupied by a military unit should not be allowed to
change ownership to an opponent.  One exception eventually for civil war
where a nation splits.


I can provide a savegame if neccessary.

Andreas




___

Reply to this item at:

  http://gna.org/bugs/?15339

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15325] Help: misc corrections to autogenerated help text, e.g. near for REQ_RANGE_ADJACENT

2010-02-11 Thread Jacob Nevins

Update of bug #15325 (project freeciv):

  Status:  Ready For Test = In Progress


___

Reply to this item at:

  http://gna.org/bugs/?15325

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15325] Help: misc corrections to autogenerated help text, e.g. near for REQ_RANGE_ADJACENT

2010-02-11 Thread Jacob Nevins

Update of bug #15325 (project freeciv):

  Status: In Progress = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15325

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15132] Civilopedia display matching image terrain, not just words

2010-02-11 Thread Jacob Nevins

Follow-up Comment #1, bug #15132 (project freeciv):

I think this could probably be done in the framework of the existing help
system, although it requires client-specific work.

One piece of information that's actually missing from the terrain help (at
least in the Gtk client) is what effect terrain specials actually have. This
usually isn't a problem, as if you're interested you can usually see an
example and click on it, but it should be fixed anyway. Could do that as part
of this bug, or raise a new bug.

I could have a look at this for the Gtk client (which I think is the
supported Windows client too). I'm not set up to work on the Win32 client,
and the Xaw client is in a bad state. (The SDL client has no help anyway.) I
don't know when I'd be able to look at this, though.

___

Reply to this item at:

  http://gna.org/bugs/?15132

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1401] [Metaticket] Improve in-game help for 2.2

2010-02-11 Thread Jacob Nevins

Update of patch #1401 (project freeciv):

 Summary: [Metaticket] Improve in-game help = [Metaticket]
Improve in-game help for 2.2


___

Reply to this item at:

  http://gna.org/patch/?1401

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1401] [Metaticket] Improve in-game help for 2.2

2010-02-11 Thread Jacob Nevins

Update of patch #1401 (project freeciv):

  Dependency Removed: = bugs #15132


___

Reply to this item at:

  http://gna.org/patch/?1401

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1401] [Metaticket] Improve in-game help for 2.2

2010-02-11 Thread Jacob Nevins

Update of patch #1401 (project freeciv):

 Planned Release: = 2.2.0  


___

Reply to this item at:

  http://gna.org/patch/?1401

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #14944] fogged borders are not restored from a savegame

2010-02-11 Thread pepeto

Update of bug #14944 (project freeciv):

 Planned Release:   2.2.0 =


___

Reply to this item at:

  http://gna.org/bugs/?14944

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15312] add check for ptile == NULL within map_colatitude()

2010-02-11 Thread Matthias Pfafferodt

Update of bug #15312 (project freeciv):

  Status:None = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15312

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15311] update definition of ice_base_colatitude

2010-02-11 Thread Matthias Pfafferodt

Update of bug #15311 (project freeciv):

  Status:None = Fixed  
 Open/Closed:Open = Closed 
 Planned Release:   2.2.0 = 2.2.0,2.1.12   


___

Reply to this item at:

  http://gna.org/bugs/?15311

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15310] fix creation of tropical temperature range

2010-02-11 Thread Matthias Pfafferodt

Update of bug #15310 (project freeciv):

  Status:None = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/bugs/?15310

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1465] simplify use of temperature map

2010-02-11 Thread Matthias Pfafferodt

URL:
  http://gna.org/patch/?1465

 Summary: simplify use of temperature map
 Project: Freeciv
Submitted by: syntron
Submitted on: Freitag 12.02.2010 um 00:58
Category: general
Priority: 3 - Low
  Status: None
 Privacy: Public
 Assigned to: syntron
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

* create the map only once
* destroy dummy map if a real one is needed

patch for S2_1 and S2_2 / trunk



___

File Attachments:


---
Date: Freitag 12.02.2010 um 00:58  Name:
20100212-S2_1-simplify-use-of-temperature-map-S2_1.patch  Size: 4kB   By:
syntron

http://gna.org/patch/download.php?file_id=8049
---
Date: Freitag 12.02.2010 um 00:58  Name:
20100212-S2_2-trunk-simplify-use-of-temperature-map.patch  Size: 4kB   By:
syntron

http://gna.org/patch/download.php?file_id=8050

___

Reply to this item at:

  http://gna.org/patch/?1465

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1466] Help: new sections Cities, Economy, Overview, other loose ends

2010-02-11 Thread Jacob Nevins

URL:
  http://gna.org/patch/?1466

 Summary: Help: new sections Cities, Economy, Overview, other
loose ends
 Project: Freeciv
Submitted by: jtn
Submitted on: Friday 12/02/10 at 02:22
Category: docs
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.2.0

___

Details:

Last substantial set of help changes:
* Add new sections Overview, Economy, and Cities (top-level so added to help
menus of all clients)
** Economy has subsections Food, Production, and Trade (including trade
routes)
* Rework Happiness section and move under Cities (hence remove from help
menus of clients)
* New subsection Pollution under Cities
* New subsections Villages and National Borders under Terrain
* Rework header text for City Improvements, Wonders of the World, and Units
with material from Cities wiki page
* A few tweaks to existing text, some hitting recently changed strings
(sorry):
** Move city-centers-are-special text from Terrain Alterations to new Cities
section and rework
** Add cross-references to new material
** Change square to tile (missed/reintroduced bits wrt patch #1370)
** Consistently avoid referring to production points specifically as
resources
** Remove some UK English spellings accidentally put in previously
* Unrelated changes
** Tweak Pillaging text
** Add some info on controls
** Document trick about Coinage and worklists I recently discovered

The vast majority of the changes are to data/helpdata.txt. Changes to code
are only for help menu tweaks (Gtk, Xaw, and Win32 client, although I only
compiled the first two and only tested the Gtk client).

Topics not covered: new 2.2 features plague and migration (neither enabled by
default).



___

File Attachments:


---
Date: Friday 12/02/10 at 02:22  Name: help-overview-cities-economy-etc.diff 
Size: 50kB   By: jtn
S2_2 r16810: last big help patch (also applies cleanly against trunk)
http://gna.org/patch/download.php?file_id=8051

___

Reply to this item at:

  http://gna.org/patch/?1466

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1401] [Metaticket] Improve in-game help for 2.2

2010-02-11 Thread Jacob Nevins

Update of patch #1401 (project freeciv):

  Depends on: = patch #1466


___

Reply to this item at:

  http://gna.org/patch/?1401

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15316] Refresh tutorial scenario for 2.2

2010-02-11 Thread Jacob Nevins

Update of bug #15316 (project freeciv):

  Status:None = Ready For Test 
 Planned Release: = 2.2.0  

___

Additional Item Attachment:

File name: tutorial-refresh.diff  Size:3 KB


___

Reply to this item at:

  http://gna.org/bugs/?15316

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1401] [Metaticket] Improve in-game help for 2.2

2010-02-11 Thread Jacob Nevins

Update of patch #1401 (project freeciv):

  Status: In Progress = Ready For Test 

___

Follow-up Comment #2:

That's it; all patches now in gna, will apply on Saturday afternoon if no
objections, this close this.

___

Reply to this item at:

  http://gna.org/patch/?1401

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15343] Help for terrain doesn't describe effect of specials

2010-02-11 Thread Jacob Nevins

URL:
  http://gna.org/bugs/?15343

 Summary: Help for terrain doesn't describe effect of
specials
 Project: Freeciv
Submitted by: jtn
Submitted on: Friday 12/02/10 at 03:25
Category: docs
Severity: 2 - Minor
Priority: 1 - Later
  Status: Ready For Test
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

As noted in bug #15132, one piece of information that's actually missing from
the terrain help is what effect terrain specials actually have on
food/production/trade.

Fix for Gtk client attached (also affects Win32 and Xaw but I can't test
those, so haven't tried to fix them).

It's dirty; I might sneak it onto S2_2 if no-one objects, but if it offends
anyone I won't.

(An alternative approach would be to assume at most two kinds of special per
terrain, as is done elsewhere, which is a different kind of dirty.)



___

File Attachments:


---
Date: Friday 12/02/10 at 03:25  Name:
S2_2-terrain-special-help-gtk-dirty.diff  Size: 2kB   By: jtn
S2_2: dirty hack to get terrain special production info into help
http://gna.org/bugs/download.php?file_id=8053

___

Reply to this item at:

  http://gna.org/bugs/?15343

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [bug #15104] S2_2: gui-xaw never shows connection dialog

2010-02-11 Thread pepeto

Update of bug #15104 (project freeciv):

 Assigned to:  evyscr = pepeto 


___

Reply to this item at:

  http://gna.org/bugs/?15104

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev