[Freeciv-Dev] [patch #4933] reduce the number of calls to normalize_map_pos()

2014-07-12 Thread Emmet Hikory
Follow-up Comment #1, patch #4933 (project freeciv):

Testing with this applied seems to take nearly the same amount of wall-clock
time (differences varied by run, but never exceeded 1% in either direction
against the same autogame).  map_pos_to_tile() sample percentage with this
applied seems to approximate prior combined sample percentage of
map_pos_to_tile() and normalize_map_pos().  Generally speaking, the sample
percentage of other functions seem to show very slight rises, and there
usually an increase in the number of functions requiring more than 1% CPU
time, so I believe this change improves things, but perhaps not enough to
warrant application to earlier branches.

___

Reply to this item at:

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

___
  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 #21932] nuke self destructs own city after tech loss

2014-07-12 Thread anonymous
Follow-up Comment #8, bug #21932 (project freeciv):

This bug is no longer present in version 2.5.

Using Explode Nuclear you can point and click the destination tile but will
now just get the message 'didn't find a route to the destination' and nothing
happens.
Using Goto behaves as before - it is not possible to move at all.
Using the keyboard works as before - you can move and explode.

And to answer  I don't think anything here limits pathfinding to looking for
single (current) turn paths only.'

With respect to nukes if you try to fire past the current move limit you will
get the message 'too far'


___

Reply to this item at:

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

___
  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 #4934] Use macros for uclass_index() and utype_class()

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/patch/?4934

 Summary: Use macros for uclass_index() and utype_class()
 Project: Freeciv
Submitted by: persia
Submitted on: Sat 12 Jul 2014 04:32:21 PM JST
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: persia
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

In testing patch #4933, I noticed nearly 3% of calls seemed to be to
uclass_index() or utype_class().  Replacing these with macros seems to remove
at least this much runtime from execution entirely.  Oddly, in one autogame, I
saved 10% user time (as measured by time(1)), with the same autogame result,
which is too much improvement to be explained by this patch, making me worry
I've done something wrong with the macro conversion (although other tests
showed improvements more in line with expectations).



___

File Attachments:


---
Date: Sat 12 Jul 2014 04:32:21 PM JST  Name:
use-macros-for-uclass_index-and-utype_class.patch  Size: 3kB   By: persia

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

___

Reply to this item at:

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

___
  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 #4931] pf_fuel_map_iterate(): adjustements

2014-07-12 Thread pepeto
Follow-up Comment #2, patch #4931 (project freeciv):

Patch #4926, comment 1: I said since bug #20361, there were a SINGLE_MOVE cost
hack except for pf_fuel_map. Actually, this was not right. This hack was
present there too and I forgot to remove it in patch #4889.

This part my be moved to patch #4926 if you want.

I made the patch over patch #4926 and patch #4930 so this shouldn't make
conflicts.


___

Reply to this item at:

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

___
  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] [patch #4933] reduce the number of calls to normalize_map_pos()

2014-07-12 Thread pepeto
Follow-up Comment #2, patch #4933 (project freeciv):

I have got better results when profiling. Without the patch:

 10.48269.30   269.30 6034611504 0.00 0.00  normalize_map_pos
  7.72467.57   198.27 1074190408 0.00 0.00  pf_normal_map_iterate
  7.02647.97   180.40 209839846 0.00 0.00  pf_fuel_map_iterate
  5.44787.69   139.72 924377761 0.00 0.00  pf_jumbo_map_iterate
  4.50903.37   115.68 8325248516 0.00 0.00  are_reqs_active
  4.31   1014.14   110.77 246671460 0.00 0.00 
get_fuel_moves_left_req
  2.57   1080.1265.98 3389242058 0.00 0.00  map_is_known_and_seen
  2.37   1140.9660.84 4665055165 0.00 0.00  mapstep
  2.28   1199.5458.58 19112205604 0.00 0.00  genlist_head
  2.11   1253.6954.15 3499063457 0.00 0.00  is_possible_base_fuel
[...]
  0.00   2568.45 0.001 0.00 0.00 
update_nations_with_startpos

---
0.160.56  348441/246671460 pf_map_new [291]
  110.61  395.53 246323019/246671460 pf_fuel_map_iterate [6]
[14]19.7  110.77  396.08 246671460 get_fuel_moves_left_req [14]
   54.15   88.79 3499063457/3499063457 is_possible_base_fuel
[31]
  134.060.00 3004180578/6034611504 normalize_map_pos [23]
   18.72   99.47 3256558157/3391373619 tile_get_known [36]
0.890.00 238401421/238403898
map_vector_to_real_distance [341]
---
   21.43  102.92 4655/4655 find_something_to_kill [9]
[35] 4.8   21.43  102.92 4655 invasion_funct [35]
   55.830.00 1251036497/6034611504 normalize_map_pos [23]
0.51   27.65 173400395/179506916 dai_diplomacy_get [86]
   14.343.09 3577616760/12850609884 tile_city [52]
0.520.00 361939781/1712405090 city_owner [246]
0.280.07 15776297/16347949 base_get_defense_power
[442]
0.340.00 188539386/202124883 player_diplstate_get
[445]
0.070.00 4655/2911444067 unit_owner [196]
0.050.00 15895384/19112205604 genlist_head [59]
0.010.04 18246946/177351059 is_military_unit [421]
0.040.00 4655/238149 unit_tile [275]
0.030.00 15895384/1397822721 city_tile [242]
0.020.00 18246946/22158942239 genlist_link_data [88]
0.010.00 18246946/22146923648 genlist_link_next [126]
0.010.00 15712070/1023670836 unit_class [373]
0.000.00  183314/51700509 city_ai_data [322]
0.000.00  183314/1086797480 unit_has_type_flag [259]
0.000.00  182001/4476158273 unit_type [179]
---


With the patch:

  7.59175.57   175.57 1074190408 0.00 0.00  pf_normal_map_iterate
  7.07339.07   163.50 209839846 0.00 0.00  pf_fuel_map_iterate
  6.69493.82   154.75 22061795161 0.00 0.00  map_pos_to_tile
  5.04610.41   116.59 8325248516 0.00 0.00  are_reqs_active
  4.58716.39   105.98 924377761 0.00 0.00  pf_jumbo_map_iterate
  3.07787.4871.09 4665055165 0.00 0.00  mapstep
  2.68849.5062.02 3499063457 0.00 0.00  is_possible_base_fuel
  2.62910.1660.66 19112205595 0.00 0.00  genlist_head
  2.60970.2460.08 3389242058 0.00 0.00  map_is_known_and_seen
  2.25   1022.3052.07 10054990814 0.00 0.00  map_move_cost
[...]
  0.00   2312.28 0.001 0.00 0.00 
update_nations_with_startpos

---
0.050.43  348441/246671460 pf_map_new [286]
   38.65  307.13 246323019/246671460 pf_fuel_map_iterate [6]
[17]15.0   38.70  307.57 246671460 get_fuel_moves_left_req [17]
   62.02   87.07 3499063457/3499063457 is_possible_base_fuel
[27]
   36.98   93.40 3256558157/3391373619 tile_get_known [31]
   27.410.00 3908096703/22061795161 map_pos_to_tile [26]
0.690.00 238401421/238403898
map_vector_to_real_distance [367]
---
7.86   68.37 4655/4655 find_something_to_kill [9]
[50] 3.37.86   68.37 4655 invasion_funct [50]
   25.640.00 3655590811/22061795161 map_pos_to_tile [26]
0.52   23.71 173400395/179506916 dai_diplomacy_get [94]
   13.343.24 3577616760/12850609884 tile_city [56]
0.830.00 361939781/1712405090 city_owner [210]
0.490.00 

[Freeciv-Dev] [bug #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread Jacob Nevins
Follow-up Comment #6, bug #21950 (project freeciv):


#define IDENTITY_NUMBER_SIZE (1+((MAX_UINT16  2) + 3))

What is the +3 for?

___

Reply to this item at:

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

___
  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 #21576] gtk2 client assert with multiplayer ruleset

2014-07-12 Thread Jacob Nevins
Follow-up Comment #15, bug #21576 (project freeciv):

Although curiously it doesn't show up here. It's r24342
http://svn.gna.org/viewcvs/freeciv?revision=24342view=revision on S2_4.

___

Reply to this item at:

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

___
  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 #4934] Use macros for uclass_index() and utype_class()

2014-07-12 Thread Marko Lindqvist
Update of patch #4934 (project freeciv):

 Planned Release:   2.6.0 = 2.4.3, 2.5.0, 2.6.0

___

Follow-up Comment #1:

We've committed other recent low-risk (i.e. all but unit/city hash rewrite)
optimizations to stable branches too. 

___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #7, bug #21950 (project freeciv):

 #define IDENTITY_NUMBER_SIZE (1+((MAX_UINT16  2) + 3))

 What is the +3 for?

The two lowest bits that MAX_UINT16  2 leaves cleared. It really should be
written as binary (11) to make code more readable, but I don't think there's
portable (older compilers) way to do that in C.

___

Reply to this item at:

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

___
  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 #22299] Server allows to move to transport tile even if it cannot load into

2014-07-12 Thread pepeto
Update of bug #22299 (project freeciv):

  Status:None = Ready For Test 
 Planned Release: = 2.5.0, 2.6.0   

___

Follow-up Comment #1:

Fix attached for trunk: use transport_from_tile() instead of
unit_class_transporter_capacity().

For S2_5, after applying the patch, only path-finding will be still affected.
But the server will respect the rules.

For S2_4, it seems very more complicate. I strongly think it should stay how
it works now, but we should drop any load/unload restriction.


(file #21368, file #21369)
___

Additional Item Attachment:

File name: trunk_remove_unit_class_transporter_capacity.patch Size:8 KB
File name: S2_5_prefer_transport_from_tile.patch Size:6 KB


___

Reply to this item at:

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

___
  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 #21576] gtk2 client assert with multiplayer ruleset

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #16, bug #21576 (project freeciv):

 Although curiously it doesn't show up here.

Comment not showing up here and ticket open when it should be closed. While
it's possible that I forget to close some ticket sometimes, this one seems
like gna has had issues (and rolled back removing the commit comment and
closing of the ticket?)

___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread Jacob Nevins
Follow-up Comment #8, bug #21950 (project freeciv):

 The two lowest bits that MAX_UINT16  2 leaves cleared.
Oh, of course.

___

Reply to this item at:

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

___
  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] Missing commits in tickets (was: [bug #21576] gtk2 client assert with multiplayer ruleset)

2014-07-12 Thread Jacob Nevins
Marko Lindqvist writes:
 Follow-up Comment #16, bug #21576 (project freeciv):
 
  Although curiously it doesn't show up here.
 
 Comment not showing up here and ticket open when it should be closed. While
 it's possible that I forget to close some ticket sometimes, this one seems
 like gna has had issues (and rolled back removing the commit comment and
 closing of the ticket?)

There was a Gna upgrade, I think around then, and for a while commit
messages stopped being linked to tickets.
I worked with people on #gna to fix the backlog for our project once it
was fixed for new commits; I thought we'd got them all, but maybe we
missed a few. Probably it doesn't indicate an ongoing issue.

As for ticket remaining open, my email archive of freeciv-dev has no
record of #21576 ever being closed, so I think that's human error.

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


[Freeciv-Dev] [patch #4935] Set HasNoZOC on some air units: AWACS, missiles, and bombers

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/patch/?4935

 Summary: Set HasNoZOC on some air units: AWACS, missiles, and
bombers
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 11:01:38 BST
Category: rulesets
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Slightly more controversial than patch #4818: air units currently impose ZOC
while over land. I think some of them shouldn't.
* AWACS clearly shouldn't, and their massive range makes allowing them to do
so of noticeable nuisance value.
* Narratively, Missiles can't harrass ground units, they have to pick a target
and say BOOM.
* Our Bombers seem to be strategic bombers, and their one-shot nature is
similar to missiles. Plus their increased range makes their ZOC a potential
nuisance

The remaining air units that I propose continue to impose ZOC:
* Helicopters clearly should, they can clearly be attack helicopters capable
of attack against mobile ground units.
* Fighters and Stealth Fighters seem to be attack aircraft as well as
air-to-air fighters.

I propose this change for classic/multiplayer/experimental.
Could also be applied to civ2civ3, but I leave that decision up to bardo.




___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread pepeto
Follow-up Comment #9, bug #21950 (project freeciv):

(MAX_UINT16  2 | 0x3), ((MAX_UINT16  2) | ((1  2) - 1)), or even
(MAX_UINT16  2 | 0xff) would be more readable I think.


___

Reply to this item at:

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

___
  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] [patch #4872] [metaticket] Help updates for 2.6.0

2014-07-12 Thread Jacob Nevins
Follow-up Comment #1, patch #4872 (project freeciv):

Generalised extras need some sorting out. e.g. noted in bug #22167:
 On a related note, when looking critically at the extras help, 
 I notice the lack of Pollution and Fallout (the code looks like 
 it supports this, with call to add * Can be cleaned by units 
 string). Not precisely related to this ticket, but I was 
 surprised not to see them.

___

Reply to this item at:

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

___
  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 #22167] River listed under Terrain Alterations in help

2014-07-12 Thread Jacob Nevins
Update of bug #22167 (project freeciv):

  Status:None = Ready For Test 
 Assigned to:None = jtn

___

Follow-up Comment #4:

 For all unbuildable extras [...] I think it makes sense to drop 
 the Cannot be built entry, and instead represent this in the 
 build cost [...] perhaps with Unbuildable.
I've taken this approach (currently it says Build: -.

 On a related note, when looking critically at the extras help, 
 I notice the lack of Pollution and Fallout [...]
Noted in patch #4872 to sort out later.

(file #21370, file #21371)
___

Additional Item Attachment:

File name: trunk-help-natural-extras.patch Size:6 KB
File name: S2_5-help-natural-extras.patch Size:4 KB


___

Reply to this item at:

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

___
  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 #4818] classic/experimental/multiplayer: set HasNoZOC on non-military units (Explorers, etc)

2014-07-12 Thread Jacob Nevins
Update of patch #4818 (project freeciv):

  Status:None = Ready For Test 
 Assigned to:None = jtn
 Summary: classic/experimental/multiplayer: set HasNoZOC on
Explorers, etc = classic/experimental/multiplayer: set HasNoZOC on
non-military units (Explorers, etc)

___

Follow-up Comment #5:

(Patch #4816 is dealing with this for civ2civ3.)

(file #21372)
___

Additional Item Attachment:

File name: trunk-nozoc-nonmil.patch   Size:10 KB


___

Reply to this item at:

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

___
  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 #4935] Set HasNoZOC on some air units: AWACS, missiles, and bombers

2014-07-12 Thread Jacob Nevins
Update of patch #4935 (project freeciv):

  Status:None = Ready For Test 
 Assigned to:None = jtn

___

Additional Item Attachment:

File name: trunk-nozoc-air.patch  Size:5 KB


___

Reply to this item at:

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

___
  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 #22260] AI never forgets tech_want

2014-07-12 Thread Jacob Nevins
Update of bug #22260 (project freeciv):

 Summary: tech_want never zeroed (not even initialized) = AI
never forgets tech_want

___

Follow-up Comment #9:

Renamed to reflect that this isn't a lack-of-initialisation bug, rather a
change in AI behaviour.
(I think the same argument for initial initialisation by calloc() also applies
to S2_4, and think we probably don't want to backport the behaviour change
there.)

___

Reply to this item at:

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

___
  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 #22302] Setting init_city_radius_sq =15 does not work in version 2.5

2014-07-12 Thread Jacob Nevins
Update of bug #22302 (project freeciv):

Category:  client-gtk-2.0 = client 
Operating System:   Microsoft Windows = Any

___

Follow-up Comment #3:

I can reproduce this on Linux too, with the experimental ruleset.

 gtk3-client (and sdl-client) do have the gfx scaling, so one 
 thing to test would be if they suffer from the same problem
They do.

___

Reply to this item at:

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

___
  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 #22313] Burgundic and Burgundian legend confusingly similar

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22313

 Summary: Burgundic and Burgundian legend confusingly
similar
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 13:30:48 BST
Category: rulesets
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_5 r25502
 Discussion Lock: Any
Operating System: Any
 Planned Release: 

___

Details:

Now that we have the Burgundic nation (1st millenium CE, added in 2012), the
Burgundian nation (Duchy of Burgundy, added 2007) has a confusingly similar
legend, since both talk about each other.

* Burgundians
** After the fall of the Western Roman Empire, a Germanic people known as the
Burgundians settled in the river valleys of eastern Gaul, lending their name
to the region. Centuries later, the Duchy of Burgundy was a prosperous country
with the court in Dijon outshining that of Paris. Today, it is one of the
regions of France.
* Burgunds
** The Burgundians were an ancient East Germanic people who probably
originated on Bornholm island. After leaving Bornholm they lived between the
Oder and Vistula rivers. During the Migration Period, along with other
Germanic peoples they invaded the Roman Empire, and in 472 CE, some of them
sacked Rome. Their first kingdom was founded in Worms, but after its
destruction by the Huns they moved to what is today Savoy and Burgundy, where
they founded their second kingdom. Eventually they were subordinated by the
Frankish Kingdom. The Bugundians gave their name to the later Romance nation
and region of Burgundy.




___

Reply to this item at:

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

___
  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 #4931] pf_fuel_map_iterate(): adjustements

2014-07-12 Thread Emmet Hikory
Follow-up Comment #3, patch #4931 (project freeciv):

Aha, so patch #4926 doesn't actually finish cleaning up the SINGLE_MOVE hack,
and so seeing a very similar section being removed in this patch caused me to
raise a false positive.  My apologies for the noise (I tend to test patches in
isolation, and perhaps shouldn't in this sort of situation).  Unless you have
a strong opinion otherwise, I think it's easier to go with the (incomplete)
patch #4926 as-is, and complete the removal of the SINGLE_MOVE hack here (with
the attached patch).

___

Reply to this item at:

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

___
  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 #22314] QT client strings unsuitable for i18n

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22314

 Summary: QT client strings unsuitable for i18n
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 13:36:29 BST
Category: client-qt
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_5 r25502
 Discussion Lock: Any
Operating System: Any
 Planned Release: 

___

Details:

I've noticed a number of constructs in the Qt client that aren't really
suitable for i18n.

It probably wants a blanket review, ideally before too many translators spend
time on the current strings.

1. Sentences assembled out of fragments by string concatenation rather than
using format strings.


unit_label1 = unit_label1 +   + _(from) +  ;



techs_known = QString(b) + _(Techs unknown by) + sp
  + QString(nation_adjective_for_player(pplayer)) + sp
  + QString(_(nation)) + QString(/b :);


2. Non-generalised pluralisation.


  if (unit_list_size(punits) == 1) {
ask.setText(_(Are you sure you want to disband that unit?));
  } else {
str = QString(_(Are you sure you want to disband those %1 units?)).arg





___

Reply to this item at:

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

___
  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 #4933] reduce the number of calls to normalize_map_pos()

2014-07-12 Thread Emmet Hikory
Follow-up Comment #3, patch #4933 (project freeciv):

Interesting.  Possibly bad luck on my part, or differences between gprof and
oprofile.  If this patch produces a nearly 10% improvement in total runtime
for some initial conditions, perhaps it should also be applied to 2.5.

___

Reply to this item at:

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

___
  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 #22315] QT client refers to CMA rather than city governor

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22315

 Summary: QT client refers to CMA rather than city
governor
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 13:38:17 BST
Category: client-qt
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_5 r25502
 Discussion Lock: Any
Operating System: Any
 Planned Release: 

___

Details:

Elsewhere we standardised on the term city governor some time ago.




___

Reply to this item at:

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

___
  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 #4936] Tart up civ2civ3 help

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/patch/?4936

 Summary: Tart up civ2civ3 help
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 13:48:32 BST
Category: rulesets
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.5.0, 2.6.0

___

Details:

As requested in patch #4739, review all the help text specific to the civ2civ3
ruleset, both for completeness and for spelling/grammar issues.




___

Reply to this item at:

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

___
  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 #3793] [metaticket] Help updates for 2.5.0

2014-07-12 Thread Jacob Nevins
Update of patch #3793 (project freeciv):

  Depends on: = patch #4936


___

Reply to this item at:

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

___
  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 #4936] Tart up civ2civ3 help

2014-07-12 Thread Jacob Nevins
Update of patch #4936 (project freeciv):

 Assigned to:None = jtn


___

Reply to this item at:

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

___
  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 #22302] Setting init_city_radius_sq =15 does not work in version 2.5

2014-07-12 Thread Jacob Nevins
Follow-up Comment #4, bug #22302 (project freeciv):

Patch #4389 used a squared value where a linear one should have been used in
canvas_to_city_pos(). I haven't worked out the complete fix yet.

___

Reply to this item at:

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

___
  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 #22302] Setting init_city_radius_sq =15 does not work in version 2.5

2014-07-12 Thread Jacob Nevins
Update of bug #22302 (project freeciv):

  Status:None = In Progress
 Assigned to:None = jtn


___

Reply to this item at:

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

___
  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 #4933] reduce the number of calls to normalize_map_pos()

2014-07-12 Thread pepeto
Follow-up Comment #4, patch #4933 (project freeciv):

I think the most of the gain is visible in late game (when the AI begins to
build fueled units). It may explain why results could be so different.


___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread pepeto
Follow-up Comment #10, bug #21950 (project freeciv):

And if we are supposed to add 1, why not using (1  18)?


___

Reply to this item at:

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

___
  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 #22302] City map UI broken with init_city_radius_sq =15 in version 2.5

2014-07-12 Thread Jacob Nevins
Update of bug #22302 (project freeciv):

  Status: In Progress = Ready For Test 
 Summary: Setting  init_city_radius_sq =15 does not work in
version 2.5 = City map UI broken with init_city_radius_sq =15 in version 2.5

___

Follow-up Comment #5:

Fix.

The default city map radius + lack of radius expanding effects was only
working by the purest of luck.

(file #21374)
___

Additional Item Attachment:

File name: trunk-S2_5-citymap-nondefault-ui.patch Size:1 KB


___

Reply to this item at:

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

___
  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 #22302] City map UI broken with init_city_radius_sq =15 in version 2.5

2014-07-12 Thread Jacob Nevins
Update of bug #22302 (project freeciv):

 Planned Release:2.5.0, 2.6.0 = 2.5.0-beta1, 2.6.0 


___

Reply to this item at:

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

___
  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 #22197] City dialog map not refreshed after changing governor

2014-07-12 Thread Jacob Nevins
Update of bug #22197 (project freeciv):

 Summary: Some errors in beta0 of freeciv2.5 = City dialog
map not refreshed after changing governor

___

Follow-up Comment #3:

 2. Changing the governor from max production to max food does 
 not refresh the city tiles shown until you close the city 
 dialog. It does show correctly in city totals. see attached
 This looks like a real bug.
Repurposing this ticket for just this report.

___

Reply to this item at:

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

___
  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 #22316] UTF-8 trouble with repeated Connect to network game / Cancel

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22316

 Summary: UTF-8 trouble with repeated Connect to network
game / Cancel
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 15:18:19 BST
Category: client-gtk-2.0
Severity: 2 - Minor
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk r25504
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

(Following on from bug #22048:)

Xubuntu 12.04 amd64; start freeciv-gtk2; repeatedly Connect to network game
then Cancel (using keyboard shortcuts for speed: hold down Alt then
c[O]nnect, [C]ancel, [O], [C], ...).

Some fraction of the time I get console error messages like the following, and
sometimes I see mangled characters in the client's status line.

Maybe some lack of thread safety in communicating metaserver/version
information back to main thread?


(freeciv-gtk2:9856): Gtk-CRITICAL **: gtk_text_buffer_emit_insert: assertion
`g_utf8_validate (text, len, NULL)' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_ref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): Gtk-CRITICAL **: gtk_text_buffer_emit_insert: assertion
`g_utf8_validate (text, len, NULL)' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_ref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

(freeciv-gtk2:9856): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

(freeciv-gtk2:9856): Gtk-CRITICAL **: gtk_text_buffer_emit_insert: assertion
`g_utf8_validate (text, len, NULL)' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_ref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): GLib-GObject-CRITICAL **: g_object_unref: assertion
`object-ref_count  0' failed

(freeciv-gtk2:9856): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()

(freeciv-gtk2:9856): Pango-WARNING **: Invalid UTF-8 string passed to
pango_layout_set_text()





___

Reply to this item at:

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

___
  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 #22316] UTF-8 trouble with repeated Connect to network game / Cancel

2014-07-12 Thread Jacob Nevins
Additional Item Attachment, bug #22316 (project freeciv):

File name: repeated_connect_utf8_trouble.png Size:377 KB


___

Reply to this item at:

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

___
  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 #22048] Crashes and other trouble with repeated Connect to network game / Cancel

2014-07-12 Thread Jacob Nevins
Update of bug #22048 (project freeciv):

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

___

Follow-up Comment #10:

 Opened bug #22108 about the wrong usage of gtk from metaserver 
 thread.
I haven't been able to reproduce any crashes with current trunk (r25504), so
I'm claiming this is now fixed by a combination of that thread fix and fixes
committed under this bug.

(I did see some minor remaining trouble, for which I've raised bug #22316.)

___

Reply to this item at:

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

___
  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 #21575] GTK2 client crash at startup

2014-07-12 Thread Jacob Nevins
Update of bug #21575 (project freeciv):

  Status:None = Duplicate  
 Open/Closed:Open = Closed 

___

Follow-up Comment #2:

 May be the same as bug #22047?
Given the backtrace, I'm assuming so. I think that that bug has been fixed by
the changes in bug #22108.

Please re-open if you can still reproduce the same crash with current code.

___

Reply to this item at:

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

___
  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 #22050] Recursive transport problems

2014-07-12 Thread pepeto
Update of bug #22050 (project freeciv):

  Status:   Need Info = In Progress


___

Reply to this item at:

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

___
  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 #22187] Client allows attempted violation of embarks/disembarks restrictions

2014-07-12 Thread pepeto
Update of bug #22187 (project freeciv):

  Status:   Fixed = In Progress
 Assigned to:  pepeto = None   
 Open/Closed:  Closed = Open   

___

Follow-up Comment #9:

I only fixed for trunk, it needs to be backported to S2_5.


___

Reply to this item at:

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

___
  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 #22317] Path-finding unable to handle recursive transports restrictions

2014-07-12 Thread pepeto
URL:
  http://gna.org/bugs/?22317

 Summary: Path-finding unable to handle recursive transports
restrictions
 Project: Freeciv
Submitted by: pepeto
Submitted on: sam. 12 juil. 2014 16:57:31 CEST
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: S2_5, trunk
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.5.0, 2.6.0

___

Details:

$subject





___

Reply to this item at:

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

___
  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 #22050] Recursive transport problems

2014-07-12 Thread pepeto
Update of bug #22050 (project freeciv):

  Depends on: = bugs #22187


___

Reply to this item at:

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

___
  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 #22050] Recursive transport problems

2014-07-12 Thread pepeto
Update of bug #22050 (project freeciv):

  Depends on: = bugs #22317


___

Reply to this item at:

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

___
  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 #22317] Path-finding unable to handle recursive transports restrictions

2014-07-12 Thread Emmet Hikory
Follow-up Comment #1, bug #22317 (project freeciv):

Why?  Isn't this handled inside unit_list_iterate(ptile-units, punit) in
pf_move_scope? or is the problem that units fail to notionally load for
amphibious pathfinding?

___

Reply to this item at:

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

___
  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 #22318] Nation translation domain not read properly by client

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22318

 Summary: Nation translation domain not read properly by
client
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 16:06:27 BST
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: In Progress
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: Any
 Planned Release: 2.5.0, 2.6.0

___

Details:

...so nation translations on the client side (such as the legend) don't work
for nations in the extended set.

Client only copies sizeof(char *) out of the ruleset packet, which is unlikely
to be enough for the only interesting case of freeciv-nations.




___

Reply to this item at:

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

___
  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 #22318] Nation translation domain not read properly by client

2014-07-12 Thread Jacob Nevins
Update of bug #22318 (project freeciv):

  Status: In Progress = Ready For Test 

___

Additional Item Attachment:

File name: trunk-S2_5-nation-translation-domain.patch Size:1 KB


___

Reply to this item at:

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

___
  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 #22319] Experimental ruleset Triremes can't move up rivers on trunk

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22319

 Summary: Experimental ruleset Triremes can't move up rivers
on trunk
 Project: Freeciv
Submitted by: jtn
Submitted on: Sat 12 Jul 2014 16:24:03 BST
Category: None
Severity: 3 - Normal
Priority: 5 - Normal
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: trunk r25504
 Discussion Lock: Any
Operating System: GNU/Linux
 Planned Release: 2.6.0

___

Details:

See attached 2.5 savegame (where this works fine).

Client seems to mostly think that triremes can move on rivers (Ctrl-Shift-N
shows tiles as native, and it lets me try to make the move), but if I try to
move with the arrow keys I get Trireme cannot move here without a native path
for Trireme

Client-side goto path drawing does think river tiles are verboton, though
(shows me a red circle-with-cross rather than a blue goto line, if I click
says Didn't find a route to the destination!




___

Reply to this item at:

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

___
  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 #22319] Experimental ruleset Triremes can't move up rivers on trunk

2014-07-12 Thread Jacob Nevins
Additional Item Attachment, bug #22319 (project freeciv):

File name: exp-trireme-25.sav.bz2 Size:14 KB


___

Reply to this item at:

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

___
  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 #4934] Use macros for uclass_index() and utype_class()

2014-07-12 Thread Emmet Hikory
Follow-up Comment #2, patch #4934 (project freeciv):

Conveniently the same patch applies, builds, and runs for all targeted
branches.

___

Reply to this item at:

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

___
  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 #4927] Avoid selecting Fighters as useful AI units

2014-07-12 Thread Emmet Hikory
Update of patch #4927 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #22319] Experimental ruleset Triremes can't move up rivers on trunk

2014-07-12 Thread Emmet Hikory
Follow-up Comment #1, bug #22319 (project freeciv):

Oh, interesting.  It seems that is_native_move() isn't prepared to handle the
case of moving from a native tile (for non-road reasons) to a destination tile
that is native because of a road which is not an acceptable connecting road. 
Neither bug #16383 nor bug #22026 managed to consider this particular
situation.

Other ways to demonstrate the issue involve having a BuildAnywhere unit that
needs roads move to a roaded tile from a city without a road, moving from a
native base (with no road) to a roaded tile, etc.

Fix is to check whether the source is native for non-road (but possibly extra)
reasons as an additional else clause before entering the extras iteration: if
the source is native, check if the destination is native for any reason
(including roads: a simple is_native_to_class(punitclass, dst_tile) will do),
and if so, return TRUE.

I'm not up to writing a patch for that today, but will do so in the next
couple days if someone else doesn't get to it first.

___

Reply to this item at:

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

___
  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 #4562] Soundtrack 0.1

2014-07-12 Thread mqtx
Follow-up Comment #11, patch #4562 (project freeciv):

I remastered the old tracks and uploaded new ones at
http://soundcloud.com/mqtx
There's an arrow facing down next to the tracks that allows free public
downloads. Thanks for adding them to the mqtx modpack!

___

Reply to this item at:

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

___
  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 #4650] Split single input xx.po file into translations/*/xx.po

2014-07-12 Thread Jacob Nevins
Follow-up Comment #10, patch #4650 (project freeciv):

 This ticket is for (a) redoing the S2_4 import 
I've now done this. This also deals with the backlog of S2_4 updates that I
had not yet brought to later branches; all newer branches that have not yet
been worked on should now have the latest available translations from older
ones.

(If some translator had already started working on S2_5 and/or trunk before
this giant update, it's benign; they can ignore it as if it were a regular
make update-po, and deal with the superfluous obsolete strings in their own
way, as pl and fr will already have had to.)

 and ideally (b) checking in a semi-automated procedure 
 (script or something) which will let us do it again
Haven't got this yet. Attached for reference is the script I used for this
job: a slight formalisation of comment #1, but has external dependencies
making it unsuitable for checkin.

(file #21378)
___

Additional Item Attachment:

File name: distributron.shSize:1 KB


___

Reply to this item at:

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

___
  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 #22320] Lua compilation tries to use _setjmp() when configure has only checked _longjmp()

2014-07-12 Thread Marko Lindqvist
URL:
  http://gna.org/bugs/?22320

 Summary: Lua compilation tries to use _setjmp() when
configure has only checked _longjmp()
 Project: Freeciv
Submitted by: cazfi
Submitted on: Sat 12 Jul 2014 10:40:28 PM EEST
Category: bootstrap
Severity: 3 - Normal
Priority: 5 - Normal
  Status: Ready For Test
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.4.3, 2.5.0, 2.6.0

___

Details:

IRC:

Begasus: but I still see Haiku having a problem with the declaration for
_setjmp in luaconf.h




ldo.c uses _setjmp() (in addition to _longjmp() ) in a code guarded by
LUA_USE_ULONGJMP, which we set in localluaconf.h when HAVE__LONGJMP is defined
by configure.

Attached fix makes LUA_USE_ULONGJMP to depend on both HAVE__LONGJMP and
HAVE__SETJMP.




___

File Attachments:


---
Date: Sat 12 Jul 2014 10:40:28 PM EEST  Name: _SetJmpCheck.patch  Size: 1kB  
By: cazfi

http://gna.org/bugs/download.php?file_id=21379

___

Reply to this item at:

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

___
  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 #22320] Lua compilation tries to use _setjmp() when configure has only checked _longjmp()

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #1, bug #22320 (project freeciv):

- S2_4 version

(file #21380)
___

Additional Item Attachment:

File name: _SetJmpCheck-S2_4.patchSize:0 KB


___

Reply to this item at:

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

___
  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 #20723] Enabling multiple luasql backends broken on S2_5 trunk

2014-07-12 Thread Jacob Nevins
Follow-up Comment #5, bug #20723 (project freeciv):

I want to fix this properly for 2.5.0 rather than have a regression. Can
anyone help?

However, failing that, we could make configure disallow multiple luasql
backends.

___

Reply to this item at:

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

___
  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] [task #7668] Tracking release 2.5.0

2014-07-12 Thread Jacob Nevins
Update of task #7668 (project freeciv):

  Dependency Removed: = task #7760 


___

Reply to this item at:

  http://gna.org/task/?7668

___
  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 #22321] tech_bulb_sum uninitialized in tech_upkeep_calc()

2014-07-12 Thread Marko Lindqvist
URL:
  http://gna.org/bugs/?22321

 Summary: tech_bulb_sum uninitialized in tech_upkeep_calc()
 Project: Freeciv
Submitted by: cazfi
Submitted on: Sat 12 Jul 2014 11:41:41 PM EEST
Category: general
Severity: 3 - Normal
Priority: 5 - Normal
  Status: Ready For Test
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 2.6.0

___

Details:

tech_bulb_sum is uninitialized when we start adding to it.

Fix attached



___

File Attachments:


---
Date: Sat 12 Jul 2014 11:41:41 PM EEST  Name: TechBulbSumInit.patch  Size:
479B   By: cazfi

http://gna.org/bugs/download.php?file_id=21381

___

Reply to this item at:

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

___
  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] 2.5.0-beta1 and 2.4.3 plans

2014-07-12 Thread Jacob Nevins
Hello folks,

We don't seem to have any pressing reasons not to ship the first beta
for 2.5.0, so I plan to try to get the tarball out either next weekend
(19-20 July) or, failing that, at the end of July.

Current draft release notes are here:
http://www.freeciv.org/wiki/NEWS-2.5.0

=-=-=-=-=-

As regards S2_5 translations: there won't be a string freeze, but all
updates are of course welcome.

I have just committed a large update to translations on S2_5 and trunk
to remove the large numbers of duplicate 'obsolete' strings that have
infested some of the translation files since the split.
(More detail than you need in http://gna.org/patch/?4650.)

There were also a few translations which were fresher on older branches
because I hadn't got around to copying them across; this has now been
fixed (es/ru S2_4 - S2_5 and trunk; ko S2_5 - trunk).

If you haven't started S2_5 yet, it's best to start with the fresh files
just uploaded to http://www.cazfi.net/freeciv/translations/S2_5/ (a
similar update for S2_6 will follow soon).

If you _have_ started before this update, you can ignore it if that's
more convenient; it's similar to a make update-po, and nothing will be
lost if you do so.

(Translations with recent activity -- pl and fr -- have not been
touched.)

Areas with potentially volatile strings that you might want to leave
until last:
  client/gui-qt/ (due to bug #22314 / bug #22315)
  data/civ2civ3/ (changes expected under patch #4936)
(These probably won't be finalised until after beta1.)

People trying to test their extended nation translations on S2_5/trunk
may find that it doesn't work very well due to http://gna.org/bugs/?22318.
The fix for this should be committed to svn in a couple of days.

I'm aware the translator workflow for these new split translations is a
bit unclear; do feel free to ask about it.

=-=-=-=-=-

We're also thinking of doing a stable 2.4.3 release soon, just to pick
up bugfixes and make it available for e.g. the next version of Debian. I
don't have a firm date for that (or its string freeze), but expect it to
be after 2.5.0-beta1.

However, there has been an unusually large amount of string changes and
additions since 2.4.2, so if you haven't looked at your S2_4 translation
recently, you might want to get started soon. cazfi.net is up to date
for S2_4 translations.

(If anyone wants to finish off S2_4 before starting on S2_5, we can push
any S2_4 updates into S2_5 split translations for the beta.)

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


[Freeciv-Dev] [patch #4459] Requirement range Traderoutes

2014-07-12 Thread Emmet Hikory
Update of patch #4459 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #4937] Really assert tech is in valid range

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/patch/?4937

 Summary: Really assert tech is in valid range
 Project: Freeciv
Submitted by: persia
Submitted on: Sun 13 Jul 2014 07:03:36 AM JST
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: persia
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.4.3, 2.5.0, 2.6.0

___

Details:

The advance_required() assert that appears to intend to check that the
provided ID is within the valid range always returns TRUE when A_NONE 
A_LAST, so doesn't actually check anything useful.  Changing logical OR to
logical AND makes the test properly check the range.



___

File Attachments:


---
Date: Sun 13 Jul 2014 07:03:36 AM JST  Name:
really-assert-tech-is-in-valid-range.patch  Size: 795B   By: persia

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

___

Reply to this item at:

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

___
  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 #4938] Consolidate server precalcs and cache population

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/patch/?4938

 Summary: Consolidate server precalcs and cache population
 Project: Freeciv
Submitted by: persia
Submitted on: Sun 13 Jul 2014 07:13:03 AM JST
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: persia
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

In the client, most of the precalculation and cache population happens in
handle_rulesets_ready(), but in the server, it happens in several places,
making the order in which ruleset files are loaded very important (as there
are subtle bugs with caches not being properly populated for the wrong order),
and needing care to avoid use-without-assignment issues (such as bug #22014 or
problems with set_unit_class_caches() introduced with patch #4649 ).

This patch consolidates that in load_rulesetdir(), and further moves the
improvement feature cache to improvement.c, rather than being duplicate logic
in ruleset.c and packhand.c.

I'm not quite sure why role_unit_precalcs() is in set_client_state() rather
than handle_rulesets_ready(), so I've left it there for now.



___

File Attachments:


---
Date: Sun 13 Jul 2014 07:13:03 AM JST  Name:
consolidate-server-precalcs-and-cache-population.patch  Size: 5kB   By: persia

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

___

Reply to this item at:

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

___
  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 #4939] Use const for more sorts of requirement checks

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/patch/?4939

 Summary: Use const for more sorts of requirement checks
 Project: Freeciv
Submitted by: persia
Submitted on: Sun 13 Jul 2014 07:18:09 AM JST
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: persia
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Whlie working on patch #4885, I noticed a number of cases where I'd really
rather be passing a const value to check a requirement, or whether something
could happen.  The attached patch adds the const keyword in more places where
the function in question neither intends nor needs to modify the passed
object.

Also, the workarounds to not pass a const value in daieffects.c introduced in
patch #4822 have been removed.



___

File Attachments:


---
Date: Sun 13 Jul 2014 07:18:09 AM JST  Name:
use-const-for-more-sorts-of-requirement-checks.patch  Size: 8kB   By: persia

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

___

Reply to this item at:

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

___
  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 #4940] Rewrite universal_fulfills_requirement()

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/patch/?4940

 Summary: Rewrite universal_fulfills_requirement()
 Project: Freeciv
Submitted by: persia
Submitted on: Sun 13 Jul 2014 07:39:18 AM JST
Category: general
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: persia
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.6.0

___

Details:

Patch #4558 introduced universal_fulfills_requirement(), which I've found very
useful for patch #4822, bug #14210, and patch #4885 .  However, the more I use
this, the more I become frustrated with the volume of boilerplate required.

The attached patch rewrites the implementation so the callers may use a
locally-scoped universal, rather than a malloc()'d universals_u, and
determines the name of the item_found function via a switch statement, rather
than encoding the function name in the caller.  I've chosen to return ITF_YES
for unimplemented requirement kinds, given that callers are static, but for
safety these could be adjusted to include an fc_assert().

Most of the assertions have also been removed, mostly because I prefer both
assert-before use and assignment-in-declarations, which aren't entirely
compatible.  If others think these assertions are important, I suggest that
the appropriate places are a single assert to the passed pointer in
requirement_fulfilled_by_foo(), and a single assert on reqs in
universal_fulfills_requirement() (and would be happy to add them in another
revision of this patch).

The result is 8 lines less that need be added to requirements.c for each new
requirement kind, with more lines safe for copy and paste.



___

File Attachments:


---
Date: Sun 13 Jul 2014 07:39:18 AM JST  Name:
rewrite-universal_fulfills_requirement.patch  Size: 8kB   By: persia

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

___

Reply to this item at:

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

___
  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] [task #7751] Tracking release 2.5.0-beta1

2014-07-12 Thread Jacob Nevins
Update of task #7751 (project freeciv):

  Depends on: = task #7813 


___

Reply to this item at:

  http://gna.org/task/?7751

___
  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 #4940] Rewrite universal_fulfills_requirement()

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #1, patch #4940 (project freeciv):

 so the callers may use a locally-scoped universal, rather than
 a malloc()'d universals_u,

What prevented thay previously? From the patch it seems that the function did
not made any assumptions if the pointer received was dynamically allocated
memory or local, though the caller you have adjusted for some reason (or
no-reason?) did it with fc_malloc(). OTOH you now change it to be
passed-by-value rather than by pointer. I think all that makes is making it
less efficient (copying of the full structure in every function call, and
maybe also before) and harder to pass something caller originally has as
pointer (such as getting memory with fc_malloc())

___

Reply to this item at:

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

___
  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 #22322] Unqualified female ruler titles

2014-07-12 Thread Jacob Nevins
Update of bug #22322 (project freeciv):

 Summary: Unqualified female ruler names = Unqualified female
ruler titles


___

Reply to this item at:

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

___
  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 #22322] Unqualified female ruler names

2014-07-12 Thread Jacob Nevins
URL:
  http://gna.org/bugs/?22322

 Summary: Unqualified female ruler names
 Project: Freeciv
Submitted by: jtn
Submitted on: Sun 13 Jul 2014 00:46:34 BST
Category: rulesets
Severity: 3 - Normal
Priority: 5 - Normal
  Status: In Progress
 Assigned to: jtn
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: Any
 Planned Release: 2.4.3, 2.5.0, 2.6.0

___

Details:

There are a few cases of identical male and female ruler names without i18n
qualification to distinguish them.




___

Reply to this item at:

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

___
  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 #4938] Consolidate server precalcs and cache population

2014-07-12 Thread Emmet Hikory
Follow-up Comment #1, patch #4938 (project freeciv):

MIssed the sanity check assert complaints in earlier testing of this.  Updated
patch populates caches subject to sanity check before doing the sanity check.

(file #21386)
___

Additional Item Attachment:

File name: consolidate-server-precalcs-and-cache-population+sanity.patch
Size:5 KB


___

Reply to this item at:

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

___
  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 #4885] Revised logic for AI improvement consideration and improvement redundancy

2014-07-12 Thread Emmet Hikory
Follow-up Comment #2, patch #4885 (project freeciv):

I decided to try this a different and more general way, but the result doesn't
actually work.  Barracks III isn't made redundant by Airport anymore (which is
good), but now Women's Suffrage isn't making Police Station redundant (which
is bad).  Any input on a model for considering redundancy that doesn't depend
on an nreqs-like concept appreciated.

Note that the new redundancy patch depends on patch #4938, patch #4939, and
patch #4930.  The AI portion is merely rebased: as that seems to have been
unchanged as I've thought about this more, and only the redundancy issue being
a blocker, I'm considering splitting the ticket.

(file #21387, file #21388)
___

Additional Item Attachment:

File name:
AI-check-missing-improvement-reqs-with-more-care+r25512-rebase.patch Size:7 KB
File name: calculate-building-redundancy-more-completely.patch Size:16 KB


___

Reply to this item at:

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

___
  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 #22322] Unqualified female ruler titles

2014-07-12 Thread Jacob Nevins
Update of bug #22322 (project freeciv):

  Status: In Progress = Ready For Test 

___

Follow-up Comment #1:

Also attached the patch I used to find instances of this in nations. I'm half
inclined to check this in (under another ticket); at least in our supplied
rulesets, male==female is always an error.

(file #21389, file #21390, file #21391)
___

Additional Item Attachment:

File name: trunk-find-identical-ruler-titles.patch Size:0 KB
File name: trunk-S2_5-female-ruler-titles.patch Size:4 KB
File name: S2_4-female-ruler-titles.patch Size:2 KB


___

Reply to this item at:

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

___
  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 #4924] adv_want typedef

2014-07-12 Thread Marko Lindqvist
Update of patch #4924 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #4923] Tech effects cache

2014-07-12 Thread Marko Lindqvist
Update of patch #4923 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #4738] Ruleset defined culture victory criteria

2014-07-12 Thread Marko Lindqvist
Update of patch #4738 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #22303] svnrev/gitrev version number word modified not translatable

2014-07-12 Thread Marko Lindqvist
Update of bug #22303 (project freeciv):

 Planned Release: 2.4.3, 2.5.0, 2.6.0 = 2.4.3, 2.5.0-beta2, 2.6.0


___

Reply to this item at:

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

___
  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 #22311] Threaded AI mishandles NoBonus road types

2014-07-12 Thread Marko Lindqvist
Update of bug #22311 (project freeciv):

 Planned Release:2.5.0, 2.6.0 = 2.5.0-beta1, 2.6.0 


___

Reply to this item at:

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

___
  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 #21629] civ2 - barb cities can't build anything due to waste

2014-07-12 Thread Marko Lindqvist
Update of bug #21629 (project freeciv):

 Planned Release: 2.4.3, 2.5.0, 2.6.0 = 2.4.3, 2.5.0-beta1, 2.6.0


___

Reply to this item at:

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

___
  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 #22320] Lua compilation tries to use _setjmp() when configure has only checked _longjmp()

2014-07-12 Thread Marko Lindqvist
Update of bug #22320 (project freeciv):

 Planned Release: 2.4.3, 2.5.0, 2.6.0 = 2.4.3, 2.5.0-beta1, 2.6.0


___

Reply to this item at:

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

___
  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 #21550] Make function of timeout / off label in UI more obvious somehow

2014-07-12 Thread Marko Lindqvist
Update of bug #21550 (project freeciv):

 Planned Release: 2.4.3, 2.5.0, 2.6.0 = 2.4.3, 2.5.0-beta1, 2.6.0


___

Reply to this item at:

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

___
  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 #4920] C11 Static assert

2014-07-12 Thread Marko Lindqvist
Update of patch #4920 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #22319] Experimental ruleset Triremes can't move up rivers on trunk

2014-07-12 Thread Emmet Hikory
Update of bug #22319 (project freeciv):

Category:None = general
  Status:None = Ready For Test 
 Assigned to:None = persia 

___

Follow-up Comment #2:

Patch attached.  Actually split test into two parts for speed: when moving
from a native terrain, there's no point iterating over extras (and it's safe
to return FALSE if the destination isn't native at all).  Destination
nativity could be wrapped in a cache boolean, but when I did it that way, it
looked ugly, so we'll risk needing to call it multiple times when attempting
to move to non-native destinations from a source that contains multiple
non-road native extras (which is probably a rare case anyway).


(file #21392)
___

Additional Item Attachment:

File name: allow-moves-to-native-roads-from-native-terrains.patch Size:1 KB


___

Reply to this item at:

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

___
  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 #4941] Alien Thick Mountains infra changes

2014-07-12 Thread Marko Lindqvist
URL:
  http://gna.org/patch/?4941

 Summary: Alien Thick Mountains infra changes
 Project: Freeciv
Submitted by: cazfi
Submitted on: Sun 13 Jul 2014 04:18:16 AM EEST
Category: rulesets
Priority: 5 - Normal
  Status: Ready For Test
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 2.5.0, 2.6.0

___

Details:

Currently doing anything to Thick Mountains is extremely slow process. That's
right from the viewpoint that even diamond drill is not enough to do anything
to these mountains, but at least players inexperienced with the ruleset (i.e.,
currently everyone) tend to forgot that and routinely start mining them only
to find the Engineer 40 turns later still in work.

Attached patch readjust this a bit in a way that hopefully works for both
viewpoints:
- Mining Thick Mountains is not possible at all in the beginning, but it
requires Burrowing technology. Once Burrowing *is* known, mining is relatively
fast
- Road building time is made significantly faster, with the assumption that
suc road gets over the mountain and is made more like filling land than
removing it



___

File Attachments:


---
Date: Sun 13 Jul 2014 04:18:16 AM EEST  Name: ThickMountaisModtime.patch 
Size: 3kB   By: cazfi

http://gna.org/patch/download.php?file_id=21393
---
Date: Sun 13 Jul 2014 04:18:16 AM EEST  Name: ThickMountaisModtime-S2_5.patch 
Size: 3kB   By: cazfi

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

___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #11, bug #21950 (project freeciv):

 And if we are supposed to add 1, why not using (1  18)?

Actually there's no longer specific need to have it as 2^y. The reason it was
2^16 was that then any value could fit to uint16, but it's not necessary to
make it exactly 4 times as big (note that every possible value consumes memory
so we can't increase it all the way to 32 bits to fit in uint32 without
significant cost). Attached version of the patch makes it 25.

(file #21395)
___

Additional Item Attachment:

File name: 18BitIdentity-2.patch  Size:0 KB


___

Reply to this item at:

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

___
  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 #21950] Game crash with popup message Exhausted city and unit numbers!

2014-07-12 Thread Marko Lindqvist
Update of bug #21950 (project freeciv):

 Planned Release: 2.4.3, 2.5.0, 2.6.0 = 2.4.3, 2.5.0-beta1, 2.6.0


___

Reply to this item at:

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

___
  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 #22323] Trunk build failure in Qt client

2014-07-12 Thread Emmet Hikory
URL:
  http://gna.org/bugs/?22323

 Summary: Trunk build failure in Qt client
 Project: Freeciv
Submitted by: persia
Submitted on: Sun 13 Jul 2014 10:38:38 AM JST
Category: client-qt
Severity: 3 - Normal
Priority: 7 - High
  Status: None
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: r25521
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

It seems that C++ has some issues using the C11 static assert introduced with
patch #4920.




___

Reply to this item at:

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

___
  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 #4941] Alien Thick Mountains infra changes

2014-07-12 Thread Emmet Hikory
Follow-up Comment #1, patch #4941 (project freeciv):

For trunk, the slightly easier to build Thick Mountain road could be
implemented as a (slower) integrating road, to indicate that landfill on an
undrillable mountain is slow, perhaps allowing a faster road once Burrowing
is known.  Even with a move_cost of 4 for the mountain road, it would be an
improvement over the move cost of 12 for unimproved Thick Mountains, so
somewhat useful.

___

Reply to this item at:

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

___
  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 #4940] Rewrite universal_fulfills_requirement()

2014-07-12 Thread Emmet Hikory
Update of patch #4940 (project freeciv):

  Status:  Ready For Test = In Progress

___

Follow-up Comment #2:

I'm not sure anything prevented using a locally scoped variable before, but
whenever I tried to do that, I got lost (with either compilation failures or
runtime issues).  The method I propose is mostly just easier for me to
comprehend, and for ease of extension, I think all the callers ought have the
same format (ideally we can collapse
these into a single function in the future, perhaps with macros for access
convenience).

Thinking about this in terms of optimisation, the introduction of the runtime
switch to determine fulfills is another source of slowness, as compared to the
previous implementation.  I think I'll try to find another way to reduce the
apparent complexity of extending this to new requirement kinds that doesn't
have the same performance impact.

___

Reply to this item at:

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

___
  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 #4940] Rewrite universal_fulfills_requirement()

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #3, patch #4940 (project freeciv):

 I'm not sure anything prevented using a locally scoped variable
 before,

But making the change to your existing patch to use pointers instead of value
should now be trivial. Just take the pointer instead of value in, and change
callers to pass local_struct instead of local_struct

___

Reply to this item at:

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

___
  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 #4900] Make three attempts of map generation

2014-07-12 Thread Marko Lindqvist
Update of patch #4900 (project freeciv):

  Status:  Ready For Test = Done   
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #4940] Rewrite universal_fulfills_requirement()

2014-07-12 Thread Emmet Hikory
Follow-up Comment #4, patch #4940 (project freeciv):

Yes, but the switch statement is unfortunate, and probably causes more of a
slowdown than whether we pass a pointer or a struct containing an enum and a
pointer.  My thought is to replace all the callers with macros that call a
common (callback-based) implementation, which should retain the current
performance with smaller code-size and greater ease of extension (my primary
interest here).


___

Reply to this item at:

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

___
  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 #4926] Properly account for attack move costs in pathfinding

2014-07-12 Thread Emmet Hikory
Update of patch #4926 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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] [task #7751] Tracking release 2.5.0-beta1

2014-07-12 Thread Marko Lindqvist
Update of task #7751 (project freeciv):

  Dependency Removed: = patch #3539


___

Reply to this item at:

  http://gna.org/task/?7751

___
  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 #4928] Introduce savegame3.c

2014-07-12 Thread Marko Lindqvist
Follow-up Comment #1, patch #4928 (project freeciv):

Patch. Copy savegame2.c as savegame3.c and savegame2.h as savegame3.h before
applying

(file #21397)
___

Additional Item Attachment:

File name: Savegame3.patch.bz2Size:15 KB


___

Reply to this item at:

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

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


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