[Freeciv-Dev] [patch #2941] Polish localization for S2_4

2011-08-24 Thread Hubert Kowalewski

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

This revision of localization incudes the changes proposed by Andrzej and
improves typographic consistency.

(file #13967)
___

Additional Item Attachment:

File name: pl.po.bz2  Size:367 KB


___

Reply to this item at:

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

___
  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 #2943] Shave 8/24 bytes of struct tile

2011-08-24 Thread Michal Mazurek

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

 Summary: Shave 8/24 bytes of struct tile
 Project: Freeciv
Submitted by: akfaew
Submitted on: Wed Aug 24 15:46:31 2011
Category: None
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

No map can be wider than 32k tiles.
+verbose+
 struct tile {
-  int x, y; /* Cartesian (map) coordinates of the tile. */
-  int nat_x, nat_y; /* Native coordinates of the tile. */
+  u_int16_t x, y; /* Cartesian (map) coordinates of the tile. */
+  u_int16_t nat_x, nat_y; /* Native coordinates of the tile. */
-verbose-

these:
struct resource *resource;
struct terrain *terrain;
can also be decreased in size from 8 bytes on 64 bit platforms to 1 byte.
They can be an index in a table of resources, or terrains. What do you think?




___

Reply to this item at:

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

___
  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 #2943] Shave 8/24 bytes of struct tile

2011-08-24 Thread Matthias Pfafferodt

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

I do remember that this was discussed before but I do not find it at the
moment. After the old discussion I did create a patch which removed x,y,nat_x
and nat_y alltogether from the tile struct. I will serach for it and check if
it still is useable ... I think I did not send it as patch because the max.
RAM saving is not that much due to the usage of pointers. But it cleans up the
namespace and only one index for the tiles is used after that at the cost of a
little more computation time.

___

Reply to this item at:

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

___
  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 #2943] Shave 8/24 bytes of struct tile

2011-08-24 Thread Marko Lindqvist

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

 I did create a patch which removed x,y,nat_x and nat_y
 alltogether from the tile struct.

Then how to you check if virtual tile is same as some real tile or another
virtual tile? Just last week bugs caused by comparing pointers in such a case
were fixed.

___

Reply to this item at:

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

___
  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 #18557] Ocean border sources do not reclaim tile they are on

2011-08-24 Thread Marko Lindqvist

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

 Summary: Ocean border sources do not reclaim tile they are
on
 Project: Freeciv
Submitted by: cazfi
Submitted on: Wed 24 Aug 2011 08:47:59 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.2.8, 2.3.1, 2.4.0

___

Details:

Original reported by heilkitty on Alien World ruleset thread on forums
http://forum.freeciv.org/viewtopic.php?t=5978

After border source in ocean temporarily loses borders, it never reclaims
central tile it's on. This is because is_claimable_ocean() checks only for
adjacent tiles, not for tile itself.

Fix attached.



___

File Attachments:


---
Date: Wed 24 Aug 2011 08:47:59 PM EEST  Name: ClaimOceanCityCenter.diff 
Size: 787B   By: cazfi

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

___

Reply to this item at:

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

___
  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 #2943] Shave 8/24 bytes of struct tile

2011-08-24 Thread Matthias Pfafferodt

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

The patch was created at a time virtual tiles did not exists ... I have found
it but not tested if it applies to trunk.

___

Reply to this item at:

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

___
  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 #2931] Dynamic road names in get_infrastructure_text()

2011-08-24 Thread Marko Lindqvist

Update of patch #2931 (project freeciv):

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


___

Reply to this item at:

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

___
  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 #2922] [lua] prepare for common lua script (2)

2011-08-24 Thread Marko Lindqvist

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

When trying to launch server, this patch results in:

1: in luascript_do_file()
[../../../../src.patched/server/scripting/luascript.c::401]: assertion 'L !=
((void *)0)' failed.
2: Backtrace:
2:  0: ./server/freeciv-server() [0x5c5918]
2:  1: ./server/freeciv-server() [0x5c8867]
2:  2: ./server/freeciv-server(vdo_log+0x125) [0x5c8df5]
2:  3: ./server/freeciv-server(do_log+0x7d) [0x5c915d]
2:  4: ./server/freeciv-server(fc_assert_fail+0x9d) [0x5c938d]
2:  5: ./server/freeciv-server(luascript_do_file+0x7a) [0x4c8aba]
2:  6: ./server/freeciv-server(script_do_file+0x13) [0x4685a3]
2:  7: ./server/freeciv-server() [0x49a9f6]
2:  8: ./server/freeciv-server(load_rulesets+0x1f77) [0x4a17d7]
2:  9: ./server/freeciv-server(srv_main+0xdc) [0x438e1c]
2:  10: ./server/freeciv-server(main+0x542) [0x432562]
2:  11: /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xfd)
[0x7f878e8b7ead]
2:  12: ./server/freeciv-server() [0x432ae5]


___

Reply to this item at:

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

___
  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 #2932] Define ggz_report_victor() as empty inline function when not needed

2011-08-24 Thread Marko Lindqvist

Update of patch #2932 (project freeciv):

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


___

Reply to this item at:

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

___
  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 #2922] [lua] prepare for common lua script (2)

2011-08-24 Thread Matthias Pfafferodt

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

bugfix and new patch attached

(file #13970, file #13971)
___

Additional Item Attachment:

File name: bugfix_prepare_lua2.diff   Size:0 KB
File name: prepare_lua2.diff  Size:16 KB


___

Reply to this item at:

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

___
  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 #2943] Shave 8/24 bytes of struct tile

2011-08-24 Thread Matthias Pfafferodt

Update of patch #2943 (project freeciv):

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

___

Follow-up Comment #4:

OK, here is the patch - it was quite hard to rebase it and to check it. A
autogame with and without the patch results in the same savegame (no
differences but the event cache).

 Then how to you check if virtual tile is same as some real tile
 or another virtual tile? Just last week bugs caused by comparing
 pointers in such a case were fixed.
The tile index is used to compare tiles. All positions (map,native,...) can
be transformed to it.

Please (re)check the added macros and their use. I did only change the gtk2
client.

Patch comment:

shrink tile struct by removing x, y, nat_x, nat_y

* x, y = index_to_map_pos()
* x_nat, y_nat = index_to_native_pos()

* some optimization on top of it is still possible (use index instead of x,y
values)

Pro:
- save RAM
- cleanup of the code (only one id for tiles - the index)

Contra:
- extra calculations needed
- no intuitive coordinate value available; macros needed


___

Reply to this item at:

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

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


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