Re: [Freeciv-Dev] Please test trunk!
Am Sunday 11 July 2010 05:48:23 schrieb Karl Goetz: On Sat, 10 Jul 2010 13:46:29 +0200 Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: Am Saturday 10 July 2010 13:10:28 schrieb Matthias Pfafferodt: Hello all developers of freeciv, today I submitted some big changes to trunk: * increase map size to 128.000 (max linear size 512) * increase max number of players to 28 should be 128! That will be a busy game! And a big savefile! Uncompressed around 150MB (bigger map size and lots of players). Most of the time is spend compressing the file ... * new savegame format (use 'set saveversion -1' to get a savegame in the old format). A script to test the new format can be found at https://gna.org/patch/?1541. It converts a savegame between the different formats and compares them. There should only be differences in the event cache. Due to some processing while loading the game, there are also differences in the map.owner sections. What will happen on clients which don't support the new format (I assume everything up to 2.2.1)? Will they crash, or simply refuse to load the files? old games will refuse to load the new save file due to a required capability (I hope '+version2' does this?!). If you want to use such a game with an old version you have to load it in 2.2.99+ and save it in the old format. I note from the ticket the formats are convertable, so will it be worth shipping the conversion scripts with newer versions of freeciv? kk Converting is done by freeciv itself (set saveversion -1). The script is used to test if the converting is working (it takes one savegame and does some cycles of loading/saving in different formats [old/new] and compares the results). ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #1742] [players] cleanup game_(init|free|reset)
URL: http://gna.org/patch/?1742 Summary: [players] cleanup game_(init|free|reset) Project: Freeciv Submitted by: syntron Submitted on: Sonntag 11.07.2010 um 10:18 Category: general Priority: 3 - Low Status: In Progress Privacy: Public Assigned to: syntron Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: identical functions for server / client ___ File Attachments: --- Date: Sonntag 11.07.2010 um 10:18 Name: 20100711-05-trunk-cleanup-game_-init-free-reset.patch Size: 2kB By: syntron http://gna.org/patch/download.php?file_id=9481 ___ Reply to this item at: http://gna.org/patch/?1742 ___ 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 #1741] [players] use player_slot_count
Update of patch #1741 (project freeciv): Summary: use player_slot_count = [players] use player_slot_count ___ Reply to this item at: http://gna.org/patch/?1741 ___ 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 #1743] [players] dynamically allocate player-diplstates
URL: http://gna.org/patch/?1743 Summary: [players] dynamically allocate player-diplstates Project: Freeciv Submitted by: syntron Submitted on: Sonntag 11.07.2010 um 10:19 Category: general Priority: 3 - Low Status: In Progress Privacy: Public Assigned to: syntron Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: ___ File Attachments: --- Date: Sonntag 11.07.2010 um 10:19 Name: 20100711-06-trunk-dynamically-allocate-player-diplstates.patch Size: 76kB By: syntron http://gna.org/patch/download.php?file_id=9482 ___ Reply to this item at: http://gna.org/patch/?1743 ___ 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 #1744] [players] rename struct player-ai_data to ai_common
URL: http://gna.org/patch/?1744 Summary: [players] rename struct player-ai_data to ai_common Project: Freeciv Submitted by: syntron Submitted on: Sonntag 11.07.2010 um 10:19 Category: general Priority: 3 - Low Status: In Progress Privacy: Public Assigned to: syntron Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: * can't be confused with aidata and struct ai_data * move initialization of ai_common.love into player.c ___ File Attachments: --- Date: Sonntag 11.07.2010 um 10:19 Name: 20100711-07-trunk-rename-struct-player-ai_data-to-ai_common.patch Size: 108kB By: syntron http://gna.org/patch/download.php?file_id=9483 ___ Reply to this item at: http://gna.org/patch/?1744 ___ 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 #1745] [players] dynamically allocate ai_data
URL: http://gna.org/patch/?1745 Summary: [players] dynamically allocate ai_data Project: Freeciv Submitted by: syntron Submitted on: Sonntag 11.07.2010 um 10:20 Category: general Priority: 3 - Low Status: In Progress Privacy: Public Assigned to: syntron Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: ___ File Attachments: --- Date: Sonntag 11.07.2010 um 10:20 Name: 20100711-08-trunk-dynamically-allocate-ai_data.patch Size: 47kB By: syntron http://gna.org/patch/download.php?file_id=9484 ___ Reply to this item at: http://gna.org/patch/?1745 ___ 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 #1732] [Metaticket] increase number of players
Update of patch #1732 (project freeciv): Depends on: = patch #1739 ___ Reply to this item at: http://gna.org/patch/?1732 ___ 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 #1732] [Metaticket] increase number of players
Follow-up Comment #1, patch #1732 (project freeciv): player pointers patches; there is an error wrt the editor: it crashes if one tries to change the player. I expect that there are some assumptions about the player struct (only patch #1739 needed) 1/6: [players] use pointers for players (patch #1739) 2/6: [players] use player_slot_count (patch #1741) 3/6: [players] cleanup game_(init|free|reset) (patch #1742) 4/6: [players] dynamically allocate player-diplstates (patch #1743) 5/6: [players] rename struct player-ai_data to ai_common (patch #1744) 6/6: [players] dynamically allocate ai_data (patch #1745) ___ Reply to this item at: http://gna.org/patch/?1732 ___ 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 #1698] Dahomey
Follow-up Comment #2, patch #1698 (project freeciv): It looks a lot better than my version. I think the central figure and the swords are nice. The heads look a bit more headlike than in the original, but I can't imagine anyone will see that when it has been shrunk. ___ Reply to this item at: http://gna.org/patch/?1698 ___ 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 #1744] [players] rename struct player-ai_data to ai_common
Follow-up Comment #1, patch #1744 (project freeciv): updated version (missed some renames in ./server/scripting/api.pkg) a thought about this struct in general: can it be removed? = love into player:player_diplstate = control as variable directly in player (as player:controlled) = gui-gtk uses skill_level; so save it as player:skill_level = the client further gets only gets science_cost and barbarian_type = all other are only ai variables so move them into ai_data comments? (file #9485) ___ Additional Item Attachment: File name: 20100711-07v2-trunk-rename-struct-player-ai_data-to-ai_common.patch Size:108 KB ___ Reply to this item at: http://gna.org/patch/?1744 ___ 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 #1746] [players] send diplstate as separate network packages
URL: http://gna.org/patch/?1746 Summary: [players] send diplstate as separate network packages Project: Freeciv Submitted by: syntron Submitted on: Sonntag 11.07.2010 um 12:44 Category: general Priority: 1 - Later Status: Postponed Privacy: Public Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: 2.3.0 ___ Details: with the increase of the number of players, 128 diplstates are saved in the package for each player. What about an extra package for the diplstate? It would contain the data in the struct as well as both player ids. Thus, for small games it would reduce the network traffic. ___ Reply to this item at: http://gna.org/patch/?1746 ___ 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 #1732] [Metaticket] increase number of players
Update of patch #1732 (project freeciv): Depends on: = patch #1746 ___ Reply to this item at: http://gna.org/patch/?1732 ___ Nachricht geschickt von/durch Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Please test trunk!
On 11 July 2010 11:13, Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: Am Sunday 11 July 2010 05:48:23 schrieb Karl Goetz: On Sat, 10 Jul 2010 13:46:29 +0200 Matthias Pfafferodt matthias.pfaffer...@mapfa.de wrote: * new savegame format (use 'set saveversion -1' to get a savegame in the old format). A script to test the new format can be found at https://gna.org/patch/?1541. It converts a savegame between the different formats and compares them. There should only be differences in the event cache. Due to some processing while loading the game, there are also differences in the map.owner sections. What will happen on clients which don't support the new format (I assume everything up to 2.2.1)? Will they crash, or simply refuse to load the files? old games will refuse to load the new save file due to a required capability (I hope '+version2' does this?!). If you want to use such a game with an old version you have to load it in 2.2.99+ and save it in the old format. Just to clarify: This change was committed to trunk only, so first release which it will be part of, is 2.3.0. Further bugfix releases from S2_2 branch (2.2.x releases) will not have it. Also, this is not server / client compatibility thing, but server / savegame compatibility thing. 2.2.x server / client will be incompatible with 2.3.x server / client anyway. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Please test trunk!
old games will refuse to load the new save file due to a required capability (I hope '+version2' does this?!). If you want to use such a game with an old version you have to load it in 2.2.99+ and save it in the old format. Just to clarify: This change was committed to trunk only, so first release which it will be part of, is 2.3.0. Further bugfix releases from S2_2 branch (2.2.x releases) will not have it. Also, this is not server / client compatibility thing, but server / savegame compatibility thing. 2.2.x server / client will be incompatible with 2.3.x server / client anyway. Sorry if I was not clear. The changes are only for trunk (will be 2.3.0). Thus, if you playing 2.2.x you will not see any of the above discussed changes. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #16245] Every government is allowed at start
Follow-up Comment #4, bug #16245 (project freeciv): The patch definitely works. ___ Reply to this item at: http://gna.org/bugs/?16245 ___ 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 #1744] [players] rename struct player-ai_data to ai_common
Follow-up Comment #2, patch #1744 (project freeciv): player-real_embassy could also be moved into diplstate. Thus only one part of the player package is per (defined) player ___ Reply to this item at: http://gna.org/patch/?1744 ___ 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 #1746] [players] send diplstate as separate network packages
Follow-up Comment #1, patch #1746 (project freeciv): player-real_embassy could also be moved into diplstate. Thus only one part of the player package is per (defined) player (see also patch #1744) ___ Reply to this item at: http://gna.org/patch/?1746 ___ 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 #1744] [players] rename struct player-ai_data to ai_common
Follow-up Comment #3, patch #1744 (project freeciv): = love into player:player_diplstate This affects only AI players, right? It should remain in structure clearly marked as AI stuff. I'm against polluting other structures with parts of AI stuff, especially with something that is only relevant to current AI implementation. We should be increasing AI modularity, not decreasing it, in hope that some day we can switch to better AI implementation. = control as variable directly in player (as player:controlled) This one makes sense. It's not part of AI, but tells if AI code should be used at all. Actually I think I already had patch to move it away from ai_data somewhere. = gui-gtk uses skill_level; so save it as player:skill_level I'm a bit undecided about this. Should all implementations of modular AI to implement same skill levels, or can they define skill levels differently? ___ Reply to this item at: http://gna.org/patch/?1744 ___ 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 #1746] [players] send diplstate as separate network packages
Follow-up Comment #2, patch #1746 (project freeciv): Each diplstate should definitely sent as separate package and not all of them as part of one big player package. This will also remove one more limit from maximum number of players; player packet will not grow beyond maximum packet size. ___ Reply to this item at: http://gna.org/patch/?1746 ___ 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 #1700] Freeciv 2.2.1 patches for Mac OS X 10.6.3
Follow-up Comment #1, patch #1700 (project freeciv): Please make separate ticket for each separate issue in the future. 1, 2, 7 and 8 ftwl client is not maintained and is likely to be completely removed soon, so it's likely nobody bothers to handle these patches. 3-6 Sounds like real problem. Can you make a patch where you use FC_AI_DEFAULT to match our naming conventions? 9 I have not looked into patch or related code, but sounds like issue that needs fixing. 10 Is this still needed with latest S2_2. I believe this issue has been taken care of since 2.2.1 release. ___ Reply to this item at: http://gna.org/patch/?1700 ___ 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 #16249] Can't build trunk with -Werror: format not a string literal and no format arguments
Follow-up Comment #3, bug #16249 (project freeciv): (Perhaps a newish-GCC thing?) Hardened GCC thing. I fixed dozens of such things when I first tried to build freeciv with hardened gcc. ___ Reply to this item at: http://gna.org/bugs/?16249 ___ 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 #16249] Can't build trunk with -Werror: format not a string literal and no format arguments
Follow-up Comment #4, bug #16249 (project freeciv): yes, I now remember the discussion; but as I don't see this, I easily forget it ... ___ Reply to this item at: http://gna.org/bugs/?16249 ___ 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 #1739] [players] use pointers for players
Follow-up Comment #6, patch #1739 (project freeciv):
a small analysis of the memory usage of freeciv (using pmap)
naming convention:
* freeciv server:
log_server-version-# player-1 = connected + started
* freeciv client (gtk):
log_client-version-# player-1 = connected + started
* versions:
S2_2 = something between R2_2_1 and S2_2
(on another system and no debug information!)
X1 = svn 17555 (before increased map size + player numbers)
X2 = svn 17568 (after increased map size + player numbers)
X3 = with patches for dynamically allocated players (126+2)
X3a = limit dynamically allocated players to (30+2)
* # players
1 = 'set aifill 1' (default map size [4])
30 = 'set aifill 30' (default map size [4])
126= 'set aifill 126' (default map size [4])
126map = 'set aifill 126; set size 128; set generator 2'
== analysis ==
* memory for the executeable (SIZE column in the tables):
EXECRO RW
[client:S2_2] 1552K + 4K + 28K
[client:X1] 1896K + 4K + 44K
[client:X2] 1896K + 4K + 44K
[client:X3] 1900K + 4K + 44K
[client:X3a] 1900K + 4K + 44K
[server:S2_2] 1708K + 4K + 16K
[server:X1] 2188K + 4K + 24K
[server:X2] 2268K + 4K + 24K
[server:X3] 2272K + 4K + 24K
[server:X3a] 2272K + 4K + 24K
* heap size ('-' not started; '+': connected and started)
1P- 1P+30P-30P+ 126P- 126P+ 126P-m
126P+m
[client:S2_2] 49120K 101044K 49120K 101200K
[client:X1]53816K 135280K 53344K 133464K
[client:X2]61812K 141864K 61812K 145632K 61636K 144092K
[client:X3]61084K 141052K 59592K 140008K 61084K 143756K 61088K
153892K
[client:X3a] 53248K 136016K 53260K 133780K
[server:S2_2] 7336K 7464K 7336K 10704K
[server:X1]10280K 11564K 10280K 17248K
[server:X2]13708K 15012K 13708K 21116K 13708K 40572K
[server:X3]10932K 12428K 10932K 18768K 11644K 41504K 12000K
30704K
[server:X3a]9816K 11156K 9816K 17420K
* there seems to be a lot of structs / static definitions which use
MAX_NUM_PLAYERS (bv_players?); thus the memory requirement is increased if
the number of players is increased (X1 = X2)
* on the client side the heap size is increased by ca. 8MB. Could this be due
to ./client/tilespec.c:311? ('player_borders[MAX_NUM_PLAYERS +
MAX_NUM_BARBARIANS][EDGE_COUNT][2];') If the number of players is reduced to
30+2 the memory requirement is similar.
(file #9487)
___
Additional Item Attachment:
File name: memory.txt Size:32 KB
___
Reply to this item at:
http://gna.org/patch/?1739
___
Nachricht geschickt von/durch Gna!
http://gna.org/
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15502] Error message Illegal treaty ... they already have this treaty level
Update of bug #15502 (project freeciv): Planned Release: 2.2.2 = ___ Reply to this item at: http://gna.org/bugs/?15502 ___ 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 #15461] No horizontal scrollbar in Inspect City report
Update of bug #15461 (project freeciv): Planned Release: 2.2.2 = ___ Reply to this item at: http://gna.org/bugs/?15461 ___ 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 #16142] Some sources not included in tarball
Update of bug #16142 (project freeciv): Planned Release: 2.2.2 = ___ Reply to this item at: http://gna.org/bugs/?16142 ___ 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 #1698] Dahomey
Update of patch #1698 (project freeciv): Assigned to:None = mixcoatl ___ Follow-up Comment #3: Drew a couple of new heads with a cruder look. Put two of them in 'bowl' as well. (file #9488) ___ Additional Item Attachment: File name: dahomey.svgSize:10 KB ___ Reply to this item at: http://gna.org/patch/?1698 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
