[Freeciv-Dev] [patch #1201] Setting to control distance of traderoutes.

2009-07-28 Thread Matthias Pfafferodt

Follow-up Comment #4, patch #1201 (project freeciv):

I can change that. I think most people will use the
minimum (= default) or a really big value ...

If I remember right, the problem is, that in freeciv
counting starts at 0 (everythere?). 8 (or trademindist)
is the tile distance between two cities, not including
the city tiles.

___

Reply to this item at:

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

___
  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 #1201] Setting to control distance of traderoutes.

2009-07-28 Thread pepeto

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

 I can change that. I think most people will use the
 minimum (= default) or a really big value ...

Actually, you could also allow lower value.  Warserver usual setting is 8
(which means 7 with your patch) for example.

 If I remember right, the problem is, that in freeciv
 counting starts at 0 (everythere?).

The distance between 2 similar tiles is 0, this is logical.

 8 (or trademindist) is the tile distance between two cities,
 not including the city tiles.

This is not logical for me.


___

Reply to this item at:

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

___
  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 #1206] Constant parameters for movement functions

2009-07-28 Thread pepeto

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

 Summary: Constant parameters for movement functions
 Project: Freeciv
Submitted by: pepeto
Submitted on: Tuesday 07/28/2009 at 11:28
Category: general
Priority: 3 - Low
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any

___

Details:

It appears that some constant flags are missing in common/movement.[ch].  The
attached patch corrects it.





___

File Attachments:


---
Date: Tuesday 07/28/2009 at 11:28  Name: trunk_const_movement.diff  Size: 2kB
  By: pepeto

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

___

Reply to this item at:

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

___
  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 #1207] pft_fill_utype_*_parameter functions

2009-07-28 Thread pepeto

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

 Summary: pft_fill_utype_*_parameter functions
 Project: Freeciv
Submitted by: pepeto
Submitted on: Tuesday 07/28/2009 at 11:33
Category: general
Priority: 3 - Low
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any

___

Details:

A bit everywhere in the code, some virtual units are created just to make a
pf_map.  Actually, it is not needed to have a unit pointer, and it's possible
to deal only with the unit_type pointer.  The attached patch grants functions
to make pf_parameter from unit_type:
* pft_fill_utype_parameter() like pft_fill_unit_parameter().
* pft_fill_utype_overlap_param() like pft_fill_unit_overlap_param().
* pft_fill_utype_attack_param() like pft_fill_unit_attack_param().

N.B.: it needs the patch #1206 applied.




___

File Attachments:


---
Date: Tuesday 07/28/2009 at 11:33  Name: trunk_pft_fill_utype.diff  Size:
17kB   By: pepeto

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

___

Reply to this item at:

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

___
  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 #1208] City warmap alternative

2009-07-28 Thread pepeto

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

 Summary: City warmap alternative
 Project: Freeciv
Submitted by: pepeto
Submitted on: Tuesday 07/28/2009 at 11:36
Category: general
Priority: 3 - Low
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any

___

Details:

In ai/advmilitary.c, the warmap is deployed for a city. I added some
equivalent named struct pf_city_map which works by unit_class when warmap
worked with move types. The city map is a vector of pf_map (which are only
created and deployed when needed). The public interface grants 3 functions:
* struct pf_city_map pf_city_map_new(const struct city pcity);
* void pf_city_map_destroy(struct pf_city_map *pfcm);
* int pf_city_map_get_move_cost(struct pf_city_map pfcm, const struct
unit_class punitclass, struct tile *ptile);




___

File Attachments:


---
Date: Tuesday 07/28/2009 at 11:36  Name: trunk_city_warmap_alternative.diff 
Size: 7kB   By: pepeto

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

___

Reply to this item at:

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

___
  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 #13863] Remove old server goto code, step 1: warmap alternatives

2009-07-28 Thread pepeto

Follow-up Comment #3, bug #13863 (project freeciv):

This ticket has been splited into 4:
* [bug #13881]: [Patch] Init pf nodes only once (fixed).
* [patch #1206]: Constant parameters for movement functions.
* [patch #1207]: pft_fill_utype_*_parameter functions.
* [patch #1208]: City warmap alternative.


___

Reply to this item at:

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

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


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


Re: [Freeciv-Dev] [patch #1204] Separate desktop files for gtk2, sdl and xaw clients

2009-07-28 Thread Egor Vyscrebentsov
On Tue, 28 Jul 2009 Marko Lindqvist wrote:
 Currently there is one desktop file for client, and it tries to execute
 gtk-client no matter which client is built.

 Attached patch makes separate desktop file for each of the clients gtk2, sdl
 and xaw. Only those desktop files that refer to actually built clients get
 installed.

Do we have _different_ icons for clients? (I guess we allow installation of
more than one client, right?) I'm afraid, patch shouldn't be applied
without them.

Also,
=
 if CLIENT_GUI_GTK_2_0
 GUI_SUBDIRS += gui-gtk-2.0
+desktopfile_DATA = freeciv-gtk2.desktop
 endif
 if CLIENT_GUI_XAW
=
I haven't seen 'elif'. Is it correct to use ' = ' and ' += ' together?

-- 
Thanks, evyscr

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


[Freeciv-Dev] [patch #1201] Setting to control distance of traderoutes.

2009-07-28 Thread Matthias Pfafferodt

Follow-up Comment #6, patch #1201 (project freeciv):

I had a look at the trade code in warserver. This
calculation is highly complex. Perhaps I will try
to get something of it into 2.3-devel ...

 I would prefer change the calculation like = 
 game.info.trademindist instead of  game.info.trademindist  and set the
default value to 9.

 Actually, you could also allow lower value. Warserver
 usual setting is 8 (which means 7 with your patch) for
 example. 

I added the '=' and set the default to 9 as it is in
warserver. The bounds are defined as [1,999].

  8 (or trademindist) is the tile distance between two cities, 
  not including the city tiles. 

 This is not logical for me.

This is my confusion about how distances are counted
in freeciv (I have to think about this from time to
time). Take to cities A and B like

 A   B
 01234 - distance is 4

I did only count the tiles _between_ the two cities.

Attached is an update version of the patch; changes:

* comparison using '='
* changed default/min/max values to [9,1,999]
* correction of a copy  past error in the default value
  if loading a savefile.


(file #6285)
___

Additional Item Attachment:

File name: version2-0001-Setting-to-control-distance-of-traderoutes.patch
Size:5 KB


___

Reply to this item at:

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

___
  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 #1203] move ruleset option illness into its own section

2009-07-28 Thread Matthias Pfafferodt

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

Should the hard coded numbers in ruleset.c be
changed to constants defined in game.h? At the
moment it is a mix out of numbers and constants.

Furthermore, perhaps a function 
secfile_lookup_int_default_min_max() is needed? It
would be equal to secfile_lookup_int_default() but
includes a check for minimum / maximum allowed
values. Such a check is included for some values
but it could be a sanity check for most values as
they should be = 0 (and = big value).

___

Reply to this item at:

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

___
  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 #1206] Constant parameters for movement functions

2009-07-28 Thread Marko Lindqvist

Update of patch #1206 (project freeciv):

 Assigned to:None = cazfi  


___

Reply to this item at:

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

___
  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 #1207] pft_fill_utype_*_parameter functions

2009-07-28 Thread Marko Lindqvist

Update of patch #1207 (project freeciv):

 Assigned to:None = cazfi  


___

Reply to this item at:

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

___
  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 #1208] City warmap alternative

2009-07-28 Thread Marko Lindqvist

Update of patch #1208 (project freeciv):

 Assigned to:None = cazfi  

___

Follow-up Comment #1:

- pf_city_map_get_costs() should consider IGTERR flag (combination of
UCF_TERRAIN_SPEED unit class flag and IGTERR unit type flag)
- pf_city_map_get_move_cost() should check UCF_TERRAIN_SPEED flag instead of
move_type to determine when each step is SINGLE_MOVE

___

Reply to this item at:

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

___
  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 #14004] Client should show plague risk as 0 when illness disabled

2009-07-28 Thread Marko Lindqvist

Follow-up Comment #3, bug #14004 (project freeciv):

When illness is disabled, plague risk tooltip has extra empty line in the
end. It should be removed.

___

Reply to this item at:

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

___
  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 #1204] Separate desktop files for gtk2, sdl and xaw clients

2009-07-28 Thread Marko Lindqvist

Follow-up Comment #1, patch #1204 (project freeciv):

Egor on mailing list:
 Do we have _different_ icons for clients? (I guess we allow
 installation of more than one client, right?) I'm afraid,
 patch shouldn't be applied without them.

Ok. Attached version of the patch only avoids installing (then broken)
desktop file when gtk client is not built. There is no desktop file when some
other client is built instead.

Please comment to bug/patch tracker in the future.


(file #6286)
___

Additional Item Attachment:

File name: DesktopOnlyWhenGtkCompiled_1204.diff Size:0 KB


___

Reply to this item at:

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

___
  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 #13814] segfault in assess_danger_player

2009-07-28 Thread Marko Lindqvist

Update of bug #13814 (project freeciv):

  Status:   Confirmed = Fixed  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #14015] add illness information to gui-win32

2009-07-28 Thread Marko Lindqvist

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

I did some necessary additions to your patch. I also tested that this
compiles, but have not yet had opportunity to test if it works.

(file #6287)
___

Additional Item Attachment:

File name: Win32PlagueRisk_14015.diff Size:2 KB


___

Reply to this item at:

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

___
  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 #13901] [Patch] Support for different graphics for oceanic cities

2009-07-28 Thread Marko Lindqvist

Update of bug #13901 (project freeciv):

Category:None = client 
  Status:None = Fixed  
 Assigned to:None = cazfi  
 Open/Closed:Open = Closed 


___

Reply to this item at:

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

___
  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 #1188] proposed menu and command key revamp

2009-07-28 Thread Marko Lindqvist

Follow-up Comment #7, patch #1188 (project freeciv):

 (necessary) refinements
  ^^^

 Drat, I was planning to commit menu restructuring now (well, I have not yet
even investigated or tested the code, but I'm sure we can make it acceptable)
and postpone accelerator changes.

 Problem with accelerator changes is that some work has been done to use same
keys in all clients. Changing them now in one client is not necessarily a good
idea.
 Even though cproc has been less active lately, SDL client in trunk is still
very much usable client. I want to avoid unnecessarily making it incompatible
now, close to S2_2 branching.

 However, after S2_2 is branched, making these changes is not a problem. Then
there is time of whole release cycle to make necessary changes to other
clients - and if nobody makes the change = nobody maintains the clients -
they will be broken by many ways anyway when 2.3 is released.

 So, my current feeling is that this ticket goes forward only after S2_2
branching. Ok?

 I can place patch menu.c.01_reorg.diff and
 menu.c.02_accels_revised.diff in two tickets -
 would you like me to go forward on that?

No need if they have to go in in same commit anyway.

___

Reply to this item at:

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

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


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