[Freeciv-Dev] (PR#39602) quickselect doesn't like the selection of many units

2007-10-15 Thread Pepeto _

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39602 

New patch: It selects new units on the tiles of the current units in
focus. It selects only 1 unit by tile, to avoid unit selection duplication .

Index: client/control.c
===
--- client/control.c(révision 13752)
+++ client/control.c(copie de travail)
@@ -2726,13 +2726,41 @@
 }
 
 /**
-...
+  Selects new units on the same tiles than the previous selected ones.
+  Allows only one unit by tile.
 **/
 void key_quickselect(enum quickselect_type qtype)
 {
+  struct unit_list *punits = unit_list_new();
+  struct unit *punit2;
+  bool tiles[MAP_INDEX_SIZE], first;
+
+  memset(tiles, 0, sizeof(tiles));
+  /* Collect the units */
   unit_list_iterate(get_units_in_focus(), punit) {
-struct unit *punit2 = quickselect(punit-tile, qtype);
+if (tiles[punit-tile-index]) {
+  /* One unit by tile only */
+  continue;
+}
 
-set_unit_focus_and_select(punit2);
+punit2 = quickselect(punit-tile, qtype);
+if (punit2) {
+  unit_list_append(punits, punit2);
+}
+tiles[punit-tile-index] = TRUE;
   } unit_list_iterate_end;
+
+  /* Set them in the focus */
+  first = TRUE;
+  unit_list_iterate(punits, punit) {
+if (first) {
+  set_unit_focus_and_select(punit);
+  first = FALSE;
+} else {
+  add_unit_focus(punit);
+}
+  } unit_list_iterate_end;
+
+  unit_list_unlink_all(punits);
+  unit_list_free(punits);
 }

Index: client/control.c
===
--- client/control.c	(révision 13752)
+++ client/control.c	(copie de travail)
@@ -2726,13 +2726,41 @@
 }
 
 /**
-...
+  Selects new units on the same tiles than the previous selected ones.
+  Allows only one unit by tile.
 **/
 void key_quickselect(enum quickselect_type qtype)
 {
+  struct unit_list *punits = unit_list_new();
+  struct unit *punit2;
+  bool tiles[MAP_INDEX_SIZE], first;
+
+  memset(tiles, 0, sizeof(tiles));
+  /* Collect the units */
   unit_list_iterate(get_units_in_focus(), punit) {
-struct unit *punit2 = quickselect(punit-tile, qtype);
+if (tiles[punit-tile-index]) {
+  /* One unit by tile only */
+  continue;
+}
 
-set_unit_focus_and_select(punit2);
+punit2 = quickselect(punit-tile, qtype);
+if (punit2) {
+  unit_list_append(punits, punit2);
+}
+tiles[punit-tile-index] = TRUE;
   } unit_list_iterate_end;
+
+  /* Set them in the focus */
+  first = TRUE;
+  unit_list_iterate(punits, punit) {
+if (first) {
+  set_unit_focus_and_select(punit);
+  first = FALSE;
+} else {
+  add_unit_focus(punit);
+}
+  } unit_list_iterate_end;
+
+  unit_list_unlink_all(punits);
+  unit_list_free(punits);
 }
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39778) [Bgu] Server doesn't load old games teams

2007-10-15 Thread William Allen Simpson

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39778 

Could you please try to give more concrete examples?  And savegames?

Do you mean that a 2.1 server doesn't load 2.0 teams?


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


[Freeciv-Dev] (PR#39568) cannot sell an improvement

2007-10-15 Thread Pepeto _

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39568 

Isn't this ticket resolved? Or does it need some more improvement?


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


[Freeciv-Dev] (PR#16196) Crash in FreeCiv 2.0.6 under Win2000

2007-10-15 Thread Pepeto _

URL: http://bugs.freeciv.org/Ticket/Display.html?id=16196 

There isn't any clue in this ticket about how the client crashed. Then,
impossible to reproduce.


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


Re: [Freeciv-Dev] [Freeciv-commits] r13766 - in /branches/S2_1: ./ data/ data/icons/ data/icons/128x128/ data/icons/16x16/ data/icons/32x32/ data/icons/48x48/ data/icons/64x64/

2007-10-15 Thread Daniel Markstedt
Thanks Egor!

Perhaps there's no need for data/freeciv-client.png
data/freeciv-server.png anymore?

 ~Daniel

On 10/16/07, Egor Vyscrebentsov [EMAIL PROTECTED] wrote:
 Author: evyscr
 Date: Tue Oct 16 00:32:26 2007
 New Revision: 13766

 URL: http://svn.gna.org/viewcvs/freeciv?rev=13766view=rev
 Log:
 Add freedesktop icons (made by Daniel.) See #39769

 Added:
 branches/S2_1/data/icons/
 branches/S2_1/data/icons/128x128/
 branches/S2_1/data/icons/128x128/freeciv-client.png   (with props)
 branches/S2_1/data/icons/128x128/freeciv-server.png   (with props)
 branches/S2_1/data/icons/16x16/
 branches/S2_1/data/icons/16x16/freeciv-client.png   (with props)
 branches/S2_1/data/icons/16x16/freeciv-server.png   (with props)
 branches/S2_1/data/icons/32x32/
 branches/S2_1/data/icons/32x32/freeciv-client.png   (with props)
 branches/S2_1/data/icons/32x32/freeciv-server.png   (with props)
 branches/S2_1/data/icons/48x48/
 branches/S2_1/data/icons/48x48/freeciv-client.png   (with props)
 branches/S2_1/data/icons/48x48/freeciv-server.png   (with props)
 branches/S2_1/data/icons/64x64/
 branches/S2_1/data/icons/64x64/freeciv-client.png   (with props)
 branches/S2_1/data/icons/64x64/freeciv-server.png   (with props)
 branches/S2_1/data/icons/Makefile.am
 Modified:
 branches/S2_1/configure.ac
 branches/S2_1/data/Makefile.am


 ___
 Freeciv-commits mailing list
 [EMAIL PROTECTED]
 https://mail.gna.org/listinfo/freeciv-commits


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


Re: [Freeciv-Dev] 2.1.0-rc1 version set

2007-10-15 Thread Daniel Markstedt
On 10/13/07, Daniel Markstedt [EMAIL PROTECTED] wrote:
 On 10/12/07, Daniel Markstedt [EMAIL PROTECTED] wrote:
  On 10/12/07, William Allen Simpson [EMAIL PROTECTED] wrote:
   I'm not sure how to tag the release (do I have to checkout 1 level above
   the branches?) -- Daniel can do that -- but version.in has been set.
  
   ___
   Freeciv-dev mailing list
   Freeciv-dev@gna.org
   https://mail.gna.org/listinfo/freeciv-dev
  
 
  I follow Jason's steps at http://freeciv.wikia.com/wiki/Release
 
  Let's wait 24h before tagging, to let some final fixes go in. Between
  now and final, docs need some attention too. Especially translated
  docs.
 
   ~Daniel
 

 gna.org's svn is unresponsive and I have a headache, so I won't be
 doing the release tonight. Will be trying again in 12hrs or so!

  ~Daniel


It has been done! RC1 tagged and tarball uploaded to beta/.

Successfully complies and runs on my Ubuntu work computer, though I
couldn't play around with it much, needless to say. ;)

I will announce the release on mailing lists and wiki when I get back
home in 8 hours or so.

 Daniel

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