------------------------------------------------------------------------ r15923 | cazfi | 2009-09-09 23:36:11 +0300 (Wed, 09 Sep 2009) | 6 lines Changed paths: M /trunk/client/client_main.c M /trunk/client/climisc.c M /trunk/client/colors_common.c M /trunk/client/colors_common.h M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/mapview_common.c M /trunk/client/mapview_common.h M /trunk/client/packhand.c M /trunk/data/misc/colors.tilespec Display link marks in mapview Patch by Pepeto See gna patch #1282 ------------------------------------------------------------------------ r15922 | cazfi | 2009-09-09 20:58:23 +0300 (Wed, 09 Sep 2009) | 5 lines Changed paths: M /trunk/server/savegame.c Save to scenario savegame information whether players should be saved. This is required when one continues to edit previously saved scenario. See gna bug #14262 ------------------------------------------------------------------------ r15921 | cazfi | 2009-09-09 20:55:28 +0300 (Wed, 09 Sep 2009) | 4 lines Changed paths: M /trunk/server/connecthand.c M /trunk/server/srv_main.c Send scenario info to client. See gna bug #14260 ------------------------------------------------------------------------ r15920 | cazfi | 2009-09-09 19:03:30 +0300 (Wed, 09 Sep 2009) | 6 lines Changed paths: M /trunk/ai/advdiplomacy.c M /trunk/ai/ailog.c M /trunk/common/featured_text.h M /trunk/common/packets.def M /trunk/server/auth.c M /trunk/server/barbarian.c M /trunk/server/cityhand.c M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/connecthand.c M /trunk/server/console.c M /trunk/server/diplhand.c M /trunk/server/diplomats.c M /trunk/server/edithand.c M /trunk/server/gamehand.c M /trunk/server/handchat.c M /trunk/server/maphand.c M /trunk/server/plrhand.c M /trunk/server/plrhand.h M /trunk/server/scripting/api_notify.c M /trunk/server/spacerace.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/techtools.c M /trunk/server/unithand.c M /trunk/server/unittools.c M /trunk/server/voting.c Color coded event messages Patch by Pepeto See gna patch #1271 ------------------------------------------------------------------------ r15918 | cazfi | 2009-09-09 02:25:03 +0300 (Wed, 09 Sep 2009) | 6 lines Changed paths: M /trunk/server/unittools.c Leave no units to current tile when bouncing them. Patch by Matthias Pfafferodt See gna bug #14078 ------------------------------------------------------------------------ r15917 | cazfi | 2009-09-09 00:24:00 +0300 (Wed, 09 Sep 2009) | 6 lines Changed paths: M /trunk/server/settlers.c Use path finding instead of warmap in settlers.c Patch by Pepeto See gna patch #1283 ------------------------------------------------------------------------ r15916 | cazfi | 2009-09-08 19:50:14 +0300 (Tue, 08 Sep 2009) | 6 lines Changed paths: M /trunk/bootstrap/generate_svnrev.sh Made --enable-svnrev to work when locale is other than English. Patch by Pepeto See gna bug #14253 ------------------------------------------------------------------------ r15915 | cazfi | 2009-09-08 00:53:20 +0300 (Tue, 08 Sep 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/chatline.h M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/mapctrl.c M /trunk/common/featured_text.c Featured text shortcuts for gtk client chat line. Patch by Pepeto See gna patch #1276 ------------------------------------------------------------------------ r15913 | cazfi | 2009-09-07 23:39:18 +0300 (Mon, 07 Sep 2009) | 6 lines Changed paths: M /trunk/server/barbarian.c M /trunk/server/edithand.c M /trunk/server/srv_main.c M /trunk/server/techtools.c M /trunk/server/techtools.h Fixed a team play crash when ruleset defines global init techs Patch by Pepeto See gna RT #20855 ------------------------------------------------------------------------ r15911 | cazfi | 2009-09-07 01:39:35 +0300 (Mon, 07 Sep 2009) | 6 lines Changed paths: M /trunk/client/citydlg_common.c M /trunk/client/gui-gtk-2.0/cityrep.c M /trunk/client/gui-gtk-2.0/wldlg.c M /trunk/client/gui-sdl/optiondlg.c M /trunk/client/gui-sdl/wldlg.c M /trunk/client/gui-win32/wldlg.c M /trunk/client/gui-xaw/wldlg.c M /trunk/client/packhand.c M /trunk/common/city.c M /trunk/common/dataio.c M /trunk/common/generate_packets.py M /trunk/common/worklist.c M /trunk/common/worklist.h M /trunk/server/cityhand.c M /trunk/server/citytools.c M /trunk/server/savegame.c Renamed *_worklist() functions as worklist_*() Patch by Pepeto See gna bug #13879 ------------------------------------------------------------------------ r15910 | cazfi | 2009-09-07 01:12:59 +0300 (Mon, 07 Sep 2009) | 6 lines Changed paths: M /trunk/client/colors_common.c M /trunk/client/colors_common.h M /trunk/client/mapview_common.c M /trunk/data/misc/colors.tilespec Color definitions of their own for traderoute lines. Patch by Pepeto See gna patch #1279 ------------------------------------------------------------------------ r15909 | cazfi | 2009-09-06 02:11:19 +0300 (Sun, 06 Sep 2009) | 6 lines Changed paths: M /trunk/client/chatline_common.c M /trunk/client/chatline_common.h M /trunk/client/climisc.c M /trunk/client/climisc.h M /trunk/client/gui-ftwl/chatline.c M /trunk/client/gui-ftwl/dialogs.c M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/dialogs.c M /trunk/client/gui-sdl/chatline.c M /trunk/client/gui-sdl/dialogs.c M /trunk/client/gui-stub/chatline.c M /trunk/client/gui-stub/dialogs.c M /trunk/client/gui-win32/chatline.c M /trunk/client/gui-win32/dialogs.c M /trunk/client/gui-xaw/chatline.c M /trunk/client/gui-xaw/dialogs.c M /trunk/client/include/chatline_g.h M /trunk/client/include/dialogs_g.h M /trunk/client/messagewin_common.c M /trunk/client/messagewin_common.h M /trunk/common/featured_text.c M /trunk/common/featured_text.h Clients unable to handle featured text are not confused with it. Patch by Pepeto See gna patch #1270 ------------------------------------------------------------------------ r15908 | cazfi | 2009-09-05 21:23:38 +0300 (Sat, 05 Sep 2009) | 7 lines Changed paths: M /trunk/ai/aitools.c M /trunk/server/Makefile.am D /trunk/server/airgoto.c D /trunk/server/airgoto.h M /trunk/server/gotohand.c Replaced last use of old airgoto code with path finding. Removed airgoto.[ch] Patch by Pepeto See gna patch #1277 ------------------------------------------------------------------------ r15907 | jcreus | 2009-09-04 02:39:41 +0300 (Fri, 04 Sep 2009) | 1 line Changed paths: M /trunk/po/ca.po Translation update ------------------------------------------------------------------------ r15906 | cazfi | 2009-09-04 00:46:21 +0300 (Fri, 04 Sep 2009) | 6 lines Changed paths: M /trunk/ai/advdiplomacy.c AI does not complain about treaty in progress it proposed itself. Patch by Ann (kudra) See gna patch #1241 ------------------------------------------------------------------------ r15905 | cazfi | 2009-09-04 00:41:32 +0300 (Fri, 04 Sep 2009) | 6 lines Changed paths: M /trunk/utility/hash.c Trying to iterate over a NULL hash table will just iterate over nothing. Patch by Madeline Book See gna bug #13802 ------------------------------------------------------------------------ r15904 | cazfi | 2009-09-04 00:37:30 +0300 (Fri, 04 Sep 2009) | 8 lines Changed paths: M /trunk/utility/Makefile.am A /trunk/utility/iterator.c M /trunk/utility/iterator.h Added a simple stub generic iterator that can be used when an iterator init functions receives invalid arguments. Patch by Madeline Book See gna bug #13801 ------------------------------------------------------------------------ r15903 | cazfi | 2009-09-04 00:23:42 +0300 (Fri, 04 Sep 2009) | 6 lines Changed paths: M /trunk/client/helpdata.c Unit help mentions if unit has "Shield2Gold" flag Patch by Matthias Pfafferodt See gna bug #14070 ------------------------------------------------------------------------ r15902 | cazfi | 2009-09-04 00:18:30 +0300 (Fri, 04 Sep 2009) | 6 lines Changed paths: M /trunk/server/stdinhand.c Check against recursive reset commands in serv files. Patch by Matthias Pfafferodt See gna bug #14063 ------------------------------------------------------------------------ r15901 | cazfi | 2009-09-03 00:11:01 +0300 (Thu, 03 Sep 2009) | 7 lines Changed paths: M /trunk/ai/advdiplomacy.c M /trunk/common/map.c M /trunk/common/map.h M /trunk/server/gamehand.c M /trunk/server/generator/height_map.c M /trunk/server/generator/mapgen.c M /trunk/server/generator/mapgen_topology.c M /trunk/server/generator/mapgen_topology.h M /trunk/server/generator/startpos.c M /trunk/server/generator/temperature_map.c M /trunk/server/meta.c M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/settings.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c Moved all fields of the civ_map structure which are only used in the server side into a map.server structure. Patch by Pepeto See gna patch #1209 ------------------------------------------------------------------------ r15900 | cazfi | 2009-09-02 23:47:13 +0300 (Wed, 02 Sep 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/chatline.h M /trunk/client/gui-gtk-2.0/gui_main.c gtk-client implementation of featured text. Patch by Pepeto See gna bug #13891 ------------------------------------------------------------------------ r15899 | cazfi | 2009-09-02 23:40:39 +0300 (Wed, 02 Sep 2009) | 6 lines Changed paths: M /trunk/server/srv_main.c Removed duplicate clear_all_votes() call. Patch by Matthias Pfafferodt See gna bug #14229 ------------------------------------------------------------------------ r15898 | cazfi | 2009-09-02 23:19:32 +0300 (Wed, 02 Sep 2009) | 6 lines Changed paths: M /trunk/server/techtools.c Fixed a bug that wrong tech was passed with "tech_researched" signal. Patch by Matz See gna bug #14217 ------------------------------------------------------------------------ r15897 | cazfi | 2009-09-01 00:29:23 +0300 (Tue, 01 Sep 2009) | 6 lines Changed paths: M /trunk/client/helpdata.c Added helptext about migration effects to government help. Patch by Matthias Pfafferodt See gna bug #14072 ------------------------------------------------------------------------ r15896 | cazfi | 2009-09-01 00:26:07 +0300 (Tue, 01 Sep 2009) | 6 lines Changed paths: M /trunk/client/helpdata.c Added helptext about health effects to government help. Patch by Matthias Pfafferodt See gna bug #14071 ------------------------------------------------------------------------ r15895 | cazfi | 2009-09-01 00:14:45 +0300 (Tue, 01 Sep 2009) | 6 lines Changed paths: M /trunk/common/nation.c M /trunk/common/nation.h Use generic iterator for nations. Patch by Madeline Book See gna patch #13793 ------------------------------------------------------------------------ r15894 | cazfi | 2009-08-31 23:57:51 +0300 (Mon, 31 Aug 2009) | 6 lines Changed paths: M /trunk/ai/aiair.c Updated AI airgoto to use path finding. Patch by Pepeto See gna patch #1256 ------------------------------------------------------------------------ r15893 | cazfi | 2009-08-31 23:28:30 +0300 (Mon, 31 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-win32/citydlg.c M /trunk/client/gui-win32/menu.c Menu and command key revamp, win32-client Patch by John Keller See gna patch #1212 ------------------------------------------------------------------------ r15892 | cazfi | 2009-08-27 02:45:48 +0300 (Thu, 27 Aug 2009) | 6 lines Changed paths: M /trunk/utility/hash.c M /trunk/utility/hash.h Added functions hash_copy() and hash_equal() Patch by Madeline Book See gna bug #13800 ------------------------------------------------------------------------ r15891 | cazfi | 2009-08-27 02:35:22 +0300 (Thu, 27 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/pages.c Fixed "save as" crash, Patch by Ann (kudra) See gna bug #14115 ------------------------------------------------------------------------ r15890 | cazfi | 2009-08-27 02:01:22 +0300 (Thu, 27 Aug 2009) | 6 lines Changed paths: M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset Cleanup of game.ruleset files. Patch by Matthias Pfafferodt See gna patch #1251 ------------------------------------------------------------------------ r15889 | cazfi | 2009-08-27 01:48:17 +0300 (Thu, 27 Aug 2009) | 6 lines Changed paths: M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c Moved illness definitions to section of their own. Patch by Matthias Pfafferodt See gna patch #1203 ------------------------------------------------------------------------ r15888 | cazfi | 2009-08-26 02:37:25 +0300 (Wed, 26 Aug 2009) | 4 lines Changed paths: M /trunk/common/base.h M /trunk/common/packets.def M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/maphand.c M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/unittools.c M /trunk/version.in Added support for bases to have vision in invisible layer too. See gna patch #1215 ------------------------------------------------------------------------ r15887 | cazfi | 2009-08-26 02:20:32 +0300 (Wed, 26 Aug 2009) | 6 lines Changed paths: M /trunk/client/climisc.c Display messages in messages dialog in Game Over state also. Patch by Pepeto See gna bug #13667 ------------------------------------------------------------------------ r15886 | cazfi | 2009-08-26 02:14:02 +0300 (Wed, 26 Aug 2009) | 7 lines Changed paths: M /trunk/client/helpdata.c Display ruleset defined trademindist in caravan unit helptext instead of hardcoded value 9. Patch by Matthias Pfafferodt See gna bug #14069 ------------------------------------------------------------------------ r15885 | cazfi | 2009-08-26 01:50:02 +0300 (Wed, 26 Aug 2009) | 7 lines Changed paths: M /trunk/client/control.c Fixed a crash when load command is issued to multiple units and some of them cannot. Patch by Pepeto See gna bug #14030 ------------------------------------------------------------------------ r15884 | cazfi | 2009-08-26 01:32:51 +0300 (Wed, 26 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-xaw/menu.c Menu and command key revamp, xaw-client Patch by John Keller See gna patch #1213 ------------------------------------------------------------------------ r15883 | cazfi | 2009-08-26 01:28:12 +0300 (Wed, 26 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-sdl/citydlg.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-sdl/mapctrl.c M /trunk/client/gui-sdl/mapview.c M /trunk/client/gui-sdl/menu.c M /trunk/client/gui-sdl/messagewin.c Menu and command key revamp, sdl-client Patch by John Keller See gna patch #1211 ------------------------------------------------------------------------ r15882 | cazfi | 2009-08-20 00:56:19 +0300 (Thu, 20 Aug 2009) | 6 lines Changed paths: M /trunk/common/Makefile.am A /trunk/common/featured_text.c A /trunk/common/featured_text.h Common part of featured text feature Patch by Pepeto See gna bug #13891 ------------------------------------------------------------------------ r15881 | cazfi | 2009-08-19 00:26:10 +0300 (Wed, 19 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/gui-gtk-2.0/menu.c M /trunk/data/helpdata.txt Menu and command key revamp, gtk-client Patch by John Keller See gna patch #1188 ------------------------------------------------------------------------ r15880 | cazfi | 2009-08-18 00:02:12 +0300 (Tue, 18 Aug 2009) | 6 lines Changed paths: M /trunk/server/cityturn.c Use current ruler title instead of hardcoded "sire" in low funds warning. Patch by Ann (kudra) See gna patch #1219 ------------------------------------------------------------------------ r15879 | cazfi | 2009-08-17 23:51:03 +0300 (Mon, 17 Aug 2009) | 6 lines Changed paths: M /trunk/doc/HACKING Set minplayers to 0 in autogame example. Patch by Matthias Pfafferodt See gna bug #14061 ------------------------------------------------------------------------ r15877 | cazfi | 2009-08-17 23:47:09 +0300 (Mon, 17 Aug 2009) | 2 lines Changed paths: M /trunk/data/default/units.ruleset Reverted accidentally committed testing change. ------------------------------------------------------------------------ r15876 | cazfi | 2009-08-17 23:45:31 +0300 (Mon, 17 Aug 2009) | 6 lines Changed paths: M /trunk/common/aicore/path_finding.c M /trunk/data/default/units.ruleset Fixed handling of units with 0 move rate. Patch by Pepeto See gna bug #13889 ------------------------------------------------------------------------ r15874 | cazfi | 2009-08-13 00:30:11 +0300 (Thu, 13 Aug 2009) | 4 lines Changed paths: M /trunk/m4/xaw-client.m4 Fixed autoconf-2.64 warning. See gna bug #14045 ------------------------------------------------------------------------ r15873 | cazfi | 2009-08-11 01:16:01 +0300 (Tue, 11 Aug 2009) | 4 lines Changed paths: M /trunk/server/savegame.c Determine game.info.is_new_game before it's used. See gna bug #14051 ------------------------------------------------------------------------ r15872 | cazfi | 2009-08-11 01:13:57 +0300 (Tue, 11 Aug 2009) | 5 lines Changed paths: M /trunk/server/savegame.c Fixed a bug that base with vision capability does not provide vision after game saved & loaded. See gna bug #14050 ------------------------------------------------------------------------ r15870 | cazfi | 2009-08-11 01:10:49 +0300 (Tue, 11 Aug 2009) | 7 lines Changed paths: M /trunk/client/control.c Do not send illegal packets when unloading allied units from transport. Patch by Pepeto See gna bug #14032 ------------------------------------------------------------------------ r15869 | cazfi | 2009-08-11 00:54:34 +0300 (Tue, 11 Aug 2009) | 4 lines Changed paths: M /trunk/client/Makefile.am Install freeciv.desktop only when gtk-client is built. See gna patch #1204 ------------------------------------------------------------------------ r15868 | cazfi | 2009-08-11 00:28:21 +0300 (Tue, 11 Aug 2009) | 6 lines Changed paths: M /trunk/common/aicore/pf_tools.c M /trunk/common/aicore/pf_tools.h Added functions to make pf_parameter from unit_type Patch by Pepeto See gna patch #1207 ------------------------------------------------------------------------ r15867 | cazfi | 2009-08-11 00:16:10 +0300 (Tue, 11 Aug 2009) | 7 lines Changed paths: M /trunk/client/mapview_common.c Do not show (wrong) trade routes and growth turn information about enemy cities. Patch by Pepeto See gna bug #13958 ------------------------------------------------------------------------ r15866 | cazfi | 2009-08-01 23:27:45 +0300 (Sat, 01 Aug 2009) | 4 lines Changed paths: M /trunk/data/default/script.lua M /trunk/data/default/terrain.ruleset Added ruins to default ruleset. See gna bug #13861 ------------------------------------------------------------------------ r15865 | cazfi | 2009-08-01 00:42:59 +0300 (Sat, 01 Aug 2009) | 6 lines Changed paths: M /trunk/common/aicore/path_finding.c M /trunk/common/aicore/path_finding.h Added pf_city_map related code that will later replace city warmap code. Patch by Pepeto See gna patch #1208 ------------------------------------------------------------------------ r15863 | cazfi | 2009-08-01 00:28:57 +0300 (Sat, 01 Aug 2009) | 6 lines Changed paths: M /trunk/client/control.c M /trunk/client/control.h Fixed a crash when unload all command is issued to multiple units. Patch by Pepeto See gna bug #14031 ------------------------------------------------------------------------ r15862 | cazfi | 2009-08-01 00:03:05 +0300 (Sat, 01 Aug 2009) | 6 lines Changed paths: M /trunk/client/gui-win32/citydlg.c Display city plague risk in win32 client Patch by Matthias Pfafferodt and myself See gna bug #14015 ------------------------------------------------------------------------ r15861 | cazfi | 2009-07-31 23:57:28 +0300 (Fri, 31 Jul 2009) | 6 lines Changed paths: M /trunk/client/citydlg_common.c M /trunk/client/gui-gtk-2.0/citydlg.c Show plague risk as "-.-" when illness disabled from ruleset. Patch by Matthias Pfafferodt See gna bug #14004 ------------------------------------------------------------------------ r15860 | cazfi | 2009-07-31 01:11:17 +0300 (Fri, 31 Jul 2009) | 4 lines Changed paths: M /trunk/common/fc_types.h M /trunk/common/game.c M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset M /trunk/server/ruleset.c M /trunk/version.in Added support for named user unit type flags. See gna patch #1205 ------------------------------------------------------------------------ r15858 | cazfi | 2009-07-30 23:38:30 +0300 (Thu, 30 Jul 2009) | 6 lines Changed paths: M /trunk/common/city.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/savegame.c M /trunk/server/settings.c M /trunk/version.in Added trademindist server option. Longturn patch adapted by Matthias Pfafferodt See gna patch #1201 ------------------------------------------------------------------------ r15857 | cazfi | 2009-07-30 00:52:13 +0300 (Thu, 30 Jul 2009) | 6 lines Changed paths: M /trunk/common/movement.c M /trunk/common/movement.h Made some parameters const Patch by Pepeto See gna patch #1206 ------------------------------------------------------------------------ r15856 | cazfi | 2009-07-29 23:26:52 +0300 (Wed, 29 Jul 2009) | 6 lines Changed paths: M /trunk/server/commands.c M /trunk/server/commands.h M /trunk/server/settings.c M /trunk/server/settings.h M /trunk/server/srv_main.c M /trunk/server/stdinhand.c Added reset command. Warclient patch adapted by Matthias Pfafferodt See gna bug #13931 ------------------------------------------------------------------------ r15855 | cazfi | 2009-07-29 23:18:51 +0300 (Wed, 29 Jul 2009) | 7 lines Changed paths: M /trunk/ai/aidata.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/manual/civmanual.c M /trunk/server/citytools.c M /trunk/server/connecthand.c M /trunk/server/gamehand.c M /trunk/server/maphand.c M /trunk/server/meta.c M /trunk/server/report.c M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/score.c M /trunk/server/sernet.c M /trunk/server/settings.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/techtools.c M /trunk/server/unittools.c Moved all fields of the civ_game structure which are only used in the server side into a game.server structure. Patch by Pepeto See gna patch #1202 ------------------------------------------------------------------------ r15853 | cazfi | 2009-07-29 21:45:28 +0300 (Wed, 29 Jul 2009) | 2 lines Changed paths: M /trunk/po/fi.po Updated translation by Sini Ruohomaa ------------------------------------------------------------------------ r15852 | cazfi | 2009-07-29 02:21:24 +0300 (Wed, 29 Jul 2009) | 5 lines Changed paths: M /trunk/client/packhand.c M /trunk/client/tilespec.c M /trunk/common/city.h M /trunk/common/packets.def M /trunk/data/civ2/cities.ruleset M /trunk/data/default/cities.ruleset M /trunk/server/ruleset.c M /trunk/version.in Made it possible to have different graphics for oceanic cities than for land cities. See gna bug #13901 ------------------------------------------------------------------------ r15851 | cazfi | 2009-07-29 01:35:23 +0300 (Wed, 29 Jul 2009) | 6 lines Changed paths: M /trunk/ai/advmilitary.c Fixed assess_danger_player() crash. Reported by Jordi Negrevernis i Font See gna bug #13814 ------------------------------------------------------------------------ r15849 | cazfi | 2009-07-27 00:57:44 +0300 (Mon, 27 Jul 2009) | 7 lines Changed paths: M /trunk/server/techtools.c Fixed crash when lua script triggered by "tech_researched" gives another technology to player. Reported by gorillaz See gna bug #13819 ------------------------------------------------------------------------ r15847 | cazfi | 2009-07-26 01:15:42 +0300 (Sun, 26 Jul 2009) | 7 lines Changed paths: M /trunk/data/civ2/effects.ruleset M /trunk/data/default/effects.ruleset Fixed partisan appearance to require Guerilla Warfare to be known by someone. Patch by Joel Kenny See gna bug #13944 ------------------------------------------------------------------------ r15846 | cazfi | 2009-07-26 00:21:58 +0300 (Sun, 26 Jul 2009) | 2 lines Changed paths: M /trunk/po/nl.po Merged nl.po from S2_1 ------------------------------------------------------------------------ r15845 | cazfi | 2009-07-26 00:01:23 +0300 (Sun, 26 Jul 2009) | 4 lines Changed paths: M /trunk/data/amplio/moderncities.png M /trunk/data/amplio/moderncities.spec M /trunk/data/hex2t/items.png M /trunk/data/hex2t/items.spec M /trunk/data/isotrident/cities.png M /trunk/data/isotrident/cities.spec M /trunk/data/trident/tiles.png M /trunk/data/trident/tiles.spec Added graphics for ruins by vincent.croisier@advalvas.be. Taken from RT #16120 ------------------------------------------------------------------------ r15844 | cazfi | 2009-07-25 23:44:33 +0300 (Sat, 25 Jul 2009) | 2 lines Changed paths: M /trunk/po/ar.po M /trunk/po/cs.po M /trunk/po/da.po M /trunk/po/de.po M /trunk/po/el.po M /trunk/po/en_GB.po M /trunk/po/eo.po M /trunk/po/es.po M /trunk/po/et.po M /trunk/po/fa.po M /trunk/po/fr.po M /trunk/po/he.po M /trunk/po/hu.po M /trunk/po/it.po M /trunk/po/ja.po M /trunk/po/ko.po M /trunk/po/lt.po M /trunk/po/no.po M /trunk/po/pl.po M /trunk/po/pt.po M /trunk/po/pt_BR.po M /trunk/po/ro.po M /trunk/po/ru.po M /trunk/po/sv.po M /trunk/po/tr.po M /trunk/po/uk.po M /trunk/po/zh_CN.po Merged remaining translations from S2_1 ------------------------------------------------------------------------ r15843 | jcreus | 2009-07-25 00:33:43 +0300 (Sat, 25 Jul 2009) | 1 line Changed paths: M /trunk/po/ca.po Some more work ------------------------------------------------------------------------ r15842 | cazfi | 2009-07-24 23:13:49 +0300 (Fri, 24 Jul 2009) | 4 lines Changed paths: M /trunk/data/default/terrain.ruleset Added buoy See RT #40637 ------------------------------------------------------------------------ r15841 | cazfi | 2009-07-24 22:21:10 +0300 (Fri, 24 Jul 2009) | 4 lines Changed paths: M /trunk/ai/advdomestic.c AI builds more caravans when its economy is weak. See gna patch #1195 ------------------------------------------------------------------------ r15840 | cazfi | 2009-07-23 01:27:51 +0300 (Thu, 23 Jul 2009) | 4 lines Changed paths: M /trunk/server/maphand.c M /trunk/server/maphand.h M /trunk/server/scripting/api.pkg M /trunk/server/scripting/api_actions.c M /trunk/server/scripting/api_actions.h M /trunk/server/unittools.c Added create_base method to scripting interface. See gna bug #13860 ------------------------------------------------------------------------ r15839 | cazfi | 2009-07-20 01:36:25 +0300 (Mon, 20 Jul 2009) | 5 lines Changed paths: M /trunk/common/movement.c Gen-movement version of prohibiting units in cities in the middle of non-native terrain. See gna bug #13859 ------------------------------------------------------------------------ r15838 | cazfi | 2009-07-20 01:32:39 +0300 (Mon, 20 Jul 2009) | 6 lines Changed paths: M /trunk/common/base.c M /trunk/common/unit.c can_build_base() checks if base already exist in tile. Problem reported by John Keller See gna bug #13843 ------------------------------------------------------------------------ r15837 | cazfi | 2009-07-20 01:17:33 +0300 (Mon, 20 Jul 2009) | 5 lines Changed paths: M /trunk/ai/advdomestic.c M /trunk/ai/advmilitary.c M /trunk/ai/aiair.c M /trunk/ai/aicity.c M /trunk/ai/aicity.h M /trunk/ai/aidiplomat.c M /trunk/ai/aiferry.c M /trunk/ai/aihand.c M /trunk/ai/ailog.c M /trunk/ai/aiparatrooper.c M /trunk/ai/aitools.c M /trunk/ai/aiunit.c M /trunk/client/client_main.c M /trunk/common/ai.c M /trunk/common/ai.h M /trunk/common/city.c M /trunk/common/city.h M /trunk/server/aiiface.c M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/savegame.c M /trunk/server/settlers.c Made city.ai a pointer to ai_city structure instead of being the structure itself. See gna bug #13899 ------------------------------------------------------------------------ r15836 | cazfi | 2009-07-20 00:52:45 +0300 (Mon, 20 Jul 2009) | 4 lines Changed paths: M /trunk/debian/freeciv-common.install M /trunk/debian/freeciv-server.install M /trunk/debian/rules Shared libfreeciv to debian packets See gna bug #13932 ------------------------------------------------------------------------ r15835 | cazfi | 2009-07-20 00:50:23 +0300 (Mon, 20 Jul 2009) | 4 lines Changed paths: M /trunk/data/civclient.dsc.in M /trunk/data/civserver.dsc.in Use @bindir@ instead of @prefix@/bin See gna bug #13885 ------------------------------------------------------------------------ r15834 | cazfi | 2009-07-14 01:46:25 +0300 (Tue, 14 Jul 2009) | 4 lines Changed paths: M /trunk/client/gui-sdl/citydlg.c M /trunk/client/gui-sdl/helpdlg.c M /trunk/client/gui-sdl/mapview.c M /trunk/client/gui-sdl/wldlg.c Fixed SDL-client compilation See gna bug #13951 ------------------------------------------------------------------------ r15833 | cazfi | 2009-07-14 00:16:36 +0300 (Tue, 14 Jul 2009) | 6 lines Changed paths: M /trunk/common/game.h M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/stdinhand.h Check against infinite recursion with read commands. Patch by Matthias Pfafferodt See gna bug #13846 ------------------------------------------------------------------------ r15832 | cazfi | 2009-07-14 00:05:32 +0300 (Tue, 14 Jul 2009) | 4 lines Changed paths: M /trunk/client/goto.c M /trunk/client/tilespec.c M /trunk/common/aicore/path_finding.c M /trunk/common/movement.h M /trunk/common/unit.h M /trunk/server/diplomats.c Moved SINGLE_MOVE and related definitions to movement.h See gna bug #13858 ------------------------------------------------------------------------ r15831 | cazfi | 2009-07-13 23:46:20 +0300 (Mon, 13 Jul 2009) | 4 lines Changed paths: M /trunk/common/unit.c Fixed assert failure when pillaging base from tile with multiple units. See gna bug #13933 ------------------------------------------------------------------------ r15830 | cazfi | 2009-07-13 00:23:19 +0300 (Mon, 13 Jul 2009) | 5 lines Changed paths: M /trunk/client/gui-ftwl/dialogs.c M /trunk/client/gui-gtk-2.0/dialogs.c M /trunk/client/gui-sdl/dialogs.c M /trunk/client/gui-stub/dialogs.c M /trunk/client/gui-win32/dialogs.c M /trunk/client/gui-xaw/dialogs.c M /trunk/client/include/dialogs_g.h M /trunk/client/packhand.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/commands.c M /trunk/server/commands.h M /trunk/server/connecthand.c M /trunk/server/stdinhand.c M /trunk/version.in Added connectmsg command. It allows showing a message to connecting clients. See RT #40274 ------------------------------------------------------------------------ r15829 | cazfi | 2009-07-13 00:05:44 +0300 (Mon, 13 Jul 2009) | 5 lines Changed paths: M /trunk/common/unit.c "NoAggressive" base flag affects all units native to base regardless of their move type. See gna bug #13842 ------------------------------------------------------------------------ r15828 | cazfi | 2009-07-13 00:03:18 +0300 (Mon, 13 Jul 2009) | 6 lines Changed paths: M /trunk/data/civ1/script.lua M /trunk/data/civ2/script.lua M /trunk/data/default/Makefile.am A /trunk/data/default/default.lua M /trunk/data/default/script.lua M /trunk/server/ruleset.c Divided script.lua to two parts: - default.lua is common to all rulesets - script.lua has ruleset specific scripts See gna bug #13862 ------------------------------------------------------------------------ r15827 | cazfi | 2009-07-12 23:57:18 +0300 (Sun, 12 Jul 2009) | 6 lines Changed paths: M /trunk/server/settings.c Undef GEN_* macros when they are no longer needed. Patch by Matthias Pfafferodt See gna bug #13930 ------------------------------------------------------------------------ r15824 | cazfi | 2009-07-10 23:19:59 +0300 (Fri, 10 Jul 2009) | 4 lines Changed paths: M /trunk/doc/TODO Updated wishlist URL in TODO. See gna bug #13851 ------------------------------------------------------------------------ r15823 | cazfi | 2009-07-10 21:35:25 +0300 (Fri, 10 Jul 2009) | 6 lines Changed paths: M /trunk/utility/iterator.h Include support.h for definition of bool Requested by Pepeto See gna bug #13865 ------------------------------------------------------------------------ r15822 | cazfi | 2009-07-10 00:14:55 +0300 (Fri, 10 Jul 2009) | 7 lines Changed paths: M /trunk/debian/rules Previous commit missed changes to rules file. Almost total rewrite to very outdated and broken debian directory for building snapshot packets. See gna bug #13857 ------------------------------------------------------------------------ r15821 | cazfi | 2009-07-10 00:08:23 +0300 (Fri, 10 Jul 2009) | 5 lines Changed paths: M /trunk/debian/build.debian A /trunk/debian/compat M /trunk/debian/control D /trunk/debian/dirs D /trunk/debian/docs A /trunk/debian/freeciv-client-data.install A /trunk/debian/freeciv-client-gtk2.install A /trunk/debian/freeciv-client-gtk2.menu (from /trunk/debian/freeciv-gtk.menu:15820) A /trunk/debian/freeciv-client-sdl.install A /trunk/debian/freeciv-client-sdl.menu A /trunk/debian/freeciv-client-xaw3d.install A /trunk/debian/freeciv-client-xaw3d.menu (from /trunk/debian/freeciv-xaw3d.menu:15820) A /trunk/debian/freeciv-common.install D /trunk/debian/freeciv-gtk.dirs D /trunk/debian/freeciv-gtk.menu D /trunk/debian/freeciv-gtk.postinst D /trunk/debian/freeciv-gtk.postrm A /trunk/debian/freeciv-server.install A /trunk/debian/freeciv-server.menu (from /trunk/debian/menu:15820) A /trunk/debian/freeciv-sound-standard.install A /trunk/debian/freeciv-tilesets.install D /trunk/debian/freeciv-xaw3d.dirs D /trunk/debian/freeciv-xaw3d.menu D /trunk/debian/freeciv-xaw3d.postinst D /trunk/debian/freeciv-xaw3d.postrm D /trunk/debian/freeciv.desktop D /trunk/debian/menu Almost total rewrite to very outdated and broken debian directory for building snapshot packets. See gna bug #13857 ------------------------------------------------------------------------ r15819 | cazfi | 2009-07-09 01:21:56 +0300 (Thu, 09 Jul 2009) | 6 lines Changed paths: M /trunk/common/aicore/path_finding.c Initialize unreachable nodes just once. Patch by Pepeto See gna bug #13881 ------------------------------------------------------------------------ r15818 | jcreus | 2009-07-09 00:43:47 +0300 (Thu, 09 Jul 2009) | 1 line Changed paths: M /trunk/po/ca.po more updates ------------------------------------------------------------------------ r15816 | jcreus | 2009-07-09 00:33:08 +0300 (Thu, 09 Jul 2009) | 1 line Changed paths: M /trunk/po/ca.po updating Catalan translation ------------------------------------------------------------------------ r15815 | cazfi | 2009-07-09 00:27:50 +0300 (Thu, 09 Jul 2009) | 7 lines Changed paths: M /trunk/common/requirements.c M /trunk/common/requirements.h M /trunk/common/worklist.c M /trunk/server/savegame.c universal_kind_name() parameter changed from struct universal pointer to enum universals_n to clean up some hacks. Patch by Pepeto See gna bug #13880 ------------------------------------------------------------------------ r15814 | cazfi | 2009-07-08 23:47:43 +0300 (Wed, 08 Jul 2009) | 6 lines Changed paths: M /trunk/client/clinet.c M /trunk/client/ggzclient.c M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/Makefile.am A /trunk/client/gui-gtk-2.0/embedggz.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c M /trunk/client/include/Makefile.am A /trunk/client/include/ggz_g.h Moved code specific to ggz enabled gtk client from client common to gui-gtk2.0. This fixes build of multiple clients at once when one of them is ggz enabled gtk. See gna #13847 ------------------------------------------------------------------------ r15813 | cazfi | 2009-07-07 23:35:59 +0300 (Tue, 07 Jul 2009) | 6 lines Changed paths: M /trunk/ai/aicity.c M /trunk/client/citydlg_common.c M /trunk/client/gui-gtk-2.0/cma_fe.c M /trunk/client/gui-gtk-2.0/cma_fe.h M /trunk/client/gui-gtk-2.0/repodlgs.c M /trunk/client/gui-sdl/cma_fe.c M /trunk/client/gui-win32/cma_fe.c M /trunk/client/gui-win32/repodlgs.c M /trunk/client/gui-xaw/cma_fe.c M /trunk/client/gui-xaw/repodlgs.c M /trunk/client/packhand.c M /trunk/client/text.c M /trunk/client/tilespec.c M /trunk/common/aicore/cm.c M /trunk/common/aicore/cm.h M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/fc_types.h M /trunk/common/packets.def M /trunk/common/terrain.h M /trunk/common/unittype.h M /trunk/server/citytools.c Removed O_COUNT and O_MAX, used O_LAST instead Patch by Matthias Pfafferodt See gna #13875 ------------------------------------------------------------------------ r15811 | cazfi | 2009-07-06 23:52:15 +0300 (Mon, 06 Jul 2009) | 6 lines Changed paths: M /trunk/common/map.c Made "slowinvasions" setting to affect any unit moving from transport in non-native terrain to native terrain, not just ground units moving from ocean tile to land tile. See gna #13798 ------------------------------------------------------------------------ r15810 | cazfi | 2009-07-06 23:50:24 +0300 (Mon, 06 Jul 2009) | 4 lines Changed paths: M /trunk/client/helpdata.c Help mentions if unit has no "TerrainDefense" flag See gna #13845 ------------------------------------------------------------------------ r15809 | cazfi | 2009-07-06 23:49:01 +0300 (Mon, 06 Jul 2009) | 5 lines Changed paths: M /trunk/bootstrap/freeciv.desktop.in M /trunk/data/civclient.dsc.in Changed executable name "civclient" as "freeciv-gtk2" in freeciv.desktop and civclient.dsc. See gna #13832 ------------------------------------------------------------------------ r15808 | cazfi | 2009-07-06 01:23:45 +0300 (Mon, 06 Jul 2009) | 7 lines Changed paths: M /trunk/common/game.h M /trunk/server/settings.c Defined macros GAME_MIN_SAVETURNS and GAME_MAX_SAVETURNS and used them instead of magic numbers. Patch by Matthias Pfafferodt See gna #13850 ------------------------------------------------------------------------ r15807 | cazfi | 2009-07-06 00:49:07 +0300 (Mon, 06 Jul 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/menu.c Added "Build Base" submenu to "Orders" menu See gna #13843 ------------------------------------------------------------------------ r15806 | cazfi | 2009-07-06 00:31:49 +0300 (Mon, 06 Jul 2009) | 4 lines Changed paths: M /trunk/ai/aicity.c M /trunk/ai/aihunt.c M /trunk/ai/aitools.c M /trunk/ai/aiunit.c M /trunk/client/climisc.c M /trunk/client/helpdata.c M /trunk/common/aicore/pf_tools.c M /trunk/common/fc_types.h M /trunk/common/movement.c M /trunk/data/civ1/units.ruleset M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset M /trunk/server/gotohand.c Merged AIR_MOVING to BOTH_MOVING. See RT #18439 ------------------------------------------------------------------------ r15804 | cazfi | 2009-07-05 23:48:32 +0300 (Sun, 05 Jul 2009) | 7 lines Changed paths: M /trunk/client/ggzclient.c Changed ggz profile to point to freeciv.ggzgamingzone.org instead of non-functional pubserver. Patch by Jason Dorje Short See RT #39923 ------------------------------------------------------------------------ r15803 | cazfi | 2009-07-05 01:29:55 +0300 (Sun, 05 Jul 2009) | 6 lines Changed paths: M /trunk/ai/advdiplomacy.c M /trunk/ai/advdiplomacy.h M /trunk/common/Makefile.am A /trunk/common/ai.c A /trunk/common/ai.h M /trunk/common/player.c M /trunk/common/player.h M /trunk/server/aiiface.c M /trunk/server/aiiface.h M /trunk/server/cityturn.c M /trunk/server/diplhand.c M /trunk/server/plrhand.c M /trunk/server/savegame.c M /trunk/server/srv_main.c M /trunk/server/unittools.c Instead of copying same function pointers to all players, have them on one instance of new struct ai_type to which players have pointers. See gna #13834 ------------------------------------------------------------------------ r15802 | cazfi | 2009-07-05 01:17:25 +0300 (Sun, 05 Jul 2009) | 5 lines Changed paths: M /trunk/data/themes/Makefile.am Fixed installation of gtk2 client theme when both gtk2 and sdl client are built. See gna #13823 ------------------------------------------------------------------------ r15800 | cazfi | 2009-07-04 22:54:17 +0300 (Sat, 04 Jul 2009) | 4 lines Changed paths: M /trunk/client/client_main.c M /trunk/server/srv_main.c M /trunk/utility/shared.c M /trunk/utility/shared.h Free memory allocated by init_nls() See gna #13707 ------------------------------------------------------------------------ r15799 | cazfi | 2009-07-03 20:36:00 +0300 (Fri, 03 Jul 2009) | 4 lines Changed paths: M /trunk/dependencies/tolua-5.1b/src/bin/lua/code.lua M /trunk/dependencies/tolua-5.1b/src/bin/toluabind.c M /trunk/dependencies/tolua-5.1b/src/lib/tolua_event.c Fixed tolua-5.1b compiler warnings. See gna #13735 ------------------------------------------------------------------------ r15798 | cazfi | 2009-07-03 01:19:05 +0300 (Fri, 03 Jul 2009) | 2 lines Changed paths: M /trunk/po/POTFILES.in Added game.c to POTFILES.in ------------------------------------------------------------------------ r15797 | cazfi | 2009-07-03 00:26:27 +0300 (Fri, 03 Jul 2009) | 6 lines Changed paths: M /trunk/common/game.h M /trunk/server/settings.c Moved definition of GAME_*_COMPRESS_TYPE to game.h Patch by Matthias Pfafferodt See gna #13828 ------------------------------------------------------------------------ r15796 | cazfi | 2009-07-03 00:17:18 +0300 (Fri, 03 Jul 2009) | 6 lines Changed paths: M /trunk/ai/aicity.c M /trunk/ai/aidiplomat.c M /trunk/ai/aiexplorer.c M /trunk/ai/aiferry.c M /trunk/ai/aihunt.c M /trunk/ai/aisettler.c M /trunk/ai/aitools.c M /trunk/ai/aiunit.c M /trunk/client/control.c M /trunk/client/goto.c M /trunk/common/aicore/caravan.c M /trunk/common/aicore/path_finding.c M /trunk/common/aicore/path_finding.h M /trunk/common/aicore/pf_tools.c M /trunk/common/aicore/pf_tools.h M /trunk/server/settlers.c M /trunk/server/unittools.c Renamed path finding public interface with pf_map_ -prefix. Patch by Pepeto See gna #13770 ------------------------------------------------------------------------ r15795 | cazfi | 2009-07-03 00:13:19 +0300 (Fri, 03 Jul 2009) | 6 lines Changed paths: M /trunk/ai/aicity.c M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/doc/README.effects M /trunk/server/cityturn.c Added Migration_Pct effect. Patch by Matthias Pfafferodt See gna #13637 ------------------------------------------------------------------------ r15793 | cazfi | 2009-07-03 00:08:15 +0300 (Fri, 03 Jul 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/pages.c Display flags at start page player list. Patch by Pepeto See gna #13726 ------------------------------------------------------------------------ r15792 | cazfi | 2009-07-02 00:12:24 +0300 (Thu, 02 Jul 2009) | 4 lines Changed paths: M /trunk/common/combat.c M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/data/civ1/units.ruleset M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset Added "TerrainDefense" unit class flag. See gna #13753 ------------------------------------------------------------------------ r15791 | cazfi | 2009-07-01 23:26:12 +0300 (Wed, 01 Jul 2009) | 4 lines Changed paths: M /trunk/ai/aiunit.c Check fuel, not AIR_MOVING, when determining unit type simpliness. See gna #13684 ------------------------------------------------------------------------ r15790 | cazfi | 2009-07-01 22:27:13 +0300 (Wed, 01 Jul 2009) | 4 lines Changed paths: M /trunk/configure.ac Fixed build of ggz enabled gtk client. See gna #13750 ------------------------------------------------------------------------ r15788 | cazfi | 2009-06-30 23:29:51 +0300 (Tue, 30 Jun 2009) | 6 lines Changed paths: M /trunk/server/report.h M /trunk/server/stdinhand.h Removed prototype of report_server_options(). Function did no exist. Patch by Matthias Pfafferodt See gna #13804 ------------------------------------------------------------------------ r15787 | mbook | 2009-06-30 22:34:12 +0300 (Tue, 30 Jun 2009) | 13 lines Changed paths: M /trunk/server/diplomats.c Fix bug in diplomat contest calculation. - Because ">" was used instead of "<" in diplomat_success_vs_defender(), an attacking diplomat's chances were actually decreased when they should have increased. - Fixed F_SUPERSPY handling to match comment in diplomat_infiltrate_tile(). - Improved some formatting and comment style. See gna #13790 Reported by: Szunti (freeciv forum guest) ------------------------------------------------------------------------ r15785 | cazfi | 2009-06-29 21:39:16 +0300 (Mon, 29 Jun 2009) | 4 lines Changed paths: M /trunk/ai/advdiplomacy.c M /trunk/ai/advdomestic.c M /trunk/ai/advmilitary.c M /trunk/ai/aicity.c M /trunk/ai/aidata.c M /trunk/ai/aidiplomat.c M /trunk/ai/aiexplorer.c M /trunk/ai/aiferry.c M /trunk/ai/aihand.c M /trunk/ai/ailog.c M /trunk/ai/aiparatrooper.c M /trunk/ai/aisettler.c M /trunk/ai/aitech.c M /trunk/ai/aitools.c M /trunk/client/climisc.c M /trunk/client/control.c M /trunk/client/gui-gtk-2.0/diplodlg.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-sdl/diplodlg.c M /trunk/client/gui-sdl/plrdlg.c M /trunk/client/gui-win32/diplodlg.c M /trunk/client/gui-win32/plrdlg.c M /trunk/client/gui-xaw/diplodlg.c M /trunk/client/gui-xaw/pages.c M /trunk/client/gui-xaw/plrdlg.c M /trunk/client/mapctrl_common.c M /trunk/client/messagewin_common.c M /trunk/client/packhand.c M /trunk/client/plrdlg_common.c M /trunk/client/text.c M /trunk/common/diptreaty.c M /trunk/common/player.c M /trunk/common/player.h M /trunk/common/requirements.c M /trunk/common/tech.c M /trunk/server/barbarian.c M /trunk/server/cityturn.c M /trunk/server/connecthand.c M /trunk/server/diplhand.c M /trunk/server/meta.c M /trunk/server/plrhand.c M /trunk/server/savegame.c M /trunk/server/scripting/api.pkg M /trunk/server/settlers.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/techtools.c M /trunk/server/unithand.c M /trunk/server/unittools.c Renamed player.ai as player.ai_data See gna #13797 ------------------------------------------------------------------------ r15784 | mbook | 2009-06-29 20:38:08 +0300 (Mon, 29 Jun 2009) | 7 lines Changed paths: M /trunk/ai/advdiplomacy.c AI does not ask for help against unmet enemies. See gna #13559 See RT #39700 Requested by: Matthias Pfafferodt Patch by: ------------------------------------------------------------------------ r15782 | cazfi | 2009-06-28 22:20:14 +0300 (Sun, 28 Jun 2009) | 4 lines Changed paths: M /trunk/manual/civmanual.c Added option to generate manual pages from custom ruleset See gna #13670 ------------------------------------------------------------------------ r15780 | cazfi | 2009-06-27 22:40:40 +0300 (Sat, 27 Jun 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c Fixed creation of GGZ page. See gna #13791 ------------------------------------------------------------------------ r15777 | mbook | 2009-06-27 03:44:40 +0300 (Sat, 27 Jun 2009) | 5 lines Changed paths: M /trunk/common/aicore/path_finding.c Fix infinite loop during goto from danger tiles. See gna #13742 Patch by: pepeto ------------------------------------------------------------------------ r15775 | cazfi | 2009-06-26 23:46:28 +0300 (Fri, 26 Jun 2009) | 4 lines Changed paths: M /trunk/doc/CodingStyle Removed obsolete configure.in reference from CodingStyle. See gna #13682 ------------------------------------------------------------------------ r15773 | cazfi | 2009-06-25 23:03:54 +0300 (Thu, 25 Jun 2009) | 5 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/mapview_common.c M /trunk/client/tilespec.c M /trunk/client/tilespec.h M /trunk/doc/README.graphics Added support for units taller than 1.5 x terrain tile height in isometric tilesets. See gna #13671 ------------------------------------------------------------------------ r15772 | cazfi | 2009-06-24 23:09:17 +0300 (Wed, 24 Jun 2009) | 6 lines Changed paths: M /trunk/ai/advdiplomacy.c M /trunk/ai/advdiplomacy.h M /trunk/common/player.h M /trunk/server/aiiface.c M /trunk/server/aiiface.h M /trunk/server/diplomats.c M /trunk/server/plrhand.c M /trunk/server/unittools.c In AI interface, separate functions for each incident type are replaced with one generic insident function that takes incident type as paramter. See gna #13724 ------------------------------------------------------------------------ r15770 | cazfi | 2009-06-22 23:48:11 +0300 (Mon, 22 Jun 2009) | 5 lines Changed paths: M /trunk/common/player.c M /trunk/common/player.h M /trunk/server/scripting/api.pkg M /trunk/server/scripting/api_methods.c M /trunk/server/scripting/api_methods.h M /trunk/server/srv_main.c Added Player:victory() method to scripting API. It can be used to create custom victory conditions for scenarios. See gna #13666 ------------------------------------------------------------------------ r15769 | mbook | 2009-06-22 07:22:37 +0300 (Mon, 22 Jun 2009) | 5 lines Changed paths: M /trunk/server/report.c Fix bug in tech score when player has no techs. See gna #13733 Patch by: pepeto ------------------------------------------------------------------------ r15766 | cazfi | 2009-06-21 21:50:36 +0300 (Sun, 21 Jun 2009) | 14 lines Changed paths: M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/game.h M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/cityturn.h M /trunk/server/srv_main.c Migration handling update - minimum for mgr_*chance is 0 - changed logic of the function calls - score calculation is moved and only executed if the value of mgr_score_calc_turn (a new variable in the city struct) is not equal to the current turn - define default values for city->migration_score and city->mgr_score_calc_turn Patch by Matthias Pfafferodt, with minor modifications by me See gna #13636 ------------------------------------------------------------------------ r15765 | cazfi | 2009-06-21 00:19:46 +0300 (Sun, 21 Jun 2009) | 4 lines Changed paths: M /trunk/server/barbarian.c Fixed memory leak in sea barbarian creation See gna #13708 ------------------------------------------------------------------------ r15763 | cazfi | 2009-06-20 23:46:59 +0300 (Sat, 20 Jun 2009) | 7 lines Changed paths: M /trunk/client/text.c Show ping of actual player connection instead of player's first connection, which may be observer. Patch by pepeto See gna #13725 ------------------------------------------------------------------------ r15762 | mbook | 2009-06-20 04:32:44 +0300 (Sat, 20 Jun 2009) | 5 lines Changed paths: M /trunk/server/stdinhand.c Fix explain command for settings with underscores. See gna #13652 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15761 | mbook | 2009-06-20 04:32:34 +0300 (Sat, 20 Jun 2009) | 12 lines Changed paths: M /trunk/client/editor.c M /trunk/client/editor.h M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/tilespec.c M /trunk/client/tilespec.h M /trunk/data/misc/editor.spec Simplify editor copy and paste handling. - Tool modes "copy" and "paste" are replaced by a "copy and paste" tool. - Fixed bug in paste_tile() causing specials and bases to not be correctly set in the edit packet. - edit_buffer_get_status_string() just counts the number of virtual tiles in the buffer. - Added 'copypaste' editor sprite. See gna #13715 ------------------------------------------------------------------------ r15760 | cazfi | 2009-06-20 00:51:33 +0300 (Sat, 20 Jun 2009) | 7 lines Changed paths: M /trunk/data/default/buildings.ruleset Updated Stock Exchange help to document bonuses when Marketplace is destroyed from the city. Patch by Jacob Nevins See gna #13654 ------------------------------------------------------------------------ r15759 | cazfi | 2009-06-20 00:38:20 +0300 (Sat, 20 Jun 2009) | 4 lines Changed paths: M /trunk/client/Makefile.am Fixed linking of Windows gtk & win32 clients when sound enabled. See gna #13722 ------------------------------------------------------------------------ r15758 | mbook | 2009-06-19 08:04:31 +0300 (Fri, 19 Jun 2009) | 12 lines Changed paths: M /trunk/client/text.c M /trunk/common/unit.c M /trunk/common/unit.h Add upkeep information to unit texts. - Replace unit_activity_text() by re-entrant version unit_activity_astr(). - unit_activity_text() is kept as a non re-entrant wrapper for old code. - Fix formatting in unit_activity_astr(). See gna #13587 Patch by: Matthias Pfafferodt With some changes by me. ------------------------------------------------------------------------ r15757 | mbook | 2009-06-19 07:48:37 +0300 (Fri, 19 Jun 2009) | 5 lines Changed paths: M /trunk/utility/iterator.h Avoid compiler warning about strict-aliasing. See gna #13719 Patch by: pepeto ------------------------------------------------------------------------ r15755 | cazfi | 2009-06-18 23:36:42 +0300 (Thu, 18 Jun 2009) | 4 lines Changed paths: M /trunk/common/player.h M /trunk/server/Makefile.am A /trunk/server/aiiface.c A /trunk/server/aiiface.h M /trunk/server/cityturn.c M /trunk/server/plrhand.c M /trunk/server/savegame.c M /trunk/server/srv_main.c M /trunk/server/unittools.c Second set of AI function pointers See gna #13694 ------------------------------------------------------------------------ r15754 | cazfi | 2009-06-18 19:45:19 +0300 (Thu, 18 Jun 2009) | 2 lines Changed paths: A /trunk/dependencies/tolua-5.1b A /trunk/dependencies/tolua-5.1b/Makefile.am A /trunk/dependencies/tolua-5.1b/README A /trunk/dependencies/tolua-5.1b/include A /trunk/dependencies/tolua-5.1b/include/tolua.h A /trunk/dependencies/tolua-5.1b/src A /trunk/dependencies/tolua-5.1b/src/Makefile.am A /trunk/dependencies/tolua-5.1b/src/bin A /trunk/dependencies/tolua-5.1b/src/bin/Makefile.am A /trunk/dependencies/tolua-5.1b/src/bin/lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/all.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/array.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/basic.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/class.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/clean.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/code.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/compat.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/container.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/declaration.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/define.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/doit.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/enumerate.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/feature.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/function.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/module.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/namespace.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/operator.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/package.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/typedef.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/variable.lua A /trunk/dependencies/tolua-5.1b/src/bin/lua/verbatim.lua A /trunk/dependencies/tolua-5.1b/src/bin/tolua.c A /trunk/dependencies/tolua-5.1b/src/bin/tolua.pkg A /trunk/dependencies/tolua-5.1b/src/bin/toluabind.c A /trunk/dependencies/tolua-5.1b/src/lib A /trunk/dependencies/tolua-5.1b/src/lib/Makefile.am A /trunk/dependencies/tolua-5.1b/src/lib/tolua_event.c A /trunk/dependencies/tolua-5.1b/src/lib/tolua_event.h A /trunk/dependencies/tolua-5.1b/src/lib/tolua_is.c A /trunk/dependencies/tolua-5.1b/src/lib/tolua_map.c A /trunk/dependencies/tolua-5.1b/src/lib/tolua_push.c A /trunk/dependencies/tolua-5.1b/src/lib/tolua_to.c Added tolua-5.1b to svn. ------------------------------------------------------------------------ r15753 | mbook | 2009-06-18 04:58:30 +0300 (Thu, 18 Jun 2009) | 5 lines Changed paths: M /trunk/client/agents/agents.c Fix va_list corruption in agent code. See gna #13714 Patch by: Bernd Jendrissek ------------------------------------------------------------------------ r15750 | mbook | 2009-06-18 04:53:42 +0300 (Thu, 18 Jun 2009) | 5 lines Changed paths: M /trunk/client/agents/agents.c Agent calls to different agents are never equal. See gna #13713 Patch by: Bernd Jendrissek ------------------------------------------------------------------------ r15749 | cazfi | 2009-06-18 00:06:10 +0300 (Thu, 18 Jun 2009) | 4 lines Changed paths: M /trunk/server/unittools.c Do not access punit->homecity after punit freed. See gna #13706 ------------------------------------------------------------------------ r15748 | cazfi | 2009-06-17 23:55:25 +0300 (Wed, 17 Jun 2009) | 4 lines Changed paths: M /trunk/client/editor.c M /trunk/common/movement.c M /trunk/common/movement.h Removed is_air_unit() See gna #13681 ------------------------------------------------------------------------ r15747 | cazfi | 2009-06-17 23:46:06 +0300 (Wed, 17 Jun 2009) | 5 lines Changed paths: M /trunk/common/combat.c Unit in city or fortified gets defense bonus iff its class has CanFortify flag. See gna #13677 ------------------------------------------------------------------------ r15746 | cazfi | 2009-06-16 21:56:07 +0300 (Tue, 16 Jun 2009) | 4 lines Changed paths: M /trunk/server/citytools.c Remove vision from lost city only after it has seen under new owner. See gna #13702 ------------------------------------------------------------------------ r15745 | cazfi | 2009-06-15 19:00:59 +0300 (Mon, 15 Jun 2009) | 4 lines Changed paths: M /trunk/ai/aicity.c M /trunk/client/climisc.c M /trunk/client/helpdata.c M /trunk/common/aicore/pf_tools.c M /trunk/common/fc_types.h M /trunk/common/movement.c M /trunk/server/gotohand.c Renamed HELI_MOVING as BOTH_MOVING See gna #13683 ------------------------------------------------------------------------ r15744 | cazfi | 2009-06-14 23:04:31 +0300 (Sun, 14 Jun 2009) | 4 lines Changed paths: M /trunk/common/player.h M /trunk/server/diplhand.c M /trunk/server/diplomats.c M /trunk/server/plrhand.c M /trunk/server/srv_main.c Call some of the AI functions through function pointers. See gna #13680 ------------------------------------------------------------------------ r15743 | cazfi | 2009-06-13 22:43:42 +0300 (Sat, 13 Jun 2009) | 5 lines Changed paths: M /trunk/ai/advmilitary.c M /trunk/common/combat.c AI checks that defense building it considers to build actually works against attacker unit class. See gna #13673 ------------------------------------------------------------------------ r15742 | cazfi | 2009-06-12 21:09:35 +0300 (Fri, 12 Jun 2009) | 4 lines Changed paths: M /trunk/data/default/units.ruleset Updated trireme unit type flag comment to reflect current implementation. See gna #13658 ------------------------------------------------------------------------ r15741 | cazfi | 2009-06-12 02:21:56 +0300 (Fri, 12 Jun 2009) | 5 lines Changed paths: M /trunk/ai/advmilitary.c M /trunk/ai/aitools.c M /trunk/ai/aiunit.c M /trunk/client/gui-ftwl/mapview.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/helpdata.c M /trunk/client/tilespec.c M /trunk/common/aicore/pf_tools.c M /trunk/common/movement.c M /trunk/common/unit.c M /trunk/common/unit.h M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/server/airgoto.c M /trunk/server/edithand.c M /trunk/server/unittools.c Replaced some is_air_unit() calls with more proper checks for fuel usage. Defined utype_fuel() macro and used it. See gna #13645 ------------------------------------------------------------------------ r15740 | cazfi | 2009-06-11 00:17:08 +0300 (Thu, 11 Jun 2009) | 4 lines Changed paths: M /trunk/client/helpdata.c Help browser shows if unit can pillage See gna #13650 ------------------------------------------------------------------------ r15739 | cazfi | 2009-06-10 01:52:36 +0300 (Wed, 10 Jun 2009) | 4 lines Changed paths: M /trunk/client/gui-win32/repodlgs.c Fixed Win32 client compilation. See gna #13663 ------------------------------------------------------------------------ r15738 | cazfi | 2009-06-10 00:55:51 +0300 (Wed, 10 Jun 2009) | 4 lines Changed paths: M /trunk/client/gui-xaw/repodlgs.c Fixed Xaw client compilation. See gna #13662 ------------------------------------------------------------------------ r15737 | cazfi | 2009-06-10 00:39:08 +0300 (Wed, 10 Jun 2009) | 4 lines Changed paths: M /trunk/client/gui-sdl/repodlgs.c Fixed SDL client compilation. See gna #13661 ------------------------------------------------------------------------ r15735 | cazfi | 2009-06-10 00:22:02 +0300 (Wed, 10 Jun 2009) | 7 lines Changed paths: M /trunk/client/helpdata.c Fixed help browser crash when ruleset has fuel using unit for which there is no suitable carrier unit. Reported by Ugo Degrigny See gna #13649 ------------------------------------------------------------------------ r15734 | cazfi | 2009-06-09 22:05:41 +0300 (Tue, 09 Jun 2009) | 4 lines Changed paths: M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c M /trunk/server/srv_main.c M /trunk/utility/shared.c M /trunk/utility/shared.h M /trunk/version.in Made calendar labels ("BC" & "AD") ruleset configurable. See gna #13625 ------------------------------------------------------------------------ r15730 | cazfi | 2009-06-09 20:50:31 +0300 (Tue, 09 Jun 2009) | 4 lines Changed paths: M /trunk/data/helpdata.txt Updated bug URL in About page to point to gna. See gna #13644 ------------------------------------------------------------------------ r15729 | cazfi | 2009-06-09 17:50:03 +0300 (Tue, 09 Jun 2009) | 11 lines Changed paths: M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/ruleset.c M /trunk/server/ruleset.h M /trunk/server/savegame.c Rolled resource identifier changes back to what they were in 2.1. Removed associated code hacks. Savegame compatibility with 2.1 and older stable releases is maintained. Savegame compatibility with older 2.1.99 development versions is lost. Patch by Stéphane Messerli with minor additions by myself. See RT #40767 ------------------------------------------------------------------------ r15728 | cazfi | 2009-06-08 23:18:37 +0300 (Mon, 08 Jun 2009) | 5 lines Changed paths: M /trunk/ai/advmilitary.c M /trunk/client/helpdata.c M /trunk/common/unit.c M /trunk/common/unit.h M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/data/civ1/units.ruleset M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset M /trunk/version.in Added unit class flag "DoesntOccupyTile". Renamed "CanOccupy" flag as "CanOccupyCity". See gna #13631 ------------------------------------------------------------------------ r15727 | cazfi | 2009-06-08 23:11:12 +0300 (Mon, 08 Jun 2009) | 6 lines Changed paths: M /trunk/ai/aicity.c M /trunk/client/citydlg_common.c M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/doc/README.effects M /trunk/server/cityturn.c M /trunk/server/ruleset.c M /trunk/version.in New plague probability formula. Patch by Matthias Pfafferodt See gna #13611 ------------------------------------------------------------------------ r15726 | cazfi | 2009-06-08 22:54:33 +0300 (Mon, 08 Jun 2009) | 5 lines Changed paths: M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/barbarian.c M /trunk/server/meta.c M /trunk/server/savegame.c M /trunk/server/score.c M /trunk/server/settings.c M /trunk/server/srv_main.c M /trunk/version.in Replaced endyear with endturn setting. Onsetbarbs setting takes turn instead of year. See gna #13624 ------------------------------------------------------------------------ r15725 | mbook | 2009-06-08 04:13:01 +0300 (Mon, 08 Jun 2009) | 13 lines Changed paths: M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/gui-gtk-2.0/repodlgs.c M /trunk/client/gui-sdl/citydlg.c M /trunk/client/gui-sdl/repodlgs.c M /trunk/client/gui-win32/citydlg.c M /trunk/client/gui-win32/repodlgs.c M /trunk/client/gui-xaw/citydlg.c M /trunk/client/gui-xaw/repodlgs.c M /trunk/client/packhand.c M /trunk/client/repodlgs_common.c M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/packets.def M /trunk/common/unit.c M /trunk/common/unit.h M /trunk/server/citytools.c M /trunk/server/citytools.h M /trunk/server/cityturn.c M /trunk/server/savegame.c M /trunk/server/unittools.c Store upkeep information in unit struct. - Add upkeep[] array to struct unit and unit info packet. - Move city_unit_upkeep() to server/citytools.c. - Remove calls to city_unit_upkeep() and similar upkeep calculcations in all clients. - Investigating an enemy city does not show the upkeep costs of supported units. See gna #13586 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15724 | cazfi | 2009-06-07 21:50:26 +0300 (Sun, 07 Jun 2009) | 5 lines Changed paths: M /trunk/server/barbarian.c Prevented barbarian spawning code from creating units with Trireme flag to unsafe ocean. See gna #13632 ------------------------------------------------------------------------ r15723 | cazfi | 2009-06-06 23:58:50 +0300 (Sat, 06 Jun 2009) | 4 lines Changed paths: M /trunk/common/unit.c M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/data/civ1/units.ruleset M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset M /trunk/version.in Added CanPillage unit class flag See gna #13629 ------------------------------------------------------------------------ r15722 | cazfi | 2009-06-06 23:41:31 +0300 (Sat, 06 Jun 2009) | 4 lines Changed paths: M /trunk/client/control.c M /trunk/client/packhand.c M /trunk/common/base.h M /trunk/common/packets.def M /trunk/common/unit.c M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/ruleset.c M /trunk/server/unittools.c M /trunk/version.in Added boolean property pillageable, defaulting to TRUE, for bases. See gna #13628 ------------------------------------------------------------------------ r15720 | cazfi | 2009-06-06 00:41:27 +0300 (Sat, 06 Jun 2009) | 7 lines Changed paths: M /trunk/common/fc_types.h M /trunk/server/ruleset.c M /trunk/version.in Added ruleset loading time check that MAX_NUM_REQS is not exceeded. Increased MAX_NUM_REQS from 4 to 10. Problem reported by Matthias Pfafferodt See gna #13600 ------------------------------------------------------------------------ r15719 | cazfi | 2009-06-06 00:33:03 +0300 (Sat, 06 Jun 2009) | 5 lines Changed paths: M /trunk/ai/aicity.c M /trunk/common/city.c M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/data/civ1/effects.ruleset M /trunk/data/civ2/effects.ruleset M /trunk/data/default/effects.ruleset M /trunk/doc/README.effects M /trunk/version.in Added Tile_Workable effect. City can work only those tiles where effect is active. See gna #13618 ------------------------------------------------------------------------ r15718 | cazfi | 2009-06-06 00:20:59 +0300 (Sat, 06 Jun 2009) | 4 lines Changed paths: M /trunk/common/game.c M /trunk/common/packets.def M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c M /trunk/server/srv_main.c M /trunk/version.in Configurable game start year. See gna #13508 ------------------------------------------------------------------------ r15716 | cazfi | 2009-06-04 23:45:49 +0300 (Thu, 04 Jun 2009) | 6 lines Changed paths: M /trunk/data/default/buildings.ruleset Fixed Hydro Plant help text. Patch by Jacob Nevins See RT #40805 ------------------------------------------------------------------------ r15715 | cazfi | 2009-06-04 23:36:02 +0300 (Thu, 04 Jun 2009) | 5 lines Changed paths: M /trunk/data/civ2/effects.ruleset M /trunk/data/default/effects.ruleset Fixed a bug that city center got double farmland bonus if actual farmland was builkt there. See gna #13619 ------------------------------------------------------------------------ r15714 | cazfi | 2009-06-04 23:20:10 +0300 (Thu, 04 Jun 2009) | 5 lines Changed paths: M /trunk/common/game.c M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/version.in Made year 0 -> 1 hack optional and prevented it from completely stopping year advancement when turn length is one year at year 0 See gna #13615 ------------------------------------------------------------------------ r15713 | cazfi | 2009-06-04 23:13:22 +0300 (Thu, 04 Jun 2009) | 6 lines Changed paths: M /trunk/common/city.c M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c M /trunk/version.in Made illness_pollution_factor configurable Patch by Matthias Pfafferodt See gna #13605 ------------------------------------------------------------------------ r15712 | cazfi | 2009-06-04 23:05:56 +0300 (Thu, 04 Jun 2009) | 6 lines Changed paths: M /trunk/doc/README.effects Documented requirement field 'negated' Patch by Matthias Pfafferodt See gna #13600 ------------------------------------------------------------------------ r15711 | cazfi | 2009-06-03 17:51:33 +0300 (Wed, 03 Jun 2009) | 6 lines Changed paths: M /trunk/client/citydlg_common.c M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/common/city.c M /trunk/common/city.h Plague risk popup shows how much pollution contributes to plague risk. Patch by Matthias Pfafferodt See gna #13604 ------------------------------------------------------------------------ r15710 | mbook | 2009-06-03 03:03:16 +0300 (Wed, 03 Jun 2009) | 1 line Changed paths: M /trunk/doc/README.effects Updated effect docs in light of the last patch. ------------------------------------------------------------------------ r15709 | mbook | 2009-06-03 03:03:05 +0300 (Wed, 03 Jun 2009) | 8 lines Changed paths: M /trunk/common/unittype.c M /trunk/common/unittype.h M /trunk/data/default/units.ruleset Unit flag for converting shield to gold upkeep. - Units must have the F_SHIELD2GOLD flag in order for EFT_SHIELD2GOLD_FACTOR to apply to them. See gna #13585 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15708 | mbook | 2009-06-03 02:48:11 +0300 (Wed, 03 Jun 2009) | 11 lines Changed paths: M /trunk/ai/aicity.c M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/common/unittype.c M /trunk/doc/README.effects Add effect to change shield to gold upkeep. - New effect EFT_SHIELD2GOLD_FACTOR (Shield2Gold_Factor) gives the conversion rate of shield to gold upkeep as an integer percent (so 100 means 1 shield becomes 1 gold, 200 to 2 gold, etc.). - Updated effects documentation. See gna #13583 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15707 | cazfi | 2009-06-03 01:30:06 +0300 (Wed, 03 Jun 2009) | 6 lines Changed paths: M /trunk/common/city.c Health effects reduce plague probability, not increase. Patch by Matthias Pfafferodt See gna #13603 ------------------------------------------------------------------------ r15706 | cazfi | 2009-06-02 18:00:05 +0300 (Tue, 02 Jun 2009) | 5 lines Changed paths: M /trunk/ai/aicity.c M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/common/packets.def M /trunk/common/tech.c M /trunk/data/civ1/effects.ruleset M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/effects.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/effects.ruleset M /trunk/data/default/game.ruleset M /trunk/doc/README.effects M /trunk/server/ruleset.c M /trunk/version.in Added effect type Tech_Cost_Factor. It is used in civ/2 rulesets to double research costs at year 1. Old tech_cost_double_year is removed. See gna #13608 ------------------------------------------------------------------------ r15705 | mbook | 2009-06-02 04:11:04 +0300 (Tue, 02 Jun 2009) | 11 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Property editor is a popup dialog window. - Replaced code that tried to pack the property editor into the bottom notebook with code that instead makes it a popup dialog. - Replaced object type switching combo box with notebook tabs. - Improved layout of property page widgets. - Property panel frame label shows the object type. See gna #13550 ------------------------------------------------------------------------ r15704 | mbook | 2009-06-02 04:10:55 +0300 (Tue, 02 Jun 2009) | 7 lines Changed paths: M /trunk/client/editor.c M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/gui-gtk-2.0/editprop.h M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c M /trunk/client/include/editgui_g.h Scenario properties menu item. - Added an 'objtype' parameter to property_editor_popup() and editgui_popup_properties(). - Updated stubs for other GUIs. See gna #13544 ------------------------------------------------------------------------ r15703 | mbook | 2009-06-02 04:10:42 +0300 (Tue, 02 Jun 2009) | 3 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Always select first object in the object list. See gna #13546 ------------------------------------------------------------------------ r15702 | mbook | 2009-06-02 04:10:33 +0300 (Tue, 02 Jun 2009) | 3 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Pretty print strings in object list columns. See gna #13543 ------------------------------------------------------------------------ r15701 | mbook | 2009-06-02 03:53:27 +0300 (Tue, 02 Jun 2009) | 11 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/packhand.c M /trunk/common/packets.def M /trunk/server/edithand.c Game scenario editable properties. - Added 4 new editable properties corresponding to scenario parameters to the property editor. - Added a textview based sub-type of extviewer. - Added editable gtktextviews to the list of widgets allowed to grab keyboard events in toplevel_handler(). - Some cleanup and improvement in related code. See gna #13542 ------------------------------------------------------------------------ r15700 | cazfi | 2009-06-02 03:50:04 +0300 (Tue, 02 Jun 2009) | 7 lines Changed paths: M /trunk/client/helpdata.c M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/fc_types.h M /trunk/common/requirements.c M /trunk/common/terrain.c M /trunk/common/terrain.h M /trunk/data/civ2/effects.ruleset M /trunk/data/default/effects.ruleset M /trunk/doc/README.effects M /trunk/server/cityturn.c M /trunk/server/ruleset.c M /trunk/version.in Added requirement types "TerrainAlter" and "CityTile". Used them to provide automatic farmland at city center. Patch by Jacob Nevins with changes by me See RT #40207 ------------------------------------------------------------------------ r15699 | mbook | 2009-06-02 03:24:34 +0300 (Tue, 02 Jun 2009) | 3 lines Changed paths: M /trunk/common/game.c Initialize scenario parameters in game struct. See RT #40229 ------------------------------------------------------------------------ r15698 | mbook | 2009-06-02 03:24:24 +0300 (Tue, 02 Jun 2009) | 22 lines Changed paths: M /trunk/client/connectdlg_common.c M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-gtk-2.0/pages.h M /trunk/client/packhand.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/civserver.c M /trunk/server/connecthand.c M /trunk/server/edithand.c M /trunk/server/gamehand.c M /trunk/server/gamehand.h M /trunk/server/savegame.c M /trunk/server/savegame.h M /trunk/server/srv_main.c M /trunk/server/srv_main.h M /trunk/server/stdinhand.c M /trunk/version.in Scenario saving and loading. - Added scenario info packets and handlers. - Added server argument --scenarios used to pass the path where the server should load and save scenario files. - Added "--scenarios ~/.freeciv/scenarios" to the arguments for the server process started from the client. - Added "Save Scenario" menu item to the editor menu. - Extended save dialog to permit saving of scenarios. - Added section in savegame code for storing and reading of scenario information. - Some cleanup and rearrangement of packet definitions in common/packet.def. - Updated mandatory network capability string. See RT #40229 Patch by: Marko Lindqvist With the last two items by me. ------------------------------------------------------------------------ r15696 | cazfi | 2009-06-01 17:43:20 +0300 (Mon, 01 Jun 2009) | 5 lines Changed paths: M /trunk/configure.ac Fallback to hardcoded program name 'sed' with autoconf versions older than 2.60 where AC_PROG_SED is not available. See gna #13572 ------------------------------------------------------------------------ r15695 | mbook | 2009-06-01 04:01:56 +0300 (Mon, 01 Jun 2009) | 3 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Fix bug hiding boolean columns in object list. See gna #13541 ------------------------------------------------------------------------ r15694 | mbook | 2009-06-01 04:00:13 +0300 (Mon, 01 Jun 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/gui-gtk-2.0/gui_stuff.c M /trunk/client/gui-gtk-2.0/gui_stuff.h Enable/disable gobject callback functions. - Replaced {enable,disable}_widget_callback by {enable,disable}_gobject_callback. See gna #13540 ------------------------------------------------------------------------ r15693 | mbook | 2009-06-01 03:56:06 +0300 (Mon, 01 Jun 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/gamedlgs.c Put local options in scrolled window. - Also, make 400 pixels the default height for the options dialog window. See GNA #13525 ------------------------------------------------------------------------ r15691 | cazfi | 2009-06-01 02:48:16 +0300 (Mon, 01 Jun 2009) | 6 lines Changed paths: M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset Updated gold_upkeep comments in civ1 & civ2 rulesets. Patch by Matthias Pfafferodt See gna #13598 ------------------------------------------------------------------------ r15690 | cazfi | 2009-06-01 01:27:04 +0300 (Mon, 01 Jun 2009) | 4 lines Changed paths: M /trunk/autogen.sh Minimum version of libtool is 1.4.3 See gna #13573 ------------------------------------------------------------------------ r15689 | cazfi | 2009-06-01 01:25:13 +0300 (Mon, 01 Jun 2009) | 7 lines Changed paths: M /trunk/server/cityturn.c Queue city refreshes inside sell_random_buildings() so each city is refreshed max one times even if they sell several buildings. Patch by Matthias Pfafferodt See gna #13596 ------------------------------------------------------------------------ r15688 | cazfi | 2009-05-31 18:09:43 +0300 (Sun, 31 May 2009) | 6 lines Changed paths: M /trunk/server/cityturn.c Replaced unitgold struct by a unit_list. Patch by Matthias Pfafferodt See gna #13595 ------------------------------------------------------------------------ r15687 | mbook | 2009-05-29 05:15:44 +0300 (Fri, 29 May 2009) | 13 lines Changed paths: M /trunk/common/city.c M /trunk/common/game.h M /trunk/common/player.c M /trunk/data/default/game.ruleset M /trunk/server/cityturn.c Extend gold_upkeep_style setting. - New setting value allows building upkeep to be paid per city, but unit upkeep to be paid by the nation. - Updated help text in default ruleset. - Split {city,player}_balance_treasury() functions into separate pairs for units and buildings. See GNA #13582 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15686 | mbook | 2009-05-29 05:02:03 +0300 (Fri, 29 May 2009) | 10 lines Changed paths: M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/fc_types.h M /trunk/common/unit.c M /trunk/common/unit.h M /trunk/server/cityturn.c M /trunk/server/diplomats.c M /trunk/server/savegame.c M /trunk/server/unithand.c M /trunk/server/unittools.c Store unit upkeep in unit struct. - Removed duplicated upkeep calculation code. - Added city_units_upkeep() function to update upkeep values for all support units of a city. - Added clarifying comment for num_output_types. See GNA #13581 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15685 | mbook | 2009-05-28 21:46:44 +0300 (Thu, 28 May 2009) | 10 lines Changed paths: M /trunk/client/repodlgs_common.c M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/player.c M /trunk/server/cityturn.c Some cleanup of unit and gold upkeep functions. - Moved city_total_{unit,impr}_gold_upkeep() to common. - Made city_support() and player_get_expected_income() take into account the value of game.info.gold_upkeep_style. See GNA #13580 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15684 | mbook | 2009-05-28 04:58:30 +0300 (Thu, 28 May 2009) | 11 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h Option for small display widget layout. - Gui option 'small_display_layout' controls whether the left "panel" on the main game page extends all the way down the window. - Option requires a program restart in order to take effect. - The main map canvas is given a minimum size of 300 by 300 pixels. See GNA #13524 ------------------------------------------------------------------------ r15681 | cazfi | 2009-05-24 22:04:11 +0300 (Sun, 24 May 2009) | 6 lines Changed paths: M /trunk/ai/aicity.c M /trunk/client/citydlg_common.c M /trunk/client/citydlg_common.h M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/packhand.c M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/common/events.c M /trunk/common/events.h M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/data/stdsounds.soundspec M /trunk/doc/README.effects M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/scripting/api.pkg M /trunk/version.in Added ruleset options and support for plague caused by overcrowding. Patch by Yoav Luft, Matthias Pfafferodt and myself See RT #40607 ------------------------------------------------------------------------ r15677 | cazfi | 2009-05-24 21:20:59 +0300 (Sun, 24 May 2009) | 4 lines Changed paths: M /trunk/configure.ac Changed bug address to point to gna See gna #13422 ------------------------------------------------------------------------ r15676 | mbook | 2009-05-23 04:33:32 +0300 (Sat, 23 May 2009) | 3 lines Changed paths: A /trunk/client/voteinfo.c A /trunk/client/voteinfo.h Add new voteinfo client source files. See GNA #13515 ------------------------------------------------------------------------ r15675 | mbook | 2009-05-23 04:33:23 +0300 (Sat, 23 May 2009) | 17 lines Changed paths: M /trunk/client/Makefile.am M /trunk/client/client_main.c M /trunk/client/gui-ftwl/pages.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-sdl/pages.c M /trunk/client/gui-stub/pages.c M /trunk/client/gui-win32/pages.c M /trunk/client/gui-xaw/pages.c M /trunk/client/include/pages_g.h M /trunk/client/packhand.c M /trunk/common/packets.def M /trunk/server/commands.c M /trunk/server/commands.h M /trunk/server/connecthand.c M /trunk/server/plrhand.c M /trunk/server/plrhand.h M /trunk/server/sernet.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/voting.c M /trunk/server/voting.h M /trunk/version.in Improved voting code ported from warclient. - Added new vote related packets. - Moved all voting related code on the server side to server/voting.[ch]. - Added gui function voteinfo_gui_update() and stubs for all guis. - Added vote parameters to command definitions. - Modified notify_team() to send to all players if the first argument is NULL. - Cleaned up vote_command() in stdinhand.c. - Some rearrangement of handle_stdin_input(). See GNA #13515 Warclient code originally by pepeto, woodswolf, and myself. ------------------------------------------------------------------------ r15668 | cazfi | 2009-05-22 21:26:00 +0300 (Fri, 22 May 2009) | 5 lines Changed paths: M /trunk/server/unithand.c Added proper error message to case where user tries to add Settlers to city owned by ally. See gna #13539 ------------------------------------------------------------------------ r15666 | cazfi | 2009-05-14 00:30:20 +0300 (Thu, 14 May 2009) | 4 lines Changed paths: M /trunk/data/misc/colors.tilespec Removed unused color entries, added lake color. See gna #13509 ------------------------------------------------------------------------ r15664 | cazfi | 2009-05-12 03:02:26 +0300 (Tue, 12 May 2009) | 4 lines Changed paths: M /trunk/client/chatline_common.c M /trunk/server/ruleset.c Include stdarg.h when ever va_list used See gna #13486 ------------------------------------------------------------------------ r15663 | cazfi | 2009-05-12 02:59:35 +0300 (Tue, 12 May 2009) | 4 lines Changed paths: M /trunk/configure.ac Replaced instances of obsolete AC_TRY_RUN with AC_RUN_IFELSE. See gna #13489 ------------------------------------------------------------------------ r15662 | cazfi | 2009-05-12 00:33:13 +0300 (Tue, 12 May 2009) | 4 lines Changed paths: M /trunk/ai/aicity.c M /trunk/common/effects.c M /trunk/common/effects.h M /trunk/common/game.c M /trunk/data/civ1/effects.ruleset M /trunk/data/civ2/effects.ruleset M /trunk/data/default/effects.ruleset M /trunk/doc/README.effects Added effect type Turn_Years. It is used to drive calendars. See RT #39413 ------------------------------------------------------------------------ r15661 | cazfi | 2009-05-10 20:52:07 +0300 (Sun, 10 May 2009) | 4 lines Changed paths: M /trunk/tests/copyright.sh Removed amiga directory from copyright.sh check See gna #13484 ------------------------------------------------------------------------ r15660 | cazfi | 2009-05-10 20:19:47 +0300 (Sun, 10 May 2009) | 4 lines Changed paths: M /trunk/data/amplio/water.png M /trunk/data/amplio/water.spec M /trunk/data/amplio.tilespec Added Lake graphics by John W. Bjerk aka Eleazar See RT #40625 ------------------------------------------------------------------------ r15659 | mbook | 2009-05-08 22:05:24 +0300 (Fri, 08 May 2009) | 5 lines Changed paths: M /trunk/server/gamehand.c Fix lost hack access in single player mode. See GNA #13494 Reported by: Christian Knoke ------------------------------------------------------------------------ r15657 | mbook | 2009-05-08 19:22:59 +0300 (Fri, 08 May 2009) | 3 lines Changed paths: M /trunk/common/connection.c M /trunk/common/connection.h Some connection accessor functions. See GNA #13490 ------------------------------------------------------------------------ r15654 | cazfi | 2009-05-07 23:42:10 +0300 (Thu, 07 May 2009) | 6 lines Changed paths: M /trunk/common/effects.h M /trunk/common/fc_types.h M /trunk/common/requirements.c M /trunk/doc/README.effects M /trunk/server/cityturn.c M /trunk/server/ruleset.c MinYear requirement type Original code by engla as part of another patch, updated and modified by me See gna #13476 ------------------------------------------------------------------------ r15652 | cazfi | 2009-05-06 17:01:00 +0300 (Wed, 06 May 2009) | 7 lines Changed paths: M /trunk/common/improvement.c M /trunk/common/improvement.h M /trunk/common/unittype.c Fixed a bug that even if wonder set as improvement requirement for unit was built, unit was not buildable. Reported by banjo. See RT #39530 ------------------------------------------------------------------------ r15651 | cazfi | 2009-05-06 15:36:45 +0300 (Wed, 06 May 2009) | 4 lines Changed paths: M /trunk/configure.ac Configure time AF_INET6 check. See gna #13483 ------------------------------------------------------------------------ r15650 | cazfi | 2009-05-06 11:48:06 +0300 (Wed, 06 May 2009) | 5 lines Changed paths: M /trunk/client/packhand.c M /trunk/common/effects.c M /trunk/server/citytools.c M /trunk/server/connecthand.c M /trunk/server/edithand.c M /trunk/server/maphand.c M /trunk/server/maphand.h M /trunk/server/srv_main.c M /trunk/server/srv_main.h M /trunk/server/stdinhand.c M /trunk/version.in Make full game_free()+game_init() reset on client side when /taking player. This makes sure there is no invalid pointers to ruleset data. See RT #39627 ------------------------------------------------------------------------ r15649 | cazfi | 2009-05-06 11:16:22 +0300 (Wed, 06 May 2009) | 4 lines Changed paths: M /trunk/data/amplio/water.spec M /trunk/data/amplio.tilespec Removed references to unused oceant tyles from Amplio specfiles. See gna ticket #13479 ------------------------------------------------------------------------ r15648 | cazfi | 2009-05-05 17:27:40 +0300 (Tue, 05 May 2009) | 4 lines Changed paths: M /trunk/client/packhand.c M /trunk/common/packets.def M /trunk/common/unittype.h M /trunk/data/civ1/units.ruleset M /trunk/data/civ2/units.ruleset M /trunk/data/default/units.ruleset M /trunk/server/ruleset.c M /trunk/server/unithand.c M /trunk/version.in Configurable size for newly founded cities See gna ticket #13460 ------------------------------------------------------------------------ r15647 | mbook | 2009-05-05 04:10:57 +0300 (Tue, 05 May 2009) | 11 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/common/connection.c M /trunk/common/connection.h M /trunk/server/commands.c M /trunk/server/connecthand.c M /trunk/server/connecthand.h M /trunk/server/sernet.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c Improved access levels ported from Warclient. - Added two new access levels, ALLOW_BASIC and ALLOW_ADMIN, for players and remote server operators respectively. - Added field server.granted_access_level to struct connection to keep track of a user's initial access level during attaching and detaching. - Fixed out-of-date comment about SSET_SERVER_ONLY. See GNA #13433 ------------------------------------------------------------------------ r15645 | cazfi | 2009-05-05 02:00:31 +0300 (Tue, 05 May 2009) | 2 lines Changed paths: M /trunk/data/amplio/ocean.png Removed bright green pixels from the middle of the ocean. ------------------------------------------------------------------------ r15644 | cazfi | 2009-05-05 00:30:23 +0300 (Tue, 05 May 2009) | 2 lines Changed paths: M /trunk/po/POTFILES.in Added missing files to POTFILES.in ------------------------------------------------------------------------ r15643 | cazfi | 2009-05-05 00:07:47 +0300 (Tue, 05 May 2009) | 2 lines Changed paths: M /trunk/dependencies/lua-5.1/Version M /trunk/dependencies/lua-5.1/src/loadlib.c M /trunk/dependencies/lua-5.1/src/lobject.h M /trunk/dependencies/lua-5.1/src/lua.h Updated lua to version 5.1.4 ------------------------------------------------------------------------ r15642 | cazfi | 2009-05-04 23:15:02 +0300 (Mon, 04 May 2009) | 4 lines Changed paths: M /trunk/bootstrap/civ.in Fixed creation of client executable name for Windows. See gna ticket #13477 ------------------------------------------------------------------------ r15641 | cazfi | 2009-05-04 21:32:46 +0300 (Mon, 04 May 2009) | 2 lines Changed paths: A /trunk/client/dummy.c Added dummy.c missing from previous commit. ------------------------------------------------------------------------ r15640 | cazfi | 2009-05-04 20:58:10 +0300 (Mon, 04 May 2009) | 4 lines Changed paths: M /trunk/bootstrap/civ.in M /trunk/client/Makefile.am M /trunk/client/gui-ftwl/Makefile.am M /trunk/client/gui-gtk-2.0/Makefile.am M /trunk/client/gui-sdl/Makefile.am M /trunk/client/gui-stub/Makefile.am M /trunk/client/gui-win32/Makefile.am M /trunk/client/gui-xaw/Makefile.am M /trunk/client/text.c M /trunk/configure.ac M /trunk/m4/auth.m4 M /trunk/m4/gtk2-client.m4 M /trunk/m4/no-client.m4 M /trunk/m4/sdl-client.m4 M /trunk/m4/win32-client.m4 M /trunk/m4/xaw-client.m4 Made it possible to build multiple clients at once. See RT ticket #40144 ------------------------------------------------------------------------ r15638 | cazfi | 2009-05-03 22:26:33 +0300 (Sun, 03 May 2009) | 4 lines Changed paths: M /trunk/m4/sound.m4 Fixed explicit --enable-sdl-mixer to not to disable sdl-mixer. See gna ticket #13444 ------------------------------------------------------------------------ r15636 | cazfi | 2009-05-03 19:24:33 +0300 (Sun, 03 May 2009) | 7 lines Changed paths: M /trunk/client/gui-win32/helpdlg.c Show correct Requirement and Obsolete by tech for wonders in win32-client help browser. Reported by Daniel Doran See RT ticket #40765 ------------------------------------------------------------------------ r15635 | cazfi | 2009-05-01 15:27:15 +0300 (Fri, 01 May 2009) | 4 lines Changed paths: M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c M /trunk/client/include/gui_main_g.h M /trunk/client/packhand.c M /trunk/common/fc_types.h M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/srv_main.c M /trunk/version.in Send client gui type to server. See gna ticket #13426 ------------------------------------------------------------------------ r15634 | cazfi | 2009-04-30 22:28:29 +0300 (Thu, 30 Apr 2009) | 4 lines Changed paths: M /trunk/common/Makefile.am Added fc_svnrev_gen.h to BUILT_SOURCES See gna ticket #13459 ------------------------------------------------------------------------ r15633 | cazfi | 2009-04-30 20:31:46 +0300 (Thu, 30 Apr 2009) | 4 lines Changed paths: M /trunk/dependencies/toluaxx/src/bin/parsecmd.cxx Fixed toluaxx compile with gcc-4.4 See gna ticket #13457 ------------------------------------------------------------------------ r15631 | cazfi | 2009-04-30 00:25:04 +0300 (Thu, 30 Apr 2009) | 7 lines Changed paths: M /trunk/server/report.c M /trunk/server/report.h M /trunk/server/srv_main.c Write civscore.log in the beginning of the turn, immediately after values are calculated. Write also final values when game ends. Requested by Theodore Munk See gna ticket #13419 ------------------------------------------------------------------------ r15629 | cazfi | 2009-04-30 00:16:05 +0300 (Thu, 30 Apr 2009) | 6 lines Changed paths: M /trunk/server/score.c Put spaceship state to civscore.log instead of score given by spaceship. Requested by Theodore Munk See gna ticket #13402 ------------------------------------------------------------------------ r15627 | cazfi | 2009-04-30 00:06:10 +0300 (Thu, 30 Apr 2009) | 4 lines Changed paths: M /trunk/client/attribute.c Do not send attribute block if observing or dead See gna ticket #13410 ------------------------------------------------------------------------ r15626 | cazfi | 2009-04-28 21:31:00 +0300 (Tue, 28 Apr 2009) | 7 lines Changed paths: M /trunk/client/clinet.c M /trunk/client/servers.c M /trunk/server/meta.c M /trunk/server/sernet.c M /trunk/utility/netintf.c M /trunk/utility/netintf.h When IPv6 is enabled but kernel does not support it, socket creation fallbacks to IPv4. Problem reported by mir3x See gna ticket #13423 ------------------------------------------------------------------------ r15625 | mbook | 2009-04-27 19:48:27 +0300 (Mon, 27 Apr 2009) | 5 lines Changed paths: M /trunk/server/gamehand.c Fix wrong enum type for unit role. See gna ticket #13401 Reported by: gilles ------------------------------------------------------------------------ r15622 | cazfi | 2009-04-25 11:26:04 +0300 (Sat, 25 Apr 2009) | 5 lines Changed paths: M /trunk/server/report.c Record players total score to civscore.log. Requested by Theodore Munk See gna ticket #13403 ------------------------------------------------------------------------ r15621 | cazfi | 2009-04-25 10:40:44 +0300 (Sat, 25 Apr 2009) | 5 lines Changed paths: M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c M /trunk/m4/sdl-client.m4 M /trunk/m4/sound.m4 Use macro AUDIO_SDL instead of SDL to check if SDL_mixer audio support is used. See gna ticket #13411 ------------------------------------------------------------------------ r15620 | cazfi | 2009-04-25 10:38:16 +0300 (Sat, 25 Apr 2009) | 4 lines Changed paths: M /trunk/common/effects.c Fixed ai_find_source_building() to correctly return best matching building. See gna ticket #13414 ------------------------------------------------------------------------ r15619 | cazfi | 2009-04-25 10:36:15 +0300 (Sat, 25 Apr 2009) | 5 lines Changed paths: M /trunk/client/clinet.c M /trunk/client/gui-sdl/gui_iconv.c M /trunk/client/servers.c M /trunk/server/meta.c M /trunk/server/sernet.c M /trunk/utility/fciconv.c M /trunk/utility/ioz.c M /trunk/utility/netintf.c M /trunk/utility/shared.c M /trunk/utility/support.c M /trunk/utility/support.h Changed mystrerror() to take error as parameter instead of accessing errno itself. At the same time renamed it as fc_strerror() See gna ticket #13412 ------------------------------------------------------------------------ r15618 | cazfi | 2009-04-25 10:25:45 +0300 (Sat, 25 Apr 2009) | 5 lines Changed paths: M /trunk/m4/xaw-client.m4 Removed currently unused code portion that defaulted xaw client to xaw3d without possibility to disable it. See gna ticket #13409 ------------------------------------------------------------------------ r15616 | cazfi | 2009-04-23 18:41:46 +0300 (Thu, 23 Apr 2009) | 4 lines Changed paths: M /trunk/client/client_main.c M /trunk/configure.ac Restored http://meta.freeciv.org/metaserver.phtml as default metaserver. See gna ticket #13407 ------------------------------------------------------------------------ r15615 | cazfi | 2009-04-22 16:30:14 +0300 (Wed, 22 Apr 2009) | 5 lines Changed paths: M /trunk/client/client_main.c M /trunk/doc/man/civclient.6 Client side metaserver URL setting parameter is now "-M" just like in server side. See gna ticket #13392 ------------------------------------------------------------------------ r15613 | cazfi | 2009-04-13 20:43:02 +0300 (Mon, 13 Apr 2009) | 4 lines Changed paths: M /trunk/server/civserver.c M /trunk/server/meta.c M /trunk/server/srv_main.c M /trunk/server/srv_main.h Added commandline parameter to set hostname visible on metaserver See #40755 ------------------------------------------------------------------------ r15612 | cazfi | 2009-04-13 20:40:24 +0300 (Mon, 13 Apr 2009) | 4 lines Changed paths: M /trunk/configure.ac Enable IPv6 support by default See #40756 ------------------------------------------------------------------------ r15611 | mbook | 2009-04-12 09:16:15 +0300 (Sun, 12 Apr 2009) | 5 lines Changed paths: M /trunk/server/savegame.c Fix disappearing resources in savegame. See #40758 Patch by: Stéphane Messerli ------------------------------------------------------------------------ r15610 | mbook | 2009-04-12 04:29:33 +0300 (Sun, 12 Apr 2009) | 16 lines Changed paths: M /trunk/common/game.h M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/cityturn.c M /trunk/server/ruleset.c M /trunk/server/unittools.c M /trunk/server/unittools.h M /trunk/version.in Ruleset setting for unit and city gold upkeep. - Ruleset setting 'gold_upkeep_style' controls how gold upkeep is paid by the player. - The default value 0 preserves the existing behavior, while using 1 will make gold upkeep be paid by the nation as a whole. - Added the setting with appropriate value to the civ1, civ2, and default rulesets. - Some formatting and style fixes in the surrounding code. See #40619 Patch by: Matthias Pfafferodt With some improvements by me. ------------------------------------------------------------------------ r15602 | dmarks | 2009-03-24 15:14:29 +0200 (Tue, 24 Mar 2009) | 1 line Changed paths: M /trunk/po/sv.po Fix grammatical oddness in Swedish translation. Patch by Erik Kaldo in PR#40622 ------------------------------------------------------------------------ r15597 | mbook | 2009-03-23 20:20:04 +0200 (Mon, 23 Mar 2009) | 4 lines Changed paths: M /trunk/client/client_main.c Automatically update old metaserver address. See #40752 ------------------------------------------------------------------------ r15588 | mbook | 2009-03-22 05:25:17 +0200 (Sun, 22 Mar 2009) | 4 lines Changed paths: M /trunk/configure.ac Use cazfi.net metaserver as the default. See #40752 ------------------------------------------------------------------------ r15585 | stikonas | 2009-03-21 16:25:48 +0200 (Sat, 21 Mar 2009) | 1 line Changed paths: M /trunk/po/lt.po Some Lithuanian translation updates. ------------------------------------------------------------------------ r15581 | mbook | 2009-03-17 00:38:28 +0200 (Tue, 17 Mar 2009) | 12 lines Changed paths: M /trunk/common/city.h M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/citytools.c M /trunk/server/citytools.h M /trunk/server/cityturn.c M /trunk/server/cityturn.h M /trunk/server/savegame.c M /trunk/server/settings.c M /trunk/server/srv_main.c M /trunk/version.in Citizen migration feature, with options. - Server setting 'migration' controls whether migration is enabled (default off). - Migration parameters are control by "mgr_" prefixed settings. See #40612 Patch by: Matthias Pfafferodt With minor style changes by me. ------------------------------------------------------------------------ r15579 | mbook | 2009-03-16 01:58:34 +0200 (Mon, 16 Mar 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c Work around crash due to missing NULL pointer check in gtk notebook code. See #40743 Reported by: Brendon Oram ------------------------------------------------------------------------ r15577 | mbook | 2009-03-16 01:33:41 +0200 (Mon, 16 Mar 2009) | 6 lines Changed paths: M /trunk/common/unit.c Fix data type bug causing unit power factor to lose precision. See #40746 Reported by: kevin in Korea ------------------------------------------------------------------------ r15573 | cproc | 2009-03-08 18:33:31 +0200 (Sun, 08 Mar 2009) | 4 lines Changed paths: M /trunk/configure.ac Check if the C++ compiler works and abort with an error message otherwise. Reported by Joan Creus in PR#40305, patch by me. ------------------------------------------------------------------------ r15572 | cproc | 2009-03-08 18:23:04 +0200 (Sun, 08 Mar 2009) | 6 lines Changed paths: M /trunk/client/gui-ftwl/Makefile.am M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/Makefile.am M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-sdl/Makefile.am M /trunk/client/gui-stub/Makefile.am M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/Makefile.am M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/Makefile.am M /trunk/client/gui-xaw/gui_main.c - include SDL.h in each gui-main.c if compiled with SDL audio support, so main() can become SDL_main() if needed. - add $(SOUND_CFLAGS) in each gui's Makefile.am See PR#40640 ------------------------------------------------------------------------ r15571 | cazfi | 2009-03-08 13:53:32 +0200 (Sun, 08 Mar 2009) | 4 lines Changed paths: M /trunk/server/maphand.c Fixed copying of city from player map to player map. See #40741 ------------------------------------------------------------------------ r15569 | cazfi | 2009-03-06 16:26:18 +0200 (Fri, 06 Mar 2009) | 2 lines Changed paths: M /trunk/po/fi.po Updated translation by Sini Ruohomaa. ------------------------------------------------------------------------ r15567 | mbook | 2009-03-04 00:59:37 +0200 (Wed, 04 Mar 2009) | 20 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-gtk-2.0/plrdlg.c Rearrange widget layout to fit on an 800x600 display. - Main page buttons are arranged in a 3x2 table. - Removed most calls to gtk_widget_set_size_request(). - Do not fill in the unit pixmap table until after the game starts. - Player report buttons are replaced by a menu bar. - Allow horizontal scrolling for the pregame player list and chat textview. - The unit info label and civilization info label contents are aligned to the left. See #12825 Requested by: Steve Walton Peeter Vois jukey Vadim Peretokin ------------------------------------------------------------------------ r15565 | mbook | 2009-03-04 00:41:59 +0200 (Wed, 04 Mar 2009) | 8 lines Changed paths: M /trunk/client/climisc.c Sort small wonders separately in production lists. - Small wonders are sorted before great wonders in their own block, instead of being mixed in with regular buildings. See #40740 ------------------------------------------------------------------------ r15563 | mbook | 2009-03-04 00:36:44 +0200 (Wed, 04 Mar 2009) | 15 lines Changed paths: M /trunk/client/text.c Improved popit info text. - Added location coordinates, native coordinates and continent number. - Added owner username (or player name for AIs) and owner team to tile, city and unit description strings. - Added line break and indent between city description and city improvements. - Updated TRANS comments and used angled brackets <> for %s example placeholders. See #40488 Requested by: Tomasz Niemcewicz ------------------------------------------------------------------------ r15561 | mbook | 2009-03-04 00:26:32 +0200 (Wed, 04 Mar 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/pages.c Multiplayer allies-only chat toggle button and option. See #40487 Requested by: Tomasz Niemcewicz ------------------------------------------------------------------------ r15559 | mbook | 2009-03-03 23:45:50 +0200 (Tue, 03 Mar 2009) | 8 lines Changed paths: M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/server/savegame.c M /trunk/server/settings.c M /trunk/server/srv_main.c M /trunk/version.in Option to not end game on spaceship arrival. See #40381 Patch by: Matthias Pfafferodt Requested by: guest gdgourou (wishlist forum) http://forum.freeciv.org/viewtopic.php?p=20940 ------------------------------------------------------------------------ r15556 | cazfi | 2009-03-01 19:35:20 +0200 (Sun, 01 Mar 2009) | 5 lines Changed paths: M /trunk/common/aicore/cm.c Workaround for gcc optimization bug causing server to crash immediately when new city is founded. Reported by many in #40610 ------------------------------------------------------------------------ r15554 | cproc | 2009-03-01 00:38:57 +0200 (Sun, 01 Mar 2009) | 3 lines Changed paths: M /trunk/autogen.sh add a "--no-configure-run" option to autogen.sh See PR#40739. ------------------------------------------------------------------------ r15549 | mbook | 2009-02-26 05:23:48 +0200 (Thu, 26 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/pages.c Fix missing Q_() for qualified column name. See #40738 ------------------------------------------------------------------------ r15546 | cazfi | 2009-02-25 17:25:34 +0200 (Wed, 25 Feb 2009) | 4 lines Changed paths: M /trunk/server/maphand.c map_get_player_city() cleanup See #40735 ------------------------------------------------------------------------ r15544 | cazfi | 2009-02-24 18:35:25 +0200 (Tue, 24 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-xaw/connectdlg.c Fixed compiler warnings. See #40736 ------------------------------------------------------------------------ r15543 | mbook | 2009-02-22 23:56:58 +0200 (Sun, 22 Feb 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/messagewin.c Avoid gtk warning due to focusing unrealized treeview. See #40731 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15540 | cazfi | 2009-02-22 19:58:28 +0200 (Sun, 22 Feb 2009) | 5 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c Use localtime() instead of localtime_r() since latter does not exist on all supported platforms (MinGW). See #40726 ------------------------------------------------------------------------ r15539 | mbook | 2009-02-22 02:03:36 +0200 (Sun, 22 Feb 2009) | 19 lines Changed paths: M /trunk/client/control.c M /trunk/client/control.h M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/gui-xaw/menu.c Improved mass unit selection. - Shortcut 'j' selects a single unit (the first unit in the selection list). - Shortcut 'k' selects all units of the same type as the currently selected units on the same tiles as the currently selected units. - Shortcut 'k' selects all units on the same tiles as the currenty selected units. - Shortcut 'y' selects all units of the same type on the same continents as the currently selected units. - Shortcut 'y' selects all units of the same type as the currently selected units. - Selection includes units with orders or units under AI control. See #40727 ------------------------------------------------------------------------ r15537 | mbook | 2009-02-22 01:46:20 +0200 (Sun, 22 Feb 2009) | 7 lines Changed paths: M /trunk/client/gui-gtk-2.0/cityrep.c City report "Add 2nd Last" production menu item. See #40729 Suggested by guest Carstairs in the wishlist forum: http://forum.freeciv.org/viewtopic.php?t=5797 ------------------------------------------------------------------------ r15535 | mbook | 2009-02-22 01:41:31 +0200 (Sun, 22 Feb 2009) | 7 lines Changed paths: M /trunk/client/gui-gtk-2.0/cityrep.c Added set and append worklist menu items to the city report. See #40728 Suggested by guest Carstairs in the wishlist forum: http://forum.freeciv.org/viewtopic.php?t=5797 ------------------------------------------------------------------------ r15533 | mbook | 2009-02-22 01:35:36 +0200 (Sun, 22 Feb 2009) | 4 lines Changed paths: M /trunk/client/options.c M /trunk/client/options.h M /trunk/client/packhand.c Option to disable caravan popup. See #40730 ------------------------------------------------------------------------ r15531 | mbook | 2009-02-22 01:24:55 +0200 (Sun, 22 Feb 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/pages.c M /trunk/data/default/units.ruleset M /trunk/data/nation/slovakian.ruleset Fix "leader" translation ambiguity. See #40725 Reported by: Susanna Björverud ------------------------------------------------------------------------ r15529 | mbook | 2009-02-22 01:20:27 +0200 (Sun, 22 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/cityrep.c Clear worklist menu item in the city report. See #40723 ------------------------------------------------------------------------ r15527 | mbook | 2009-02-22 01:16:47 +0200 (Sun, 22 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/messagewin.c Option to hide message window buttons. See #40733 ------------------------------------------------------------------------ r15525 | mbook | 2009-02-22 01:08:55 +0200 (Sun, 22 Feb 2009) | 11 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/messagewin.c Option to have new events appear at the top of the message window. - Some cleanup and generalization of message window code. - The message window list store now keeps track of the "meswin" row of an event added to the store. This value is the index passed to such functions as get_message() and meswin_goto(). See #40718 ------------------------------------------------------------------------ r15523 | mbook | 2009-02-22 00:17:39 +0200 (Sun, 22 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/pages.c Option to have the metaserver tab appear first in the network page. See #40701 ------------------------------------------------------------------------ r15521 | mbook | 2009-02-21 23:16:16 +0200 (Sat, 21 Feb 2009) | 7 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/messagewin.c Option to split the lower area into two notebooks. - If the option is enabled, the message window will always appear in the right notebook. See #40705 ------------------------------------------------------------------------ r15519 | mbook | 2009-02-21 23:08:48 +0200 (Sat, 21 Feb 2009) | 9 lines Changed paths: M /trunk/client/cityrepdata.c M /trunk/client/gui-gtk-2.0/cityrep.c Revert city report column ordering changes of r12989. - The first four columns of the city report are name, size, state and concise state. - In the gtk2 client, columns may be reordered by clicking and dragging the column headers. See #40680 ------------------------------------------------------------------------ r15517 | mbook | 2009-02-20 07:08:34 +0200 (Fri, 20 Feb 2009) | 9 lines Changed paths: M /trunk/client/control.c M /trunk/client/control.h M /trunk/client/goto.c M /trunk/client/options.c M /trunk/client/options.h Option to not clear unit orders on selection. - If the option is enabled, selecting a unit does not clear its orders. - Orders can be cleared by issuing new orders or by pressing . See #40724 ------------------------------------------------------------------------ r15515 | mbook | 2009-02-20 04:03:57 +0200 (Fri, 20 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/pages.c Focus chat entry when switching to the start/pregame page. See #40722 ------------------------------------------------------------------------ r15513 | mbook | 2009-02-20 03:56:35 +0200 (Fri, 20 Feb 2009) | 8 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/chatline.h M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/pages.c Improved automatic chatline scrolling. - The chatline textview is scrolled to the bottom when switching to the pregame or game page, and whenever the textview widget is resized. See #40721 ------------------------------------------------------------------------ r15511 | mbook | 2009-02-20 03:46:13 +0200 (Fri, 20 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/messagewin.c Right click on message window row centers on event tile. See #40719 ------------------------------------------------------------------------ r15509 | mbook | 2009-02-20 03:35:06 +0200 (Fri, 20 Feb 2009) | 12 lines Changed paths: M /trunk/client/goto.c M /trunk/client/goto.h M /trunk/client/gui-gtk-2.0/mapctrl.c M /trunk/client/mapctrl_common.c M /trunk/client/mapview_common.c M /trunk/client/mapview_common.h M /trunk/client/packhand.c M /trunk/client/tilespec.c Map decoration drawing speedup and cleanup. - Removed drawing code from client/goto.[ch]. - Removed expensive redraws caused by calls to update_map_canvas_visible() in popit and selection rectangle code. - Replaced map-sized arrays by hash tables. - Added 'mapdeco' API for marking tile highlights, tile crosshairs, and goto line segments. See #40717 ------------------------------------------------------------------------ r15505 | mbook | 2009-02-18 06:31:12 +0200 (Wed, 18 Feb 2009) | 13 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_stuff.c M /trunk/client/gui-gtk-2.0/gui_stuff.h M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-sdl/connectdlg.c M /trunk/client/gui-win32/connectdlg.c M /trunk/client/gui-xaw/connectdlg.c M /trunk/client/servers.c M /trunk/client/servers.h Server player list addition and server scan cleanup. - Information about players on a server is visible in a list view in the network page (it remains empty for lan servers because they do not send this information). - General cleanup and simplification of server scan API and usage. - Fixed memory leak due to server scans or their resources not being freed in some situations. See #40707 ------------------------------------------------------------------------ r15503 | mbook | 2009-02-18 06:14:09 +0200 (Wed, 18 Feb 2009) | 7 lines Changed paths: M /trunk/client/climisc.c M /trunk/client/climisc.h M /trunk/client/gui-gtk-2.0/gui_main.c Buy city production directly from mapview. - Selecting cities and pressing 'b' buys the cities' productions in the order of cheapest first. See #40704 ------------------------------------------------------------------------ r15501 | mbook | 2009-02-18 06:05:47 +0200 (Wed, 18 Feb 2009) | 4 lines Changed paths: M /trunk/client/control.c M /trunk/client/control.h M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/mapview_common.c M /trunk/client/options.c M /trunk/client/options.h Option to show production buy cost in the city description. See #40702 ------------------------------------------------------------------------ r15499 | mbook | 2009-02-18 05:20:37 +0200 (Wed, 18 Feb 2009) | 7 lines Changed paths: M /trunk/client/cityrepdata.c Revert city report concise status symbols changes. - The concise city status symbols are changed back to * for celebrating and X for disorder. See #40700 ------------------------------------------------------------------------ r15497 | mbook | 2009-02-18 04:26:24 +0200 (Wed, 18 Feb 2009) | 9 lines Changed paths: M /trunk/client/editor.c M /trunk/client/editor.h M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/mapview.c M /trunk/client/mapctrl_common.c M /trunk/client/mapview_common.c Use XOR drawing operation for selection rectangle. - The selection rectangle is erased by drawing over itself. - Removed unneeded calls to redraw_selection_rectangle(). - Simplify editor rectangle drawing code. See #40646 ------------------------------------------------------------------------ r15495 | mbook | 2009-02-16 02:19:48 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/data/nation/armenian.ruleset M /trunk/data/nation/illyrian.ruleset M /trunk/data/nation/mayan.ruleset M /trunk/data/nation/soviet.ruleset Minor fixes and improvements in nation legend texts. See #40694 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15494 | mbook | 2009-02-16 02:19:41 +0200 (Mon, 16 Feb 2009) | 10 lines Changed paths: M /trunk/server/diplomats.c M /trunk/server/unithand.c M /trunk/server/unittools.c M /trunk/server/unittools.h Fix veteran notify message grammar. - Do not try to "link up" veteran notify message with previous event. - Simplified notify_unit_experience(). See #40693 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15493 | mbook | 2009-02-16 02:19:34 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/client/gui-sdl/gui_string.c Removed unused SDL code containing strings marked for translation. See #40691 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15492 | mbook | 2009-02-16 02:19:27 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/client/text.c M /trunk/server/report.c Fix " of the " constructs. See #40689 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15491 | mbook | 2009-02-16 02:19:20 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/server/unittools.c Fix and improve gold upkeep disband message. See #40687 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15490 | mbook | 2009-02-16 02:19:14 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/server/savegame.c Do not translate internal game loading error message. See #40690 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15489 | mbook | 2009-02-16 02:19:07 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/data/scenario/tutorial.sav Fix typos in tutorial scenario. See #40699 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15488 | mbook | 2009-02-16 02:19:00 +0200 (Mon, 16 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/mapview.c Capitalize first letter of civilization frame label. See #40692 ------------------------------------------------------------------------ r15487 | mbook | 2009-02-16 02:18:53 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/client/cityrepdata.c M /trunk/client/gui-xaw/citydlg.c M /trunk/data/default/units.ruleset Fix "workers" translation ambiguity. See #40684 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15486 | mbook | 2009-02-16 02:18:42 +0200 (Mon, 16 Feb 2009) | 6 lines Changed paths: M /trunk/client/text.c Fix sentence fragments in text_happiness_units(). See #40685 Reported by: Sini Ruohomaa ------------------------------------------------------------------------ r15473 | cazfi | 2009-02-15 21:55:06 +0200 (Sun, 15 Feb 2009) | 4 lines Changed paths: M /trunk/common/vision.c M /trunk/common/vision.h M /trunk/server/citytools.c M /trunk/server/maphand.c M /trunk/server/maphand.h M /trunk/server/unittools.c Removed some unnecessary vision site code. See #40712 ------------------------------------------------------------------------ r15472 | mbook | 2009-02-15 21:18:42 +0200 (Sun, 15 Feb 2009) | 4 lines Changed paths: M /trunk/server/settings.c M /trunk/server/srv_main.c Improved autogenerated savename with turn number. See #40681 ------------------------------------------------------------------------ r15470 | mbook | 2009-02-10 06:12:53 +0200 (Tue, 10 Feb 2009) | 4 lines Changed paths: M /trunk/utility/hash.c Fix off-by-one bug in hash iterator implementation. See #40711 ------------------------------------------------------------------------ r15469 | mbook | 2009-02-10 06:10:50 +0200 (Tue, 10 Feb 2009) | 4 lines Changed paths: M /trunk/client/mapctrl_common.c M /trunk/client/options.c M /trunk/client/options.h Option to select cities before units with the selection rectangle. See #40703 ------------------------------------------------------------------------ r15467 | mbook | 2009-02-10 05:52:48 +0200 (Tue, 10 Feb 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/chatline.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h Option to prefix chat messages with the current time. See #40706 ------------------------------------------------------------------------ r15463 | mbook | 2009-02-07 20:46:46 +0200 (Sat, 07 Feb 2009) | 6 lines Changed paths: M /trunk/client/goto.c Fix assertion failure when doing irrigation-connect on a mine. See #40676 Reported By: Ann Barcomb ------------------------------------------------------------------------ r15461 | cazfi | 2009-02-03 22:16:08 +0200 (Tue, 03 Feb 2009) | 2 lines Changed paths: M /trunk/po/fi.po Updated translation by Sini Ruohomaa. ------------------------------------------------------------------------ r15459 | cazfi | 2009-02-03 14:06:05 +0200 (Tue, 03 Feb 2009) | 4 lines Changed paths: M /trunk/configure.ac M /trunk/m4/compiler.m4 Use -rpath option only if linker supports it. Reported by Daniel Markstedt, ticket #40672 ------------------------------------------------------------------------ r15458 | mbook | 2009-02-01 01:18:00 +0200 (Sun, 01 Feb 2009) | 8 lines Changed paths: M /trunk/server/plrhand.c M /trunk/utility/genlist.c M /trunk/utility/genlist.h M /trunk/utility/shared.c M /trunk/utility/shared.h M /trunk/utility/speclist.h Add shuffle functions for int arrays, genlists, and speclists. - Also, make shuffle_players() use the new function. See #40618 Patch by: Matthias Pfafferodt ------------------------------------------------------------------------ r15457 | mbook | 2009-01-30 05:46:52 +0200 (Fri, 30 Jan 2009) | 6 lines Changed paths: M /trunk/client/mapview_common.c Simple traderoute line drawing on the main map. See #40667 Ported from warclient code originally by pepeto and myself. ------------------------------------------------------------------------ r15455 | dmarks | 2009-01-30 01:21:20 +0200 (Fri, 30 Jan 2009) | 1 line Changed paths: M /trunk/data/nation/saxon.ruleset make freeciv.pot fails when non-ascii character is included in translated string. Reported by Susanna Bjorverud . See #40696 ------------------------------------------------------------------------ r15454 | mbook | 2009-01-29 05:30:33 +0200 (Thu, 29 Jan 2009) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/gui-gtk-2.0/cma_fe.c M /trunk/client/gui-gtk-2.0/wldlg.c Fix all mnemonic shortcut conflicts in city dialog. See #40675 Reported by: Susanna Björverud ------------------------------------------------------------------------ r15453 | mbook | 2009-01-29 04:31:40 +0200 (Thu, 29 Jan 2009) | 7 lines Changed paths: M /trunk/client/gui-gtk-2.0/mapctrl.c Re-enable copy to production clipboard. - shift + right mouse button is copy. - shift + ctrl + right mouse button is paste. See #40679 ------------------------------------------------------------------------ r15451 | mbook | 2009-01-29 03:35:42 +0200 (Thu, 29 Jan 2009) | 4 lines Changed paths: M /trunk/client/control.c M /trunk/client/options.c M /trunk/client/options.h Option to disable all mouse cursor changes. See #40678 ------------------------------------------------------------------------ r15448 | dmarks | 2009-01-29 01:54:57 +0200 (Thu, 29 Jan 2009) | 1 line Changed paths: M /trunk/data/default/nations.ruleset M /trunk/data/flags/Makefile.am A /trunk/data/flags/saxony-shield.png A /trunk/data/flags/saxony.png A /trunk/data/flags/saxony.svg M /trunk/data/misc/flags.spec M /trunk/data/misc/shields.spec M /trunk/data/nation/Makefile.am M /trunk/data/nation/german.ruleset A /trunk/data/nation/saxon.ruleset M /trunk/po/POTFILES.in Add Saxon nation. Nation file by Bjorn Adelberg with flag from the Public Domain edited by nation file author. Minor edits by me. See #40211 ------------------------------------------------------------------------ r15447 | dmarks | 2009-01-29 01:44:24 +0200 (Thu, 29 Jan 2009) | 1 line Changed paths: M /trunk/data/nation/egyptian.ruleset M /trunk/data/nation/persian.ruleset Some remaining nativist leader names. See #40670 ------------------------------------------------------------------------ r15446 | mbook | 2009-01-29 00:58:59 +0200 (Thu, 29 Jan 2009) | 4 lines Changed paths: M /trunk/server/stdinhand.c M /trunk/utility/shared.c M /trunk/utility/shared.h List ambiguous matches when using the help command. See #40673 ------------------------------------------------------------------------ r15445 | mbook | 2009-01-29 00:42:47 +0200 (Thu, 29 Jan 2009) | 4 lines Changed paths: M /trunk/server/stdinhand.c Allow underscore character in option names. See #40671 ------------------------------------------------------------------------ r15443 | mbook | 2009-01-28 23:47:21 +0200 (Wed, 28 Jan 2009) | 9 lines Changed paths: M /trunk/server/unittools.c Fix teleporting exploit by modifying bounce_unit() behavior. - When resolving stack conflicts, instead of teleporting to the nearest owned city, units are moved to a random safe tile within a 2 tile distance of their current position. See #40658 ------------------------------------------------------------------------ r15442 | mbook | 2009-01-26 07:31:28 +0200 (Mon, 26 Jan 2009) | 4 lines Changed paths: M /trunk/client/connectdlg_common.c Somewhat clearer client hack access messages. See #40662 ------------------------------------------------------------------------ r15440 | mbook | 2009-01-26 06:45:04 +0200 (Mon, 26 Jan 2009) | 7 lines Changed paths: M /trunk/client/editor.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/server/edithand.c M /trunk/utility/hash.c M /trunk/utility/hash.h Improved hash iteration using the iterator interface. - There is now hash_keys_iterate and hash_values_iterate in addition to an improved version of hash_iterate. See #40597 ------------------------------------------------------------------------ r15439 | mbook | 2009-01-26 06:44:55 +0200 (Mon, 26 Jan 2009) | 4 lines Changed paths: M /trunk/utility/Makefile.am A /trunk/utility/iterator.h Generic iterator interface. See #40596 ------------------------------------------------------------------------ r15437 | cazfi | 2009-01-25 17:53:24 +0200 (Sun, 25 Jan 2009) | 5 lines Changed paths: M /trunk/m4/auth.m4 Fixed a bug that mysql libraries wewre never searched from alternative locations. See #40674 ------------------------------------------------------------------------ r15436 | mbook | 2009-01-22 09:17:24 +0200 (Thu, 22 Jan 2009) | 4 lines Changed paths: M /trunk/server/diplhand.c Notify player when alliance is impossible due to war relations. See #40655 ------------------------------------------------------------------------ r15435 | dmarks | 2009-01-22 06:05:26 +0200 (Thu, 22 Jan 2009) | 1 line Changed paths: M /trunk/data/nation/southkorean.ruleset Correct transliteration of some South Korean cities. ------------------------------------------------------------------------ r15434 | cazfi | 2009-01-20 16:36:52 +0200 (Tue, 20 Jan 2009) | 4 lines Changed paths: M /trunk/common/game.h M /trunk/server/maphand.c M /trunk/server/settings.c Added borders mode where borders extend to unknown tiles revealing them. See #40639 ------------------------------------------------------------------------ r15433 | cazfi | 2009-01-20 16:31:55 +0200 (Tue, 20 Jan 2009) | 4 lines Changed paths: M /trunk/server/unittools.c Always clear borders when base is pillaged. See #40664 ------------------------------------------------------------------------ r15432 | cazfi | 2009-01-20 00:14:08 +0200 (Tue, 20 Jan 2009) | 4 lines Changed paths: M /trunk/client/gui-sdl/dialogs.c Compile fix See #40669 ------------------------------------------------------------------------ r15431 | cazfi | 2009-01-19 22:31:12 +0200 (Mon, 19 Jan 2009) | 5 lines Changed paths: M /trunk/common/base.h M /trunk/common/packets.def M /trunk/server/citytools.c M /trunk/server/maphand.c M /trunk/server/maphand.h M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/unittools.c M /trunk/version.in Added vision range property to base types. Vision is given to player who owns the tile where base is. See #40636 ------------------------------------------------------------------------ r15430 | mbook | 2009-01-19 06:42:20 +0200 (Mon, 19 Jan 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/server/edithand.c Implemented the player gold editable property in the property editor. See #40648 ------------------------------------------------------------------------ r15429 | cazfi | 2009-01-18 20:39:19 +0200 (Sun, 18 Jan 2009) | 4 lines Changed paths: M /trunk/doc/man/civclient.6 M /trunk/doc/man/civserver.6 Documented --announce command line option. See #40665 ------------------------------------------------------------------------ r15428 | cazfi | 2009-01-18 20:34:36 +0200 (Sun, 18 Jan 2009) | 5 lines Changed paths: M /trunk/ai/aiunit.c M /trunk/common/aicore/pf_tools.c M /trunk/common/base.c M /trunk/common/base.h M /trunk/common/movement.c M /trunk/common/movement.h M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/unittools.c Added "NativeTile" base type flag. Tile where such base is, is considered native for those units that base affects. See #40635 ------------------------------------------------------------------------ r15427 | cazfi | 2009-01-18 20:25:55 +0200 (Sun, 18 Jan 2009) | 6 lines Changed paths: M /trunk/server/savegame.c Fixed a bug in how base building actions are read from savegame. Reported by Mark Metson See #40666 ------------------------------------------------------------------------ r15426 | cazfi | 2009-01-17 14:49:08 +0200 (Sat, 17 Jan 2009) | 6 lines Changed paths: M /trunk/server/scripting/api.pkg Added missing event types to api.pkg. Patch by Matthias Pfafferodt See #40657 ------------------------------------------------------------------------ r15424 | cazfi | 2009-01-17 13:44:28 +0200 (Sat, 17 Jan 2009) | 6 lines Changed paths: M /trunk/m4/ggz.m4 Fixed bashisms from configure to make it work with Solaris /bin/sh Patch by Halton Huo See #40659 ------------------------------------------------------------------------ r15423 | cazfi | 2009-01-17 13:35:22 +0200 (Sat, 17 Jan 2009) | 7 lines Changed paths: M /trunk/common/base.c M /trunk/common/base.h M /trunk/common/combat.c M /trunk/common/packets.def M /trunk/common/tile.c M /trunk/common/tile.h M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/ruleset.c M /trunk/version.in Added separate defense_bonus value for each base type. "DefenseBonus" flag is removed and so is global definition of fortress_defense_bonus. If several bases at the same tile provide defense bonus for unit, sum of these is used. See #40634 ------------------------------------------------------------------------ r15422 | cazfi | 2009-01-16 19:02:04 +0200 (Fri, 16 Jan 2009) | 5 lines Changed paths: M /trunk/server/scripting/api.pkg M /trunk/server/scripting/api_methods.c M /trunk/server/scripting/api_methods.h Added functions Player:has_wonder() and City:has_building() to scripting API. See #40645 ------------------------------------------------------------------------ r15421 | cazfi | 2009-01-16 18:55:23 +0200 (Fri, 16 Jan 2009) | 7 lines Changed paths: M /trunk/client/packhand.c M /trunk/common/base.c M /trunk/common/base.h M /trunk/common/borders.c M /trunk/common/packets.def M /trunk/common/tile.c M /trunk/common/tile.h M /trunk/data/civ1/terrain.ruleset M /trunk/data/civ2/terrain.ruleset M /trunk/data/default/terrain.ruleset M /trunk/server/maphand.c M /trunk/server/ruleset.c M /trunk/server/savegame.c M /trunk/server/unittools.c M /trunk/version.in Replaced base type flag "ClaimTerritory" with integer holding border radius. Civ1 & civ2 rulesets are fixed so that their Fortress has no territory claiming properties. See #40633 ------------------------------------------------------------------------ r15420 | cazfi | 2009-01-16 18:44:51 +0200 (Fri, 16 Jan 2009) | 4 lines Changed paths: M /trunk/ai/aihand.c M /trunk/server/srv_main.c Fixed memory leak when AI finishes building ferryboat See #40653 ------------------------------------------------------------------------ r15419 | mbook | 2009-01-15 08:21:42 +0200 (Thu, 15 Jan 2009) | 4 lines Changed paths: M /trunk/client/editor.c M /trunk/client/editor.h M /trunk/client/gui-gtk-2.0/editgui.c Popup a warning if the ruleset defines no editor tool values. See #40624 ------------------------------------------------------------------------ r15418 | mbook | 2009-01-14 07:23:20 +0200 (Wed, 14 Jan 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/cityrep.c Move governor menu to its own toplevel menu item in the city report. See #40621 ------------------------------------------------------------------------ r15417 | cazfi | 2009-01-13 18:21:51 +0200 (Tue, 13 Jan 2009) | 4 lines Changed paths: M /trunk/common/game.h M /trunk/server/maphand.c M /trunk/server/settings.c Added new borders mode where player can see all tiles inside borders. See #40631 ------------------------------------------------------------------------ r15416 | mbook | 2009-01-12 04:36:22 +0200 (Mon, 12 Jan 2009) | 9 lines Changed paths: M /trunk/client/gui-gtk-2.0/repodlgs.c M /trunk/client/helpdata.c Fix compilation with Sun Studio Community Edition compiler. - Replaced O_COUNT by O_MAX in local struct array field. - Replaced COREQ_APPEND macro by equivalent code. See #40616 Reported by: James McClain ------------------------------------------------------------------------ r15414 | cazfi | 2009-01-11 18:38:06 +0200 (Sun, 11 Jan 2009) | 8 lines Changed paths: M /trunk/ai/aisettler.c M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/gui-sdl/mapview.c M /trunk/client/gui-win32/menu.c M /trunk/client/text.c M /trunk/client/tilespec.c M /trunk/common/borders.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/common/unit.c M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/maphand.c M /trunk/server/ruleset.c M /trunk/server/sanitycheck.c M /trunk/server/savegame.c M /trunk/server/score.c M /trunk/server/settings.c M /trunk/version.in Moved borders radius information to game.ruleset. Server option now only selects borders mode (currently disabled/enabled). In addition to borders base radius, ruleset has definition of how fast borders expand when city grows. See #40630 ------------------------------------------------------------------------ r15413 | cazfi | 2009-01-11 18:14:34 +0200 (Sun, 11 Jan 2009) | 4 lines Changed paths: M /trunk/common/player.c M /trunk/common/player.h M /trunk/common/vision.c M /trunk/common/vision.h M /trunk/server/citytools.c M /trunk/server/maphand.c Removed some now unused vision sites code. See #40638 ------------------------------------------------------------------------ r15412 | cazfi | 2009-01-10 06:06:01 +0200 (Sat, 10 Jan 2009) | 2 lines Changed paths: M /trunk/data/amplio/moderncities.png M /trunk/data/amplio/moderncities.spec M /trunk/data/hex2t/items.png M /trunk/data/hex2t/items.spec M /trunk/data/isotrident/cities.png M /trunk/data/isotrident/cities.spec M /trunk/data/trident/tiles.png M /trunk/data/trident/tiles.spec Added buoy graphics by Eleazar. ------------------------------------------------------------------------ r15410 | cazfi | 2009-01-10 00:30:30 +0200 (Sat, 10 Jan 2009) | 2 lines Changed paths: M /trunk/client/agents/agents.c M /trunk/client/agents/cma_core.c M /trunk/client/attribute.c M /trunk/client/chatline_common.c M /trunk/client/citydlg_common.c M /trunk/client/client_main.c M /trunk/client/climap.c M /trunk/client/climisc.c M /trunk/client/clinet.c M /trunk/client/connectdlg_common.c M /trunk/client/control.c M /trunk/client/editor.c M /trunk/client/goto.c M /trunk/client/gui-ftwl/connectdlg.c M /trunk/client/gui-ftwl/dialogs.c M /trunk/client/gui-ftwl/gotodlg.c M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-ftwl/gui_text.c M /trunk/client/gui-ftwl/mapview.c M /trunk/client/gui-gtk-2.0/caravan_dialog.c M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/gui-gtk-2.0/cityrep.c M /trunk/client/gui-gtk-2.0/cma_fe.c M /trunk/client/gui-gtk-2.0/connectdlg.c M /trunk/client/gui-gtk-2.0/dialogs.c M /trunk/client/gui-gtk-2.0/diplodlg.c M /trunk/client/gui-gtk-2.0/diplomat_dialog.c M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/gui-gtk-2.0/gamedlgs.c M /trunk/client/gui-gtk-2.0/gotodlg.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/helpdlg.c M /trunk/client/gui-gtk-2.0/inteldlg.c M /trunk/client/gui-gtk-2.0/mapctrl.c M /trunk/client/gui-gtk-2.0/mapview.c M /trunk/client/gui-gtk-2.0/menu.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-gtk-2.0/plrdlg.c M /trunk/client/gui-gtk-2.0/repodlgs.c M /trunk/client/gui-gtk-2.0/spaceshipdlg.c M /trunk/client/gui-gtk-2.0/wldlg.c M /trunk/client/gui-sdl/caravan_dialog.c M /trunk/client/gui-sdl/chatline.c M /trunk/client/gui-sdl/citydlg.c M /trunk/client/gui-sdl/cityrep.c M /trunk/client/gui-sdl/cma_fe.c M /trunk/client/gui-sdl/connectdlg.c M /trunk/client/gui-sdl/dialogs.c M /trunk/client/gui-sdl/diplodlg.c M /trunk/client/gui-sdl/diplomat_dialog.c M /trunk/client/gui-sdl/gotodlg.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-sdl/gui_tilespec.c M /trunk/client/gui-sdl/helpdlg.c M /trunk/client/gui-sdl/inteldlg.c M /trunk/client/gui-sdl/mapctrl.c M /trunk/client/gui-sdl/mapview.c M /trunk/client/gui-sdl/menu.c M /trunk/client/gui-sdl/optiondlg.c M /trunk/client/gui-sdl/plrdlg.c M /trunk/client/gui-sdl/repodlgs.c M /trunk/client/gui-sdl/spaceshipdlg.c M /trunk/client/gui-sdl/themespec.c M /trunk/client/gui-sdl/wldlg.c M /trunk/client/gui-stub/connectdlg.c M /trunk/client/gui-stub/gotodlg.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-stub/mapview.c M /trunk/client/gui-win32/chatline.c M /trunk/client/gui-win32/citydlg.c M /trunk/client/gui-win32/cityrep.c M /trunk/client/gui-win32/cma_fe.c M /trunk/client/gui-win32/connectdlg.c M /trunk/client/gui-win32/dialogs.c M /trunk/client/gui-win32/diplodlg.c M /trunk/client/gui-win32/gotodlg.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-win32/helpdlg.c M /trunk/client/gui-win32/inteldlg.c M /trunk/client/gui-win32/mapctrl.c M /trunk/client/gui-win32/mapview.c M /trunk/client/gui-win32/menu.c M /trunk/client/gui-win32/plrdlg.c M /trunk/client/gui-win32/ratesdlg.c M /trunk/client/gui-win32/repodlgs.c M /trunk/client/gui-win32/spaceshipdlg.c M /trunk/client/gui-win32/wldlg.c M /trunk/client/gui-xaw/actions.c M /trunk/client/gui-xaw/citydlg.c M /trunk/client/gui-xaw/cityrep.c M /trunk/client/gui-xaw/cma_fe.c M /trunk/client/gui-xaw/connectdlg.c M /trunk/client/gui-xaw/dialogs.c M /trunk/client/gui-xaw/diplodlg.c M /trunk/client/gui-xaw/diplomat_dialog.c M /trunk/client/gui-xaw/gotodlg.c M /trunk/client/gui-xaw/graphics.c M /trunk/client/gui-xaw/gui_main.c M /trunk/client/gui-xaw/helpdlg.c M /trunk/client/gui-xaw/inteldlg.c M /trunk/client/gui-xaw/mapctrl.c M /trunk/client/gui-xaw/mapview.c M /trunk/client/gui-xaw/menu.c M /trunk/client/gui-xaw/pages.c M /trunk/client/gui-xaw/plrdlg.c M /trunk/client/gui-xaw/ratesdlg.c M /trunk/client/gui-xaw/repodlgs.c M /trunk/client/gui-xaw/spaceshipdlg.c M /trunk/client/gui-xaw/wldlg.c M /trunk/client/helpdata.c M /trunk/client/mapctrl_common.c M /trunk/client/mapview_common.c M /trunk/client/messagewin_common.c M /trunk/client/options.c M /trunk/client/overview_common.c M /trunk/client/packhand.c M /trunk/client/plrdlg_common.c M /trunk/client/repodlgs_common.c M /trunk/client/reqtree.c M /trunk/client/servers.c M /trunk/client/text.c M /trunk/client/tilespec.c Include client_main.h instead of civclient.h ------------------------------------------------------------------------ r15409 | cazfi | 2009-01-09 23:30:09 +0200 (Fri, 09 Jan 2009) | 2 lines Changed paths: M /trunk/autogen.sh Require file client/civclient.c instead of client/civclient.h in srcdir. ------------------------------------------------------------------------ r15408 | cazfi | 2009-01-09 22:56:44 +0200 (Fri, 09 Jan 2009) | 3 lines Changed paths: A /trunk/client/civclient.c Added new dummy civclient.c which svn refused to add simultaneously with renaming of old one. ------------------------------------------------------------------------ r15407 | cazfi | 2009-01-09 22:55:33 +0200 (Fri, 09 Jan 2009) | 9 lines Changed paths: M /trunk/ai/Makefile.am M /trunk/autogen.sh M /trunk/client/Makefile.am M /trunk/client/agents/Makefile.am D /trunk/client/civclient.c D /trunk/client/civclient.h A /trunk/client/client_main.c (from /trunk/client/civclient.c:15406) A /trunk/client/client_main.h (from /trunk/client/civclient.h:15406) M /trunk/client/gui-ftwl/Makefile.am M /trunk/client/gui-gtk-2.0/Makefile.am M /trunk/client/gui-sdl/Makefile.am M /trunk/client/gui-stub/Makefile.am M /trunk/client/gui-win32/Makefile.am M /trunk/client/gui-xaw/Makefile.am M /trunk/common/Makefile.am M /trunk/common/aicore/Makefile.am M /trunk/configure.ac M /trunk/m4/compiler.m4 M /trunk/manual/Makefile.am M /trunk/server/Makefile.am M /trunk/server/generator/Makefile.am M /trunk/server/scripting/Makefile.am M /trunk/utility/Makefile.am M /trunk/utility/ftwl/Makefile.am Use libtool to build libraries. Sources from utilitity and common directories are combined in to libfreeciv, server parts common to civserver and civmanual are combined to libfreeciv-srv. By default static libraries are built, shared not. See #40177 ------------------------------------------------------------------------ r15406 | cazfi | 2009-01-09 20:55:48 +0200 (Fri, 09 Jan 2009) | 2 lines Changed paths: M /trunk/server/savegame.c Compile fix. ------------------------------------------------------------------------ r15405 | cazfi | 2009-01-09 20:41:35 +0200 (Fri, 09 Jan 2009) | 2 lines Changed paths: A /trunk/common/borders.c A /trunk/common/borders.h Added new files under version control. This is part of #40629. ------------------------------------------------------------------------ r15404 | cazfi | 2009-01-09 20:38:16 +0200 (Fri, 09 Jan 2009) | 5 lines Changed paths: M /trunk/server/savegame.c Restored saving of borders information to savegames in a 2.1 savegame compatible way. See #40642 ------------------------------------------------------------------------ r15403 | cazfi | 2009-01-09 20:35:27 +0200 (Fri, 09 Jan 2009) | 5 lines Changed paths: M /trunk/ai/aisettler.c M /trunk/client/packhand.c M /trunk/common/Makefile.am M /trunk/common/map.c M /trunk/common/tile.c M /trunk/common/tile.h M /trunk/common/vision.c M /trunk/common/vision.h M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/generator/mapgen.c M /trunk/server/maphand.c M /trunk/server/maphand.h M /trunk/server/sanitycheck.c M /trunk/server/savegame.c M /trunk/server/unittools.c Store all borders related information to master map, and not to player maps and vision sites. See #40629 ------------------------------------------------------------------------ r15402 | cazfi | 2009-01-08 23:44:11 +0200 (Thu, 08 Jan 2009) | 5 lines Changed paths: M /trunk/client/civclient.c M /trunk/client/civclient.h M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c Renamed existing client main() as client_main(). Added new main(), that calls client_main(), for each gui separately. See #40640 ------------------------------------------------------------------------ r15401 | mbook | 2009-01-08 09:54:19 +0200 (Thu, 08 Jan 2009) | 4 lines Changed paths: M /trunk/client/editor.c M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/common/packets.def M /trunk/server/edithand.c Removed editor territory tool. See #40615 ------------------------------------------------------------------------ r15400 | cazfi | 2009-01-07 15:38:35 +0200 (Wed, 07 Jan 2009) | 4 lines Changed paths: M /trunk/server/ruleset.c Fixed help about attacking against unreachable units. See #40628 ------------------------------------------------------------------------ r15399 | cazfi | 2009-01-07 15:36:46 +0200 (Wed, 07 Jan 2009) | 4 lines Changed paths: M /trunk/ai/advmilitary.c M /trunk/server/ruleset.c Fixed overzealous assert preventing "Both" moving ferryboats. Reported by Yoav Luft, ticket #40617 ------------------------------------------------------------------------ r15398 | mbook | 2009-01-07 08:52:19 +0200 (Wed, 07 Jan 2009) | 7 lines Changed paths: M /trunk/ai/aiexplorer.c Make auto-explore respect borders. See #40570 Patch by: Thomas Kuehne (With minor changes by me.) ------------------------------------------------------------------------ r15396 | mbook | 2009-01-05 20:45:12 +0200 (Mon, 05 Jan 2009) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/citydlg.c Add frame around city dialog output info popup. See #16243 ------------------------------------------------------------------------ r15395 | cazfi | 2009-01-05 18:29:16 +0200 (Mon, 05 Jan 2009) | 4 lines Changed paths: M /trunk/server/savegame.c Fixed saving of bases. Reported by Matthias Pfafferodt, ticket #40620 ------------------------------------------------------------------------ r15394 | cazfi | 2009-01-05 16:39:37 +0200 (Mon, 05 Jan 2009) | 5 lines Changed paths: M /trunk/server/unittools.c Fixed crash when building base that conflicts with another base type to tile where is no previous base. See #40627 ------------------------------------------------------------------------ r15393 | hunterz | 2009-01-03 10:55:31 +0200 (Sat, 03 Jan 2009) | 1 line Changed paths: M /trunk/po/cs.po 84% done ------------------------------------------------------------------------ r15392 | cazfi | 2009-01-02 15:35:01 +0200 (Fri, 02 Jan 2009) | 2 lines Changed paths: M /trunk/data/nation/phoenician.ruleset Typofix ------------------------------------------------------------------------ r15391 | mbook | 2008-12-30 06:17:27 +0200 (Tue, 30 Dec 2008) | 10 lines Changed paths: M /trunk/server/sernet.c M /trunk/utility/timing.c Check for NULL ping timers when closing a connection. - Add timer_list_iterate macro. - Check for NULL connection in close_connection(). - Check for NULL timer in free_timer(). See #40605 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15389 | mbook | 2008-12-29 08:06:31 +0200 (Mon, 29 Dec 2008) | 7 lines Changed paths: M /trunk/server/stdinhand.c Cleanup save file name searching in load command. - Also, add ".gz", ".bz2", and ".sav.bz2" to the list of checked extensions. See #40604 ------------------------------------------------------------------------ r15388 | mbook | 2008-12-28 08:42:05 +0200 (Sun, 28 Dec 2008) | 11 lines Changed paths: M /trunk/common/combat.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/data/civ1/game.ruleset M /trunk/data/civ2/game.ruleset M /trunk/data/default/game.ruleset M /trunk/server/ruleset.c M /trunk/version.in Make the tired attack penalty optional via the ruleset. - The new game ruleset field tired_attack in the combat_rules section controls whether units that have less than a full move left will have their attack strength reduced when they attack. - The server and default ruleset disable it. - It is enabled in the civ1 and civ2 rulesets. See #40591 ------------------------------------------------------------------------ r15387 | hunterz | 2008-12-27 12:04:21 +0200 (Sat, 27 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 84% done ------------------------------------------------------------------------ r15386 | mbook | 2008-12-27 07:26:15 +0200 (Sat, 27 Dec 2008) | 6 lines Changed paths: M /trunk/common/map.h M /trunk/server/generator/mapgen.c Fix river generation for island generator. See #15947 Patch by: Brendon Oram ------------------------------------------------------------------------ r15384 | hunterz | 2008-12-26 21:18:29 +0200 (Fri, 26 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 83% done ------------------------------------------------------------------------ r15383 | hunterz | 2008-12-26 20:15:07 +0200 (Fri, 26 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 82% done ------------------------------------------------------------------------ r15382 | hunterz | 2008-12-26 16:50:22 +0200 (Fri, 26 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 81% done ------------------------------------------------------------------------ r15381 | hunterz | 2008-12-26 14:08:47 +0200 (Fri, 26 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 80% done ------------------------------------------------------------------------ r15380 | hunterz | 2008-12-26 12:03:44 +0200 (Fri, 26 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po 79% done ------------------------------------------------------------------------ r15379 | hunterz | 2008-12-23 17:05:21 +0200 (Tue, 23 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15378 | hunterz | 2008-12-23 16:28:05 +0200 (Tue, 23 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15377 | hunterz | 2008-12-23 15:24:39 +0200 (Tue, 23 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15376 | hunterz | 2008-12-22 10:58:03 +0200 (Mon, 22 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15375 | hunterz | 2008-12-21 23:18:58 +0200 (Sun, 21 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15374 | mbook | 2008-12-20 07:11:18 +0200 (Sat, 20 Dec 2008) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/cityrep.c Update total buy cost when production changes in city list. See #40599 Requested by: Christian Knoke ------------------------------------------------------------------------ r15373 | mbook | 2008-12-19 07:22:37 +0200 (Fri, 19 Dec 2008) | 6 lines Changed paths: M /trunk/server/savegame.c Fix bug preventing embassy information from loading correctly. See #40598 Reported by: Christian Knoke ------------------------------------------------------------------------ r15372 | hunterz | 2008-12-18 16:42:25 +0200 (Thu, 18 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15371 | hunterz | 2008-12-18 13:55:35 +0200 (Thu, 18 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15370 | hunterz | 2008-12-17 15:05:43 +0200 (Wed, 17 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15369 | hunterz | 2008-12-17 13:39:50 +0200 (Wed, 17 Dec 2008) | 1 line Changed paths: M /trunk/po/cs.po update strings ------------------------------------------------------------------------ r15368 | mbook | 2008-12-17 05:00:37 +0200 (Wed, 17 Dec 2008) | 6 lines Changed paths: M /trunk/server/generator/mapgen.c Prevent island generator from connecting continents. See #17435 Patch by: Brendon Oram ------------------------------------------------------------------------ r15366 | mbook | 2008-12-16 06:09:41 +0200 (Tue, 16 Dec 2008) | 4 lines Changed paths: M /trunk/common/packets.def M /trunk/server/edithand.c M /trunk/server/srv_main.c M /trunk/version.in Reduce code duplication in server edit handlers. See #40593 ------------------------------------------------------------------------ r15365 | mbook | 2008-12-10 07:43:04 +0200 (Wed, 10 Dec 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/dialogs.c Fix bug preventing selection of roads as pillage target. See #40590 ------------------------------------------------------------------------ r15364 | mbook | 2008-12-09 07:31:57 +0200 (Tue, 09 Dec 2008) | 20 lines Changed paths: M /trunk/ai/aiferry.c M /trunk/ai/aitools.c M /trunk/client/goto.c M /trunk/common/aicore/path_finding.c M /trunk/common/aicore/path_finding.h M /trunk/common/aicore/pf_tools.c M /trunk/common/aicore/pf_tools.h Redesigned path finding code for air units. - Air patrol and way points now work as expected (and without crashing). - Client goto forbids dangerous moves (they can still be accomplished using the keyboard). - struct pf_map is made into an abstract base class for three dervied map types. - pf_normal_map handles the regular goto case. - pf_danger_map seperates out the old danger handling code. - pf_fuel_map is added to handle units with fuel. - Added const to many function arguments. - Fixed style and formatting in modified areas. See #40536 Patch by: pepeto (With minor input by me.) ------------------------------------------------------------------------ r15363 | mbook | 2008-12-08 06:08:50 +0200 (Mon, 08 Dec 2008) | 4 lines Changed paths: M /trunk/server/ruleset.c Only call aifill during ruleset load if necessary. See #40585 ------------------------------------------------------------------------ r15362 | mbook | 2008-12-07 07:16:00 +0200 (Sun, 07 Dec 2008) | 12 lines Changed paths: M /trunk/common/player.h M /trunk/server/savegame.c M /trunk/utility/registry.c M /trunk/utility/registry.h Fix player loading bug. - Use player_slots_iterate instead of players_iterate when loading map known data. - Set loaded player slots to used when loading players. - Use new function secfile_has_section() to check for player sections in save game. See #40584 Reported by: Christian Knoke ------------------------------------------------------------------------ r15360 | mbook | 2008-12-06 06:57:23 +0200 (Sat, 06 Dec 2008) | 4 lines Changed paths: M /trunk/server/auth.c Remove is_safe_filename check in load_auth_config. See #40577 ------------------------------------------------------------------------ r15359 | mbook | 2008-12-06 06:53:39 +0200 (Sat, 06 Dec 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/editgui.c Do not apply tool to selection when using shortcut key. See #40575 ------------------------------------------------------------------------ r15358 | mbook | 2008-12-06 06:49:19 +0200 (Sat, 06 Dec 2008) | 4 lines Changed paths: M /trunk/data/trident/tiles.spec Fix trident fortress tag. See #40574 ------------------------------------------------------------------------ r15357 | mbook | 2008-12-05 06:00:39 +0200 (Fri, 05 Dec 2008) | 2 lines Changed paths: M /trunk/version.in Updated capability string due to packet changes. ------------------------------------------------------------------------ r15356 | mbook | 2008-12-05 06:00:32 +0200 (Fri, 05 Dec 2008) | 6 lines Changed paths: M /trunk/client/editor.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/common/packets.def M /trunk/server/edithand.c Implemented a tile property for editing bases. - Also, fixed paste mode for the base tool. See #40573 ------------------------------------------------------------------------ r15355 | mbook | 2008-12-05 03:33:57 +0200 (Fri, 05 Dec 2008) | 12 lines Changed paths: M /trunk/client/editor.c M /trunk/client/editor.h M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/gui-gtk-2.0/editgui.h M /trunk/client/gui-gtk-2.0/editprop.c Implemented copy and paste modes for most editor tools. - Copy mode lets the user store all objects in a square of a given radius or in an arbitrary group of selected tiles into a separate buffer. - Paste mode allows the contents of the buffer to be placed anywhere on the map. - Also, each tool now has its own set of parameters (e.g. size, count) instead of using one global set. See #40569 ------------------------------------------------------------------------ r15354 | mbook | 2008-12-05 02:14:50 +0200 (Fri, 05 Dec 2008) | 4 lines Changed paths: M /trunk/client/tilespec.c M /trunk/client/tilespec.h M /trunk/data/misc/editor.png M /trunk/data/misc/editor.spec Added copy and paste icons for the editor. See #40568 ------------------------------------------------------------------------ r15353 | mbook | 2008-12-05 00:10:57 +0200 (Fri, 05 Dec 2008) | 6 lines Changed paths: M /trunk/common/unit.c Allow the pillaging of bases. See #40539 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15352 | mbook | 2008-12-04 06:52:49 +0200 (Thu, 04 Dec 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/plrdlg.c Simplify and cleanup gtk2 player list update code. See #40566 ------------------------------------------------------------------------ r15351 | mbook | 2008-12-03 08:09:25 +0200 (Wed, 03 Dec 2008) | 4 lines Changed paths: M /trunk/common/tile.c M /trunk/common/tile.h Added some tile helper functions. See #40567 ------------------------------------------------------------------------ r15350 | cazfi | 2008-12-01 15:24:45 +0200 (Mon, 01 Dec 2008) | 2 lines Changed paths: M /trunk/version.in Bumped capability string as #40562 changed packet definition. ------------------------------------------------------------------------ r15349 | mbook | 2008-12-01 06:39:28 +0200 (Mon, 01 Dec 2008) | 8 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/common/packets.def M /trunk/server/edithand.c Implemented more unit properties for the property editor. - Added value type for bool. - Added unit properties fuel, moved, done_moving, hp and veteran. See #40562 ------------------------------------------------------------------------ r15340 | mbook | 2008-11-29 02:59:37 +0200 (Sat, 29 Nov 2008) | 11 lines Changed paths: M /trunk/common/connection.c M /trunk/server/sernet.c Fix longstanding connection freezing bug. - Add missing initialization of compression.frozen_level in connection_common_init(). - Also, make finish_processing_request() check for valid connection to avoid benign warning. See #39131 Reported by: pepeto ------------------------------------------------------------------------ r15337 | mbook | 2008-11-28 07:43:15 +0200 (Fri, 28 Nov 2008) | 6 lines Changed paths: M /trunk/server/connecthand.c Send information about lost connections not attached to players. See #39613 Reported by: pepeto ------------------------------------------------------------------------ r15335 | mbook | 2008-11-28 02:53:20 +0200 (Fri, 28 Nov 2008) | 4 lines Changed paths: M /trunk/server/stdinhand.c Send connection info when cmdlevel is changed. See #40479 ------------------------------------------------------------------------ r15332 | mbook | 2008-11-26 05:17:05 +0200 (Wed, 26 Nov 2008) | 4 lines Changed paths: M /trunk/server/auth.c M /trunk/utility/md5.c M /trunk/utility/md5.h Fix buffer overrun by create_md5sum(). See #40578 ------------------------------------------------------------------------ r15323 | mbook | 2008-11-23 09:04:50 +0200 (Sun, 23 Nov 2008) | 4 lines Changed paths: M /trunk/server/connecthand.c M /trunk/server/stdinhand.c Minor fixes relating to the take command. See #40529 ------------------------------------------------------------------------ r15320 | mbook | 2008-11-21 05:00:43 +0200 (Fri, 21 Nov 2008) | 6 lines Changed paths: M /trunk/server/unithand.c Reset a unit's done_moving flag when orders are cleared. See #40563 Patch by: pepeto ------------------------------------------------------------------------ r15319 | cazfi | 2008-11-20 02:35:28 +0200 (Thu, 20 Nov 2008) | 2 lines Changed paths: M /trunk/po/fi.po Updated translation by Timo Jyrinki. ------------------------------------------------------------------------ r15318 | mbook | 2008-11-20 01:58:35 +0200 (Thu, 20 Nov 2008) | 8 lines Changed paths: M /trunk/server/stdinhand.c Send correct player information when game is loaded. See #40565 Reported by: pepeto Christian Knoke ------------------------------------------------------------------------ r15317 | mbook | 2008-11-19 20:43:18 +0200 (Wed, 19 Nov 2008) | 4 lines Changed paths: A /trunk/server/edithand.h Add file I forgot for last commit. Part of #40561 ------------------------------------------------------------------------ r15316 | mbook | 2008-11-19 07:43:30 +0200 (Wed, 19 Nov 2008) | 4 lines Changed paths: M /trunk/common/map.c M /trunk/common/player.h M /trunk/common/tile.h M /trunk/server/Makefile.am M /trunk/server/edithand.c M /trunk/server/plrhand.c M /trunk/server/srv_main.c Remove server-only editor code from common files. See #40561 ------------------------------------------------------------------------ r15315 | stikonas | 2008-11-18 19:58:45 +0200 (Tue, 18 Nov 2008) | 1 line Changed paths: M /trunk/po/lt.po Some updates to Lithuanian translation. ------------------------------------------------------------------------ r15314 | cazfi | 2008-11-16 20:17:40 +0200 (Sun, 16 Nov 2008) | 4 lines Changed paths: M /trunk/server/savegame.c Fixed crash when saving game when ruleset has no base types defined. See #40564 ------------------------------------------------------------------------ r15313 | mbook | 2008-11-16 06:12:28 +0200 (Sun, 16 Nov 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Implemented the tile vision property for the property editor. See #40560 ------------------------------------------------------------------------ r15312 | cproc | 2008-11-13 06:08:10 +0200 (Thu, 13 Nov 2008) | 1 line Changed paths: M /trunk/configure.ac M /trunk/m4/win32-client.m4 M /trunk/m4/xaw-client.m4 Explicitly call PKG_PROG_PKG_CONFIG for the case that the first call to PKG_CHECK_MODULES does not happen. See PR#40555. ------------------------------------------------------------------------ r15310 | mbook | 2008-11-13 05:38:04 +0200 (Thu, 13 Nov 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/editgui.c Use double quotes in take command string sent by editor toolbar. See #40559 ------------------------------------------------------------------------ r15309 | mbook | 2008-11-12 04:53:54 +0200 (Wed, 12 Nov 2008) | 4 lines Changed paths: M /trunk/server/Makefile.am M /trunk/server/sernet.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/server/stdinhand.h A /trunk/server/voting.c A /trunk/server/voting.h Moved voting coding out of stdinhand and into its own module. See #40552 ------------------------------------------------------------------------ r15308 | cazfi | 2008-11-11 19:10:48 +0200 (Tue, 11 Nov 2008) | 4 lines Changed paths: M /trunk/server/citytools.c Release border allocations of shrinking city. See #40538 ------------------------------------------------------------------------ r15307 | mbook | 2008-11-11 02:35:07 +0200 (Tue, 11 Nov 2008) | 4 lines Changed paths: M /trunk/client/editor.c M /trunk/client/editor.h M /trunk/client/gui-ftwl/gui_main.c M /trunk/client/gui-gtk-2.0/editgui.c M /trunk/client/gui-gtk-2.0/editprop.c M /trunk/client/gui-gtk-2.0/editprop.h M /trunk/client/gui-gtk-2.0/gui_stuff.c M /trunk/client/gui-gtk-2.0/gui_stuff.h M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-stub/gui_main.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/gui_main.c M /trunk/client/include/editgui_g.h M /trunk/client/packhand.c M /trunk/common/packets.def M /trunk/common/player.c M /trunk/server/edithand.c M /trunk/server/maphand.c M /trunk/server/plrhand.c M /trunk/server/srv_main.c Property editor create and destroy buttons, and support code. See #40534 ------------------------------------------------------------------------ r15306 | cazfi | 2008-11-10 18:31:03 +0200 (Mon, 10 Nov 2008) | 2 lines Changed paths: D /trunk/dependencies/lua D /trunk/dependencies/tolua Removed lua 5.0 and tolua directories. ------------------------------------------------------------------------ r15305 | mbook | 2008-11-09 23:43:15 +0200 (Sun, 09 Nov 2008) | 6 lines Changed paths: M /trunk/client/gui-gtk-2.0/editprop.c Replace call to gtk_tree_row_reference_get_model() for older gtk versions. See #40553 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15304 | cazfi | 2008-11-09 23:10:17 +0200 (Sun, 09 Nov 2008) | 4 lines Changed paths: M /trunk/client/servers.c M /trunk/server/sernet.c Fixed a couple of compiler warnings when compiling for cygwin. See #40554 ------------------------------------------------------------------------ r15303 | mbook | 2008-11-09 09:17:41 +0200 (Sun, 09 Nov 2008) | 10 lines Changed paths: M /trunk/client/gui-gtk-2.0/plrdlg.c M /trunk/client/gui-sdl/finddlg.c M /trunk/client/gui-win32/plrdlg.c M /trunk/server/gamehand.c M /trunk/server/savegame.c Fix a few places that assumed contiguous player numbers. - Gtk2 player list dialog. - SDL find city dialog. - Win32 player list dialog. - Initial placement of units at game start in server. - Loading of diplstates from savegame. See #40551 ------------------------------------------------------------------------ r15302 | mbook | 2008-11-08 07:49:06 +0200 (Sat, 08 Nov 2008) | 6 lines Changed paths: M /trunk/client/packhand.c Remove a hack causing an inconsistent turn done button state. See #40550 Reported by: HanduMan ------------------------------------------------------------------------ r15299 | mbook | 2008-11-07 09:04:09 +0200 (Fri, 07 Nov 2008) | 6 lines Changed paths: M /trunk/server/stdinhand.c M /trunk/server/stdinhand.h Fix some minor bugs related to the take, observe and detach commands. - Also, make the function detach_command() extern. See #40549 ------------------------------------------------------------------------ r15298 | mbook | 2008-11-06 07:41:20 +0200 (Thu, 06 Nov 2008) | 9 lines Changed paths: M /trunk/client/gui-gtk-2.0/gui_main.c M /trunk/client/gui-gtk-2.0/gui_main.h M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-gtk-2.0/pages.h Clean up pregame connection list code. - Hence, fix a bug caused by old code that assumed that player numbers were contiguous. See #40548 Reported by: Christian Knoke ------------------------------------------------------------------------ r15297 | mbook | 2008-11-05 07:05:45 +0200 (Wed, 05 Nov 2008) | 7 lines Changed paths: M /trunk/common/city.c M /trunk/common/city.h M /trunk/common/tile.c M /trunk/common/tile.h M /trunk/common/unit.c M /trunk/common/unit.h Added code to create and destroy virtual tiles. - Also, added helper functions to check if a city or unit is virtual. See #40547 ------------------------------------------------------------------------ r15296 | mbook | 2008-11-04 02:57:03 +0200 (Tue, 04 Nov 2008) | 9 lines Changed paths: M /trunk/client/chatline_common.c M /trunk/client/citydlg_common.c M /trunk/client/control.c M /trunk/client/goto.c M /trunk/client/gui-ftwl/mapview.c M /trunk/client/gui-gtk-2.0/citydlg.c M /trunk/client/gui-gtk-2.0/pages.c M /trunk/client/gui-sdl/chatline.c M /trunk/client/gui-sdl/citydlg.c M /trunk/client/gui-sdl/gui_main.c M /trunk/client/gui-win32/graphics.c M /trunk/client/gui-win32/gui_main.c M /trunk/client/gui-xaw/citydlg.c M /trunk/client/helpdata.c M /trunk/client/mapview_common.c M /trunk/client/packhand.c M /trunk/client/servers.c M /trunk/client/text.c M /trunk/common/diptreaty.c M /trunk/common/effects.c M /trunk/common/game.c M /trunk/common/map.c M /trunk/server/citytools.c M /trunk/server/cityturn.c M /trunk/server/diplhand.c M /trunk/server/scripting/script_signal.c M /trunk/server/sernet.c M /trunk/server/stdinhand.c M /trunk/server/techtools.c M /trunk/server/unittools.c M /trunk/utility/ftwl/widget_window.c M /trunk/utility/genlist.c M /trunk/utility/genlist.h M /trunk/utility/registry.c M /trunk/utility/speclist.h Genlist/speclist free function cleanup. - genlist_free() frees all memory allocated by the list, not just the struct. - genlist_unlink_all() renamed to genlist_clear(). - Removed redundant genlist_unlink_all() calls. See #40546 ------------------------------------------------------------------------ r15294 | cazfi | 2008-11-03 17:34:54 +0200 (Mon, 03 Nov 2008) | 4 lines Changed paths: M /trunk/ai/ailog.c Renamed OUT as AILOG_OUT to avoid namespace conflicts. See #40541 ------------------------------------------------------------------------ r15292 | mbook | 2008-11-01 06:44:21 +0200 (Sat, 01 Nov 2008) | 4 lines Changed paths: M /trunk/client/gui-gtk-2.0/plrdlg.c Remove unneeded edit menu in player list dialog. See #40545 ------------------------------------------------------------------------ r15291 | mbook | 2008-10-31 06:50:55 +0200 (Fri, 31 Oct 2008) | 4 lines Changed paths: M /trunk/client/packhand.c M /trunk/client/tilespec.c M /trunk/common/map.c M /trunk/common/map.h M /trunk/common/packets.def M /trunk/common/tile.h M /trunk/server/edithand.c M /trunk/server/maphand.c Cleaner handling of editor start position data. See #40537 ------------------------------------------------------------------------ r15289 | cazfi | 2008-10-30 21:05:11 +0200 (Thu, 30 Oct 2008) | 4 lines Changed paths: M /trunk/server/auth.c Fixed compiler warnings from auth build See #40544 ------------------------------------------------------------------------ r15288 | mbook | 2008-10-30 05:35:40 +0200 (Thu, 30 Oct 2008) | 4 lines Changed paths: M /trunk/server/connecthand.c Fix forgotten player info sending in pregame. See #40540 ------------------------------------------------------------------------ r15286 | cazfi | 2008-10-29 19:13:56 +0200 (Wed, 29 Oct 2008) | 2 lines Changed paths: M /trunk/po/fi.po Updated translation by Sini Ruohomaa. ------------------------------------------------------------------------ r15285 | mbook | 2008-10-29 04:06:39 +0200 (Wed, 29 Oct 2008) | 9 lines Changed paths: M /trunk/client/civclient.c M /trunk/client/options.c M /trunk/client/options.h M /trunk/client/packhand.c Added client option for autocentering on new turn. - Default is TRUE, to preserve existing behaviour. - Also, moved some client game initialization calls so that they are only called on game start, rather than every turn. See #40533 ------------------------------------------------------------------------ r15284 | mbook | 2008-10-28 05:54:02 +0200 (Tue, 28 Oct 2008) | 8 lines Changed paths: M /trunk/ai/aitools.h M /trunk/client/civclient.c M /trunk/client/civclient.h M /trunk/client/climisc.c M /trunk/client/packhand.c M /trunk/client/text.c M /trunk/common/capstr.c M /trunk/common/game.c M /trunk/common/game.h M /trunk/common/packets.def M /trunk/common/player.c M /trunk/common/player.h M /trunk/server/barbarian.c M /trunk/server/connecthand.c M /trunk/server/plrhand.c M /trunk/server/plrhand.h M /trunk/server/savegame.c M /trunk/server/srv_main.c M /trunk/server/stdinhand.c M /trunk/utility/support.c M /trunk/version.in Player handling cleanup and improvement. - Players can be added or removed at any time and have unique, unchanging IDs. - Player info packet protocol simplified. Please see #40524 for a detailed discussion of changes. ------------------------------------------------------------------------ r15280 | jdorje | 2008-10-24 21:01:17 +0300 (Fri, 24 Oct 2008) | 2 lines Changed paths: D /branches/S2_2 A /trunk (from /branches/S2_2:15279) Move S2_2 onto trunk. ------------------------------------------------------------------------ r15277 | mbook | 2008-10-23 03:30:22 +0300 (Thu, 23 Oct 2008) | 6 lines Changed paths: M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/generator/utilities.h Make shallow ocean areas near coast for the island generator. See #40503 Reported by: Andreas Røsdal ------------------------------------------------------------------------ r15275 | mbook | 2008-10-22 02:33:01 +0300 (Wed, 22 Oct 2008) | 8 lines Changed paths: M /branches/S2_2/server/report.c M /branches/S2_2/server/report.h M /branches/S2_2/server/settings.c M /branches/S2_2/server/settings.h M /branches/S2_2/server/stdinhand.c Disallow setting timeout less than 30 for non-hack connections. - Added 'struct connection' parameter to all setting validate callback functions. - Improved some style and formatting in set_command. See #40466 ------------------------------------------------------------------------ r15272 | mbook | 2008-10-20 00:01:19 +0300 (Mon, 20 Oct 2008) | 10 lines Changed paths: M /branches/S2_2/server/generator/mapgen.c Fix bug that filled land tiles with water terrain. - Thus fix random "infinite loop" assertion failure in map_fractal_generate. See #40453 Reported by: Christian Knoke Madeline Book ------------------------------------------------------------------------ r15269 | cazfi | 2008-10-17 22:59:11 +0300 (Fri, 17 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/server/unittools.c Free border allocations when fortress is pillaged See #40501 ------------------------------------------------------------------------ r15266 | cazfi | 2008-10-12 00:30:07 +0300 (Sun, 12 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/ai/ailog.c M /branches/S2_2/client/agents/cma_fec.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-xaw/cma_fe.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/text.c M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/console.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/scripting/script.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/utility/registry.c Fixed "format not a string literal and no format arguments" -warnings See #40504 ------------------------------------------------------------------------ r15264 | cazfi | 2008-10-12 00:13:29 +0300 (Sun, 12 Oct 2008) | 5 lines Changed paths: M /branches/S2_2/client/chatline_common.c Make chat message buffer longer. This helps savegame problem reported by Dennis d'Entremont and investigated by Christian Prochaska See #40515 ------------------------------------------------------------------------ r15261 | mbook | 2008-10-11 00:59:12 +0300 (Sat, 11 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/server/cityturn.c Fix infinite worklist loop and some minor style improvements. See #40521 ------------------------------------------------------------------------ r15259 | mbook | 2008-10-11 00:15:42 +0300 (Sat, 11 Oct 2008) | 6 lines Changed paths: M /branches/S2_2/server/plrhand.c Minor aifill fixes. - Refill AIs when a player is removed. See #40481 ------------------------------------------------------------------------ r15256 | mbook | 2008-10-10 23:55:46 +0300 (Fri, 10 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/pages.c Fix assertion failure when picking nation. See #40516 ------------------------------------------------------------------------ r15254 | evyscr | 2008-10-09 18:13:34 +0300 (Thu, 09 Oct 2008) | 2 lines Changed paths: M /branches/S2_2/data/civ1/effects.ruleset M /branches/S2_2/data/civ2/effects.ruleset Add missed effects in civ1 and civ2 rulesets (PR#40519.) ------------------------------------------------------------------------ r15248 | mbook | 2008-10-07 05:20:14 +0300 (Tue, 07 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/server/edithand.c Disallow changing nation to an already assigned nation. See #40513 ------------------------------------------------------------------------ r15247 | mbook | 2008-10-07 05:20:07 +0300 (Tue, 07 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/gui-gtk-2.0/editprop.c Added tooltips in editor mode and general widget cleanup. See #40512 ------------------------------------------------------------------------ r15246 | mbook | 2008-10-07 05:19:59 +0300 (Tue, 07 Oct 2008) | 10 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editprop.c Improved property name filter in the property editor. - Filter string may contain logical operators &, | and !. - Object list columns are filtered too. - Properties "NAT_{X,Y}" renamed to "NAT {X,Y}" because the underscore was being interpreted as a shortcut. - Added filter tooltip. See #40511 ------------------------------------------------------------------------ r15245 | mbook | 2008-10-07 05:19:49 +0300 (Tue, 07 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editprop.c M /branches/S2_2/common/packets.def M /branches/S2_2/server/edithand.c Implemented city food and shield stock editable properties. See #40509 ------------------------------------------------------------------------ r15243 | mbook | 2008-10-07 01:16:03 +0300 (Tue, 07 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/server/handchat.c Show public chat messages in server console. See #21794 ------------------------------------------------------------------------ r15242 | cazfi | 2008-10-05 22:10:27 +0300 (Sun, 05 Oct 2008) | 4 lines Changed paths: M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/ruleset.c Get information about bases that cannot coexist from ruleset. See #40502 ------------------------------------------------------------------------ r15239 | mbook | 2008-09-30 23:13:31 +0300 (Tue, 30 Sep 2008) | 6 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gotodlg.c Fix bad packing parameters in gtk goto dialog. See #40119 Report and patch by: Jacob Nevins ------------------------------------------------------------------------ r15235 | mbook | 2008-09-30 00:24:17 +0300 (Tue, 30 Sep 2008) | 10 lines Changed paths: M /branches/S2_2/server/commands.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/stdinhand.h Voting cleanup and extension using code from the Warclient project. - Users can now safely vote in pregame. - Voters can abstain from voting. - Default first_access_level is ALLOW_INFO. See #40475 Original code by pepeto, woodswolf and me. Ported to S2_2 by me. ------------------------------------------------------------------------ r15234 | mbook | 2008-09-30 00:24:08 +0300 (Tue, 30 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/utility/shared.c M /branches/S2_2/utility/shared.h Added helper function free_tokens for the result of get_tokens. See #40475 ------------------------------------------------------------------------ r15230 | mbook | 2008-09-28 06:02:59 +0300 (Sun, 28 Sep 2008) | 6 lines Changed paths: M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h Fix fortress foreground drawing over fog. See #40500 Reported by: Marko Lindqvist ------------------------------------------------------------------------ r15228 | mbook | 2008-09-28 04:51:53 +0300 (Sun, 28 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c Popdown property editor when edit mode ends. See #40499 ------------------------------------------------------------------------ r15226 | mbook | 2008-09-28 02:18:55 +0300 (Sun, 28 Sep 2008) | 6 lines Changed paths: M /branches/S2_2/client/helpdata.c Fix government help text buffer truncation. See #40505 Reported by: Martijn Plass ------------------------------------------------------------------------ r15220 | mbook | 2008-09-28 01:52:50 +0300 (Sun, 28 Sep 2008) | 14 lines Changed paths: M /branches/S2_2/server/plrhand.c Do not reveal gold and government information when sending player info. - This information was being sent even when players had no contact. This is changed so that players of less than INFO_MEETING info level only receive placeholder values. - Zero is sent as a placeholder for gold. - The "government during revolution" (i.e. anarchy) is sent as a placeholder for government. See #40495 Reported by: pepeto ------------------------------------------------------------------------ r15218 | cproc | 2008-09-27 17:25:03 +0300 (Sat, 27 Sep 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/widget.c M /branches/S2_2/client/gui-sdl/widget.h ------------------------------------------------------------------------ r15215 | mbook | 2008-09-26 00:31:26 +0300 (Fri, 26 Sep 2008) | 6 lines Changed paths: M /branches/S2_2/server/sernet.c Fix compile warning due to debug message format string. See #40445 Reported by: Tristan Hoffmann ------------------------------------------------------------------------ r15212 | mbook | 2008-09-23 00:35:35 +0300 (Tue, 23 Sep 2008) | 6 lines Changed paths: M /branches/S2_2/server/savegame.c Fix buffer overflow in bases vision during savegame load. See #40486 Reported and patch created by Egor Vyscrebentsov . ------------------------------------------------------------------------ r15210 | mbook | 2008-09-18 01:42:12 +0300 (Thu, 18 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.h M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/gui-gtk-2.0/editprop.c M /branches/S2_2/client/gui-gtk-2.0/editprop.h M /branches/S2_2/client/packhand.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.def M /branches/S2_2/server/edithand.c Added the "game" object type to the property editor. See #40483 ------------------------------------------------------------------------ r15208 | mbook | 2008-09-17 23:07:43 +0300 (Wed, 17 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/client/connectdlg_common.c Remove hardcoded sending of autotoggle=1 on savegame load. See #40465 ------------------------------------------------------------------------ r15205 | mbook | 2008-09-13 05:15:49 +0300 (Sat, 13 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/server/settings.c M /branches/S2_2/server/stdinhand.c Move side-effects in setting validate callbacks to set command body. See #40480 ------------------------------------------------------------------------ r15202 | mbook | 2008-09-09 23:48:14 +0300 (Tue, 09 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c Allow property editing as global observer. See #40477 ------------------------------------------------------------------------ r15200 | mbook | 2008-09-09 06:37:52 +0300 (Tue, 09 Sep 2008) | 8 lines Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/gui_id.h M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/optiondlg.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/mapview_common.h M /branches/S2_2/client/options.c M /branches/S2_2/client/options.h M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h M /branches/S2_2/data/misc/citybar.png M /branches/S2_2/data/misc/citybar.spec M /branches/S2_2/doc/README.SDLClient City traderoute display with gtk and sdl view options. See #40447 Requested by Michael Mielke . Patch by Nicolas R. Wadhwani and myself. Citybar trade icon created by me. ------------------------------------------------------------------------ r15198 | cazfi | 2008-09-08 21:58:49 +0300 (Mon, 08 Sep 2008) | 8 lines Changed paths: M /branches/S2_2/server/generator/startpos.c Do not require so many specials for continent to be acceptable starting place. Also try harder to get acceptable starting positions. Finding acceptable starting positions started fail when separatepoles was fixed, and polar oil is no longer contributing to goodness of continents. Problem reported by Madeline, ticket #40453 ------------------------------------------------------------------------ r15196 | cazfi | 2008-09-05 01:23:04 +0300 (Fri, 05 Sep 2008) | 5 lines Changed paths: M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/server/unittools.c There cannot be two territory claiming bases on same tile. If one exist already when new one is built, old one is removed. See #40474 ------------------------------------------------------------------------ r15194 | cazfi | 2008-09-04 15:21:00 +0300 (Thu, 04 Sep 2008) | 5 lines Changed paths: M /branches/S2_2/client/text.c Fixed a problem that tile info popup did not list bases if it was only infrastructure in that tile. See #40473 ------------------------------------------------------------------------ r15191 | mbook | 2008-09-03 23:32:23 +0300 (Wed, 03 Sep 2008) | 10 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/client/text.c M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.def M /branches/S2_2/server/savegame.c M /branches/S2_2/server/settings.c M /branches/S2_2/server/srv_main.c Implemented team alternating movement phases. - 'Simultaneous phases' server setting renamed to 'phase mode' and extended to integer values. - New setting phasemode=2 allows teammates to play their turn at the same time, but makes teams as a whole alternate. Feature requested in #40444 by Michael Mielke . ------------------------------------------------------------------------ r15190 | cazfi | 2008-09-02 00:39:41 +0300 (Tue, 02 Sep 2008) | 4 lines Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/unit.h M /branches/S2_2/common/unitlist.c M /branches/S2_2/common/unitlist.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/edithand.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c Made number of base types adjustable. Max number of base types is now 32. See #40469 ------------------------------------------------------------------------ r15188 | cazfi | 2008-08-29 18:18:19 +0300 (Fri, 29 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/utility/ftwl/be_sdl.c M /branches/S2_2/utility/ftwl/be_x11_cairo_32.c Fixed ftwl-client compilation. See #40471 ------------------------------------------------------------------------ r15186 | cazfi | 2008-08-29 00:56:09 +0300 (Fri, 29 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/gui_main.c Fixed win32-client compilation. See #40470 ------------------------------------------------------------------------ r15184 | cazfi | 2008-08-29 00:07:34 +0300 (Fri, 29 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/server/savegame.c Save ongoing base building activity by base number and not by base type specific actions. See #40462 ------------------------------------------------------------------------ r15182 | cazfi | 2008-08-29 00:02:10 +0300 (Fri, 29 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/gui_main.c Fixed sdl-client compilation See #40468 ------------------------------------------------------------------------ r15180 | cazfi | 2008-08-28 03:06:29 +0300 (Thu, 28 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/servers.c M /branches/S2_2/server/sernet.c Fixed IPv4 compilation when platform does not have inet_aton() See #40461 ------------------------------------------------------------------------ r15177 | mbook | 2008-08-27 22:49:29 +0300 (Wed, 27 Aug 2008) | 6 lines Changed paths: M /branches/S2_2/client/packhand.c Do not close races dialog on user join or quit. See #40455 Reported by: Michael Mielke ------------------------------------------------------------------------ r15174 | mbook | 2008-08-27 22:02:07 +0300 (Wed, 27 Aug 2008) | 9 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/clinet.c M /branches/S2_2/client/servers.c M /branches/S2_2/common/connection.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/utility/netintf.c M /branches/S2_2/utility/netintf.h Changed my_ prefix to fc_ for network functions. - In particular, fixed conflict between function my_connect and the mysql function of the same name. See #40460 Reported by: Andreas Røsdal ------------------------------------------------------------------------ r15172 | cproc | 2008-08-27 19:51:14 +0300 (Wed, 27 Aug 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/gui_id.h M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/optiondlg.c Added a shortcut and map options entry for the city worker output display. Patch by Nicolas R. Wadhwani in PR#40458. ------------------------------------------------------------------------ r15171 | cazfi | 2008-08-25 21:22:29 +0300 (Mon, 25 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-xaw/dialogs.c Fixed xaw-client compilation See #40457 ------------------------------------------------------------------------ r15168 | mbook | 2008-08-25 06:32:00 +0300 (Mon, 25 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/repodlgs_common.c Only send private saved settings on forked servers. See #40449 ------------------------------------------------------------------------ r15166 | mbook | 2008-08-25 06:09:48 +0300 (Mon, 25 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/server/commands.c Remove out-of-date information in vote command help text. See #40448 ------------------------------------------------------------------------ r15162 | mbook | 2008-08-24 03:03:28 +0300 (Sun, 24 Aug 2008) | 2 lines Changed paths: M /branches/S2_2/client/editor.c Fixed warning about possible use of uninitialized value. ------------------------------------------------------------------------ r15161 | cazfi | 2008-08-23 14:58:16 +0300 (Sat, 23 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/pf_tools.c M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/edithand.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c M /branches/S2_2/version.in Handle military bases independently from specials. See #40441 ------------------------------------------------------------------------ r15159 | cazfi | 2008-08-22 14:22:54 +0300 (Fri, 22 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/client/text.c Fixed a bug that if there is just one enemy visible building in a city, it's not shown in tile popup. See #40440 ------------------------------------------------------------------------ r15156 | mbook | 2008-08-21 05:08:58 +0300 (Thu, 21 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/common/packets.def M /branches/S2_2/server/edithand.c Minor improvements to the editor unit tool in erase mode. See #40442. ------------------------------------------------------------------------ r15155 | cazfi | 2008-08-21 01:25:27 +0300 (Thu, 21 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/servers.c M /branches/S2_2/server/civserver.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/utility/netintf.h M /branches/S2_2/utility/shared.c M /branches/S2_2/utility/shared.h Added option for IPv6 lan game announcement See #40438 ------------------------------------------------------------------------ r15151 | cproc | 2008-08-17 17:31:53 +0300 (Sun, 17 Aug 2008) | 1 line Changed paths: M /branches/S2_2/utility/shared.c Fix absolute path detection on Windows. See PR#40439. ------------------------------------------------------------------------ r15146 | mbook | 2008-08-16 03:37:35 +0300 (Sat, 16 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editprop.c Added coordinate related read-only tile properties. See #40437 ------------------------------------------------------------------------ r15145 | mbook | 2008-08-16 03:37:25 +0300 (Sat, 16 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/gui-gtk-2.0/editprop.c M /branches/S2_2/client/gui-gtk-2.0/editprop.h Property editor is a tab in the bottom notebook. See #40432 ------------------------------------------------------------------------ r15144 | mbook | 2008-08-16 03:37:11 +0300 (Sat, 16 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/server/edithand.c Dead players made alive on city or unit edit. See #40420 ------------------------------------------------------------------------ r15143 | cazfi | 2008-08-15 23:59:54 +0300 (Fri, 15 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/tile.c tile_activity_base_time() cleanup See #40434 ------------------------------------------------------------------------ r15141 | cazfi | 2008-08-15 23:42:15 +0300 (Fri, 15 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/maphand.c Add bases to player vision sites list. This fixes fortress territory claiming, at least partially. See #40435 ------------------------------------------------------------------------ r15139 | cazfi | 2008-08-15 22:43:28 +0300 (Fri, 15 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/unit.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c M /branches/S2_2/version.in Number of possible airlifts / turn from value of Airlift effect See #40427 ------------------------------------------------------------------------ r15137 | cazfi | 2008-08-15 01:15:55 +0300 (Fri, 15 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/menu.c Use get_base_by_gui_type() instead of hardcoded base type index. See #40431 ------------------------------------------------------------------------ r15135 | cazfi | 2008-08-14 20:45:49 +0300 (Thu, 14 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/server/citytools.c Do not set vision range same as borders range. See #40433 ------------------------------------------------------------------------ r15132 | cazfi | 2008-08-14 00:50:17 +0300 (Thu, 14 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/requirements.c M /branches/S2_2/data/civ1/effects.ruleset M /branches/S2_2/data/civ2/effects.ruleset M /branches/S2_2/data/default/effects.ruleset M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in Separate requirement type for military bases. See #40426 ------------------------------------------------------------------------ r15130 | cazfi | 2008-08-13 02:31:07 +0300 (Wed, 13 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/server/generator/mapgen.c Fixed separatepoles option See #40417 ------------------------------------------------------------------------ r15128 | cazfi | 2008-08-12 01:47:13 +0300 (Tue, 12 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/combat.c M /branches/S2_2/common/packets.def M /branches/S2_2/common/unittype.c M /branches/S2_2/common/unittype.h M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/default/units.ruleset M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in Replaced unit type flag "AttackAny" with list of unreachable unit classes unit type can attack against. See #34422 ------------------------------------------------------------------------ r15125 | mbook | 2008-08-12 01:09:11 +0300 (Tue, 12 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/editor.h M /branches/S2_2/client/gui-ftwl/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/gui-gtk-2.0/editprop.c M /branches/S2_2/client/gui-gtk-2.0/editprop.h M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-stub/gui_main.c M /branches/S2_2/client/gui-win32/gui_main.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/include/editgui_g.h M /branches/S2_2/client/packhand.c M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/improvement.c M /branches/S2_2/common/improvement.h M /branches/S2_2/common/packets.def M /branches/S2_2/server/edithand.c M /branches/S2_2/server/srv_main.c Client and server framework for editing properties of game entities. Please see #40375 for overview, details and discussion. Patch by me. ------------------------------------------------------------------------ r15123 | cazfi | 2008-08-11 03:51:52 +0300 (Mon, 11 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aidata.c Fixed a couple of AI crashes related to ocean cities. See #40422 ------------------------------------------------------------------------ r15121 | cazfi | 2008-08-10 17:54:34 +0300 (Sun, 10 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/data/default/buildings.ruleset Any oceanic terrain makes building Lighthouse and Magellan's Expedition possible, not just Ocean. See #40424 ------------------------------------------------------------------------ r15114 | cazfi | 2008-08-10 02:08:00 +0300 (Sun, 10 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/common/map.h M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/ruleset.c Added terrain ruleset option for specials in the middle of the ocean. By default specials are restricted to land tiles and tiles next to land. See #40423 ------------------------------------------------------------------------ r15112 | cazfi | 2008-08-10 00:12:57 +0300 (Sun, 10 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.c Fixed assert failure when investigating enemy city. See #40421 ------------------------------------------------------------------------ r15110 | cazfi | 2008-08-09 23:34:01 +0300 (Sat, 09 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.c Fixed free unit upkeep. See #40418 ------------------------------------------------------------------------ r15107 | cazfi | 2008-08-09 19:33:31 +0300 (Sat, 09 Aug 2008) | 7 lines Changed paths: M /branches/S2_2/m4/freetype2.m4 Replaced AS_HELP_STRING with AC_HELP_STRING for supporting older autoconf versions. Problem reported by Christian Prochaska. Patch by Daniel Markstedt Ticket #40416 ------------------------------------------------------------------------ r15104 | mbook | 2008-08-08 05:54:13 +0300 (Fri, 08 Aug 2008) | 10 lines Changed paths: M /branches/S2_2/client/packhand.c Remove reliance on tile_owner in city info packet handlers. - Function city_owner is used instead of tile_owner to check for changes in the city owner. - Removed modification of tile owner in handle_city_info and handle_city_short_info. - Fixed style of two-lined multi-assignment statement. See #40327 and #40408, patch by me. ------------------------------------------------------------------------ r15102 | dmarks | 2008-08-07 04:04:19 +0300 (Thu, 07 Aug 2008) | 1 line Changed paths: M /branches/S2_2/configure.ac A /branches/S2_2/po/eo.po Add Esperanto translation; sent to me by Antonio C. Codazzi ------------------------------------------------------------------------ r15100 | mbook | 2008-08-07 02:42:32 +0300 (Thu, 07 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/data/default/terrain.ruleset Irrigation increases hill terrain food output by 1. See #40383; patch by me. ------------------------------------------------------------------------ r15097 | mbook | 2008-08-06 06:52:54 +0300 (Wed, 06 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/client/packhand.c Fixed minor bug in strncmp usage. See #40415, patch by me. ------------------------------------------------------------------------ r15095 | cazfi | 2008-08-03 19:53:06 +0300 (Sun, 03 Aug 2008) | 6 lines Changed paths: M /branches/S2_2/server/maphand.c Make cities visible in fogged tiles. Problem reported by Jason. Patch by Nicolas R. Wadhwani. Ticket #40316 ------------------------------------------------------------------------ r15093 | cazfi | 2008-08-03 19:47:37 +0300 (Sun, 03 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/server/scripting/api_find.c Fixed find.role_unit_type scripting crash when there is no units for given role in the ruleset. See #40414 ------------------------------------------------------------------------ r15091 | cazfi | 2008-08-03 19:44:17 +0300 (Sun, 03 Aug 2008) | 5 lines Changed paths: M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/generator/mapgen.c Make ocean deeper far from coast in order to make trireme passable connections between continents less likely. See #40413 ------------------------------------------------------------------------ r15089 | mbook | 2008-08-02 08:07:44 +0300 (Sat, 02 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.c Built great wonders show "never" for turns-to-build. See #40382, patch by me. ------------------------------------------------------------------------ r15085 | mbook | 2008-08-02 07:28:31 +0300 (Sat, 02 Aug 2008) | 2 lines Changed paths: M /branches/S2_2/ai/aicity.c Fix warning about possible use of uninitialized value. ------------------------------------------------------------------------ r15084 | cazfi | 2008-08-01 21:22:08 +0300 (Fri, 01 Aug 2008) | 6 lines Changed paths: M /branches/S2_2/ai/aisettler.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/unit.c M /branches/S2_2/common/vision.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/settings.c M /branches/S2_2/version.in Border size is now mainly determined by server setting borders, and only slightly modified by city size. Cities always claims at least citymap size area. See #40370 ------------------------------------------------------------------------ r15082 | cazfi | 2008-08-01 20:23:32 +0300 (Fri, 01 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aicity.c For a number of effect types, check limitations on affected unit classes. See #40404 ------------------------------------------------------------------------ r15080 | cazfi | 2008-08-01 20:09:07 +0300 (Fri, 01 Aug 2008) | 4 lines Changed paths: M /branches/S2_2/data/default/script.lua M /branches/S2_2/server/scripting/api_actions.c Settlers instead of Workers from huts. See #40409 ------------------------------------------------------------------------ r15078 | cazfi | 2008-07-31 23:24:21 +0300 (Thu, 31 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/utility/netintf.c M /branches/S2_2/utility/netintf.h IPv6 support added See #40410 ------------------------------------------------------------------------ r15075 | mbook | 2008-07-28 04:51:22 +0300 (Mon, 28 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/data/isotrident/cities.png Fix fortress background image in isotrident tileset. See #40373, image edited by me. ------------------------------------------------------------------------ r15074 | mbook | 2008-07-28 04:51:09 +0300 (Mon, 28 Jul 2008) | 7 lines Changed paths: M /branches/S2_2/client/gui-ftwl/canvas.c M /branches/S2_2/client/gui-gtk-2.0/canvas.c M /branches/S2_2/client/gui-sdl/canvas.c M /branches/S2_2/client/gui-stub/canvas.c M /branches/S2_2/client/gui-win32/canvas.c M /branches/S2_2/client/gui-xaw/mapview.c M /branches/S2_2/client/include/canvas_g.h M /branches/S2_2/client/options.c M /branches/S2_2/client/options.h M /branches/S2_2/client/reqtree.c Optional curved lines for the techtree. See #40221. Patch-by: Stuart Hacking Signed-off-by: Madeline Book ------------------------------------------------------------------------ r15070 | mbook | 2008-07-28 03:59:23 +0300 (Mon, 28 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/client/servers.c Fix compile warning about uninitialized value. ------------------------------------------------------------------------ r15068 | cazfi | 2008-07-27 20:40:09 +0300 (Sun, 27 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/m4/freetype2.m4 Updated freetype2.m4 from freetype 2.3.7 ------------------------------------------------------------------------ r15066 | cazfi | 2008-07-27 20:05:56 +0300 (Sun, 27 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aiair.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/ai/aiunit.h M /branches/S2_2/common/city.h Store number of units capable of attack or occupying in invasion strucuture instead of just bit telling if such units exist. See #40403 ------------------------------------------------------------------------ r15064 | cazfi | 2008-07-27 14:11:02 +0300 (Sun, 27 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/client/servers.c M /branches/S2_2/configure.ac M /branches/S2_2/server/sernet.c Use getnameinfo() to get information about incoming connections when IPv6 support enabled. See #40405 ------------------------------------------------------------------------ r15062 | cazfi | 2008-07-27 12:53:23 +0300 (Sun, 27 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/stdinhand.c Use enum ai_level instead of plain numeric values in cmd_of_level() See #40402 ------------------------------------------------------------------------ r15060 | cazfi | 2008-07-26 01:16:18 +0300 (Sat, 26 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/lua-5.1/Version M /branches/S2_2/dependencies/lua-5.1/src/lapi.c M /branches/S2_2/dependencies/lua-5.1/src/lstrlib.c New bugfix -patches from lua.org applied. ------------------------------------------------------------------------ r15058 | cazfi | 2008-07-25 22:39:20 +0300 (Fri, 25 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/ai/advmilitary.c Consider building Coastal defense or SAM Battery in response to respective danger. See #40398 ------------------------------------------------------------------------ r15056 | cazfi | 2008-07-25 22:36:46 +0300 (Fri, 25 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/manual/civmanual.c Fixed civmanual crashes See #40400 ------------------------------------------------------------------------ r15054 | cazfi | 2008-07-25 00:23:05 +0300 (Fri, 25 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/clinet.c M /branches/S2_2/client/servers.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/sernet.c Use address family from sockaddr instead of hardcoded AF_INET (IPv4). See #40394 ------------------------------------------------------------------------ r15052 | cazfi | 2008-07-24 23:25:33 +0300 (Thu, 24 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/stdinhand.c AI handicaps to bitvector. See #40397 ------------------------------------------------------------------------ r15050 | cazfi | 2008-07-24 21:04:09 +0300 (Thu, 24 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/version.in Updated capstr as unit class flag vector changed. ------------------------------------------------------------------------ r15048 | cazfi | 2008-07-24 20:59:23 +0300 (Thu, 24 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/common/movement.c M /branches/S2_2/common/unittype.c M /branches/S2_2/common/unittype.h M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/default/units.ruleset M /branches/S2_2/server/ruleset.c Added unitclass flag "RiverNative" allowing river moving boats. See #40396 ------------------------------------------------------------------------ r15046 | mbook | 2008-07-24 20:55:09 +0300 (Thu, 24 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/terrain.ruleset Remove unused terrain resource entries in civ1 ruleset. See #40368, patch by me. ------------------------------------------------------------------------ r15043 | cazfi | 2008-07-24 20:09:03 +0300 (Thu, 24 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aihand.c M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/plrhand.h M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c Avoid false "max rates exceeded" -message. See #40389 ------------------------------------------------------------------------ r15041 | cazfi | 2008-07-24 19:34:26 +0300 (Thu, 24 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/common/aicore/pf_tools.c Fixed goto for amphibious units. See #40395 ------------------------------------------------------------------------ r15038 | mbook | 2008-07-24 04:28:23 +0300 (Thu, 24 Jul 2008) | 7 lines Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/options.c M /branches/S2_2/client/options.h M /branches/S2_2/client/tilespec.c View option to toggle city worker display on main map. See #40213. Patch-by: Nicolas R. Wadhwani Signed-off-by: Madeline Book ------------------------------------------------------------------------ r15036 | mbook | 2008-07-24 03:41:42 +0300 (Thu, 24 Jul 2008) | 7 lines Changed paths: M /branches/S2_2/client/options.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/overview_common.h Client option for drawing the borders layer on ocean tiles in the overview. See #40386. Patch-by: Nicolas R. Wadhwani Signed-off-by: Madeline Book ------------------------------------------------------------------------ r15035 | cazfi | 2008-07-23 01:36:06 +0300 (Wed, 23 Jul 2008) | 11 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/common/effects.c M /branches/S2_2/common/effects.h Improved ai_find_source_building() - It takes city instead of player as parameter to make sure particular city can build what gets selected - It returns best (as greatest effect value) building instead of first match - It can take unit class or move type building should affect. This makes it more probable that selected building really does what we build it for See #40393 ------------------------------------------------------------------------ r15033 | cazfi | 2008-07-22 23:09:15 +0300 (Tue, 22 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/helpdata.c M /branches/S2_2/data/default/units.ruleset Corrected Trireme helptexts. See #40392 ------------------------------------------------------------------------ r15030 | cazfi | 2008-07-22 23:06:41 +0300 (Tue, 22 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/po/POTFILES.in M /branches/S2_2/po/POTFILES.skip Added missing files to POTFILES.in See #40391 ------------------------------------------------------------------------ r15028 | cazfi | 2008-07-22 16:49:23 +0300 (Tue, 22 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/clinet.c M /branches/S2_2/client/servers.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/sernet.c M /branches/S2_2/utility/netintf.c M /branches/S2_2/utility/netintf.h Added function sockaddr_size() and used it instead of hardcoding IPv4 size. See #40388 ------------------------------------------------------------------------ r15025 | cproc | 2008-07-22 03:34:22 +0300 (Tue, 22 Jul 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/citydlg.c Fix changing of specialists at resolutions higher than 640x480. See PR#40387. ------------------------------------------------------------------------ r15023 | cazfi | 2008-07-21 14:13:45 +0300 (Mon, 21 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/client/clinet.c M /branches/S2_2/client/servers.c M /branches/S2_2/server/sernet.c M /branches/S2_2/utility/netintf.c M /branches/S2_2/utility/netintf.h Added sockaddr_in6 member to my_sockaddr union. Cleanup to naming of my_sockaddr members. See #40362 ------------------------------------------------------------------------ r15020 | cazfi | 2008-07-21 12:18:31 +0300 (Mon, 21 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/text.c Fixed client crash in the end of turn in altering movement mode. See #40384 ------------------------------------------------------------------------ r15017 | cazfi | 2008-07-21 12:14:15 +0300 (Mon, 21 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/auth.c Fixed error message about illegal auth port parameter. See #40385 ------------------------------------------------------------------------ r15014 | cazfi | 2008-07-21 12:12:18 +0300 (Mon, 21 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/stdinhand.c Fixed /take assert when all player slots are in use. See #40354 ------------------------------------------------------------------------ r15010 | mbook | 2008-07-21 06:40:59 +0300 (Mon, 21 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/data/misc/editor.png M /branches/S2_2/data/misc/editor.spec Replaced my hodgepodge of editor icons by nicer ones. See #40267. Icons created by Pep (guest to freeciv forums). Spec file by me. ------------------------------------------------------------------------ r15009 | mbook | 2008-07-21 06:40:29 +0300 (Mon, 21 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/editor.h M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h M /branches/S2_2/data/misc/editor.spec Added military base editor tool. See #40380, patch by me. ------------------------------------------------------------------------ r15008 | cazfi | 2008-07-18 22:00:44 +0300 (Fri, 18 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/scripting/script_signal.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c Added "unit_lost" event. Requested by Daniel Markstedt, ticket #34717 ------------------------------------------------------------------------ r15005 | cazfi | 2008-07-15 18:17:02 +0300 (Tue, 15 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h Removed player_count_no_barbarians() and used identical normal_player_count() instead. See #40377 ------------------------------------------------------------------------ r15003 | cazfi | 2008-07-15 02:40:27 +0300 (Tue, 15 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/configure.ac Added configure checks required by upcoming IPv6 support. See #40361 ------------------------------------------------------------------------ r15001 | jdorje | 2008-07-14 23:56:17 +0300 (Mon, 14 Jul 2008) | 5 lines Changed paths: M /branches/S2_1/configure.ac M /branches/S2_1/data/civserver.dsc.in M /branches/S2_1/m4/ggz.m4 M /branches/S2_1/server/ggzserver.c M /branches/S2_1/server/ggzserver.h M /branches/S2_1/server/savegame.c M /branches/S2_1/server/srv_main.c M /branches/S2_1/server/stdinhand.c M /branches/S2_1/server/stdinhand.h M /branches/S2_2/common/game.h M /branches/S2_2/configure.ac M /branches/S2_2/data/civserver.dsc.in M /branches/S2_2/m4/ggz.m4 M /branches/S2_2/server/ggzserver.c M /branches/S2_2/server/ggzserver.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/stdinhand.h Add ggz-style savegame support. This also bumps the required version to 0.99.4 for server support. Patch by me in PR#40317. ------------------------------------------------------------------------ r14998 | cproc | 2008-07-14 19:34:27 +0300 (Mon, 14 Jul 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/cityrep.c Fix city report size calculations. Reported by Eric Francis in PR#40328, patch by me. ------------------------------------------------------------------------ r14995 | cproc | 2008-07-14 18:35:06 +0300 (Mon, 14 Jul 2008) | 1 line Changed paths: M /branches/S2_2/client/connectdlg_common.c M /branches/S2_2/utility/shared.c Make the internal server store savegames in the user's home directory on Windows. See PR#40341. ------------------------------------------------------------------------ r14991 | mbook | 2008-07-12 21:40:13 +0300 (Sat, 12 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/mapview_common.h M /branches/S2_2/client/tilespec.c Use struct canvas for making editor tool value icons. See #40371, patch by me. ------------------------------------------------------------------------ r14989 | cazfi | 2008-07-10 12:45:09 +0300 (Thu, 10 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/common/city.h M /branches/S2_2/server/cityturn.c Introduced city_list_iterate_safe. Used it to fix potential problems when city starves. See #40367 ------------------------------------------------------------------------ r14987 | cazfi | 2008-07-09 11:02:14 +0300 (Wed, 09 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/ruleset.c Avoid crash when printing error message about removed tech requirement. See #40363 ------------------------------------------------------------------------ r14985 | jdorje | 2008-07-08 09:28:19 +0300 (Tue, 08 Jul 2008) | 4 lines Changed paths: M /branches/S2_1/server/auth.c M /branches/S2_2/server/auth.c Fix forward enumeration references in auth.c. Patch by me in PR#40366. ------------------------------------------------------------------------ r14982 | mbook | 2008-07-08 07:37:59 +0300 (Tue, 08 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c Avoid using gtk_button_set_image for compatibility with older gtk versions. Reported by Daniel Markstedt in #40343, patch by me. ------------------------------------------------------------------------ r14980 | cazfi | 2008-07-07 12:16:35 +0300 (Mon, 07 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/common/tech.c M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/techtools.c M /branches/S2_2/server/techtools.h Fixed crash when loading saved game when tech leakage is enabled. Reported by Chris Williams, ticket #40027 ------------------------------------------------------------------------ r14977 | cazfi | 2008-07-07 12:03:28 +0300 (Mon, 07 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/wldlg.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/improvement.c M /branches/S2_2/common/improvement.h M /branches/S2_2/server/ruleset.c Do not mark buildings redundant, when they allow building of unit. See #40359 ------------------------------------------------------------------------ r14975 | cazfi | 2008-07-06 17:37:16 +0300 (Sun, 06 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/packets.def M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in Fixed Fortress, or any other territory claiming base, crash See #40178 ------------------------------------------------------------------------ r14972 | cazfi | 2008-07-06 17:33:05 +0300 (Sun, 06 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/gotohand.c M /branches/S2_2/server/gotohand.h M /branches/S2_2/server/srv_main.c Free mappos arrays. See #40352 ------------------------------------------------------------------------ r14970 | cazfi | 2008-07-05 17:45:58 +0300 (Sat, 05 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/include/helpdlg_g.h M /branches/S2_2/common/packets.def M /branches/S2_2/data/civ1/game.ruleset M /branches/S2_2/data/civ2/game.ruleset M /branches/S2_2/data/default/game.ruleset M /branches/S2_2/data/helpdata.txt M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in Added support for ruleset description. See #40358 ------------------------------------------------------------------------ r14968 | cazfi | 2008-07-05 11:56:22 +0300 (Sat, 05 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/autogen.sh M /branches/S2_2/bootstrap/civ.in M /branches/S2_2/bootstrap/ser.in Backported civ & ser cleanup. See #40052. ------------------------------------------------------------------------ r14966 | mbook | 2008-07-05 03:45:59 +0300 (Sat, 05 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c Fix widget spacing on main page due to editor widgets. See #40344, patch by me. ------------------------------------------------------------------------ r14965 | jdorje | 2008-07-04 23:30:38 +0300 (Fri, 04 Jul 2008) | 1 line Changed paths: A /branches/S2_2/data/graphics/logo+splash (from /trunk/data/graphics/logo+splash:14964) Copy over logo+splash directory from trunk. ------------------------------------------------------------------------ r14964 | jdorje | 2008-07-04 23:24:42 +0300 (Fri, 04 Jul 2008) | 1 line Changed paths: M /branches/S2_2/data/nation/southafrican.ruleset Improve the grammar of a nation legend. ------------------------------------------------------------------------ r14963 | jdorje | 2008-07-04 09:35:48 +0300 (Fri, 04 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/server/stdinhand.c Add documentation for load_command. ------------------------------------------------------------------------ r14962 | cazfi | 2008-07-04 00:23:25 +0300 (Fri, 04 Jul 2008) | 5 lines Changed paths: M /branches/S2_2/data/default/script.lua M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/scripting/api_find.c M /branches/S2_2/server/scripting/api_find.h Added functionality to find role unit to lua scripting. This is used to properly spawn "Hut" and "HutTech" units from huts. See #40355 ------------------------------------------------------------------------ r14960 | cazfi | 2008-07-03 21:56:55 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/cityturn.c Recalculate borders when city size changes See #40350 ------------------------------------------------------------------------ r14958 | cazfi | 2008-07-03 21:17:28 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/menu.c Removed reference to now removed Regenerate Water -menuitem. See #40353 ------------------------------------------------------------------------ r14956 | cazfi | 2008-07-03 21:12:44 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/ai/advdiplomacy.c M /branches/S2_2/ai/aihand.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-xaw/menu.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/common/city.c M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.def M /branches/S2_2/data/civ1/governments.ruleset M /branches/S2_2/data/civ2/governments.ruleset M /branches/S2_2/data/default/governments.ruleset M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/srv_main.c Renamed government_when_anarchy as government_during_revolution. See #40348 ------------------------------------------------------------------------ r14953 | jdorje | 2008-07-03 18:08:31 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_1/server/gamehand.c M /branches/S2_2/server/gamehand.c Disable hack challenge when in GGZ mode. Patch by me in PR#40311. ------------------------------------------------------------------------ r14952 | jdorje | 2008-07-03 09:24:18 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_1/server/ggzserver.c M /branches/S2_2/server/ggzserver.c Fix GGZ handlers for error and spectator events. Patch by me in PR#40357. ------------------------------------------------------------------------ r14950 | cazfi | 2008-07-03 02:52:25 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/maphand.c Fixed problem with borders. Every other turn they were removing themselves. See #40214 ------------------------------------------------------------------------ r14948 | cazfi | 2008-07-03 02:25:29 +0300 (Thu, 03 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aitools.h Removed use of uninitialized memory from ferry pathfinding. See #40351 ------------------------------------------------------------------------ r14945 | cazfi | 2008-07-02 20:13:03 +0300 (Wed, 02 Jul 2008) | 6 lines Changed paths: M /branches/S2_2/common/requirements.c M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/maphand.c For terrain and special requirements in range "Adjacent" check also tile itself. This allows building Hydro Plant in city placed on one tile river. Reported by HanduMan, ticket #40347 ------------------------------------------------------------------------ r14943 | cazfi | 2008-07-02 05:36:45 +0300 (Wed, 02 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/common/terrain.h Set unknown terrain identifier to 'u' to restore savegame compatibility. ------------------------------------------------------------------------ r14941 | cazfi | 2008-07-02 01:33:37 +0300 (Wed, 02 Jul 2008) | 6 lines Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/common/packets.def M /branches/S2_2/common/terrain.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/edithand.c M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/generator/utilities.h M /branches/S2_2/version.in Removed code that created ocean types based on hardcoded identifiers. Default ruleset has three ocean types: Ocean, Deep Ocean and Lake. civ1 & civ2 rulesets have only one Ocean type. See #40165 ------------------------------------------------------------------------ r14938 | mbook | 2008-07-02 01:07:40 +0300 (Wed, 02 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.c Allow editing properties of a group of selected tiles at once. See #40336, patch by me. ------------------------------------------------------------------------ r14936 | mbook | 2008-07-02 00:39:02 +0300 (Wed, 02 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/editor.h Use hash table for editor tile selection implementation. See #40335, patch by me. ------------------------------------------------------------------------ r14935 | mbook | 2008-07-02 00:23:05 +0300 (Wed, 02 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/utility/hash.c Fixed comment typo in previous commit. :( ------------------------------------------------------------------------ r14932 | mbook | 2008-07-02 00:13:31 +0300 (Wed, 02 Jul 2008) | 11 lines Changed paths: M /branches/S2_2/utility/hash.c M /branches/S2_2/utility/hash.h Some minor but useful hash table improvements. - Added iteration programming interface. - Added hash_iterate macro. - Added hash_set_no_shrink to allow programmer control over hash table shrinking. - Added efficient special case for hash_delete_all_entries when there are no free functions for keys and values. See #40324, patch by me. ------------------------------------------------------------------------ r14931 | cazfi | 2008-07-01 21:06:41 +0300 (Tue, 01 Jul 2008) | 4 lines Changed paths: M /branches/S2_2/server/citytools.c Removed duplicate check against running out of available nations. See #40346 ------------------------------------------------------------------------ r14929 | cazfi | 2008-07-01 12:45:28 +0300 (Tue, 01 Jul 2008) | 2 lines Changed paths: M /branches/S2_2/configure.ac Removed AM_MAINTAINER_MODE, as decided in #40342 ------------------------------------------------------------------------ r14924 | mbook | 2008-06-30 21:44:55 +0300 (Mon, 30 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c Avoid using gtk_image_clear for compatibility with older gtk versions. See #40343, patch by me. ------------------------------------------------------------------------ r14923 | cazfi | 2008-06-30 21:28:59 +0300 (Mon, 30 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/cityturn.h M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/scripting/script_signal.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c Added script events "city_lost" and "city_destroyed" Requested by Daniel Markstedt, ticket #34717 ------------------------------------------------------------------------ r14918 | cazfi | 2008-06-30 12:54:22 +0300 (Mon, 30 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/Makefile.am M /branches/S2_2/dependencies/Makefile.am Distribute new m4-files. See #40345 ------------------------------------------------------------------------ r14916 | cazfi | 2008-06-30 09:40:24 +0300 (Mon, 30 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/common/packets.def M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in - Made maximum lake size configurable - Removed lakes from civ1 and civ2 ruleset See #40338 ------------------------------------------------------------------------ r14914 | cazfi | 2008-06-30 09:18:41 +0300 (Mon, 30 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/generator/mapgen.c Fixed initial lake creation See #40339 ------------------------------------------------------------------------ r14907 | cazfi | 2008-06-28 20:40:54 +0300 (Sat, 28 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/ai/Makefile.am M /branches/S2_2/ai/aiparatrooper.c M /branches/S2_2/common/terrain.h M /branches/S2_2/server/edithand.c M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/generator/utilities.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/savegame.c Moved map_regenerate_water() to map generating code with name regenerate_water() It is now used also in initial map generating. See #40294 ------------------------------------------------------------------------ r14905 | cazfi | 2008-06-28 18:09:41 +0300 (Sat, 28 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset Removed new terrain types added since 2.1, except different ocean types. See #40309 ------------------------------------------------------------------------ r14902 | jdorje | 2008-06-27 06:45:21 +0300 (Fri, 27 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/sernet.c Fix quitidle (-q) option. Patch by me in PR#40332. ------------------------------------------------------------------------ r14900 | mbook | 2008-06-27 01:37:23 +0300 (Fri, 27 Jun 2008) | 7 lines Changed paths: M /branches/S2_2/common/city.c Fix printing of obsolete wonders. See #39982. Patch by Jacob Nevins . Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14898 | mbook | 2008-06-27 00:27:17 +0300 (Fri, 27 Jun 2008) | 8 lines Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/editor.h Disregard size when applying editor tool to selection. - Renamed editor_apply_tool_batch_finished to editor_notify_edit_finished. - Removed unneeded function editor_apply_tool_single. See #40323, patch by me. ------------------------------------------------------------------------ r14896 | cazfi | 2008-06-26 23:49:14 +0300 (Thu, 26 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/bin/parsecmd.cxx Fixed compiler warning See #40331 ------------------------------------------------------------------------ r14894 | cazfi | 2008-06-26 23:09:42 +0300 (Thu, 26 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aicity.c Do not aimlessly move small wonders from city to city. Requested by banjo in #39543 ------------------------------------------------------------------------ r14891 | cazfi | 2008-06-26 22:29:14 +0300 (Thu, 26 Jun 2008) | 6 lines Changed paths: A /branches/S2_2/m4/codeset.m4 M /branches/S2_2/m4/locale.m4 locale.m4 cleanup - Added standard codeset.m4, which provides AM_LANGINFO_CODESET - Serial number syntax fixed See #40301 ------------------------------------------------------------------------ r14889 | cazfi | 2008-06-26 21:46:46 +0300 (Thu, 26 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/data/default/effects.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/data/default/units.ruleset Make separate unit class for triremes: - Limit triremes to certain ocean types and not to squares next to land - Triremes will not get movement bonus from Nuclear Power See #35708 ------------------------------------------------------------------------ r14887 | mbook | 2008-06-26 06:26:48 +0300 (Thu, 26 Jun 2008) | 7 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/editgui.c Allow default F1-F12 handlers in edit mode. - Also, use 'p' as the player start position tool keyboard shortcut. See #40322, patch by me. ------------------------------------------------------------------------ r14884 | cazfi | 2008-06-25 11:34:13 +0300 (Wed, 25 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-ftwl/gui_main.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-stub/gui_main.c M /branches/S2_2/client/gui-win32/gui_main.c M /branches/S2_2/client/gui-xaw/gui_main.c Fixed compilation of clients other than gtk2. Reported by Andreas Røsdal, ticket 40325 ------------------------------------------------------------------------ r14881 | jdorje | 2008-06-25 06:44:42 +0300 (Wed, 25 Jun 2008) | 5 lines Changed paths: M /branches/S2_1/client/gui-gtk-2.0/gui_main.c M /branches/S2_1/common/capstr.h M /branches/S2_1/configure.ac M /branches/S2_1/data/civclient.dsc.in M /branches/S2_1/data/civserver.dsc.in M /branches/S2_1/m4/version.m4 M /branches/S2_1/version.in M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/common/capstr.h M /branches/S2_2/configure.ac M /branches/S2_2/data/civclient.dsc.in M /branches/S2_2/data/civserver.dsc.in M /branches/S2_2/version.in Separate mandatory and optional capabilities in the capstring. This is needed so that GGZ can distinguish by the mandatory capabilities only. Patch by me in PR#40308. ------------------------------------------------------------------------ r14879 | mbook | 2008-06-24 23:21:56 +0300 (Tue, 24 Jun 2008) | 16 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/server/connecthand.c Fix global observer handling in client and server. - Moved setting of pconn->observer to the beginning of detach_connection_to_player; callers assumed that it can be used to toggle observer status without changing 'attached' status. - Removed out-of-date no-longer-applicable comment in handle_conn_info. - Removed log error flagging of detached connections in handle_conn_info. - Removed related #if 0 stuff from package_conn_info. - Updated comment headers for functions {detach,attach}_connection_to_player. See #40139, patch by me. ------------------------------------------------------------------------ r14877 | cazfi | 2008-06-24 22:33:02 +0300 (Tue, 24 Jun 2008) | 3 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c Revert attempt to fix #40303 from S2_2 and TRUNK, which are not even affected by the bug. ------------------------------------------------------------------------ r14875 | cazfi | 2008-06-24 22:26:36 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/common/events.c M /branches/S2_2/common/events.h M /branches/S2_2/data/stdsounds.soundspec M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/unittools.c Added event type for miscellaneous unit deaths. See #39938 ------------------------------------------------------------------------ r14873 | cazfi | 2008-06-24 22:14:38 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/data/default/script.lua M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/scripting/api_actions.c M /branches/S2_2/server/scripting/script.c Fixed hut handling errors. See #40289 ------------------------------------------------------------------------ r14871 | cazfi | 2008-06-24 21:29:56 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/meta.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/utility/netintf.c Handle literal IPv6 URLs correctly. See #40302 ------------------------------------------------------------------------ r14869 | cazfi | 2008-06-24 19:25:34 +0300 (Tue, 24 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/lua-5.1/src/Makefile.am Distribute localluaconf.h ------------------------------------------------------------------------ r14867 | cazfi | 2008-06-24 19:01:27 +0300 (Tue, 24 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/po/POTFILES.in Update POTFILES list about editor source files. ------------------------------------------------------------------------ r14866 | cazfi | 2008-06-24 18:42:27 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/lib/Makefile.am Fixed 'make dist' & 'make distcheck' Reported by Egor Vyscrebentsov in #40320 ------------------------------------------------------------------------ r14865 | cazfi | 2008-06-24 11:46:51 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset Removed comments about UnsafeOcean See #40298 ------------------------------------------------------------------------ r14858 | mbook | 2008-06-24 04:32:02 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c Fix visual corruption in flag images. See #40246, patch by me. ------------------------------------------------------------------------ r14857 | mbook | 2008-06-24 04:31:32 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/cityrep.c Show total buy cost for selected cities in the city report. See #40291, patch by me. ------------------------------------------------------------------------ r14854 | jdorje | 2008-06-24 02:49:58 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_0/server/stdinhand.c M /branches/S2_1/server/stdinhand.c M /branches/S2_2/server/stdinhand.c Don't reset the wrong player name when a player is /cut in pregame. See PR#39503. ------------------------------------------------------------------------ r14851 | jdorje | 2008-06-24 01:47:25 +0300 (Tue, 24 Jun 2008) | 4 lines Changed paths: M /branches/S2_1/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/pages.c Go straight to the network page when autoconnecting to a server that needs a password. Patch from PR#38354. ------------------------------------------------------------------------ r14846 | mbook | 2008-06-23 04:35:48 +0300 (Mon, 23 Jun 2008) | 12 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/editor.c M /branches/S2_2/client/editor.h M /branches/S2_2/client/gui-gtk-2.0/Makefile.am M /branches/S2_2/client/gui-gtk-2.0/dialogs.c D /branches/S2_2/client/gui-gtk-2.0/editdlg.c D /branches/S2_2/client/gui-gtk-2.0/editdlg.h A /branches/S2_2/client/gui-gtk-2.0/editgui.c A /branches/S2_2/client/gui-gtk-2.0/editgui.h A /branches/S2_2/client/gui-gtk-2.0/editprop.c A /branches/S2_2/client/gui-gtk-2.0/editprop.h (from /branches/S2_2/client/gui-gtk-2.0/editdlg.h:14844) M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.h M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-gtk-2.0/mapview.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/include/Makefile.am A /branches/S2_2/client/include/editgui_g.h (from /branches/S2_2/client/gui-gtk-2.0/editdlg.h:14844) M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/map.c M /branches/S2_2/common/movement.c M /branches/S2_2/common/movement.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/player.h M /branches/S2_2/common/tile.h M /branches/S2_2/data/amplio.tilespec M /branches/S2_2/data/hex2t.tilespec M /branches/S2_2/data/isophex.tilespec M /branches/S2_2/data/isotrident.tilespec M /branches/S2_2/data/misc/Makefile.am A /branches/S2_2/data/misc/editor.spec M /branches/S2_2/data/trident.tilespec M /branches/S2_2/server/edithand.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/srv_main.c Work in progress on new editor toolbar and associated GUI. - Tentative implementation of the integrated editor interface as described at http://freeciv.wikia.com/wiki/Editor. - Some files added/moved: renamed editdlg.[ch] -> editgui.[ch] added editgui_g.h added editprop.[ch] added editor.spec Extensive discussion in #40184. Patch by me. ------------------------------------------------------------------------ r14844 | jdorje | 2008-06-23 03:34:23 +0300 (Mon, 23 Jun 2008) | 1 line Changed paths: M /branches/S2_2/dependencies M /branches/S2_2/dependencies/lua-5.1 M /branches/S2_2/dependencies/lua-5.1/src M /branches/S2_2/dependencies/toluaxx M /branches/S2_2/dependencies/toluaxx/src M /branches/S2_2/dependencies/toluaxx/src/bin M /branches/S2_2/dependencies/toluaxx/src/lib Set svn:ignore. ------------------------------------------------------------------------ r14843 | jdorje | 2008-06-23 03:19:27 +0300 (Mon, 23 Jun 2008) | 4 lines Changed paths: M /branches/S2_0/client/packhand.c M /branches/S2_1/client/packhand.c M /branches/S2_2/client/packhand.c Fix incorrect setting of map.num_continents when continents are renumbered. Reported by Stephen Jolley in PR#39472. Patch by me. ------------------------------------------------------------------------ r14838 | cproc | 2008-06-22 14:50:48 +0300 (Sun, 22 Jun 2008) | 1 line Changed paths: M /branches/S2_2/client/servers.c add missing check for EWOULDBLOCK. Reported by Madeline Book in PR#40297, patch by me. ------------------------------------------------------------------------ r14835 | cazfi | 2008-06-22 12:10:29 +0300 (Sun, 22 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/gui-gtk-2.0/gui_main.c - Fixed sensitivity of Start and Pick Nation buttons - Pick Nation button text now turn in to Take Player when appropriate See #40234 ------------------------------------------------------------------------ r14833 | cazfi | 2008-06-22 10:07:11 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c Fixed global oserver crash on connectdlg. See #40303 ------------------------------------------------------------------------ r14828 | cazfi | 2008-06-22 07:05:02 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/utility/netintf.c Handle empty http_proxy environment variable correctly. Reported by Christian Knoke as part of #16526. ------------------------------------------------------------------------ r14825 | jdorje | 2008-06-22 06:18:41 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/chatline_common.c Fix buffer overflow in send_chat_printf. Patch by me in PR#40299. ------------------------------------------------------------------------ r14822 | mbook | 2008-06-22 06:01:38 +0300 (Sun, 22 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/server/connecthand.c Cancel AI mode when attaching to aifill player in pregame. See #40254. Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14820 | cazfi | 2008-06-22 05:18:37 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/common/generate_packets.py M /branches/S2_2/server/maphand.c Made it possible to force send of is-info packets. See #40295 ------------------------------------------------------------------------ r14818 | cazfi | 2008-06-22 04:47:40 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/server/commands.c Added some translator comments. Requested by Daniel Markstedt, ticket #40248 ------------------------------------------------------------------------ r14816 | cazfi | 2008-06-22 00:36:51 +0300 (Sun, 22 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/Makefile.am M /branches/S2_2/autogen.sh M /branches/S2_2/configure.ac A /branches/S2_2/dependencies/lua-5.1/src/localluaconf.h M /branches/S2_2/dependencies/lua-5.1/src/luaconf.h A /branches/S2_2/dependencies/m4 A /branches/S2_2/dependencies/m4/mkstemp.m4 A /branches/S2_2/dependencies/m4/stdlib_h.m4 Check functions optionally used by lua at configure time. Requested by Madeline Book, ticket #40286 ------------------------------------------------------------------------ r14813 | cazfi | 2008-06-21 15:04:03 +0300 (Sat, 21 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/scripting/api_utilities.c M /branches/S2_2/server/scripting/api_utilities.h Added logging functions for lua scripts. See #40290 ------------------------------------------------------------------------ r14810 | cazfi | 2008-06-21 14:18:29 +0300 (Sat, 21 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/scripts/setup_auth_server.sh M /branches/S2_2/server/auth.c Use Mysql port information from authentication config file. See #40293 ------------------------------------------------------------------------ r14808 | cazfi | 2008-06-21 14:12:17 +0300 (Sat, 21 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/pages.c Aitoggle player under human control when taking in connect dialog. See #40292 ------------------------------------------------------------------------ r14805 | cazfi | 2008-06-19 23:18:10 +0300 (Thu, 19 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/servers.c M /branches/S2_2/server/sernet.c Fixed winsock related compiler warnings. See #40281 ------------------------------------------------------------------------ r14802 | cazfi | 2008-06-19 23:12:49 +0300 (Thu, 19 Jun 2008) | 3 lines Changed paths: M /branches/S2_2/Makefile.am A /branches/S2_2/m4/lib-ld.m4 A /branches/S2_2/m4/lib-link.m4 A /branches/S2_2/m4/lib-prefix.m4 Added lib-link.m4, lib-prefix.m4 and lib-ld.m4. Already present macros depend on these. ------------------------------------------------------------------------ r14799 | cazfi | 2008-06-18 23:33:03 +0300 (Wed, 18 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/utility/log.c M /branches/S2_2/utility/log.h log_set_callback() returns old callback See #40285 ------------------------------------------------------------------------ r14796 | cazfi | 2008-06-18 20:23:11 +0300 (Wed, 18 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/common/game.h M /branches/S2_2/server/stdinhand.c Made all-AI games possible again. See #40288 ------------------------------------------------------------------------ r14794 | cazfi | 2008-06-18 19:37:12 +0300 (Wed, 18 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/ruleset.c It is possible to make military bases unbuildable. This fixes problem of civ1 ruleset having Airbase enabled. See #40279 ------------------------------------------------------------------------ r14791 | cazfi | 2008-06-18 18:16:07 +0300 (Wed, 18 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/settings.c M /branches/S2_2/server/stdinhand.c Only human players count toward minplayers. See #40206 ------------------------------------------------------------------------ r14789 | cazfi | 2008-06-18 18:12:47 +0300 (Wed, 18 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/lua-5.1/COPYRIGHT M /branches/S2_2/dependencies/lua-5.1/Version M /branches/S2_2/dependencies/lua-5.1/src/lapi.c M /branches/S2_2/dependencies/lua-5.1/src/lapi.h M /branches/S2_2/dependencies/lua-5.1/src/lauxlib.c M /branches/S2_2/dependencies/lua-5.1/src/lauxlib.h M /branches/S2_2/dependencies/lua-5.1/src/lbaselib.c M /branches/S2_2/dependencies/lua-5.1/src/lcode.c M /branches/S2_2/dependencies/lua-5.1/src/lcode.h M /branches/S2_2/dependencies/lua-5.1/src/ldblib.c M /branches/S2_2/dependencies/lua-5.1/src/ldebug.c M /branches/S2_2/dependencies/lua-5.1/src/ldebug.h M /branches/S2_2/dependencies/lua-5.1/src/ldo.c M /branches/S2_2/dependencies/lua-5.1/src/ldo.h M /branches/S2_2/dependencies/lua-5.1/src/ldump.c M /branches/S2_2/dependencies/lua-5.1/src/lfunc.c M /branches/S2_2/dependencies/lua-5.1/src/lfunc.h M /branches/S2_2/dependencies/lua-5.1/src/lgc.c M /branches/S2_2/dependencies/lua-5.1/src/lgc.h M /branches/S2_2/dependencies/lua-5.1/src/linit.c M /branches/S2_2/dependencies/lua-5.1/src/liolib.c M /branches/S2_2/dependencies/lua-5.1/src/llex.c M /branches/S2_2/dependencies/lua-5.1/src/llex.h M /branches/S2_2/dependencies/lua-5.1/src/lmathlib.c M /branches/S2_2/dependencies/lua-5.1/src/lmem.c M /branches/S2_2/dependencies/lua-5.1/src/lmem.h M /branches/S2_2/dependencies/lua-5.1/src/loadlib.c M /branches/S2_2/dependencies/lua-5.1/src/lobject.c M /branches/S2_2/dependencies/lua-5.1/src/lobject.h M /branches/S2_2/dependencies/lua-5.1/src/lopcodes.c M /branches/S2_2/dependencies/lua-5.1/src/lopcodes.h M /branches/S2_2/dependencies/lua-5.1/src/loslib.c M /branches/S2_2/dependencies/lua-5.1/src/lparser.c M /branches/S2_2/dependencies/lua-5.1/src/lparser.h M /branches/S2_2/dependencies/lua-5.1/src/lstate.c M /branches/S2_2/dependencies/lua-5.1/src/lstate.h M /branches/S2_2/dependencies/lua-5.1/src/lstring.c M /branches/S2_2/dependencies/lua-5.1/src/lstring.h M /branches/S2_2/dependencies/lua-5.1/src/lstrlib.c M /branches/S2_2/dependencies/lua-5.1/src/ltable.c M /branches/S2_2/dependencies/lua-5.1/src/ltable.h M /branches/S2_2/dependencies/lua-5.1/src/ltablib.c M /branches/S2_2/dependencies/lua-5.1/src/ltm.c M /branches/S2_2/dependencies/lua-5.1/src/ltm.h M /branches/S2_2/dependencies/lua-5.1/src/lua.c M /branches/S2_2/dependencies/lua-5.1/src/lua.h M /branches/S2_2/dependencies/lua-5.1/src/luaconf.h M /branches/S2_2/dependencies/lua-5.1/src/lualib.h M /branches/S2_2/dependencies/lua-5.1/src/lundump.c M /branches/S2_2/dependencies/lua-5.1/src/lundump.h M /branches/S2_2/dependencies/lua-5.1/src/lvm.c M /branches/S2_2/dependencies/lua-5.1/src/lvm.h M /branches/S2_2/dependencies/lua-5.1/src/lzio.c M /branches/S2_2/dependencies/lua-5.1/src/lzio.h Updated lua to version 5.1.3 and applied lua.org patches as of 16-Jun-08. ------------------------------------------------------------------------ r14787 | cazfi | 2008-06-17 22:19:46 +0300 (Tue, 17 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/ai/advmilitary.c Cleanup assess_danger(). Allow danger to use one more bit, meaning that danger can be twice as big as before without getting dangerous danger. See #40278 ------------------------------------------------------------------------ r14784 | mbook | 2008-06-17 21:58:53 +0300 (Tue, 17 Jun 2008) | 26 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/base.c M /branches/S2_2/common/base.h M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c Skip base specials in tile_special_type_iterate. - Military base specials S_FORTRESS and S_AIRBASE are skipped in tile_special_type_iterate. New code should never assumed that they exist there. - All code that used tile_special_type_iterate and assumed base specials were included has been updated to do away with this assumption. - Added helper function base_get_tile_special_type as a temporary convenience while bases are being transitioned out of specials. - Added a base type argument to tile_remove_base for the possible future need of having to distinguish between multiple base types on a single tile. - Added helper function tile_has_base to test whether the given tile has a base of the given type. - Added helper function player_tile_has_base to do the same for plrtiles. See #40283 for related discussion. Patch by me. This is a further step in the general plan of generalizing and moving military bases out of specials as per #33767. Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14782 | cazfi | 2008-06-17 16:25:19 +0300 (Tue, 17 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/server/savegame.c Fixed loading of scenario games. See #40167 ------------------------------------------------------------------------ r14779 | cazfi | 2008-06-17 16:07:21 +0300 (Tue, 17 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/Makefile.am A /branches/S2_2/bootstrap/config.rpath M /branches/S2_2/m4/iconv.m4 Updated iconv.m4 See #40275 ------------------------------------------------------------------------ r14777 | cazfi | 2008-06-17 16:02:30 +0300 (Tue, 17 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/ai/advdiplomacy.c M /branches/S2_2/ai/aidata.c M /branches/S2_2/ai/aitech.c M /branches/S2_2/client/colors_common.c M /branches/S2_2/client/colors_common.h M /branches/S2_2/client/gui-gtk-2.0/diplodlg.c M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-sdl/diplodlg.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/gui_tilespec.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/diplodlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-xaw/diplodlg.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/reqtree.c M /branches/S2_2/common/tech.c M /branches/S2_2/common/tech.h M /branches/S2_2/data/misc/colors.tilespec M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/edithand.c M /branches/S2_2/server/techtools.c Renamed functions and constants: - 'reachable' tech is tech player can gain some time - 'prereqs_known' tech is tech player can start researching immediately See #40280 ------------------------------------------------------------------------ r14775 | cazfi | 2008-06-17 15:32:14 +0300 (Tue, 17 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/chatline_common.c M /branches/S2_2/client/chatline_common.h M /branches/S2_2/client/connectdlg_common.c M /branches/S2_2/client/gui-gtk-2.0/connectdlg.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-sdl/chatline.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-xaw/repodlgs.c Added function send_chat_printf(). Used where appropriate. See #40284 ------------------------------------------------------------------------ r14765 | cazfi | 2008-06-16 07:58:47 +0300 (Mon, 16 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/configure.ac M /branches/S2_2/dependencies/Makefile.am M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/scripting/script.c Use lua-5.1 and toluaxx. See #40276 ------------------------------------------------------------------------ r14763 | cazfi | 2008-06-16 04:25:42 +0300 (Mon, 16 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/server/meta.c M /branches/S2_2/server/meta.h M /branches/S2_2/server/srv_main.c Do not start if explicitly requested metaserver connection cannot be established. See #40277 ------------------------------------------------------------------------ r14761 | cazfi | 2008-06-15 21:03:10 +0300 (Sun, 15 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/client/gui-win32/menu.c Updated gui-win32 actions menu functionality to gui-gtk2 level. This fixes random crashes when units move and menu sensitivity should be adjusted. See #40241 ------------------------------------------------------------------------ r14759 | cazfi | 2008-06-15 15:59:32 +0300 (Sun, 15 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/ai/advdiplomacy.c Fixed bug that AI tried to get unreachable techs from treaty. Patch by Per and myself. See #38372 ------------------------------------------------------------------------ r14757 | cazfi | 2008-06-15 04:04:12 +0300 (Sun, 15 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/goto.c Fixed compiler warning in goto code. See #40265 ------------------------------------------------------------------------ r14755 | cazfi | 2008-06-15 04:00:45 +0300 (Sun, 15 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/data/default/techs.ruleset Typofix. ------------------------------------------------------------------------ r14753 | cazfi | 2008-06-14 22:11:07 +0300 (Sat, 14 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/common/improvement.c Corrected comment See #40273 ------------------------------------------------------------------------ r14751 | cazfi | 2008-06-14 18:24:19 +0300 (Sat, 14 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/bin/lua/tlx_variable.lua M /branches/S2_2/dependencies/toluaxx/src/bin/toluaxx.bind.cxx Fixed "unused variable"-warnings in toluaxx generated code. ------------------------------------------------------------------------ r14748 | mbook | 2008-06-14 05:08:44 +0300 (Sat, 14 Jun 2008) | 4 lines Changed paths: A /branches/S2_2/data/misc/editor.png (PR#40267) Editor icon images. Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14746 | mbook | 2008-06-14 01:10:02 +0300 (Sat, 14 Jun 2008) | 10 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h (PR#40269) Client player helper functions. - Some trivial accessors for client.conn.playing and global observer checking. New code should use these functions instead of accessing client.conn.playing and client.conn.observer directly. Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14744 | mbook | 2008-06-14 00:54:49 +0300 (Sat, 14 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/po/es.po (PR#40264) Fix minor typo in Spanish translation. Reported-by: Condex (http://forum.freeciv.org/viewtopic.php?p=20400) Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14742 | cazfi | 2008-06-13 22:07:42 +0300 (Fri, 13 Jun 2008) | 9 lines Changed paths: M /branches/S2_2/client/climisc.c Rewritten handle_event() - Popup for server operator message is shown to all clients, even those attached to AI mode player - Always show messages that are configured to be shown somewhere. If it cannot be shown where configured, show in chatline See #40190 ------------------------------------------------------------------------ r14740 | cazfi | 2008-06-13 21:49:45 +0300 (Fri, 13 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.ruleset M /branches/S2_2/server/maphand.c Unhardcoded map generation lake placement. Instead of hardcoded TERRAIN_LAKE_IDENTIFIER, terrain flag is used to determine what terrain to place as freshwater lake. See #40270 ------------------------------------------------------------------------ r14737 | cazfi | 2008-06-12 21:17:40 +0300 (Thu, 12 Jun 2008) | 3 lines Changed paths: M /branches/S2_2/data/civ1/effects.ruleset Civ1 ruleset: Added No_Diplomacy effect to barbarians and base Empire_Size_Step effect to make ruleset playable. ------------------------------------------------------------------------ r14735 | cazfi | 2008-06-12 16:36:15 +0300 (Thu, 12 Jun 2008) | 2 lines Changed paths: M /branches/S2_2/Makefile.am D /branches/S2_2/m4/esd.m4 Removed unused esd.m4. ------------------------------------------------------------------------ r14733 | cazfi | 2008-06-12 14:07:23 +0300 (Thu, 12 Jun 2008) | 3 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/bin/lua/tlx_package.lua M /branches/S2_2/dependencies/toluaxx/src/bin/toluaxx.bind.cxx Generated luaopen_xxx() is commented out. It was not used at all and caused compiler warning. ------------------------------------------------------------------------ r14730 | jdorje | 2008-06-12 07:54:54 +0300 (Thu, 12 Jun 2008) | 2 lines Changed paths: M /branches/S2_0/Makefile.am M /branches/S2_1/Makefile.am M /branches/S2_2/Makefile.am Add missing m4 files to EXTRA_DIST. ------------------------------------------------------------------------ r14727 | cazfi | 2008-06-11 18:21:42 +0300 (Wed, 11 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ2/effects.ruleset Fixed fundamentalism bugs. Patch by Madeline Book, see #40257 ------------------------------------------------------------------------ r14723 | cazfi | 2008-06-10 22:59:29 +0300 (Tue, 10 Jun 2008) | 6 lines Changed paths: M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/unittools.c Passengers never conquer cities. This fixes assert failure during civil war. See #40261 ------------------------------------------------------------------------ r14720 | cazfi | 2008-06-09 19:05:42 +0300 (Mon, 09 Jun 2008) | 5 lines Changed paths: M /branches/S2_2/server/savegame.c Fixed the way savegame loading modifies games where city center is worked by some other city. See #40253 ------------------------------------------------------------------------ r14718 | cazfi | 2008-06-09 18:53:35 +0300 (Mon, 09 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/bootstrap/civ.in M /branches/S2_2/bootstrap/ser.in M /branches/S2_2/configure.ac Correct path separator on Windows builds. See #40247 ------------------------------------------------------------------------ r14714 | jdorje | 2008-06-08 07:10:49 +0300 (Sun, 08 Jun 2008) | 4 lines Changed paths: M /branches/S2_2/client/cityrepdata.c Fix a harmless warning triggered in gcc 4.3. See PR#40258. ------------------------------------------------------------------------ r14709 | mbook | 2008-06-06 07:44:13 +0300 (Fri, 06 Jun 2008) | 9 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/pages.c Fix network refresh button for gtk2 client. - Function update_network_lists now cancels a running server scan if one is active when it is called. Reported-by: James Hemming (PR#40256) Signed-off-by: Madeline Book ------------------------------------------------------------------------ r14704 | jnmbk | 2008-06-01 16:10:09 +0300 (Sun, 01 Jun 2008) | 1 line Changed paths: M /branches/S2_2/po/tr.po 3758 translated, 399 fuzzy, 525 untranslated ------------------------------------------------------------------------ r14703 | chomwitt | 2008-05-27 01:09:54 +0300 (Tue, 27 May 2008) | 2 lines Changed paths: M /branches/S2_2/po/el.po greek translation update ------------------------------------------------------------------------ r14696 | cazfi | 2008-05-18 22:38:46 +0300 (Sun, 18 May 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/bin/toluaxx.bind.cxx Regenerated lua bindings of toluaxx itself. ------------------------------------------------------------------------ r14690 | cazfi | 2008-05-17 01:24:20 +0300 (Sat, 17 May 2008) | 5 lines Changed paths: M /branches/S2_2/ai/aidata.c Set ai.num_continents and ai.num_oceans zero in ai_data_phase_done() to make them consistent with memory allocations. This fixes crash reported by Marek Jancuska in #40243 ------------------------------------------------------------------------ r14686 | cazfi | 2008-05-17 00:52:19 +0300 (Sat, 17 May 2008) | 6 lines Changed paths: M /branches/S2_2/server/unittools.c Send remove_unit packet to client when unit owner changes before removing unit vision. This fixes client side assert if unit was not seen by no other unit. Similar crashes reported by many in #15712 ------------------------------------------------------------------------ r14683 | cazfi | 2008-05-16 02:25:35 +0300 (Fri, 16 May 2008) | 4 lines Changed paths: M /branches/S2_2/m4/win32-client.m4 M /branches/S2_2/m4/xaw-client.m4 Fixed libpng checks to work correctly with modern libpng installations. See #40242 ------------------------------------------------------------------------ r14680 | cazfi | 2008-05-13 13:00:48 +0300 (Tue, 13 May 2008) | 5 lines Changed paths: M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/unittools.c Do not rely on old unit or city pointers to be valid after call to script_signal_emit() See #39668 ------------------------------------------------------------------------ r14677 | cazfi | 2008-05-13 12:47:26 +0300 (Tue, 13 May 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/packets.def M /branches/S2_2/server/plrhand.c M /branches/S2_2/version.in Show leader name of created players in connect dialog See #40239 ------------------------------------------------------------------------ r14674 | cproc | 2008-05-13 03:23:37 +0300 (Tue, 13 May 2008) | 2 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/options.c M /branches/S2_2/client/options.h M /branches/S2_2/client/packhand.c Fix citybar view options. Reported by Susanna Björverud in PR#40128, patch by Madeline Book. ------------------------------------------------------------------------ r14672 | cazfi | 2008-05-10 15:24:30 +0300 (Sat, 10 May 2008) | 4 lines Changed paths: M /branches/S2_2/INSTALL Minor corrections to INSTALL See #40240 ------------------------------------------------------------------------ r14669 | cazfi | 2008-05-10 01:30:35 +0300 (Sat, 10 May 2008) | 4 lines Changed paths: M /branches/S2_2/server/stdinhand.c Fixed /take of currently observed player. See #40235 ------------------------------------------------------------------------ r14666 | cazfi | 2008-05-10 01:24:29 +0300 (Sat, 10 May 2008) | 5 lines Changed paths: M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c Make sure all previous player <-> team associations are cleared before loading saved game. See #40224 ------------------------------------------------------------------------ r14663 | cazfi | 2008-05-10 01:11:19 +0300 (Sat, 10 May 2008) | 5 lines Changed paths: M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/plrhand.h Make sure we don't run out of playable nations when new civil war player is created. See #40233 ------------------------------------------------------------------------ r14658 | cazfi | 2008-05-07 04:31:49 +0300 (Wed, 07 May 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/governments.ruleset M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/governments.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/nation/barbarian.ruleset M /branches/S2_2/data/nation/pirate.ruleset Removed obsoleted entries from rulesets. See #40230 ------------------------------------------------------------------------ r14656 | cazfi | 2008-05-07 04:26:03 +0300 (Wed, 07 May 2008) | 4 lines Changed paths: M /branches/S2_2/client/Makefile.am M /branches/S2_2/server/Makefile.am M /branches/S2_2/server/scripting/Makefile.am Added api_gen.[ch] to BUILT_SOURCES. See #40231 ------------------------------------------------------------------------ r14654 | cazfi | 2008-05-06 03:57:41 +0300 (Tue, 06 May 2008) | 2 lines Changed paths: M /branches/S2_2/m4/c99.m4 Added missing includes to C99 test. See #40163 ------------------------------------------------------------------------ r14652 | cazfi | 2008-05-06 03:05:01 +0300 (Tue, 06 May 2008) | 6 lines Changed paths: M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c Limit number of players so that there's playable nations for everyone. This fixes several crashes when ruleset provides less than MAX_PLAYERS nations. See #40195 ------------------------------------------------------------------------ r14649 | cazfi | 2008-05-05 03:33:13 +0300 (Mon, 05 May 2008) | 5 lines Changed paths: M /branches/S2_2/m4/ggz.m4 Do not add any host specific include or library paths when configured with --without-ggz-dir. This fixes Freeciv cross-compilation. See #40134 ------------------------------------------------------------------------ r14647 | cazfi | 2008-05-04 16:25:14 +0300 (Sun, 04 May 2008) | 5 lines Changed paths: M /branches/S2_2/configure.ac M /branches/S2_2/server/sernet.c Fixed handling of newlines in input when readline is not used, but getline() is available. See #40225 ------------------------------------------------------------------------ r14645 | cazfi | 2008-05-03 19:53:59 +0300 (Sat, 03 May 2008) | 5 lines Changed paths: M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/unittools.c Do not create barbarian units to tiles where they cannot live. As unleash_barbarians() got rewritten several other bugs disappeared as well. See #40218 ------------------------------------------------------------------------ r14642 | cazfi | 2008-05-03 11:02:02 +0300 (Sat, 03 May 2008) | 4 lines Changed paths: M /branches/S2_2/server/barbarian.c Fixed bug preventing barbarian creation from hut. See #40222 ------------------------------------------------------------------------ r14640 | elmo | 2008-05-02 22:47:08 +0300 (Fri, 02 May 2008) | 1 line Changed paths: M /branches/S2_2/po/et.po 3800 ------------------------------------------------------------------------ r14639 | cazfi | 2008-05-02 20:18:50 +0300 (Fri, 02 May 2008) | 4 lines Changed paths: M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/sanitycheck.h Fixed city size vs citizen count inconsistency See #40215 ------------------------------------------------------------------------ r14637 | elmo | 2008-05-02 17:04:55 +0300 (Fri, 02 May 2008) | 1 line Changed paths: M /branches/S2_2/po/et.po Some updates ------------------------------------------------------------------------ r14635 | elmo | 2008-04-30 10:35:14 +0300 (Wed, 30 Apr 2008) | 1 line Changed paths: A /branches/S2_2/po/statistics.rb statistics.rb has been updated: it can output a nice HTML page now. ------------------------------------------------------------------------ r14633 | elmo | 2008-04-30 00:06:58 +0300 (Wed, 30 Apr 2008) | 1 line Changed paths: M /branches/S2_2/po/et.po What a setback. S2_2 is sure very different from S2_1, translation-wise. ------------------------------------------------------------------------ r14630 | jdorje | 2008-04-29 22:35:49 +0300 (Tue, 29 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/po/POTFILES.in Add missing file to POTFILES.in. Reported by Prekates Alexnadros; patch by Elmo Todurov. ------------------------------------------------------------------------ r14629 | cazfi | 2008-04-29 09:13:39 +0300 (Tue, 29 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/terrain.ruleset Make all land terrains passable to land and air units in civ1 ruleset. See #40219 ------------------------------------------------------------------------ r14626 | cazfi | 2008-04-28 01:32:35 +0300 (Mon, 28 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c Fixed client crash when tile is worked by unknown city. See #40212 ------------------------------------------------------------------------ r14624 | englabenny | 2008-04-24 22:43:11 +0300 (Thu, 24 Apr 2008) | 7 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/wldlg.c (PR#39821) Global Lists Bug... Can't Add to top of list? The global worklist editor would not allow the < buttons (prepend and append) to become sensitive, since ptr->pcity is NULL for global worklits. This fixes that case. ------------------------------------------------------------------------ r14617 | cazfi | 2008-04-23 00:54:08 +0300 (Wed, 23 Apr 2008) | 5 lines Changed paths: M /branches/S2_2/ai/aitools.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c Fixed crashes when former AI settler on city founding mission gets new orders. See #40208 ------------------------------------------------------------------------ r14614 | cazfi | 2008-04-23 00:46:29 +0300 (Wed, 23 Apr 2008) | 2 lines Changed paths: M /branches/S2_2/m4/ggz.m4 Updated ggz.m4 from ggz project. ------------------------------------------------------------------------ r14609 | jdorje | 2008-04-22 06:36:56 +0300 (Tue, 22 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/sernet.c Fix a memory leak in the readline code. Report and fix by "Elmo Todurov" in PR#40209. ------------------------------------------------------------------------ r14599 | cazfi | 2008-04-17 23:15:33 +0300 (Thu, 17 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/doc/man/civclient.6 M /branches/S2_2/doc/man/civserver.6 Updated manpages See #40181 ------------------------------------------------------------------------ r14597 | cazfi | 2008-04-17 10:47:04 +0300 (Thu, 17 Apr 2008) | 5 lines Changed paths: M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/stdinhand.h Do not skip minplayers check (& others) present in start_command(), when game is started by player ready packet. See #40194 ------------------------------------------------------------------------ r14595 | cazfi | 2008-04-17 01:27:14 +0300 (Thu, 17 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/bootstrap/civ.in M /branches/S2_2/bootstrap/ser.in M /branches/S2_2/configure.ac Execute programs by their correct name in Windows; add suffix ".exe" See #40205 ------------------------------------------------------------------------ r14591 | cazfi | 2008-04-16 21:37:15 +0300 (Wed, 16 Apr 2008) | 11 lines Changed paths: M /branches/S2_2/common/connection.c M /branches/S2_2/common/player.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/utility/shared.c M /branches/S2_2/utility/shared.h M /branches/S2_2/utility/support.c M /branches/S2_2/utility/support.h Fixed several bugs in handling of quoted command parameters by small redesign - Only strings both starting and ending with '"' are considered quoted and these starting and ending quotes are only ones ignored during matching - Correct string length comparison for quoted strings implemented and used - Connection name parameters can be quoted See #40196 ------------------------------------------------------------------------ r14589 | cazfi | 2008-04-16 00:40:53 +0300 (Wed, 16 Apr 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/toluaxx/src/bin/main.cxx M /branches/S2_2/dependencies/toluaxx/src/bin/parsecmd.cxx M /branches/S2_2/dependencies/toluaxx/src/bin/parsecmd.hxx M /branches/S2_2/dependencies/toluaxx/src/lib/tolua_event.c M /branches/S2_2/dependencies/toluaxx/src/lib/tolua_map.c Fixed toluaxx compiler warnings. Some of those indicated real problems. ------------------------------------------------------------------------ r14587 | cazfi | 2008-04-16 00:36:28 +0300 (Wed, 16 Apr 2008) | 2 lines Changed paths: M /branches/S2_2/configure.ac Typofix. ------------------------------------------------------------------------ r14583 | cazfi | 2008-04-15 12:07:47 +0300 (Tue, 15 Apr 2008) | 6 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/pages.c Corrected commands sent to server - /cmdlevel and /cut take connection name parameter, not player name - "Give ctrl access" sends /cmdlevel instead of /cut Patch by Pepeto in #39614 ------------------------------------------------------------------------ r14579 | jcreus | 2008-04-12 13:45:07 +0300 (Sat, 12 Apr 2008) | 1 line Changed paths: M /branches/S2_2/po/ca.po Update to ca.po ------------------------------------------------------------------------ r14576 | cazfi | 2008-04-09 16:07:32 +0300 (Wed, 09 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/utility/fcintl.h Do not include libintl.h when nls disabled See #40199 ------------------------------------------------------------------------ r14573 | cazfi | 2008-04-08 16:18:09 +0300 (Tue, 08 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/terrain.c Fixed memory leak in terrain ruleset resource handling See #40197 ------------------------------------------------------------------------ r14571 | cazfi | 2008-04-08 15:44:48 +0300 (Tue, 08 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/ruleset.c Sanity check ruleset requirement vectors when loading rulesets. See #40193 ------------------------------------------------------------------------ r14569 | cazfi | 2008-04-08 15:31:29 +0300 (Tue, 08 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/data/civ1/terrain.ruleset Fixed fatal syntax errors in civ1 ruleset See #40192 ------------------------------------------------------------------------ r14566 | cazfi | 2008-04-07 16:18:49 +0300 (Mon, 07 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/client/civclient.c Added bug reporting address to client main help Requested by Christian Knoke, ticket #39777 ------------------------------------------------------------------------ r14564 | cazfi | 2008-04-07 16:07:06 +0300 (Mon, 07 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/connecthand.c When new client connects, send Edit Mode notification only to that connection. See #40191 ------------------------------------------------------------------------ r14562 | cazfi | 2008-04-07 16:03:57 +0300 (Mon, 07 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/plrhand.c Send error log messages only to connections with hack permissions. Patch by Madeline Book in #40170 ------------------------------------------------------------------------ r14558 | cazfi | 2008-04-06 11:47:46 +0300 (Sun, 06 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/ai/advdiplomacy.c Fixed AI crash when city destroyed during trade negotiation See #40185 ------------------------------------------------------------------------ r14556 | cazfi | 2008-04-06 11:21:32 +0300 (Sun, 06 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/common/events.c M /branches/S2_2/common/events.h M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/stdinhand.c M /branches/S2_2/version.in Separate event type for messages sent by server operator. Patch by Madeline Book, ticket #40183 ------------------------------------------------------------------------ r14553 | cazfi | 2008-04-05 01:47:25 +0300 (Sat, 05 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/common/city.c Improved comments about city structure initialization. See #40180 ------------------------------------------------------------------------ r14551 | cazfi | 2008-04-05 01:43:05 +0300 (Sat, 05 Apr 2008) | 5 lines Changed paths: M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c Added reference count to vision site. Free vision site memory always when all tiles have released it, and only then. See #40176 ------------------------------------------------------------------------ r14548 | cazfi | 2008-04-03 20:13:20 +0300 (Thu, 03 Apr 2008) | 9 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/packhand.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/edithand.c Fixed number of Edit Mode checkitem related problems: - Edit Mode checkitem is checked iff edit mode is active in the server - Edit Mode checkitem is sensitive iff the client may toggle it - The Edit Mode checkitem has shortcut ctrl-e - The notify message includes the connection that set Edit Mode - Server informs connecting clients about edit mode Patch by Madeline Book, ticket #40126 ------------------------------------------------------------------------ r14544 | cazfi | 2008-04-03 18:32:30 +0300 (Thu, 03 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/cityrep.c Fixed city report "Select -> Citizen Governor -> none" crash. Reported by Marek Jancuska and Chris, ticket #40171 ------------------------------------------------------------------------ r14542 | cazfi | 2008-04-03 02:13:38 +0300 (Thu, 03 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/connecthand.h M /branches/S2_2/server/stdinhand.c Fixed "take -" crash when there is no free player slots. See #40179 ------------------------------------------------------------------------ r14539 | cazfi | 2008-04-01 11:07:48 +0300 (Tue, 01 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/srv_main.c Fixed generate_players() illegal memory access See #40175 ------------------------------------------------------------------------ r14536 | cazfi | 2008-04-01 10:44:49 +0300 (Tue, 01 Apr 2008) | 4 lines Changed paths: M /branches/S2_2/server/ruleset.c Fixed memory leak in terrain.ruleset loading. See #40174 ------------------------------------------------------------------------ r14533 | cazfi | 2008-03-30 19:36:54 +0300 (Sun, 30 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/server/stdinhand.c Check if turn ended only when game is running. See #40172 ------------------------------------------------------------------------ r14530 | cazfi | 2008-03-30 13:08:01 +0300 (Sun, 30 Mar 2008) | 2 lines Changed paths: M /branches/S2_2/common/game.h Removed obsoleted civstyle min/max/default definitions. ------------------------------------------------------------------------ r14526 | cazfi | 2008-03-28 09:22:38 +0200 (Fri, 28 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aicity.c Do not try to upgrade allied units. See #40148 ------------------------------------------------------------------------ r14523 | cazfi | 2008-03-28 09:12:02 +0200 (Fri, 28 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/ai/aiferry.c M /branches/S2_2/common/aicore/pf_tools.c M /branches/S2_2/common/aicore/pf_tools.h M /branches/S2_2/server/unithand.c Fixed pathfinding crash when ferry is forced to leave path. See #40169 ------------------------------------------------------------------------ r14520 | dmarks | 2008-03-27 01:28:05 +0200 (Thu, 27 Mar 2008) | 1 line Changed paths: M /branches/S2_2/po/sv.po Updates to Swedish localization; patch by Susanna Bjorverud with changes by me (PR#40132) ------------------------------------------------------------------------ r14519 | cazfi | 2008-03-27 00:39:45 +0200 (Thu, 27 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/bootstrap/fc_svnrev_gen.h.in M /branches/S2_2/bootstrap/generate_svnrev.sh Fixed generate_svnrev relative path handling. See #40168 ------------------------------------------------------------------------ r14517 | cazfi | 2008-03-26 04:09:38 +0200 (Wed, 26 Mar 2008) | 2 lines Changed paths: D /branches/S2_2/intl Removed obsolete intl-directory. ------------------------------------------------------------------------ r14513 | cazfi | 2008-03-26 02:01:28 +0200 (Wed, 26 Mar 2008) | 7 lines Changed paths: M /branches/S2_2/common/dataio.c dio_get_uint8(), dio_get_unit16() and dio_get_uint32() now set destination variable to zeor when they fail. This way callers will never use totally uninitialized variable as size for memory allocation. See #40164 ------------------------------------------------------------------------ r14510 | cazfi | 2008-03-25 10:44:15 +0200 (Tue, 25 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/server/savegame.c Avoid myrand() call before rand initialized. See #40166 ------------------------------------------------------------------------ r14507 | cazfi | 2008-03-24 04:14:57 +0200 (Mon, 24 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/optiondlg.c Make Options button translatable. Patch by Susanna Björverud in #40156 ------------------------------------------------------------------------ r14505 | cazfi | 2008-03-24 01:56:38 +0200 (Mon, 24 Mar 2008) | 5 lines Changed paths: M /branches/S2_2/client/mapctrl_common.c Moved some functionality outside assert() so release builds will work too. This is part of #40164 ------------------------------------------------------------------------ r14502 | dmarks | 2008-03-22 08:43:05 +0200 (Sat, 22 Mar 2008) | 1 line Changed paths: M /branches/S2_2/data/nation/dominican.ruleset Correct plural ------------------------------------------------------------------------ r14498 | cazfi | 2008-03-19 05:45:30 +0200 (Wed, 19 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/helpdlg.c Fixed problem that some translated strings were not used. Patch by Susanna Björverud in #40157 ------------------------------------------------------------------------ r14494 | cazfi | 2008-03-19 05:07:41 +0200 (Wed, 19 Mar 2008) | 5 lines Changed paths: M /branches/S2_2/common/generate_packets.py Check legality of the size received from network before passing it to dio_get_memory(). See #40161 ------------------------------------------------------------------------ r14492 | wsimpson | 2008-03-18 20:12:11 +0200 (Tue, 18 Mar 2008) | 40 lines Changed paths: M /branches/S2_2/ai/aidata.h M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c (PR#15729) player ordering changes bizarrely when you observe AI players (PR#39665) set aifill 0 does not remove any ai players (PR#40037) set aifill 30 has multiple problems (PR#40149) [Tracking] aifill settings Reported by (respectively): Jason Dorje Short Marko Lindqvist Egor Vyscrebentsov (me) Patch by me. This patch solves only some server-side problems. Related client issues will be resolved for each gui separately. server/srv_main.c aifill() Slightly reorganized for improved execution efficiency. 0 now removes all aifill() players. AI*n is used for the name, a form not usually allowed for other names, preventing (malicious) user confusion with an AI. Post-increment AI number, allowing AI*0 to match Team 0. Since most calls are after 1 connection, will be AI*1 to match Team 1, etc. server/connecthand.c attach_connection_to_player() Select first uncontrolled player, instead of trying to add another user, solving the reported problems with aifill 30. Has the display advantage that humans will now be grouped at the top of listings. Remove aifill() call; most calls here don't need it, or are inside a loop that makes needless repeated calls. Instead, added elsewhere following the call, as appropriate. server/stdinhand.c create_ai_player() Select first uncontrolled player, instead of trying to add another user, solving the reported problems with aifill 30. Other miscellaneous cleanup. ------------------------------------------------------------------------ r14489 | cazfi | 2008-03-18 01:00:29 +0200 (Tue, 18 Mar 2008) | 6 lines Changed paths: M /branches/S2_2/autogen.sh Check that there is no acinclude.m4 left from old builds in the source tree. Compilation problem reported by Christian Knoke. Patch from #40155 ------------------------------------------------------------------------ r14486 | cazfi | 2008-03-16 23:02:34 +0200 (Sun, 16 Mar 2008) | 5 lines Changed paths: M /branches/S2_2/configure.ac M /branches/S2_2/m4/auth.m4 M /branches/S2_2/server/Makefile.am Added configure option to search mysql from custom location. Several existing bugs fixed in the process. Patch by Madeline Book and myself in #21620 ------------------------------------------------------------------------ r14482 | cazfi | 2008-03-16 22:55:30 +0200 (Sun, 16 Mar 2008) | 3 lines Changed paths: M /branches/S2_2/common/packets.c Fixed zeroing of unused portions of attribute chunk before giving it to delta code. ------------------------------------------------------------------------ r14478 | wsimpson | 2008-03-16 15:34:27 +0200 (Sun, 16 Mar 2008) | 10 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-sdl/pages.c M /branches/S2_2/common/game.h M /branches/S2_2/server/settings.c (PR#40038) FR: Set aifill default value to more than 1 Reported by: Egor Vyscrebentsov The new(ish) load_settable_options will adjust them per game as the server settings are loaded. (PR#11283, PR#39962) Also, updated the description. ------------------------------------------------------------------------ r14475 | wsimpson | 2008-03-14 11:06:42 +0200 (Fri, 14 Mar 2008) | 9 lines Changed paths: M /branches/S2_2/client/climisc.c (PR#40137) 2.2-test client segfaults connecting to server with aifill > 0 Reported by: Egor Vyscrebentsov Pathological case of packet sent out-of-order during new connection, removing player before sending list of current players or other connection information. Never trust network data! ------------------------------------------------------------------------ r14472 | cazfi | 2008-03-13 22:24:10 +0200 (Thu, 13 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/Makefile.am M /branches/S2_2/autogen.sh Include m4 files with aclocal instead of catenating then to acinclude.m4. See #40145 ------------------------------------------------------------------------ r14469 | cazfi | 2008-03-12 22:34:42 +0200 (Wed, 12 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/utility/ftwl/widget_window.c Fixed some gui-ftwl compilation problems. See #40142 ------------------------------------------------------------------------ r14467 | wsimpson | 2008-03-12 15:30:27 +0200 (Wed, 12 Mar 2008) | 26 lines Changed paths: M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/cityturn.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c (PR#40146) deterministic borders (part 3) Now that conflicts between tile->worked and city_map[][] have been reduced, it's about time to remove the old 2.1 border code completely. Support for game.info.happyborders now uses a city queue in cityturn.c for needs_refresh that parallels the city queue in citytools.c for needs_arrange. This combination reduces the number of city_refresh() calls. common/city.[ch] add needs_refresh. server/cityturn.[ch] city_refresh_queue_add() city_refresh_queue_processing() useful feature taken from server/maphand.c (renamed). server/maphand.[ch] remove old code. test happyborders only for running game (not during load). server/savegame.c remove old code. improve log messages. fix duplication of border repair. ------------------------------------------------------------------------ r14465 | wsimpson | 2008-03-12 14:30:31 +0200 (Wed, 12 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/server/srv_main.c (PR#40147) create command names get overwritten Reported by: Michael Kaufman ------------------------------------------------------------------------ r14463 | cazfi | 2008-03-12 00:55:01 +0200 (Wed, 12 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/m4/debug.m4 Fixed setting of -Werror. See #40141 ------------------------------------------------------------------------ r14460 | cproc | 2008-03-11 23:15:57 +0200 (Tue, 11 Mar 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/citydlg.c Fix client crash on hurry production. Reported by Susanna Björverud in PR#40135, patch by me. ------------------------------------------------------------------------ r14458 | cazfi | 2008-03-11 11:18:08 +0200 (Tue, 11 Mar 2008) | 9 lines Changed paths: M /branches/S2_2/server/auth.c M /branches/S2_2/utility/shared.c - Escape user provided strings before injecting them to SQL - Restored ' as allowed character - Avoid calling mysql_query() if there was some problem while generating query string - Fixed a couple of special cases where mysql connection was not properly closed See #40018 ------------------------------------------------------------------------ r14455 | cazfi | 2008-03-10 21:14:47 +0200 (Mon, 10 Mar 2008) | 4 lines Changed paths: M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc Theme had checkbox images reversed in some situations. Patch by Madeline Book in #40125 ------------------------------------------------------------------------ r14453 | wsimpson | 2008-03-10 19:08:13 +0200 (Mon, 10 Mar 2008) | 17 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/city.c (PR#40116) client CMA crash for trade routes during game load reported by: Christian Knoke The proximate issue is that the CMA is trying to calculate a trade route value to another city, but that city hasn't been sent to the client yet. This rare ordering bug is easily fixed by checking the city tile. Also, the call to the agent was before city_info_common() was called; so the city itself isn't in the player->cities list, other initialization isn't done, etc. Fixed. The ultimate issue is that the agent code is trying to calculate values during load before everything knowable is known. This results in different values than during game play! Not fixed! ------------------------------------------------------------------------ r14451 | wsimpson | 2008-03-10 09:00:16 +0200 (Mon, 10 Mar 2008) | 7 lines Changed paths: M /branches/S2_2/server/stdinhand.c (PR#40060) server debug command has bad test for ferries reported by: Christian Knoke patch by: Jason Short ------------------------------------------------------------------------ r14449 | wsimpson | 2008-03-10 07:36:47 +0200 (Mon, 10 Mar 2008) | 77 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/city.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/cityturn.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/sanitycheck.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/unittools.c (PR#40121) vestigial city_map removal from server common/city.h city_tile_iterate_skip_free_cxy() useful iterator taken from common/aicore/cm.c (renamed), now used in server/citytools.c and server/cityturn.c, too. common/aicore/cm.c now generates its internal city_map scratch copies with exactly the same algorithm as server/citytools.c and server/savegame.c server/citytools.[ch] city_freeze_workers_queue() city_thaw_workers_queue() useful feature taken from ai/aicity.c (renamed). send_city_suppression() useful feature taken from server/srv_main.c, renamed to match send_tile_suppression(). city_map_update() city_map_update_adjacent() city_map_update_tile() city_map_update_tile_cxy() city_map_update_tile_near_city() city_map_update_tile_near_city_for_player() Removed. No longer recursively searching for adjacent cities to update each city_map[], greatly improving efficiency! city_map_update_tile_direct() Replaces city_map_update_tile_cxy(), using tile_worked() to efficiently update affected cities. city_map_update_tile_frozen() use city_freeze_workers_queue() city_map_update_tile_now() does auto_arrange_workers() immediately. city_map_update_all() use city_tile_iterate_skip_free_cxy() city_map_update_all_cities_for_player() freeze each city, somewhat improving efficiency. server/cityturn.c apply_cmresult_to_city() auto_arrange_workers() city_increase_size() rely only on the cm_result and main tile map. use city_tile_iterate_skip_free_cxy() server/maphand.[ch] map_change_ownership() Removed. No longer exhaustively searching player cities to update each city_map[], significantly improving efficiency. map_clear_border() When removing or transfering a city, earlier border versions could leave an unsightly ring of old border that wasn't cleaned up by map_calculate_borders() until a future turn. Removes the ring, allowing cities to (potentially) work the tiles. server/sanitycheck.c real_sanity_check_city() Divided into 3 internal parts: check_city_good() check_city_map() -- not used here check_city_size() real_sanity_check_city_all() does check_city_map(), too. server/savegame.c city_map used only internally for game_load() checking and repair. freeze each city, potentially improving repair efficiency. ------------------------------------------------------------------------ r14447 | wsimpson | 2008-03-09 17:59:40 +0200 (Sun, 09 Mar 2008) | 13 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/connecthand.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/stdinhand.c (PR#40123) Crash when client tries global /observe Never trust network data! The client shouldn't crash with bad data. The proximate cause of the crash is that client/packhand.c handle_conn_info() is receiving an illegal 4th case: no playing pointer, but not an observer. The ultimate cause appears to be /detach sending that bad combination. Not fixed, awaiting other issues already in other tickets. To make the future fix easier, added observing parameter to attach/detach connection_to_player(). ------------------------------------------------------------------------ r14444 | cazfi | 2008-03-09 09:38:50 +0200 (Sun, 09 Mar 2008) | 2 lines Changed paths: M /branches/S2_2/client/gui-win32/spaceshipdlg.c Include civclient.h ------------------------------------------------------------------------ r14441 | cazfi | 2008-03-09 00:54:07 +0200 (Sun, 09 Mar 2008) | 2 lines Changed paths: M /branches/S2_2/utility/netintf.c Include fcintl.h required by Windows compilation. ------------------------------------------------------------------------ r14440 | cazfi | 2008-03-08 20:09:20 +0200 (Sat, 08 Mar 2008) | 5 lines Changed paths: M /branches/S2_2/configure.ac A /branches/S2_2/m4/compiler.m4 M /branches/S2_2/m4/debug.m4 Added generic autoconf macros for testing compiler command-line options. These are used while setting Warning options. See #40056 ------------------------------------------------------------------------ r14439 | cazfi | 2008-03-08 16:56:55 +0200 (Sat, 08 Mar 2008) | 5 lines Changed paths: M /branches/S2_2/client/gui-sdl/helpdlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/themes.c Fixed sdl-client compilation. Patch by Susanna Björverud in #40127, with minor adjustments by me. ------------------------------------------------------------------------ r14437 | wsimpson | 2008-03-07 01:10:00 +0200 (Fri, 07 Mar 2008) | 1 line Changed paths: M /branches/S2_2/common/city.c (PR#40129) [PATCH] crash on change worklist unit to improvement ------------------------------------------------------------------------ r14435 | wsimpson | 2008-03-07 00:32:56 +0200 (Fri, 07 Mar 2008) | 33 lines Changed paths: M /branches/S2_2/data/nation/uruguayan.ruleset M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po (PR#40131) uruguayan.ruleset:7 highly ar.po 3002 translated messages, 1318 fuzzy translations, 362 untranslated messages. cs.po 3184 translated messages, 876 fuzzy translations, 622 untranslated messages. ca.po 4671 translated messages, 8 fuzzy translations, 3 untranslated messages. da.po 4257 translated messages, 297 fuzzy translations, 128 untranslated messages. de.po 4272 translated messages, 247 fuzzy translations, 163 untranslated messages. el.po 2123 translated messages, 476 fuzzy translations, 2083 untranslated messages. en_GB.po 70 translated messages, 4612 untranslated messages. es.po 3752 translated messages, 672 fuzzy translations, 258 untranslated messages. et.po 3668 translated messages, 555 fuzzy translations, 459 untranslated messages. fa.po 2158 translated messages, 435 fuzzy translations, 2089 untranslated messages. fi.po 3653 translated messages, 688 fuzzy translations, 341 untranslated messages. fr.po 3960 translated messages, 481 fuzzy translations, 241 untranslated messages. he.po 2040 translated messages, 194 fuzzy translations, 2448 untranslated messages. hu.po 2354 translated messages, 1508 fuzzy translations, 820 untranslated messages. it.po 2763 translated messages, 1249 fuzzy translations, 670 untranslated messages. ja.po 3811 translated messages, 514 fuzzy translations, 357 untranslated messages. ko.po 1813 translated messages, 347 fuzzy translations, 2522 untranslated messages. lt.po 3226 translated messages, 332 fuzzy translations, 1124 untranslated messages. nl.po 3801 translated messages, 633 fuzzy translations, 248 untranslated messages. nb.po 2813 translated messages, 1226 fuzzy translations, 643 untranslated messages. no.po 2813 translated messages, 1226 fuzzy translations, 643 untranslated messages. pl.po 3292 translated messages, 948 fuzzy translations, 442 untranslated messages. pt.po 2192 translated messages, 1554 fuzzy translations, 936 untranslated messages. pt_BR.po 2494 translated messages, 1452 fuzzy translations, 736 untranslated messages. ro.po 3216 translated messages, 819 fuzzy translations, 647 untranslated messages. ru.po 3817 translated messages, 541 fuzzy translations, 324 untranslated messages. sv.po 3989 translated messages, 482 fuzzy translations, 211 untranslated messages. tr.po 3738 translated messages, 399 fuzzy translations, 545 untranslated messages. uk.po 4151 translated messages, 307 fuzzy translations, 224 untranslated messages. zh_CN.po 3185 translated messages, 913 fuzzy translations, 584 untranslated messages. ------------------------------------------------------------------------ r14433 | wsimpson | 2008-03-03 23:12:44 +0200 (Mon, 03 Mar 2008) | 28 lines Changed paths: M /branches/S2_2/ai/aihand.c M /branches/S2_2/client/agents/agents.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/agents/cma_fec.c M /branches/S2_2/client/gui-gtk-2.0/cma_fe.c M /branches/S2_2/client/gui-sdl/cma_fe.c M /branches/S2_2/client/gui-win32/cma_fe.c M /branches/S2_2/client/gui-xaw/cma_fe.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/aicore/cm.h M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/packets.def M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/cityturn.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c (PR#40121) vestigial city_map removal from network and most common routines with updated logging.... common/city.h enum city_tile_type {} now has 4 values; create_city_virtual() initializes city_map to C_TILE_UNUSABLE (0). Detected several bugs that expected the initial value was C_TILE_EMPTY or C_TILE_UNAVAILABLE, and didn't properly check for valid city tiles or that tiles are actually on the map! common/city.[ch] city_map_* routines moved to server/citytools.[ch] with the others. city_refresh_from_main_map() renamed; parameter indicates use of the city_map instead. common/aicore/cm.c now generates its internal city_map scratch copies from the canonical main map in init_tile_lattice(), ignoring any existing city_map. This affects server calls, too. cm_result_from_main_map() renamed; parameter indicates use of the city_map instead. server/cityturn.c city_refresh_for_player() renamed; it wasn't global, only per player. ------------------------------------------------------------------------ r14431 | per | 2008-03-03 00:12:14 +0200 (Mon, 03 Mar 2008) | 2 lines Changed paths: M /branches/S2_2/data/nation/kongo.ruleset 2.2: Fix typo. exlporers -> explorers. Reported by sanna on IRC. ------------------------------------------------------------------------ r14429 | jnmbk | 2008-03-02 19:27:28 +0200 (Sun, 02 Mar 2008) | 1 line Changed paths: M /branches/S2_2/po/tr.po 3738 translated, 399 fuzzy, 545 untranslated ------------------------------------------------------------------------ r14427 | wsimpson | 2008-02-28 05:08:15 +0200 (Thu, 28 Feb 2008) | 9 lines Changed paths: M /branches/S2_2/client/agents/agents.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/attribute.c M /branches/S2_2/client/chatline_common.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/climap.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/clinet.c M /branches/S2_2/client/clinet.h M /branches/S2_2/client/connectdlg_common.c M /branches/S2_2/client/control.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/goto.c M /branches/S2_2/client/gui-ftwl/chat.c M /branches/S2_2/client/gui-ftwl/connectdlg.c M /branches/S2_2/client/gui-ftwl/dialogs.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/caravan_dialog.c M /branches/S2_2/client/gui-gtk-2.0/chatline.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/gui-gtk-2.0/connectdlg.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/diplodlg.c M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-gtk-2.0/gamedlgs.c M /branches/S2_2/client/gui-gtk-2.0/gotodlg.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/client/gui-gtk-2.0/inteldlg.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-gtk-2.0/mapview.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-gtk-2.0/messagewin.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-gtk-2.0/spaceshipdlg.c M /branches/S2_2/client/gui-gtk-2.0/wldlg.c M /branches/S2_2/client/gui-sdl/caravan_dialog.c M /branches/S2_2/client/gui-sdl/chatline.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/cityrep.c M /branches/S2_2/client/gui-sdl/connectdlg.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplodlg.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/gotodlg.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/gui_tilespec.c M /branches/S2_2/client/gui-sdl/helpdlg.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-sdl/optiondlg.c M /branches/S2_2/client/gui-sdl/plrdlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/spaceshipdlg.c M /branches/S2_2/client/gui-sdl/wldlg.c M /branches/S2_2/client/gui-stub/connectdlg.c M /branches/S2_2/client/gui-stub/mapview.c M /branches/S2_2/client/gui-win32/chatline.c M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/cityrep.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/diplodlg.c M /branches/S2_2/client/gui-win32/gotodlg.c M /branches/S2_2/client/gui-win32/helpdlg.c M /branches/S2_2/client/gui-win32/inteldlg.c M /branches/S2_2/client/gui-win32/mapctrl.c M /branches/S2_2/client/gui-win32/mapview.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-win32/messagedlg.c M /branches/S2_2/client/gui-win32/messagewin.c M /branches/S2_2/client/gui-win32/plrdlg.c M /branches/S2_2/client/gui-win32/ratesdlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-win32/spaceshipdlg.c M /branches/S2_2/client/gui-win32/wldlg.c M /branches/S2_2/client/gui-xaw/actions.c M /branches/S2_2/client/gui-xaw/chatline.c M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/cityrep.c M /branches/S2_2/client/gui-xaw/connectdlg.c M /branches/S2_2/client/gui-xaw/dialogs.c M /branches/S2_2/client/gui-xaw/diplodlg.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c M /branches/S2_2/client/gui-xaw/gotodlg.c M /branches/S2_2/client/gui-xaw/graphics.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/gui-xaw/inteldlg.c M /branches/S2_2/client/gui-xaw/mapctrl.c M /branches/S2_2/client/gui-xaw/mapview.c M /branches/S2_2/client/gui-xaw/menu.c M /branches/S2_2/client/gui-xaw/messagedlg.c M /branches/S2_2/client/gui-xaw/messagewin.c M /branches/S2_2/client/gui-xaw/optiondlg.c M /branches/S2_2/client/gui-xaw/pages.c M /branches/S2_2/client/gui-xaw/plrdlg.c M /branches/S2_2/client/gui-xaw/ratesdlg.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/gui-xaw/spaceshipdlg.c M /branches/S2_2/client/gui-xaw/wldlg.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/messagewin_common.c M /branches/S2_2/client/options.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/plrdlg_common.c M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/client/reqtree.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/capstr.c M /branches/S2_2/common/connection.c M /branches/S2_2/common/connection.h M /branches/S2_2/common/game.c M /branches/S2_2/common/nation.c M /branches/S2_2/configure.ac M /branches/S2_2/doc/HACKING M /branches/S2_2/server/citytools.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/handchat.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/report.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/sernet.h M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c (PR#40117) combine client.playing with aconnection into client.conn Following up after PR#40115, eliminate the duplication of client.playing and aconnection.player, by merging them in client.conn, and renaming the struct connection ->player to ->playing. Moved DEFAULT_SOCK_PORT from clinet.h and sernet.h into configure.ac to eliminate its duplication, too. ------------------------------------------------------------------------ r14426 | wsimpson | 2008-02-27 17:21:03 +0200 (Wed, 27 Feb 2008) | 10 lines Changed paths: M /branches/S2_2/client/climisc.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/game.c M /branches/S2_2/common/packets.def M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/version.in (PR#40115) vestigial game.info.player_idx removal Reported with partial patch by Madeline Book Consolidated patch by me. After discussion in PR#40113, there are no intended differences between client.playing (nee game.info.player_ptr) and aconnection.player. This codifies the duplication by always setting them at the same time, and fixes related bugs. ------------------------------------------------------------------------ r14424 | wsimpson | 2008-02-26 15:27:11 +0200 (Tue, 26 Feb 2008) | 1 line Changed paths: M /branches/S2_2/client/agents/cma_core.c (PR#40114) vestigial city_map removal from client/agents/cma_core.c ------------------------------------------------------------------------ r14422 | wsimpson | 2008-02-25 04:11:00 +0200 (Mon, 25 Feb 2008) | 20 lines Changed paths: M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/civclient.c M /branches/S2_2/client/climap.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-win32/mapctrl.c M /branches/S2_2/client/gui-xaw/mapctrl.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/packhand.h M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/path_finding.c M /branches/S2_2/common/aicore/pf_tools.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/game.c M /branches/S2_2/common/player.c M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/unit.h M /branches/S2_2/doc/HACKING M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/unittools.c (PR#40110) tile_info worked, enum known_type, city_can_work_tile(), and invisible cities Renamed some of the enum known_type to reflect their source, and replaced the order dependent < <= >= > tests. Moved city_can_work_tile() out of server/citytools into common/city, to be used by both client and server. This meant changing it somewhat, as it used some server-only functions. See new unit_occupies_tile(). Although the purpose of this series of patches is removal of conflicts between city_map[] and tile_worked(), there was (at least) one use that wasn't duplicated: * "seen" tiles worked by cities that are not yet "seen" by the client! The city_map[] has them marked TILE_UNAVAILABLE. Using the city id passed in the tile_info worked field, the client makes an "invisible" virtual city (unknown center tile) to set tile_worked(). ------------------------------------------------------------------------ r14420 | wsimpson | 2008-02-22 11:06:19 +0200 (Fri, 22 Feb 2008) | 1 line Changed paths: M /branches/S2_2/client/editor.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/packets.def M /branches/S2_2/common/terrain.h M /branches/S2_2/server/edithand.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/version.in (PR#40106) tile_info with worked, adjust field order and size ------------------------------------------------------------------------ r14417 | wsimpson | 2008-02-20 13:25:05 +0200 (Wed, 20 Feb 2008) | 1 line Changed paths: M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/attribute.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/climap.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/control.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/diplodlg.c M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-gtk-2.0/gamedlgs.c M /branches/S2_2/client/gui-gtk-2.0/gotodlg.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/client/gui-gtk-2.0/inteldlg.c M /branches/S2_2/client/gui-gtk-2.0/mapview.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-gtk-2.0/spaceshipdlg.c M /branches/S2_2/client/gui-gtk-2.0/wldlg.c M /branches/S2_2/client/gui-sdl/chatline.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/cityrep.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplodlg.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/gotodlg.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/gui_tilespec.c M /branches/S2_2/client/gui-sdl/helpdlg.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-sdl/plrdlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/spaceshipdlg.c M /branches/S2_2/client/gui-sdl/wldlg.c M /branches/S2_2/client/gui-stub/mapview.c M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/cityrep.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/diplodlg.c M /branches/S2_2/client/gui-win32/gotodlg.c M /branches/S2_2/client/gui-win32/helpdlg.c M /branches/S2_2/client/gui-win32/inteldlg.c M /branches/S2_2/client/gui-win32/mapctrl.c M /branches/S2_2/client/gui-win32/mapview.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-win32/plrdlg.c M /branches/S2_2/client/gui-win32/ratesdlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-win32/spaceshipdlg.c M /branches/S2_2/client/gui-xaw/actions.c M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/cityrep.c M /branches/S2_2/client/gui-xaw/dialogs.c M /branches/S2_2/client/gui-xaw/diplodlg.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c M /branches/S2_2/client/gui-xaw/gotodlg.c M /branches/S2_2/client/gui-xaw/graphics.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/gui-xaw/inteldlg.c M /branches/S2_2/client/gui-xaw/mapview.c M /branches/S2_2/client/gui-xaw/menu.c M /branches/S2_2/client/gui-xaw/pages.c M /branches/S2_2/client/gui-xaw/plrdlg.c M /branches/S2_2/client/gui-xaw/ratesdlg.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/gui-xaw/spaceshipdlg.c M /branches/S2_2/client/gui-xaw/wldlg.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/helpdata.h M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/messagewin_common.c M /branches/S2_2/client/options.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/plrdlg_common.c M /branches/S2_2/client/plrdlg_common.h M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/client/reqtree.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/player.c M /branches/S2_2/common/tile.c M /branches/S2_2/manual/civmanual.c M /branches/S2_2/server/savegame.c (PR#39872) game.player_ptr should be moved to client.playing ------------------------------------------------------------------------ r14416 | wsimpson | 2008-02-20 11:25:53 +0200 (Wed, 20 Feb 2008) | 92 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aisettler.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/citymap.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/game.c M /branches/S2_2/common/player.c M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/generator/startpos.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/settlers.h M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/unittools.c (PR#40104) cleanup city_map functions Comprehensive revision of city_map functions and iterators. === common/city.[ch]: * Renamed some iterators. Match the naming conventions in city_map_iterate_*() and related *_iterate_* in map.h. city_tile_iterate_cxy(_city_tile, _tile, _x, _y) city_tile_iterate(_city_tile, _tile) _city_tile is the center of the (possible) city. (_x, _y) will be elements of [0,CITY_MAP_SIZE]. * Revised the city map functions, reordering parameters to match iterators (eliminating some rarely used functions): city_base_to_city_map(...) city_tile_to_city_map(...) city_map_to_tile(...) void city_map_update(struct city *pcity, struct tile *ptile, int city_x, int city_y, enum city_tile_type type); enum city_tile_type city_map_status(const struct city *pcity, int city_x, int city_y); * Revised related functions, eliminating the city_map coordinates entirely; thereby eliminated dependence on conversion: int city_tile_output(const struct city *pcity, const struct tile *ptile, bool is_celebrating, Output_type_id otype); int city_tile_output_now(const struct city *pcity, const struct tile *ptile, Output_type_id otype); #define is_city_center(_city, _tile) (_city->tile == _tile) #define is_free_worked(_city, _tile) (_city->tile == _tile) server/citytools.[ch]: * Revised the city map functions, matching parameters to iterators; nearly eliminated dependence on conversion: bool city_can_work_tile(struct city *pcity, struct tile *ptile); void city_map_update_empty(struct city *pcity, struct tile *ptile, int city_x, int city_y); void city_map_update_worker(struct city *pcity, struct tile *ptile, int city_x, int city_y); void city_map_update_all(struct city *pcity); void city_map_update_all_cities_for_player(struct player *pplayer); void city_map_update_tile(struct city *pcity, struct tile *ptile); * Added some functions for common loops found throughout the code: void city_map_update_tile_near_city(struct city *pcity, struct tile *ptile, bool broadcast_city); void city_map_update_tile_near_city_for_player(struct city *pcity, struct tile *ptile, struct player *pplayer); === common/tile.[ch]: tile_worked() new access function, now used everywhere. common/game.c: game_remove_city() no need to update the city_map, will be thrown away! server/cityhand.c: handle_city_make_specialist() handle_city_make_worker() Added copious error logging. Never trust network data! server/sanitycheck.c: * Never checked for a valid city->tile before using it in all the city error messages.... Fixed! server/savegame.c: * Never checked for a valid size of the city_map, failing miserably with damaged or different sizes. Added error logging. Someday, should automatically rearrange. ------------------------------------------------------------------------ r14413 | wsimpson | 2008-02-17 22:35:14 +0200 (Sun, 17 Feb 2008) | 1 line Changed paths: M /branches/S2_2/server/meta.c M /branches/S2_2/server/settings.c (PR#40101) minplayers typo -- patch by Egor Vyscrebentsov ------------------------------------------------------------------------ r14408 | jcreus | 2008-02-17 16:19:34 +0200 (Sun, 17 Feb 2008) | 1 line Changed paths: M /branches/S2_2/po/ca.po Update strings ------------------------------------------------------------------------ r14406 | wsimpson | 2008-02-15 22:52:47 +0200 (Fri, 15 Feb 2008) | 1 line Changed paths: M /branches/S2_2/utility/rand.c M /branches/S2_2/utility/rand.h (PR#40098) BUG: 2.2-test myrandomly() range check ------------------------------------------------------------------------ r14404 | wsimpson | 2008-02-15 21:07:27 +0200 (Fri, 15 Feb 2008) | 10 lines Changed paths: M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/savegame.c (PR#40096) deterministic borders (part 2) This should expand city vision to the same limit as the borders, or where the borders would be over the ocean. Unlike the previous (part 1), this no longer yields exactly the same borders. The existing range progression (for borders 4) seemed a little strange, and expanded much too quickly, so I've made it more uniform, with every size having some effect. ------------------------------------------------------------------------ r14399 | wsimpson | 2008-02-13 10:18:11 +0200 (Wed, 13 Feb 2008) | 36 lines Changed paths: M /branches/S2_2/ai/aisettler.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/game.c M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c (PR#40095) 2.2-test: fix map_claim_border() for existing city and cleanup city.[ch] server/maphand.c map_claim_border() Add an omniscient test for a city. Change map_is_known() to map_is_known_and_seen(). ai/aisettler.c cityresult_fill() Default production expects the owner to be the tester, not the current border owner. Temporarily swap the owners. Similar problems found in server/citytools.c create_city() and server/savegame.c player_load_cities(). common/city.[ch] create_virtual_city() Split the code into a new city_choose_build_default(). Re-ordered the city variables to better match the .h and .c files, and the load and save order in savegame.c (PR#40093). common/tile.[ch] Renamed tile_set_city() to tile_set_worked(), to reflect its current use. Use a define for city_owner(), matching other such definitions. common/game.c game_remove_city() Always unlink cities before clearing the data fields. Revised and extended logging. client/packhand.c server/sanitycheck.c Updates to logging, checking the validity of players and tiles. Never trust network data! ------------------------------------------------------------------------ r14397 | wsimpson | 2008-02-11 04:52:42 +0200 (Mon, 11 Feb 2008) | 1 line Changed paths: M /branches/S2_2/ai/aitools.c (PR#39563) [Bug] AI doesn't want to build anything (fix) -- patch by Marko Lindqvist ------------------------------------------------------------------------ r14395 | wsimpson | 2008-02-11 04:44:36 +0200 (Mon, 11 Feb 2008) | 1 line Changed paths: M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/cityturn.h M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c (PR#40093) 2.2-test city_repair_size() and cleanup savegame.c ------------------------------------------------------------------------ r14393 | wsimpson | 2008-02-10 15:13:01 +0200 (Sun, 10 Feb 2008) | 1 line Changed paths: M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c (PR#40092) 2.2-test: fix update_dumb_city() missing update_vision_site_from_city() ------------------------------------------------------------------------ r14391 | wsimpson | 2008-02-09 22:07:19 +0200 (Sat, 09 Feb 2008) | 16 lines Changed paths: M /branches/S2_2/client/options.c M /branches/S2_2/common/events.c M /branches/S2_2/common/events.h M /branches/S2_2/data/stdsounds.soundspec M /branches/S2_2/server/console.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/stdinhand.c (PR#40087) client needs sanity check and other server log messages Moved the existing ruleset_error() intercept into the con_handle_log() callback, so that server log messages can be sent to all connections. Currently, only LOG_FATAL and LOG_ERROR. Renamed E_MESSAGE_WALL to E_LOG_FATAL, as that was already used for the ruleset_error() and operator message popups. Renamed E_PLAYER_SETTINGS (unused) to E_LOG_ERROR, and these default to chat/output only. Used instead of E_LOG_FATAL for scripting. Changed the event sections to be properly translatable. Swapped the data fields for easier sorting (by event instead of strings). Likewise for the soundspec file. Used some existing sounds. ------------------------------------------------------------------------ r14389 | wsimpson | 2008-02-09 13:22:15 +0200 (Sat, 09 Feb 2008) | 12 lines Changed paths: M /branches/S2_2/common/city.h M /branches/S2_2/common/game.c M /branches/S2_2/server/sanitycheck.c (PR#40086) city center tiles not worked, bad sanity check repair? Define FREE_WORKED_TILES for counting is_free_worked_tile(), currently only 1! Should generalize in rulesets? Fix real_sanity_check_city() to prevent removing city workers for any is_free_worked_tile(). Should consolidate with other functions! Rewrite SANITY_* macros to standardize freelog() output format. Don't assert() in game_remove_player(), use freelog() instead. ------------------------------------------------------------------------ r14387 | wsimpson | 2008-02-06 02:29:15 +0200 (Wed, 06 Feb 2008) | 14 lines Changed paths: M /branches/S2_2/ai/aidata.h M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/game.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/unit.h M /branches/S2_2/common/vision.h M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/report.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/unittools.c M /branches/S2_2/utility/shared.c M /branches/S2_2/utility/shared.h (PR#40084) identity_number, server.game_identifier, city_tile(), unit_tile() Includes some code already in 2.1 (PR#39980), used for initializing the game_identifier. Moved from game to server structure (it is server-only), and renamed to help distinguish from other "id".... Modified PR#40079, moving (and renaming) IDENTITY_NUMBER_ZERO to fc_types.h, for initializing and checking city and unit ids. Added access functions city_tile() and unit_tile(), renaming conflicting variable names. Increase the ai->stats.diplomat_reservations bit vector from 32767 (wrong) to 65536 -- potential overflow bug reported in PR#40080. ------------------------------------------------------------------------ r14385 | wsimpson | 2008-02-05 15:39:14 +0200 (Tue, 05 Feb 2008) | 6 lines Changed paths: M /branches/S2_2/ai/aicity.c (PR#39563) [Bug] AI doesn't want to build anything (log) #defined LOG_WANT symbol, moved other local LOG_* to front of file Does not fix anything other than logging! ------------------------------------------------------------------------ r14382 | wsimpson | 2008-02-04 18:36:07 +0200 (Mon, 04 Feb 2008) | 11 lines Changed paths: M /branches/S2_2/common/city.h M /branches/S2_2/common/unit.h M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unittools.c (PR#40079) BUG! city & unit ids not reserved, counter not saved/restored Properly reserve and release city & unit ids, checking for overflow. Initialize between games. Save and restore for reproducibility. Rulesets are no longer loaded twice for --file games. Debugging swaps of name and/or id for city and unit. Other minor cleanup. ------------------------------------------------------------------------ r14380 | chrisk | 2008-02-04 13:40:31 +0200 (Mon, 04 Feb 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po 4272 translated messages, 247 fuzzy translations, 163 untranslated messages. ------------------------------------------------------------------------ r14379 | wsimpson | 2008-02-04 01:48:56 +0200 (Mon, 04 Feb 2008) | 15 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/utility/rand.c M /branches/S2_2/utility/rand.h (PR#40073) BUG: 2.2-test AI building_want random interval not saved/restored Renamed *_interval to ai.building_wait, and save/restore it. Renamed the related AI "recalc" variables to have the same prefix_* as the corresponding *_want counterparts (matching the names in the savegames). Moved the pseudo-random equation from tilespec into rand, making it easier to find, trace, and use elsewhere. Other trivial cleanup. ------------------------------------------------------------------------ r14377 | wsimpson | 2008-02-03 17:08:32 +0200 (Sun, 03 Feb 2008) | 54 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/audio_sdl.c M /branches/S2_2/client/chatline_common.c M /branches/S2_2/client/chatline_common.h M /branches/S2_2/client/clinet.c M /branches/S2_2/client/connectdlg_common.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/sprite.c M /branches/S2_2/client/gui-sdl/graphics.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/gui_tilespec.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/pages.c M /branches/S2_2/client/gui-sdl/themes.c M /branches/S2_2/client/gui-sdl/themespec.c M /branches/S2_2/client/gui-sdl/themespec.h M /branches/S2_2/client/gui-win32/graphics.c M /branches/S2_2/client/gui-win32/gui_main.c M /branches/S2_2/client/gui-xaw/graphics.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/options.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/servers.h M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/version.c M /branches/S2_2/configure.ac M /branches/S2_2/data/helpdata.txt M /branches/S2_2/manual/civmanual.c M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/civserver.c M /branches/S2_2/server/generator/startpos.c M /branches/S2_2/server/meta.h M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/utility/fciconv.c M /branches/S2_2/utility/ftwl/be_common_32.c M /branches/S2_2/utility/ftwl/theme_engine.c M /branches/S2_2/utility/netintf.c M /branches/S2_2/utility/registry.c M /branches/S2_2/utility/shared.c (PR#40071) i18n: review LOG_FATAL and freeciv.org The same comprehensive review as PR#10400, this time for LOG_FATAL. Found some that probably need translation under our current requirements, and several that should not be translated, especially where a translated message is already sent to the chat output window. Compared client/tilespec.c with derived client/gui-sdl/themespec.c, and updated various inconsistent changes to messages. To better understand the loglevel of such messages, restored LOG_* constants for ruleset_error(), and replaced other "required" flags with LOG_* constants. Also, found several remaining *.freeciv.org and FREECIV_PATH in translated messages. Parameterized these messages. Found other common welcome messages and combined them. Moved the main wiki and meta URLs into configure.ac, matching the existing BUG_URL there. Requires ./autogen.sh before make! ar: 3002 translated messages, 1318 fuzzy translations, 362 untranslated messages. cs: 3184 translated messages, 876 fuzzy translations, 622 untranslated messages. ca: 4646 translated messages, 30 fuzzy translations, 6 untranslated messages. da: 4257 translated messages, 297 fuzzy translations, 128 untranslated messages. de: 4255 translated messages, 262 fuzzy translations, 165 untranslated messages. el: 2123 translated messages, 476 fuzzy translations, 2083 untranslated messages. en_GB: 70 translated messages, 4612 untranslated messages. es: 3752 translated messages, 672 fuzzy translations, 258 untranslated messages. et: 3668 translated messages, 555 fuzzy translations, 459 untranslated messages. fa: 2158 translated messages, 435 fuzzy translations, 2089 untranslated messages. fi: 3653 translated messages, 688 fuzzy translations, 341 untranslated messages. fr: 3960 translated messages, 481 fuzzy translations, 241 untranslated messages. he: 2040 translated messages, 194 fuzzy translations, 2448 untranslated messages. hu: 2354 translated messages, 1508 fuzzy translations, 820 untranslated messages. it: 2763 translated messages, 1249 fuzzy translations, 670 untranslated messages. ja: 3811 translated messages, 514 fuzzy translations, 357 untranslated messages. ko: 1813 translated messages, 347 fuzzy translations, 2522 untranslated messages. lt: 3226 translated messages, 332 fuzzy translations, 1124 untranslated messages. nl: 3801 translated messages, 633 fuzzy translations, 248 untranslated messages. nb: 2813 translated messages, 1226 fuzzy translations, 643 untranslated messages. no: 2813 translated messages, 1226 fuzzy translations, 643 untranslated messages. pl: 3292 translated messages, 948 fuzzy translations, 442 untranslated messages. pt: 2192 translated messages, 1554 fuzzy translations, 936 untranslated messages. pt_BR: 2494 translated messages, 1452 fuzzy translations, 736 untranslated messages. ro: 3216 translated messages, 819 fuzzy translations, 647 untranslated messages. ru: 3817 translated messages, 541 fuzzy translations, 324 untranslated messages. sv: 3989 translated messages, 482 fuzzy translations, 211 untranslated messages. tr: 3714 translated messages, 419 fuzzy translations, 549 untranslated messages. uk: 4151 translated messages, 307 fuzzy translations, 224 untranslated messages. zh_CN: 3185 translated messages, 913 fuzzy translations, 584 untranslated messages. ------------------------------------------------------------------------ r14375 | cazfi | 2008-02-02 10:12:22 +0200 (Sat, 02 Feb 2008) | 5 lines Changed paths: M /branches/S2_2/configure.ac M /branches/S2_2/manual/Makefile.am M /branches/S2_2/server/Makefile.am M /branches/S2_2/server/scripting/Makefile.am Define lua & tolua CFLAGS and LIBS in configure.ac instead of hardcoding them to Makefiles. See #40051 ------------------------------------------------------------------------ r14373 | chrisk | 2008-02-01 18:49:03 +0200 (Fri, 01 Feb 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po 4280 translated messages, 250 fuzzy translations, 161 untranslated messages. ------------------------------------------------------------------------ r14372 | chrisk | 2008-02-01 14:52:28 +0200 (Fri, 01 Feb 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po 4268 translated messages, 252 fuzzy translations, 171 untranslated messages. ------------------------------------------------------------------------ r14370 | wsimpson | 2008-02-01 13:44:07 +0200 (Fri, 01 Feb 2008) | 36 lines Changed paths: M /branches/S2_2/ai/aidata.c M /branches/S2_2/ai/ailog.c M /branches/S2_2/ai/aisettler.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/client/agents/agents.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/audio.c M /branches/S2_2/client/civclient.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/clinet.c M /branches/S2_2/client/gui-ftwl/chat.c M /branches/S2_2/client/gui-ftwl/citydlg.c M /branches/S2_2/client/gui-ftwl/gui_main.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapctrl.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/themespec.c M /branches/S2_2/client/gui-win32/gui_main.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/connection.c M /branches/S2_2/common/dataio.c M /branches/S2_2/common/generate_packets.py M /branches/S2_2/common/packets.c M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/auth.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unittools.c M /branches/S2_2/utility/ftwl/be_sdl.c M /branches/S2_2/utility/ftwl/be_sdl_pixels_32.c M /branches/S2_2/utility/ftwl/be_sdl_pixels_cairo_32.c M /branches/S2_2/utility/ftwl/text_renderer.c M /branches/S2_2/utility/ftwl/widget_window.c M /branches/S2_2/utility/inputfile.c M /branches/S2_2/utility/ioz.c M /branches/S2_2/utility/log.h M /branches/S2_2/utility/rand.c M /branches/S2_2/utility/timing.c (PR#10400) untranslated LOG_NORMAL messages reported by Jason Dorje Short original patch by Daniel Markstedt revised patch by me ar: 3014 translated messages, 1315 fuzzy translations, 362 untranslated messages. cs: 3204 translated messages, 869 fuzzy translations, 618 untranslated messages. ca: 4671 translated messages, 18 fuzzy translations, 2 untranslated messages. da: 4282 translated messages, 285 fuzzy translations, 124 untranslated messages. de: 4250 translated messages, 269 fuzzy translations, 172 untranslated messages. el: 2127 translated messages, 474 fuzzy translations, 2090 untranslated messages. en_GB: 70 translated messages, 4621 untranslated messages. es: 3772 translated messages, 665 fuzzy translations, 254 untranslated messages. et: 3688 translated messages, 545 fuzzy translations, 458 untranslated messages. fa: 2159 translated messages, 435 fuzzy translations, 2097 untranslated messages. fi: 3670 translated messages, 684 fuzzy translations, 337 untranslated messages. fr: 3985 translated messages, 469 fuzzy translations, 237 untranslated messages. he: 2044 translated messages, 192 fuzzy translations, 2455 untranslated messages. hu: 2365 translated messages, 1507 fuzzy translations, 819 untranslated messages. it: 2778 translated messages, 1245 fuzzy translations, 668 untranslated messages. ja: 3831 translated messages, 505 fuzzy translations, 355 untranslated messages. ko: 1820 translated messages, 341 fuzzy translations, 2530 untranslated messages. lt: 3235 translated messages, 328 fuzzy translations, 1128 untranslated messages. nl: 3819 translated messages, 628 fuzzy translations, 244 untranslated messages. nb: 2828 translated messages, 1222 fuzzy translations, 641 untranslated messages. no: 2828 translated messages, 1222 fuzzy translations, 641 untranslated messages. pl: 3308 translated messages, 943 fuzzy translations, 440 untranslated messages. pt: 2203 translated messages, 1552 fuzzy translations, 936 untranslated messages. pt_BR: 2501 translated messages, 1453 fuzzy translations, 737 untranslated messages. ro: 3232 translated messages, 814 fuzzy translations, 645 untranslated messages. ru: 3841 translated messages, 530 fuzzy translations, 320 untranslated messages. sv: 4014 translated messages, 470 fuzzy translations, 207 untranslated messages. tr: 3737 translated messages, 408 fuzzy translations, 546 untranslated messages. uk: 4170 translated messages, 299 fuzzy translations, 222 untranslated messages. zh_CN: 3203 translated messages, 906 fuzzy translations, 582 untranslated messages. ------------------------------------------------------------------------ r14369 | wsimpson | 2008-02-01 06:16:41 +0200 (Fri, 01 Feb 2008) | 1 line Changed paths: M /branches/S2_2/manual/civmanual.c M /branches/S2_2/server/commands.c M /branches/S2_2/server/commands.h M /branches/S2_2/server/stdinhand.c (PR#40062) server/stdinhand.c duplicates server/command.c text -- reported by Christian Knoke ------------------------------------------------------------------------ r14366 | wsimpson | 2008-01-31 22:18:35 +0200 (Thu, 31 Jan 2008) | 1 line Changed paths: M /branches/S2_2/server/report.c (PR#40064) historian report passes NULL format to cat_snprintf() -- reported by Christian Knoke ------------------------------------------------------------------------ r14364 | wsimpson | 2008-01-31 19:34:30 +0200 (Thu, 31 Jan 2008) | 1 line Changed paths: M /branches/S2_2/server/report.c (PR#40063) RFE: increase historian levels to prime number ------------------------------------------------------------------------ r14362 | cazfi | 2008-01-31 17:26:25 +0200 (Thu, 31 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/client/gui-sdl/gui_iconv.c Fixed gui-sdl compilation ------------------------------------------------------------------------ r14358 | jdorje | 2008-01-31 03:06:57 +0200 (Thu, 31 Jan 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/gui_iconv.c Replace strerror with mystrerror. Patch by me in PR#40057. ------------------------------------------------------------------------ r14355 | cazfi | 2008-01-31 01:42:32 +0200 (Thu, 31 Jan 2008) | 5 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/citydlg.c Fixed selling of buildings. See #39620. Patch by William Allen Simpson. ------------------------------------------------------------------------ r14354 | chrisk | 2008-01-30 23:06:17 +0200 (Wed, 30 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po 4273 translated messages, 251 fuzzy translations, 170 untranslated messages. ------------------------------------------------------------------------ r14353 | jcreus | 2008-01-30 12:58:56 +0200 (Wed, 30 Jan 2008) | 1 line Changed paths: M /branches/S2_2/po/ca.po 4694 translated messages ------------------------------------------------------------------------ r14351 | jnmbk | 2008-01-30 09:33:14 +0200 (Wed, 30 Jan 2008) | 1 line Changed paths: M /branches/S2_2/po/tr.po fixed some fuzzy strings ------------------------------------------------------------------------ r14349 | wsimpson | 2008-01-30 04:32:26 +0200 (Wed, 30 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/server/plrhand.c (PR#40020) Segfault in server aiunit.c ai_manage_units => plrhand.c maybe_make_contact() reported by Dawid Ciezarkiewicz patch by Jason Dorje Short make_contact() kills the unit because of the broken treaty and bouncing (strange in itself). maybe_make_contact() needs a safe iterator. ------------------------------------------------------------------------ r14346 | wsimpson | 2008-01-29 21:33:52 +0200 (Tue, 29 Jan 2008) | 1 line Changed paths: M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/report.c (PR#40059) BUG: i18n: Publishing year on historian reports -- revised ------------------------------------------------------------------------ r14345 | wsimpson | 2008-01-29 21:06:11 +0200 (Tue, 29 Jan 2008) | 35 lines Changed paths: M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/report.c (PR#40059) BUG: i18n: Publishing year on historian reports With a make update-po to add the new TRANS comments for everybody ar: 3042 translated messages, 1291 fuzzy translations, 362 untranslated messages. cs: 3227 translated messages, 850 fuzzy translations, 618 untranslated messages. ca: 4655 translated messages, 35 fuzzy translations, 5 untranslated messages. da: 4312 translated messages, 259 fuzzy translations, 124 untranslated messages. de: 4242 translated messages, 282 fuzzy translations, 171 untranslated messages. el: 2136 translated messages, 454 fuzzy translations, 2105 untranslated messages. en_GB: 70 translated messages, 4625 untranslated messages. es: 3799 translated messages, 643 fuzzy translations, 253 untranslated messages. et: 3716 translated messages, 520 fuzzy translations, 459 untranslated messages. fa: 2168 translated messages, 417 fuzzy translations, 2110 untranslated messages. fi: 3696 translated messages, 662 fuzzy translations, 337 untranslated messages. fr: 4014 translated messages, 444 fuzzy translations, 237 untranslated messages. he: 2053 translated messages, 179 fuzzy translations, 2463 untranslated messages. hu: 2376 translated messages, 1495 fuzzy translations, 824 untranslated messages. it: 2800 translated messages, 1227 fuzzy translations, 668 untranslated messages. ja: 3857 translated messages, 482 fuzzy translations, 356 untranslated messages. ko: 1836 translated messages, 318 fuzzy translations, 2541 untranslated messages. lt: 3252 translated messages, 306 fuzzy translations, 1137 untranslated messages. nl: 3847 translated messages, 604 fuzzy translations, 244 untranslated messages. nb: 2850 translated messages, 1204 fuzzy translations, 641 untranslated messages. no: 2850 translated messages, 1204 fuzzy translations, 641 untranslated messages. pl: 3334 translated messages, 920 fuzzy translations, 441 untranslated messages. pt: 2218 translated messages, 1539 fuzzy translations, 938 untranslated messages. pt_BR: 2518 translated messages, 1439 fuzzy translations, 738 untranslated messages. ro: 3260 translated messages, 789 fuzzy translations, 646 untranslated messages. ru: 3871 translated messages, 505 fuzzy translations, 319 untranslated messages. sv: 4044 translated messages, 445 fuzzy translations, 206 untranslated messages. tr: 3664 translated messages, 477 fuzzy translations, 554 untranslated messages. uk: 4198 translated messages, 275 fuzzy translations, 222 untranslated messages. zh_CN: 3228 translated messages, 885 fuzzy translations, 582 untranslated messages. ------------------------------------------------------------------------ r14343 | wsimpson | 2008-01-29 11:55:36 +0200 (Tue, 29 Jan 2008) | 5 lines Changed paths: M /branches/S2_2/utility/support.c (PR#40058) mystrerror() and local encoding reported by Madeline Book proposed patch by Jason Dorje Short revised patch by me. ------------------------------------------------------------------------ r14341 | chrisk | 2008-01-28 22:34:29 +0200 (Mon, 28 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po 4257 translated messages, 268 fuzzy translations, 170 untranslated messages. ------------------------------------------------------------------------ r14340 | chrisk | 2008-01-28 18:18:28 +0200 (Mon, 28 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/po/de.po finished merge with 2.1 4196 translated messages, 329 fuzzy translations, 170 untranslated messages. ------------------------------------------------------------------------ r14338 | wsimpson | 2008-01-28 02:02:52 +0200 (Mon, 28 Jan 2008) | 10 lines Changed paths: M /branches/S2_2/client/helpdata.c M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/citytools.c M /branches/S2_2/server/plrhand.c (PR#40032) server/plrhand.c civil war message plural reported by Egor Vyscrebentsov (PR#40054) Percentages in helpdata.c reported by Joan Creus The former was extensively discussed on -i18n. Combined for convenience of update-po and line-by-line comparisons ------------------------------------------------------------------------ r14335 | cproc | 2008-01-27 16:54:20 +0200 (Sun, 27 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-win32/happiness.c M /branches/S2_2/client/gui-win32/menu.c Fix gui-win32 compilation. See PR#40053. ------------------------------------------------------------------------ r14331 | wsimpson | 2008-01-27 14:21:53 +0200 (Sun, 27 Jan 2008) | 1 line Changed paths: M /branches/S2_2/doc/HACKING M /branches/S2_2/doc/README M /branches/S2_2/doc/README.nations M /branches/S2_2/doc/README.rulesets M /branches/S2_2/utility/fciconv.c M /branches/S2_2/utility/shared.c (PR#40028) gtk/pango invalid UTF-8 warning, fix documentation ------------------------------------------------------------------------ r14328 | wsimpson | 2008-01-26 17:19:23 +0200 (Sat, 26 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/helpdata.c M /branches/S2_2/manual/civmanual.c M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/tr.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po M /branches/S2_2/server/stdinhand.c (PR#40043) i18n: wordwrap_string() broken for UTF-8 translations -- reported by Egor Vyscrebentsov ------------------------------------------------------------------------ r14327 | cazfi | 2008-01-26 13:49:09 +0200 (Sat, 26 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/dependencies/lua-5.1/src/Makefile.am Do not put lua interpreter main() to (currently unused) lua-5.1 library ------------------------------------------------------------------------ r14324 | cazfi | 2008-01-25 22:44:15 +0200 (Fri, 25 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/configure.ac Added tr to ALL_LINGUAS ------------------------------------------------------------------------ r14322 | cazfi | 2008-01-25 22:28:58 +0200 (Fri, 25 Jan 2008) | 2 lines Changed paths: A /branches/S2_2/po/tr.po (from /branches/S2_1/po/tr.po:14321) Copied tr.po from S2_1 ------------------------------------------------------------------------ r14320 | wsimpson | 2008-01-23 19:10:17 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/zh_CN.po msgmerge --compendium=zh_CN.po ../../S2_1/po/zh_CN.po freeciv.pot -o zh_CN.pox zh_CN.po 3398 translated messages, 500 fuzzy translations, 376 untranslated messages. zh_CN.po+ 2554 translated messages, 1404 fuzzy translations, 734 untranslated messages. zh_CN.po= 3242 translated messages, 866 fuzzy translations, 584 untranslated messages. ------------------------------------------------------------------------ r14319 | wsimpson | 2008-01-23 19:08:27 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/sv.po msgmerge --compendium=sv.po ../../S2_1/po/sv.po freeciv.pot -o sv.pox sv.po 4274 translated messages. sv.po+ 3447 translated messages, 840 fuzzy translations, 405 untranslated messages. sv.po= 4060 translated messages, 427 fuzzy translations, 205 untranslated messages. ------------------------------------------------------------------------ r14318 | wsimpson | 2008-01-23 19:06:06 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/ro.po msgmerge --compendium=ro.po ../../S2_1/po/ro.po freeciv.pot -o ro.pox ro.po 3422 translated messages, 405 fuzzy translations, 447 untranslated messages. ro.po+ 2059 translated messages, 1204 fuzzy translations, 1429 untranslated messages. ro.po= 3275 translated messages, 770 fuzzy translations, 647 untranslated messages. ------------------------------------------------------------------------ r14317 | wsimpson | 2008-01-23 19:04:14 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/pt.po msgmerge --compendium=pt.po ../../S2_1/po/pt.po freeciv.pot -o pt.pox pt.po 2345 translated messages, 1148 fuzzy translations, 781 untranslated messages. pt.po+ 2218 translated messages, 1524 fuzzy translations, 950 untranslated messages. pt.po= 2231 translated messages, 1523 fuzzy translations, 938 untranslated messages. ------------------------------------------------------------------------ r14316 | wsimpson | 2008-01-23 19:00:14 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/pl.po msgmerge --compendium=pl.po ../../S2_1/po/pl.po freeciv.pot -o pl.pox pl.po 3435 translated messages, 543 fuzzy translations, 296 untranslated messages. pl.po+ 3320 translated messages, 926 fuzzy translations, 446 untranslated messages. pl.po= 3349 translated messages, 903 fuzzy translations, 440 untranslated messages. ------------------------------------------------------------------------ r14315 | wsimpson | 2008-01-23 18:58:15 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/no.po msgmerge --compendium=no.po ../../S2_1/po/no.po freeciv.pot -o no.pox no.po 3011 translated messages, 788 fuzzy translations, 475 untranslated messages. no.po+ 2837 translated messages, 1210 fuzzy translations, 645 untranslated messages. no.po= 2863 translated messages, 1188 fuzzy translations, 641 untranslated messages. ------------------------------------------------------------------------ r14314 | wsimpson | 2008-01-23 18:56:31 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/nl.po msgmerge --compendium=nl.po ../../S2_1/po/nl.po freeciv.pot -o nl.pox nl.po 3924 translated messages, 254 fuzzy translations, 96 untranslated messages. nl.po+ 3852 translated messages, 590 fuzzy translations, 250 untranslated messages. nl.po= 3862 translated messages, 587 fuzzy translations, 243 untranslated messages. ------------------------------------------------------------------------ r14313 | wsimpson | 2008-01-23 18:53:35 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/ko.po msgmerge --compendium=ko.po ../../S2_1/po/ko.po freeciv.pot -o ko.pox ko.po 1952 translated messages, 28 fuzzy translations, 2294 untranslated messages. ko.po+ 1031 translated messages, 296 fuzzy translations, 3365 untranslated messages. ko.po= 1848 translated messages, 304 fuzzy translations, 2540 untranslated messages. ------------------------------------------------------------------------ r14312 | wsimpson | 2008-01-23 18:24:56 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po msgmerge --compendium=ja.po ../../S2_1/po/ja.po freeciv.pot -o ja.pox ja.po 3940 translated messages, 126 fuzzy translations, 208 untranslated messages. ja.po+ 3693 translated messages, 621 fuzzy translations, 378 untranslated messages. ja.po= 3871 translated messages, 465 fuzzy translations, 356 untranslated messages. ------------------------------------------------------------------------ r14311 | wsimpson | 2008-01-23 18:20:07 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/hu.po msgmerge --compendium=hu.po ../../S2_1/po/hu.po freeciv.pot -o hu.pox hu.po 2063 translated messages, 1215 fuzzy translations, 996 untranslated messages. hu.po+ 2943 translated messages, 919 fuzzy translations, 830 untranslated messages. hu.po= 2394 translated messages, 1474 fuzzy translations, 824 untranslated messages. ------------------------------------------------------------------------ r14310 | wsimpson | 2008-01-23 18:14:57 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/he.po msgmerge --compendium=he.po ../../S2_1/po/he.po freeciv.pot -o he.pox he.po 2172 translated messages, 80 fuzzy translations, 2022 untranslated messages. he.po+ 76 translated messages, 338 fuzzy translations, 4278 untranslated messages. he.po= 2055 translated messages, 167 fuzzy translations, 2470 untranslated messages. ------------------------------------------------------------------------ r14309 | wsimpson | 2008-01-23 18:11:03 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/fr.po msgmerge --compendium=fr.po ../../S2_1/po/fr.po freeciv.pot -o fr.pox fr.po 4138 translated messages, 97 fuzzy translations, 39 untranslated messages. fr.po+ 3847 translated messages, 556 fuzzy translations, 289 untranslated messages. fr.po= 4029 translated messages, 427 fuzzy translations, 236 untranslated messages. ------------------------------------------------------------------------ r14308 | wsimpson | 2008-01-23 18:06:16 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/fa.po msgmerge --compendium=fa.po ../../S2_1/po/fa.po freeciv.pot -o fa.pox fa.po 2199 translated messages, 124 fuzzy translations, 1951 untranslated messages. fa.po+ 2108 translated messages, 412 fuzzy translations, 2172 untranslated messages. fa.po= 2172 translated messages, 410 fuzzy translations, 2110 untranslated messages. ------------------------------------------------------------------------ r14307 | wsimpson | 2008-01-23 17:57:09 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/et.po msgmerge --compendium=et.po ../../S2_1/po/et.po freeciv.pot -o et.pox et.po 3922 translated messages, 141 fuzzy translations, 211 untranslated messages. et.po+ 2462 translated messages, 693 fuzzy translations, 1537 untranslated messages. et.po= 3731 translated messages, 503 fuzzy translations, 458 untranslated messages. ------------------------------------------------------------------------ r14306 | wsimpson | 2008-01-23 17:54:27 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/es.po msgmerge --compendium=es.po ../../S2_1/po/es.po freeciv.pot -o es.pox es.po 3957 translated messages, 223 fuzzy translations, 94 untranslated messages. es.po+ 3785 translated messages, 650 fuzzy translations, 257 untranslated messages. es.po= 3813 translated messages, 626 fuzzy translations, 253 untranslated messages. ------------------------------------------------------------------------ r14305 | wsimpson | 2008-01-23 17:51:17 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/el.po msgmerge --compendium=el.po ../../S2_1/po/el.po freeciv.pot -o el.pox el.po 2209 translated messages, 168 fuzzy translations, 1897 untranslated messages. el.po+ 2128 translated messages, 435 fuzzy translations, 2129 untranslated messages. el.po= 2149 translated messages, 437 fuzzy translations, 2106 untranslated messages. ------------------------------------------------------------------------ r14304 | wsimpson | 2008-01-23 17:48:56 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/de.po msgmerge --compendium=de.po ../../S2_1/po/de.po freeciv.pot -o de.pox de.po 4241 translated messages, 33 fuzzy translations. de.po+ 3973 translated messages, 497 fuzzy translations, 222 untranslated messages. de.po= 4154 translated messages, 375 fuzzy translations, 163 untranslated messages. ------------------------------------------------------------------------ r14303 | wsimpson | 2008-01-23 17:46:40 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/da.po msgmerge --compendium=da.po ../../S2_1/po/da.po freeciv.pot -o da.pox da.po 4215 translated messages, 58 fuzzy translations, 1 untranslated message. da.po+ 4156 translated messages, 342 fuzzy translations, 194 untranslated messages. da.po= 4332 translated messages, 237 fuzzy translations, 123 untranslated messages. ------------------------------------------------------------------------ r14302 | wsimpson | 2008-01-23 17:40:39 +0200 (Wed, 23 Jan 2008) | 9 lines Changed paths: M /branches/S2_2/po/uk.po msgmerge --compendium=uk.po ../../S2_1/po/uk.po freeciv.pot -o uk.pox msgmerge --compendium=uk.pox ../../trunk/po/uk.po freeciv.pot -o uk.poxx uk.po 2342 translated messages, 1134 fuzzy translations, 798 untranslated messages. uk.po+ 4213 translated messages, 257 fuzzy translations, 222 untranslated messages. uk.po= 3254 translated messages, 1207 fuzzy translations, 231 untranslated messages. uk.po_ 4218 translated messages, 253 fuzzy translations, 221 untranslated messages. ------------------------------------------------------------------------ r14301 | wsimpson | 2008-01-23 17:18:47 +0200 (Wed, 23 Jan 2008) | 8 lines Changed paths: M /branches/S2_2/po/pt_BR.po cp ../../trunk/po/pt_BR.po pt_BR.pox msgmerge --compendium=pt_BR.po ../../S2_1/po/pt_BR.po freeciv.pot -o pt_BR.poxx pt_BR.po 2511 translated messages, 1143 fuzzy translations, 620 untranslated messages. pt_BR.po+ 661 translated messages, 1781 fuzzy translations, 2250 untranslated messages. pt_BR.po_ 2532 translated messages, 1422 fuzzy translations, 738 untranslated messages. ------------------------------------------------------------------------ r14300 | wsimpson | 2008-01-23 16:59:25 +0200 (Wed, 23 Jan 2008) | 9 lines Changed paths: M /branches/S2_2/po/lt.po msgmerge --compendium=lt.po ../../S2_1/po/lt.po freeciv.pot -o lt.pox msgmerge --compendium=lt.pox ../../trunk/po/lt.po freeciv.pot -o lt.poxx lt.po 3168 translated messages, 93 fuzzy translations, 1013 untranslated messages. lt.po+ 3063 translated messages, 468 fuzzy translations, 1161 untranslated messages. lt.po= 3144 translated messages, 400 fuzzy translations, 1148 untranslated messages. lt.po_ 3267 translated messages, 289 fuzzy translations, 1136 untranslated messages. ------------------------------------------------------------------------ r14299 | wsimpson | 2008-01-23 16:47:05 +0200 (Wed, 23 Jan 2008) | 9 lines Changed paths: M /branches/S2_2/po/cs.po msgmerge --compendium=cs.po ../../S2_1/po/cs.po freeciv.pot -o cs.pox msgmerge --compendium=cs.pox ../../trunk/po/cs.po freeciv.pot -o cs.poxx cs.po 3250 translated messages, 528 fuzzy translations, 496 untranslated messages. cs.po+ 3159 translated messages, 890 fuzzy translations, 643 untranslated messages. cs.po= 3199 translated messages, 856 fuzzy translations, 637 untranslated messages. cs.po_ 3242 translated messages, 833 fuzzy translations, 617 untranslated messages. ------------------------------------------------------------------------ r14298 | wsimpson | 2008-01-23 16:41:56 +0200 (Wed, 23 Jan 2008) | 7 lines Changed paths: M /branches/S2_2/po/ca.po msgmerge --compendium=ca.po ../../S2_1/po/ca.po freeciv.pot -o ca.pox msgmerge --compendium=ca.pox ../../trunk/po/ca.po freeciv.pot -o ca.poxx ca.po 4273 translated messages, 1 fuzzy translation. ca.po+ 4465 translated messages, 185 fuzzy translations, 42 untranslated messages. ca.po= 4604 translated messages, 56 fuzzy translations, 32 untranslated messages. ca.po_ 4676 translated messages, 12 fuzzy translations, 4 untranslated messages. ------------------------------------------------------------------------ r14297 | wsimpson | 2008-01-23 16:03:06 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/ca.po msgmerge --compendium=ca.po ../../S2_1/po/ca.po freeciv.pot -o ca.poxx ca.po 4273 translated messages, 1 fuzzy translation. ca.po+ 4465 translated messages, 185 fuzzy translations, 42 untranslated messages. ca.po= 4604 translated messages, 56 fuzzy translations, 32 untranslated messages. ------------------------------------------------------------------------ r14296 | wsimpson | 2008-01-23 15:59:39 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/ar.po msgmerge --compendium=ar.po ../../S2_1/po/ar.po freeciv.pot -o ar.poxx ar.po 3172 translated messages, 908 fuzzy translations, 194 untranslated messages. ar.po+ 2961 translated messages, 1360 fuzzy translations, 371 untranslated messages. ar.po= 3057 translated messages, 1274 fuzzy translations, 361 untranslated messages. ------------------------------------------------------------------------ r14288 | wsimpson | 2008-01-23 08:20:59 +0200 (Wed, 23 Jan 2008) | 6 lines Changed paths: M /branches/S2_2/po/en_GB.po msgmerge --compendium=en_GB.po ../../S2_1/po/en_GB.po freeciv.pot -o en_GB.poxx (plus line-by-line comparison) en_GB.po 70 translated messages, 4622 untranslated messages. ------------------------------------------------------------------------ r14287 | wsimpson | 2008-01-23 07:24:02 +0200 (Wed, 23 Jan 2008) | 94 lines Changed paths: M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/it.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/ko.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po make update-po Apparently, the first run on S2_2. It took well over half an hour! Before(-) & After(+) ar.po- 3077 translated messages, 1292 fuzzy translations, 342 untranslated messages. ar.po+ 2961 translated messages, 1360 fuzzy translations, 371 untranslated messages. ca.po- 4666 translated messages, 34 fuzzy translations, 11 untranslated messages. ca.po+ 4465 translated messages, 185 fuzzy translations, 42 untranslated messages. cs.po- 3302 translated messages, 785 fuzzy translations, 624 untranslated messages. cs.po+ 3159 translated messages, 890 fuzzy translations, 643 untranslated messages. da.po- 4346 translated messages, 202 fuzzy translations, 163 untranslated messages. da.po+ 4156 translated messages, 342 fuzzy translations, 194 untranslated messages. de.po- 4167 translated messages, 353 fuzzy translations, 191 untranslated messages. de.po+ 3973 translated messages, 497 fuzzy translations, 222 untranslated messages. el.po- 2202 translated messages, 352 fuzzy translations, 2157 untranslated messages. el.po+ 2128 translated messages, 435 fuzzy translations, 2129 untranslated messages. en_GB.po- 28 translated messages, 211 fuzzy translations, 4472 untranslated messages. en_GB.po+ 28 translated messages, 218 fuzzy translations, 4446 untranslated messages. es.po- 3970 translated messages, 514 fuzzy translations, 227 untranslated messages. es.po+ 3785 translated messages, 650 fuzzy translations, 257 untranslated messages. et.po- 2558 translated messages, 606 fuzzy translations, 1547 untranslated messages. et.po+ 2462 translated messages, 693 fuzzy translations, 1537 untranslated messages. fa.po- 2177 translated messages, 336 fuzzy translations, 2198 untranslated messages. fa.po+ 2108 translated messages, 412 fuzzy translations, 2172 untranslated messages. fi.po- 3591 translated messages, 376 fuzzy translations, 247 untranslated messages. fi.po+ 3710 translated messages, 646 fuzzy translations, 336 untranslated messages. fr.po- 4035 translated messages, 418 fuzzy translations, 258 untranslated messages. fr.po+ 3847 translated messages, 556 fuzzy translations, 289 untranslated messages. he.po- 76 translated messages, 326 fuzzy translations, 4309 untranslated messages. he.po+ 76 translated messages, 338 fuzzy translations, 4278 untranslated messages. hu.po- 3052 translated messages, 845 fuzzy translations, 814 untranslated messages. hu.po+ 2943 translated messages, 919 fuzzy translations, 830 untranslated messages. it.po- 2914 translated messages, 1142 fuzzy translations, 655 untranslated messages. it.po+ 2787 translated messages, 1233 fuzzy translations, 672 untranslated messages. ja.po- 3865 translated messages, 485 fuzzy translations, 361 untranslated messages. ja.po+ 3693 translated messages, 621 fuzzy translations, 378 untranslated messages. ko.po- 1060 translated messages, 2 fuzzy translations, 3260 untranslated messages. ko.po+ 1031 translated messages, 296 fuzzy translations, 3365 untranslated messages. lt.po- 3161 translated messages, 374 fuzzy translations, 1176 untranslated messages. lt.po+ 3063 translated messages, 468 fuzzy translations, 1161 untranslated messages. nb.po- 2967 translated messages, 1116 fuzzy translations, 628 untranslated messages. nb.po+ 2837 translated messages, 1210 fuzzy translations, 645 untranslated messages. nl.po- 4037 translated messages, 455 fuzzy translations, 219 untranslated messages. nl.po+ 3852 translated messages, 590 fuzzy translations, 250 untranslated messages. no.po- 2967 translated messages, 1116 fuzzy translations, 628 untranslated messages. no.po+ 2837 translated messages, 1210 fuzzy translations, 645 untranslated messages. pl.po- 3484 translated messages, 802 fuzzy translations, 425 untranslated messages. pl.po+ 3320 translated messages, 926 fuzzy translations, 446 untranslated messages. pt_BR.po- 666 translated messages, 1775 fuzzy translations, 2270 untranslated messages. pt_BR.po+ 661 translated messages, 1781 fuzzy translations, 2250 untranslated messages. pt.po- 2298 translated messages, 1481 fuzzy translations, 932 untranslated messages. pt.po+ 2218 translated messages, 1524 fuzzy translations, 950 untranslated messages. ro.po- 2130 translated messages, 1144 fuzzy translations, 1437 untranslated messages. ro.po+ 2059 translated messages, 1204 fuzzy translations, 1429 untranslated messages. ru.po- 3888 translated messages, 487 fuzzy translations, 318 untranslated messages. ru.po+ 3887 translated messages, 487 fuzzy translations, 318 untranslated messages. sv.po- 3610 translated messages, 717 fuzzy translations, 384 untranslated messages. sv.po+ 3447 translated messages, 840 fuzzy translations, 405 untranslated messages. uk.po- 4400 translated messages, 119 fuzzy translations, 192 untranslated messages. uk.po+ 4213 translated messages, 257 fuzzy translations, 222 untranslated messages. zh_CN.po- 2646 translated messages, 1347 fuzzy translations, 718 untranslated messages. zh_CN.po+ 2554 translated messages, 1404 fuzzy translations, 734 untranslated messages. ------------------------------------------------------------------------ r14284 | wsimpson | 2008-01-23 04:11:22 +0200 (Wed, 23 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/happiness.c M /branches/S2_2/client/gui-win32/happiness.c M /branches/S2_2/client/text.c M /branches/S2_2/client/text.h (PR#40025) Happiness plurals -- reported by joan.creus@gmail.com ------------------------------------------------------------------------ r14282 | dmarks | 2008-01-23 02:27:50 +0200 (Wed, 23 Jan 2008) | 1 line Changed paths: M /branches/S2_2/data/nation/catalan.ruleset Updates to Catalan nation. Patch by Joan Creus with input from myself, Miguel, and William. Forwardport from S2_1. PR#40001 ------------------------------------------------------------------------ r14280 | evyscr | 2008-01-22 21:23:04 +0200 (Tue, 22 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/menu.c Fix gui-xaw compilation. Patch by Marko Lindqvist in PR#40035 ------------------------------------------------------------------------ r14279 | evyscr | 2008-01-22 20:42:26 +0200 (Tue, 22 Jan 2008) | 2 lines Changed paths: M /branches/S2_2/po/ru.po Merged with branches/2_1 ru.po ------------------------------------------------------------------------ r14271 | cazfi | 2008-01-22 04:04:12 +0200 (Tue, 22 Jan 2008) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/cma_fe.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-sdl/plrdlg.c Fixed SDL-client compilation See #40034 ------------------------------------------------------------------------ r14268 | wsimpson | 2008-01-22 03:53:53 +0200 (Tue, 22 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/agents/sha.c M /branches/S2_2/common/city.c M /branches/S2_2/common/game.c M /branches/S2_2/common/nation.c M /branches/S2_2/common/unit.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/plrhand.h M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/sanitycheck.h M /branches/S2_2/server/settlers.c M /branches/S2_2/server/srv_main.c (PR#40033) sanity checking and debugging ------------------------------------------------------------------------ r14263 | wsimpson | 2008-01-21 19:03:28 +0200 (Mon, 21 Jan 2008) | 13 lines Changed paths: M /branches/S2_2/client/tilespec.c (PR#40011) client crash with bad tile(s) Reported by: angelo.conte@email.it "Jerry James" Patch by me. Even though the server tells the client a tile is not "unknown", it isn't sending valid data. For any error detected, leave the terrain black/blank. Copious client error logging. This does not fix any server issues. ------------------------------------------------------------------------ r14258 | wsimpson | 2008-01-20 05:11:56 +0200 (Sun, 20 Jan 2008) | 17 lines Changed paths: M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/client/gui-gtk-2.0/inteldlg.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-win32/helpdlg.c M /branches/S2_2/client/gui-win32/inteldlg.c M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/gui-xaw/inteldlg.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/requirements.c M /branches/S2_2/common/team.c M /branches/S2_2/common/tech.c M /branches/S2_2/server/stdinhand.c (PR#40021) view intelligence failed assertion: tech == A_FUTURE || (tech >= 0 && tech < game.control.num_tech_types) Reported by: "Dave Daku" Emergency patch by me. This does not fix the underlying problem. But clients should not crash with bad server data. Check this datum as it is passed in from the network. Only xaw checked its data for A_UNSET! This updates that check, and fixes gtk2 (and hopefully sdl and win32, although they remain untested). Also, updated TRANS comments for various "(Unknown)", "(unknown)", and "(none)" -- attempting some usage consistency. ------------------------------------------------------------------------ r14250 | wsimpson | 2008-01-19 00:44:41 +0200 (Sat, 19 Jan 2008) | 1 line Changed paths: M /branches/S2_2/po/fi.po (PR#40026) Updated Finnish translation for 2.1 (and 2.2/trunk) -- Timo Jyrinki ------------------------------------------------------------------------ r14247 | wsimpson | 2008-01-18 23:47:58 +0200 (Fri, 18 Jan 2008) | 17 lines Changed paths: M /branches/S2_2/ai/aiexplorer.c M /branches/S2_2/ai/aiexplorer.h M /branches/S2_2/ai/aiferry.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/common/unit.h M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unithand.h M /branches/S2_2/server/unittools.c M /branches/S2_2/server/unittools.h (PR#39792) explore server assert Reported by: "Brandon Van Every" "Vincent J. Schiavoni" Patch by me. First and foremost, combine the similar code paths into do_explore(), which will indirectly call unit_activity_dependencies(). Secondly, but perhaps more importantly, use enum unit_move_result returns for ai_manage_explorer(), and pass along the new MR_DEATH result. This eliminates several crashing bugs where ai.done was set for dead units. More FIXME added for future work! ------------------------------------------------------------------------ r14243 | wsimpson | 2008-01-17 07:34:32 +0200 (Thu, 17 Jan 2008) | 14 lines Changed paths: M /branches/S2_2/ai/aiair.c M /branches/S2_2/ai/aidiplomat.c M /branches/S2_2/ai/aiferry.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/common/unit.c M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unithand.h M /branches/S2_2/server/unittools.c (PR#39870) unithand, unittools, citytools routines misnamed handle_* and real_* Want names that are easy to find, so unit_*_handling() seems reasonable for functions in unithand.[ch] Added some error logging for actual handle_* routines. Never trust network data! Expand some long series of "if (... ACTIVITY_* ...)" conditions to use switch instead. This also allows the compiler to verify that all cases were tested, and grep to find the various symbols! ------------------------------------------------------------------------ r14240 | cazfi | 2008-01-15 05:20:09 +0200 (Tue, 15 Jan 2008) | 5 lines Changed paths: M /branches/S2_2/utility/shared.c Added "'" to illegal characters to avoid broken SQL when player authentication used. See #40018 ------------------------------------------------------------------------ r14238 | cazfi | 2008-01-15 05:19:19 +0200 (Tue, 15 Jan 2008) | 4 lines Changed paths: M /branches/S2_2/configure.ac Fix gettext check to work with recent gettext versions. See #39921 ------------------------------------------------------------------------ r14235 | wsimpson | 2008-01-14 06:00:42 +0200 (Mon, 14 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/helpdata.c (PR#40014) helpdata.c implicit declaration of strlcpy() ------------------------------------------------------------------------ r14232 | wsimpson | 2008-01-14 05:27:36 +0200 (Mon, 14 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/helpdata.c (PR#40013) helpdata.c more checking buffer sizes ------------------------------------------------------------------------ r14230 | wsimpson | 2008-01-14 00:03:33 +0200 (Mon, 14 Jan 2008) | 21 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/helpdlg.c M /branches/S2_2/client/gui-sdl/helpdlg.c M /branches/S2_2/client/gui-win32/helpdlg.c M /branches/S2_2/client/gui-xaw/helpdlg.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/helpdata.h (PR#40012) helpdata.c fails check of buffer size, and other problems reported by: Joan Creus Update helptext_unit() parameters to match helptext_building(). Finish the partially completed checks for helptext_tech(), helptext_terrain(), and helptext_government(). Ensure the buffers are always '\0' terminated, use strlcat(). Fix some missing translation qualifiers for comma lists, both bare ("?blistmore:, ") and c-format ("?clistmore:, %s"). Fix a number of TRANS messages that were on the wrong line, and didn't show up in the *.po files. Fix several plural translations. ------------------------------------------------------------------------ r14225 | wsimpson | 2008-01-06 22:23:07 +0200 (Sun, 06 Jan 2008) | 18 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gamedlgs.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c (PR#11823) Game doesn't save server options (PR#39984) gtk2 server options setting and saving during start screen reported by: Jukka Suomela Kevin Benton Core@copper.net Christian Knoke suggestions from warclient by: Madeline Book patch by me. Settings and Options GTK2 dialogs now Cancel, Apply, Save, allowing settings to be saved in early screens (in addition to menu saves and saves on exit committed earlier). ------------------------------------------------------------------------ r14223 | wsimpson | 2008-01-06 21:29:46 +0200 (Sun, 06 Jan 2008) | 20 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/ailog.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/civserver.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/scripting/api.pkg M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c M /branches/S2_2/version.in (PR#40000) reducing the number of *_info messages sent to client (pass 2) Most GAME_INFO packets are sent to update the number of players! That really isn't a good use of this packet. Renamed PLAYER_REMOVE to PLAYER_CONTROL, and send for both decreases and increases in the number of players. This allows a reduction of GAME_INFO packets merely sent to update game.info.nplayers. Also, allows copious error checking. Replaced scattered references to game.info.nplayers with player_count(). Moved game.info.nbarbarians into new struct civserver server, matching struct civclient client. Use player_count_no_barbarians(). Likewise, moved server_states out of game.h -- should be server-only. Completed removal of struct player ->player_no -- a process started in July with PR#39476 -- now using player_number() and player_index() everywhere. ------------------------------------------------------------------------ r14218 | wsimpson | 2008-01-01 02:28:17 +0200 (Tue, 01 Jan 2008) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c (PR#39987) GTK2 toplevel window shown before theme ------------------------------------------------------------------------ r14216 | wsimpson | 2007-12-31 15:32:43 +0200 (Mon, 31 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/helpdata.c (PR#39831) Training and combat help data ------------------------------------------------------------------------ r14213 | wsimpson | 2007-12-31 14:30:47 +0200 (Mon, 31 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_stuff.c M /branches/S2_2/client/gui-win32/repodlgs.c (PR#39999) BUG: missing Q_() for report titles ------------------------------------------------------------------------ r14209 | wsimpson | 2007-12-31 02:12:40 +0200 (Mon, 31 Dec 2007) | 5 lines Changed paths: M /branches/S2_2/ai/advdiplomacy.c M /branches/S2_2/ai/advdomestic.c M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aiair.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aidata.c M /branches/S2_2/ai/aidiplomat.c M /branches/S2_2/ai/aiferry.c M /branches/S2_2/ai/aihand.c M /branches/S2_2/ai/ailog.c M /branches/S2_2/ai/aiparatrooper.c M /branches/S2_2/ai/aitech.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/client/agents/agents.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/cityrepdata.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/connectdlg_common.c M /branches/S2_2/client/connectdlg_common.h M /branches/S2_2/client/gui-ftwl/chat.c M /branches/S2_2/client/gui-ftwl/citydlg.c M /branches/S2_2/client/gui-ftwl/dialogs.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/caravan_dialog.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/diplodlg.c M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-gtk-2.0/editdlg.c M /branches/S2_2/client/gui-gtk-2.0/finddlg.c M /branches/S2_2/client/gui-gtk-2.0/gotodlg.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/inteldlg.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-gtk-2.0/spaceshipdlg.c M /branches/S2_2/client/gui-sdl/caravan_dialog.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/cityrep.c M /branches/S2_2/client/gui-sdl/cma_fe.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplodlg.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/finddlg.c M /branches/S2_2/client/gui-sdl/gotodlg.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/wldlg.c M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/diplodlg.c M /branches/S2_2/client/gui-win32/finddlg.c M /branches/S2_2/client/gui-win32/gotodlg.c M /branches/S2_2/client/gui-win32/inteldlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-win32/spaceshipdlg.c M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/cityrep.c M /branches/S2_2/client/gui-xaw/dialogs.c M /branches/S2_2/client/gui-xaw/diplodlg.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c M /branches/S2_2/client/gui-xaw/finddlg.c M /branches/S2_2/client/gui-xaw/gotodlg.c M /branches/S2_2/client/gui-xaw/inteldlg.c M /branches/S2_2/client/gui-xaw/pages.c M /branches/S2_2/client/gui-xaw/plrdlg.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/gui-xaw/spaceshipdlg.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/plrdlg_common.c M /branches/S2_2/client/text.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/connection.c M /branches/S2_2/common/diptreaty.c M /branches/S2_2/common/game.c M /branches/S2_2/common/idex.c M /branches/S2_2/common/nation.c M /branches/S2_2/common/nation.h M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/common/vision.c M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/citytools.h M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/gotohand.c M /branches/S2_2/server/handchat.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/report.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/spacerace.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/techtools.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c (PR#39993) i18n get_nearest_city_text() problems -- partial solution (PR#39994) i18n with, and, or, lists -- partial solution (PR#39997) strings in need of TRANS comments (PR#39998) access functions city_name() and player_name() ------------------------------------------------------------------------ r14204 | wsimpson | 2007-12-26 20:49:29 +0200 (Wed, 26 Dec 2007) | 1 line Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aidiplomat.c M /branches/S2_2/ai/aihunt.c M /branches/S2_2/ai/ailog.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/common/combat.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c (PR#39971) BUG: i18n possessive problems ------------------------------------------------------------------------ r14201 | wsimpson | 2007-12-25 16:13:33 +0200 (Tue, 25 Dec 2007) | 1 line Changed paths: M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c M /branches/S2_2/server/unittools.h (PR#39973) i18n get_location_str() problems ------------------------------------------------------------------------ r14189 | dmarks | 2007-12-23 03:50:02 +0200 (Sun, 23 Dec 2007) | 1 line Changed paths: M /branches/S2_2/po/fi.po 3659 translated messages, 641 fuzzy translations, 400 untranslated messages. Translation by Timo Jyrinki and Sini Ruohomaa PR#39981 ------------------------------------------------------------------------ r14184 | dmarks | 2007-12-22 12:32:12 +0200 (Sat, 22 Dec 2007) | 1 line Changed paths: M /branches/S2_2/po/fi.po 3222 translated messages, 1047 fuzzy translations, 431 untranslated messages. Translation by Timo Jyrinki PR#39975 - forwardport from S2_1 ------------------------------------------------------------------------ r14179 | wsimpson | 2007-12-18 14:42:00 +0200 (Tue, 18 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/plrdlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-win32/plrdlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-xaw/menu.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/data/Freeciv.in (PR#39977) Cleanup: gui-xaw, gui-win32, etc: menu reports ------------------------------------------------------------------------ r14176 | dmarks | 2007-12-18 00:48:32 +0200 (Tue, 18 Dec 2007) | 1 line Changed paths: M /branches/S2_2/data/civ1/buildings.ruleset M /branches/S2_2/data/civ2/buildings.ruleset M /branches/S2_2/data/default/buildings.ruleset Add realistic terrain reqs for three default wonders, as well a number of missing ones to civ1 and civ2. PR#39944 ------------------------------------------------------------------------ r14171 | wsimpson | 2007-12-17 10:41:38 +0200 (Mon, 17 Dec 2007) | 1 line Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/gui-ftwl/dialogs.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/editdlg.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/inteldlg.c M /branches/S2_2/client/gui-gtk-2.0/mapview.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplodlg.c M /branches/S2_2/client/gui-sdl/gotodlg.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/plrdlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/spaceshipdlg.c M /branches/S2_2/client/gui-win32/connectdlg.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/diplodlg.c M /branches/S2_2/client/gui-win32/inteldlg.c M /branches/S2_2/client/gui-win32/mapview.c M /branches/S2_2/client/gui-win32/plrdlg.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-xaw/dialogs.c M /branches/S2_2/client/gui-xaw/diplodlg.c M /branches/S2_2/client/gui-xaw/inteldlg.c M /branches/S2_2/client/gui-xaw/pages.c M /branches/S2_2/client/gui-xaw/plrdlg.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/plrdlg_common.c M /branches/S2_2/client/text.c M /branches/S2_2/common/nation.c M /branches/S2_2/common/nation.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/requirements.c M /branches/S2_2/doc/README.nations M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/report.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/scripting/api_methods.c M /branches/S2_2/server/spacerace.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unittools.c M /branches/S2_2/server/unittools.h (PR#39974) nation_name_* renamed nation_adjective_* ------------------------------------------------------------------------ r14165 | wsimpson | 2007-12-16 09:40:05 +0200 (Sun, 16 Dec 2007) | 6 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.h M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-gtk-2.0/pages.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/data/helpdata.txt M /branches/S2_2/data/scenario/tutorial.sav (PR#39749) [Bug] battle groups keys don't work (Belgium and French) (PR#39927) consistent UI - Map - shortcut F4 in 2.1 - F1 in 2.2 (PR#39966) BUG: GTK2 new game screen, _Ruleset conflicts with _Ready (and Not _ready) and _Release player, etc. (PR#39967) BUG: GTK2 menu _Reports: _Players conflicts with S_paceship ------------------------------------------------------------------------ r14162 | wsimpson | 2007-12-15 10:46:20 +0200 (Sat, 15 Dec 2007) | 15 lines Changed paths: M /branches/S2_2/client/clinet.c M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/options.c M /branches/S2_2/client/options.h M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/client/repodlgs_common.h M /branches/S2_2/server/stdinhand.c (PR#39959) BUG: options/settings changes lost when Leaving & (re)Loading The save_options_on_exit menu option didn't work for Leave, only Quit. The settable options weren't saved. Keeping track of the settings that are different from default, and only saving and sending those. Fixes an outstanding client memory leak, for every single settings string packet after the first groups -- the old strings weren't freed. Fixes an append_output_window() problem with GTK2 early error reporting. Replaced them with freelog(). So far, only done for GTK2.... ------------------------------------------------------------------------ r14159 | wsimpson | 2007-12-12 20:40:52 +0200 (Wed, 12 Dec 2007) | 41 lines Changed paths: M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/settings.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c (PR#39960) reducing the number of *_info messages sent to client (pass 1) Because send_player_info() is hidden inside certain functions, remove and scatter to various code branches instead to reveal code flow. This also fixes several potential bugs. Moreover, in most places that send_all_info() was called, it was immediately followed by send_player_info(NULL, NULL), duplicated to the connection! Generally, send_conn_info() after send_game_info() and send_player_info() because of player number. This also fixes several potential bugs. server/connecthand.c establish_new_connection() repeat calls in various code branches to avoid sending redundant packets. bug fix: send_conn_info() after send_game_info() and send_player_info() attach_connection_to_player() remove redundant calls, scatter to various code branches instead: send_game_info(NULL) send_player_info(pplayer, NULL) lost_connection_to_client() send_player_info(pplayer, NULL) was only sent in S_S_RUNNING, but also sent sometimes by toggle_ai_player_direct(); now always send for consistency. server/srv_main.c send_all_info() remove redundant call after each call, include within function: send_player_info(NULL, NULL) server/stdinhand.c toggle_ai_player_direct() remove redundant call, scatter to various code branches instead: send_player_info(pplayer, NULL) (allows the calls to be moved ahead of sending *_info) detach_command() bug fix? detaching observer should be sent rulesets (like /take)? ------------------------------------------------------------------------ r14157 | wsimpson | 2007-12-12 16:31:59 +0200 (Wed, 12 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.h (PR#12188) Alt-t key does not work ------------------------------------------------------------------------ r14154 | wsimpson | 2007-12-12 14:09:25 +0200 (Wed, 12 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/repodlgs.c M /branches/S2_2/client/gui-win32/repodlgs.c M /branches/S2_2/client/gui-xaw/repodlgs.c M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/client/repodlgs_common.h M /branches/S2_2/common/packets.def M /branches/S2_2/manual/civmanual.c M /branches/S2_2/server/settings.h M /branches/S2_2/server/stdinhand.c (PR#39964) BUG: server settable options uninitialized and bad values ------------------------------------------------------------------------ r14150 | wsimpson | 2007-12-10 00:46:11 +0200 (Mon, 10 Dec 2007) | 29 lines Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/clinet.c M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/gamehand.h M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/ruleset.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c (PR#39956) reducing the number of rulesets sent to client (pass 1) server/ruleset.c load_rulesets() remove redundant send_rulesets(), usually sent later after game_load(), instead send only after explicit server/stdinhand.c set_rulesetdir() In addition, this fixes a bug sending rulesets to game.all_connections instead of the correct game.est_connections (established). server/savegame.c game_load() remove redundant send_ruleset_nations(), sent later with send_rulesets() server/srv_main.c start_game() remove redundant send_server_settings() Generally, send_server_settings() after send_rulesets() for delta compression of the redundancy and updates. client/repodlgs_common.c calloc instead of malloc Also, the server and client had identically named handle_packet_input() routines, yet were not the generated packet handler names. Renamed to avoid confusion with each other, and with packets.def handlers. ------------------------------------------------------------------------ r14147 | wsimpson | 2007-12-08 19:56:33 +0200 (Sat, 08 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/gui_main.c (PR#39924) BUG: escape doesn't cancel dialogs nor much of anything else ------------------------------------------------------------------------ r14142 | wsimpson | 2007-12-07 23:15:48 +0200 (Fri, 07 Dec 2007) | 18 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/agents/cma_fec.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/cityrepdata.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/control.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/city.c M /branches/S2_2/common/game.c M /branches/S2_2/common/game.h M /branches/S2_2/common/packets.c M /branches/S2_2/common/packets.def M /branches/S2_2/common/packets.h M /branches/S2_2/common/requirements.c M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/gamehand.h M /branches/S2_2/server/report.c M /branches/S2_2/server/ruleset.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unithand.c M /branches/S2_2/version.in (PR#39948) divorce client_states from server_states The "client" state values were sent across the network (and actually are the server state). The "server" state values are saved in savegames, although the values are usually replaced and/or ignored upon loading.... This patch stops sending game state as a packet. Each client derives its own current state from the packet events independently. Also, *_game_state() had special processing to clear the delta values sent across the network. (PR#7085 & 7216) This patch clears the delta values with *_ruleset_control() instead, because that better matches clearing the rulesets for each game! Because the client_states are no longer in game.h, and game.h is not needed in civclient.h, fix a significant number of missing game.h and specialist.h #includes. They always should have been there! ------------------------------------------------------------------------ r14140 | wsimpson | 2007-12-06 04:24:20 +0200 (Thu, 06 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/goto.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-gtk-2.0/mapview.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-win32/mapctrl.c M /branches/S2_2/client/mapctrl_common.c (PR#39850) missing control re-initialization for second game ------------------------------------------------------------------------ r14136 | wsimpson | 2007-12-05 02:10:29 +0200 (Wed, 05 Dec 2007) | 7 lines Changed paths: M /branches/S2_2/client/tilespec.c (PR#39947) 2.2-test more build errors with gcc 2.95.3 Partial revert of r14132 and r14133. While the sentiment was good, the original problem was the bad PR#34336 patch that inserted an "if" in the middle of the initializers just before a comment. Instead, use conditional assignment. ------------------------------------------------------------------------ r14134 | jdorje | 2007-12-05 01:04:23 +0200 (Wed, 05 Dec 2007) | 5 lines Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aidata.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/common/effects.c M /branches/S2_2/server/cityturn.c Use a different form of initializer for recursive initialization of struct/union values. This form is both C99 and works in gcc 2.95. Patch by in PR#39947. ------------------------------------------------------------------------ r14133 | jdorje | 2007-12-05 01:00:52 +0200 (Wed, 05 Dec 2007) | 4 lines Changed paths: M /branches/S2_2/client/tilespec.c M /branches/S2_2/server/savegame.c Don't declare variables mid-function. Patch by in PR#39947 with changes by me. ------------------------------------------------------------------------ r14130 | wsimpson | 2007-12-04 19:45:49 +0200 (Tue, 04 Dec 2007) | 15 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/game.h M /branches/S2_2/server/edithand.c M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/stdinhand.c (PR#39946) [cleanup] send_game_info() Fix bad parameters in savegame (from PR#39940). The number of players is in game.info, so send_game_info() MUST be called before send_player_info(). Fixed several potential bugs. Fix old hack by using S_S_GENERATING_WAITING, so named because previous code called it GAME_GENERATION_STATE, "Waiting", UNUSED_STATE, and "Unknown". Removed duplicate sends in server/plrhand.c split_player() Removed duplicate sends in server/stdinhand.c set_command() Since this is a cleanup, not affecting user visible features, leave the popdown_races_dialog(), but flag it with a FIXME! ------------------------------------------------------------------------ r14126 | wsimpson | 2007-12-04 01:28:41 +0200 (Tue, 04 Dec 2007) | 1 line Changed paths: M /branches/S2_2/common/nation.c M /branches/S2_2/server/stdinhand.c (PR#39842) rulesetdir in already started game and bounds_check_nation -- reported by Egor Vyscrebentsov ------------------------------------------------------------------------ r14121 | wsimpson | 2007-12-03 14:41:03 +0200 (Mon, 03 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/agents/agents.c M /branches/S2_2/client/civclient.c M /branches/S2_2/client/civclient.h M /branches/S2_2/client/climisc.c M /branches/S2_2/client/clinet.c M /branches/S2_2/client/control.c M /branches/S2_2/client/gui-ftwl/gotodlg.c M /branches/S2_2/client/gui-ftwl/gui_main.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/chatline.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-sdl/optiondlg.c M /branches/S2_2/client/gui-sdl/repodlgs.c M /branches/S2_2/client/gui-sdl/themespec.c M /branches/S2_2/client/gui-stub/gotodlg.c M /branches/S2_2/client/gui-win32/gui_main.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/gui-xaw/pages.c M /branches/S2_2/client/options.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/game.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/connecthand.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/meta.c M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/sernet.c M /branches/S2_2/server/sernet.h M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/srv_main.h M /branches/S2_2/server/stdinhand.c (PR#39940) [cleanup] client/server state symbols ------------------------------------------------------------------------ r14116 | wsimpson | 2007-12-02 17:26:27 +0200 (Sun, 02 Dec 2007) | 1 line Changed paths: M /branches/S2_2/common/events.c (PR#39943) more veteran is broken english -- reported by Karl Goetz ------------------------------------------------------------------------ r14113 | wsimpson | 2007-12-02 17:09:00 +0200 (Sun, 02 Dec 2007) | 1 line Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/gui-gtk-2.0/gui_main.c (PR#39602) quickselect doesn't like the selection of many units -- patches rejected -- rarely used keys deleted ------------------------------------------------------------------------ r14108 | wsimpson | 2007-11-29 18:57:38 +0200 (Thu, 29 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c (PR#39929) GTK2 (F3) Players (Alt-C) _Cancel Treaty conflicts with Chat, City ------------------------------------------------------------------------ r14105 | wsimpson | 2007-11-29 16:52:03 +0200 (Thu, 29 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c (PR#39909) BUG: leader gender ignored in diplomat/spy dialog ------------------------------------------------------------------------ r14101 | wsimpson | 2007-11-29 07:20:58 +0200 (Thu, 29 Nov 2007) | 11 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-gtk-2.0/messagewin.c M /branches/S2_2/client/gui-win32/menu.c (PR#39900) _Update button in city report to _Inspect (PR#39912) consistent UI - Chat - use apostrophe for shortcut (PR#39913) consistent UI - Government should be Edit Remove related gui-gtk2 menu and tab shortcut conflicts. Unlike 2.1, merged Editor under Edit, moved Government to submenu of Game, and added Options submenu under Game to reduce clutter. Similar changes to gui-win32 (incomplete and untested). ------------------------------------------------------------------------ r14098 | jdorje | 2007-11-28 23:40:10 +0200 (Wed, 28 Nov 2007) | 1 line Changed paths: M /branches/S2_2/doc/README Simple typo fix. ------------------------------------------------------------------------ r14094 | wsimpson | 2007-11-28 19:59:07 +0200 (Wed, 28 Nov 2007) | 1 line Changed paths: M /branches/S2_2/server/settings.c (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3 ------------------------------------------------------------------------ r14091 | jdorje | 2007-11-28 10:21:50 +0200 (Wed, 28 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/server/auth.c Fix out-of-place TRANS comment. Reported by Christian Knoke in PR#39747. ------------------------------------------------------------------------ r14088 | jdorje | 2007-11-28 10:02:42 +0200 (Wed, 28 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/data/Makefile.am M /branches/S2_2/m4/ggz.m4 Install ggzd game and room files in the configure-detected directory. See PR#39808. ------------------------------------------------------------------------ r14087 | jdorje | 2007-11-28 09:25:53 +0200 (Wed, 28 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/configure.ac Move AC_GNU_SOURCE test up near the top of configure. See PR#39849. ------------------------------------------------------------------------ r14084 | jdorje | 2007-11-28 09:10:41 +0200 (Wed, 28 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/configure.ac Check for GNU glibc (needed for strcasestr extension). Patch by Marko Lindqvist in PR#39849. ------------------------------------------------------------------------ r14080 | jdorje | 2007-11-27 00:48:38 +0200 (Tue, 27 Nov 2007) | 5 lines Changed paths: M /branches/S2_2/client/gui-gtk-2.0/cityrep.c Avoid triggering a gcc 4.1/4.2 bug that breaks city report CMA control. Report and patch by Castanier Carl in PR#39722 with changes by me. ------------------------------------------------------------------------ r14076 | jdorje | 2007-11-26 02:54:36 +0200 (Mon, 26 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/client/gui-sdl/chatline.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/colors.h M /branches/S2_2/client/gui-sdl/connectdlg.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/graphics.c M /branches/S2_2/client/gui-sdl/inteldlg.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/themespec.c M /branches/S2_2/client/gui-sdl/widget_button.c M /branches/S2_2/client/gui-sdl/widget_checkbox.c M /branches/S2_2/client/gui-sdl/widget_scrollbar.c M /branches/S2_2/client/gui-sdl/wldlg.c Fix various reported compiler errors from gcc 2.95 on beos. Patch by me in PR#39906. ------------------------------------------------------------------------ r14068 | jdorje | 2007-11-26 01:01:36 +0200 (Mon, 26 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/client/reqtree.c Don't declare new variables mid-function. Patch by me in PR#39905. ------------------------------------------------------------------------ r14065 | dmarks | 2007-11-26 00:56:28 +0200 (Mon, 26 Nov 2007) | 1 line Changed paths: M /branches/S2_2/m4/ggz.m4 New ggz.m4 borrowed from ggz svn. See PR#39611. ------------------------------------------------------------------------ r14061 | dmarks | 2007-11-26 00:34:01 +0200 (Mon, 26 Nov 2007) | 1 line Changed paths: M /branches/S2_2/utility/log.c Use mystrdup instead of strdup. Patch by Jason Dorje Short in PR#39904. ------------------------------------------------------------------------ r14058 | dmarks | 2007-11-26 00:22:04 +0200 (Mon, 26 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/nation/australian.ruleset Change Australian city style to European, as requested by Karl Goetz in PR#39887. ------------------------------------------------------------------------ r14054 | wsimpson | 2007-11-25 19:06:52 +0200 (Sun, 25 Nov 2007) | 10 lines Changed paths: M /branches/S2_2/client/packhand.c M /branches/S2_2/common/city.c M /branches/S2_2/common/map.c M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/common/terrain.c M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c (PR#39895) deterministic borders (part 1) Initial re-design of the border code, leaving much of the old code in place for comparison. For a game in progress, the code yields *exactly* the same borders. For new games, borders spring into place around cities as soon as they are built. Border source information is now kept only in the player map tiles, instead of the main client/server tiles. ------------------------------------------------------------------------ r14051 | wsimpson | 2007-11-25 14:21:48 +0200 (Sun, 25 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/connectdlg_common.c (PR#39901) Patch: Fix permission on open() call -- reported by Brian Pepple ------------------------------------------------------------------------ r14047 | cproc | 2007-11-25 06:44:46 +0200 (Sun, 25 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/cma_fe.c Fix slider movement in the city governor dialog. Reported by in PR#39859, patch by me. ------------------------------------------------------------------------ r14039 | dmarks | 2007-11-24 14:48:20 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/flags/unknown-shield.png M /branches/S2_2/data/flags/unknown.png M /branches/S2_2/data/flags/unknown.svg Fix Inkscape crash. ------------------------------------------------------------------------ r14036 | dmarks | 2007-11-24 13:58:14 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/flags/rome-shield.png M /branches/S2_2/data/flags/rome.png M /branches/S2_2/data/flags/rome.svg Fix Inkscape crash. ------------------------------------------------------------------------ r14033 | wsimpson | 2007-11-24 13:33:59 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/server/savegame.c (PR#39898) Buffer overflow during autosave -- reported by loganjerry@gmail.com ------------------------------------------------------------------------ r14030 | dmarks | 2007-11-24 12:28:19 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/flags/constantine-shield.png M /branches/S2_2/data/flags/constantine.png M /branches/S2_2/data/flags/constantine.svg Fix Inkscape crash. ------------------------------------------------------------------------ r14027 | dmarks | 2007-11-24 05:11:44 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civclient.dsc.in M /branches/S2_2/data/civserver.dsc.in Update URL ------------------------------------------------------------------------ r14025 | dmarks | 2007-11-24 04:23:17 +0200 (Sat, 24 Nov 2007) | 1 line Changed paths: M /branches/S2_2/configure.ac A /branches/S2_2/po/ko.po Forwardport Korean l10n. ------------------------------------------------------------------------ r14021 | wsimpson | 2007-11-24 01:04:27 +0200 (Sat, 24 Nov 2007) | 6 lines Changed paths: M /branches/S2_2/client/climisc.c M /branches/S2_2/scripts/setup_auth_server.sh M /branches/S2_2/server/unittools.c (PR#39818) 2.1.0 multiple bugs: "gives" -> "give" reported by Christoph Petschnig (PR#39884) Typo "succesfully" in English airlift message reported by Jacob Nevins ------------------------------------------------------------------------ r14017 | wsimpson | 2007-11-23 22:49:02 +0200 (Fri, 23 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gotodlg.c M /branches/S2_2/client/gui-gtk-2.0/messagewin.c M /branches/S2_2/client/gui-gtk-2.0/plrdlg.c (PR#23078) 2.1.0 (F1) City & (F3) Player - (Alt-H) S_how conflicts with _Help ------------------------------------------------------------------------ r14013 | dmarks | 2007-11-22 01:02:17 +0200 (Thu, 22 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/misc/small.png M /branches/S2_2/data/misc/small.spec Replace dollar symbol with more universal gold coin. Reported by Ronny Standtke in PR#39838. Graphics by Hogne Haskjold. ------------------------------------------------------------------------ r14011 | dmarks | 2007-11-21 16:24:37 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/default/units.ruleset Add missing newline. ------------------------------------------------------------------------ r14009 | dmarks | 2007-11-21 15:25:15 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/default/units.ruleset Fix gettext warnings. ------------------------------------------------------------------------ r14005 | dmarks | 2007-11-21 14:43:46 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ2/buildings.ruleset M /branches/S2_2/data/civ2/effects.ruleset Add effect to civ2 ruleset Eiffel Tower and update helptext. PR#39874 ------------------------------------------------------------------------ r14002 | dmarks | 2007-11-21 14:39:45 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/default/buildings.ruleset M /branches/S2_2/data/default/effects.ruleset Reword Eiffel Tower helptext to reflect new rules. Reported by eadleofice in PR#39826. ------------------------------------------------------------------------ r13998 | dmarks | 2007-11-21 14:31:26 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ2/units.ruleset Improve elephant helptext. Reported by Chris Knoke in PR#39748. ------------------------------------------------------------------------ r13997 | dmarks | 2007-11-21 14:29:08 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ1/units.ruleset M /branches/S2_2/data/civ2/units.ruleset M /branches/S2_2/data/default/units.ruleset Improve diplomat and spy helptexts. Reported by Marko Lindqvist in PR#39541; patch by me. ------------------------------------------------------------------------ r13994 | wsimpson | 2007-11-21 03:55:15 +0200 (Wed, 21 Nov 2007) | 1 line Changed paths: M /branches/S2_2/server/savegame.c M /branches/S2_2/server/srv_main.c (PR#39876) fix soft restart; load game freelog translation; re-order early load ------------------------------------------------------------------------ r13991 | wsimpson | 2007-11-18 15:14:10 +0200 (Sun, 18 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/packhand.c (PR#39868) unit woken up from sentry not properly deselected ------------------------------------------------------------------------ r13988 | wsimpson | 2007-11-18 08:02:32 +0200 (Sun, 18 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/control.c (PR#39873) harmonize 2.1 and 2.2 control.c somewhat ------------------------------------------------------------------------ r13986 | dmarks | 2007-11-17 15:51:29 +0200 (Sat, 17 Nov 2007) | 1 line Changed paths: M /branches/S2_2/server/unittools.c Clarify paradrop server message. Reported by Chris Knoke in PR#9347 with patch by Jason Dorje. ------------------------------------------------------------------------ r13983 | dmarks | 2007-11-17 15:36:02 +0200 (Sat, 17 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/options.c Turn off fullscreen mode by default. See PR#12119 ------------------------------------------------------------------------ r13978 | jdorje | 2007-11-16 13:02:07 +0200 (Fri, 16 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/civ1/script.lua M /branches/S2_2/data/civ2/script.lua M /branches/S2_2/data/default/ai_effects.ruleset M /branches/S2_2/data/fonts/COPYING.Vera M /branches/S2_2/data/nation/breton.ruleset M /branches/S2_2/data/nation/burgundian.ruleset M /branches/S2_2/data/nation/kurd.ruleset M /branches/S2_2/data/nation/norman.ruleset M /branches/S2_2/data/nation/templar.ruleset M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/gtkrc M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/menubar.rc M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/panel.rc M /branches/S2_2/data/themes/gui-sdl/human/COPYING.DejaVu M /branches/S2_2/data/themes/gui-sdl/human/COPYING.UnDotum M /branches/S2_2/data/themes/gui-sdl/human/COPYING.fireflysung M /branches/S2_2/data/themes/gui-sdl/human/COPYING.sazanami M /branches/S2_2/dependencies/lua-5.1/COPYRIGHT M /branches/S2_2/dependencies/lua-5.1/Version M /branches/S2_2/dependencies/lua-5.1/etc/lua.hpp M /branches/S2_2/dependencies/tolua/README M /branches/S2_2/dependencies/toluaxx/src/bin/help.cxx M /branches/S2_2/dependencies/toluaxx/src/bin/help.hxx M /branches/S2_2/dependencies/toluaxx/src/bin/lua/tlx_compat51.lua M /branches/S2_2/dependencies/toluaxx/src/bin/lua/tlx_custom.lua M /branches/S2_2/dependencies/toluaxx/src/bin/main.hxx M /branches/S2_2/dependencies/toluaxx/src/bin/parsecmd.cxx M /branches/S2_2/dependencies/toluaxx/src/bin/parsecmd.hxx M /branches/S2_2/dependencies/toluaxx/src/bin/platform.hxx M /branches/S2_2/dependencies/toluaxx/src/bin/toluaxx.bind.cxx M /branches/S2_2/m4/pkg.m4 M /branches/S2_2/scripts/freeciv.supp Set svn:eol-style to native on a number of additional text files. ------------------------------------------------------------------------ r13974 | jdorje | 2007-11-16 12:08:14 +0200 (Fri, 16 Nov 2007) | 1 line Changed paths: M /branches/S2_2/bootstrap/generate_svnrev.sh M /branches/S2_2/scripts/setup_auth_server.sh Set svn:eol-style (svn property) to native for *.svg files. ------------------------------------------------------------------------ r13969 | jdorje | 2007-11-16 11:44:55 +0200 (Fri, 16 Nov 2007) | 2 lines Changed paths: M /branches/S2_2/data/flags/ainu.svg M /branches/S2_2/data/flags/akwe.svg M /branches/S2_2/data/flags/belarus.svg M /branches/S2_2/data/flags/brittany.svg M /branches/S2_2/data/flags/burgundy.svg M /branches/S2_2/data/flags/burundi.svg M /branches/S2_2/data/flags/chola.svg M /branches/S2_2/data/flags/dominica.svg M /branches/S2_2/data/flags/gupta.svg M /branches/S2_2/data/flags/hawaii.svg M /branches/S2_2/data/flags/himyar.svg M /branches/S2_2/data/flags/hopi.svg M /branches/S2_2/data/flags/innu.svg M /branches/S2_2/data/flags/kanem-bornu.svg M /branches/S2_2/data/flags/kazakhstan.svg M /branches/S2_2/data/flags/khwarezm.svg M /branches/S2_2/data/flags/kongo.svg M /branches/S2_2/data/flags/korea_ancient.svg M /branches/S2_2/data/flags/kurd.svg M /branches/S2_2/data/flags/kyrgyzstan.svg M /branches/S2_2/data/flags/laos.svg M /branches/S2_2/data/flags/majapahit.svg M /branches/S2_2/data/flags/mapuche.svg M /branches/S2_2/data/flags/moldova.svg M /branches/S2_2/data/flags/muskogee.svg M /branches/S2_2/data/flags/normandy.svg M /branches/S2_2/data/flags/north_korea.svg M /branches/S2_2/data/flags/nubia.svg M /branches/S2_2/data/flags/numidia.svg M /branches/S2_2/data/flags/nuu-chah-nulth.svg M /branches/S2_2/data/flags/pirate.svg M /branches/S2_2/data/flags/prussia.svg M /branches/S2_2/data/flags/purhepecha.svg M /branches/S2_2/data/flags/srivijaya.svg M /branches/S2_2/data/flags/taino.svg M /branches/S2_2/data/flags/tairona.svg M /branches/S2_2/data/flags/tajikistan.svg M /branches/S2_2/data/flags/templar.svg M /branches/S2_2/data/flags/thrace.svg M /branches/S2_2/data/flags/tocharian.svg M /branches/S2_2/data/flags/tupi.svg M /branches/S2_2/data/flags/turkmenistan.svg M /branches/S2_2/data/flags/uae.svg M /branches/S2_2/data/flags/uzbekistan.svg M /branches/S2_2/data/graphics/wonders/isaac_newtons_college.svg M /branches/S2_2/data/graphics/wonders/js_bachs_cathedral.svg M /branches/S2_2/data/graphics/wonders/lighthouse.svg M /branches/S2_2/data/graphics/wonders/united_nations.svg Set svn:eol-style (svn property) to native for *.svg files. ------------------------------------------------------------------------ r13968 | jdorje | 2007-11-16 11:37:43 +0200 (Fri, 16 Nov 2007) | 2 lines Changed paths: M /branches/S2_2/bootstrap/fc_svnrev_gen.h.in M /branches/S2_2/bootstrap/freeciv-server.desktop.in M /branches/S2_2/client/gui-gtk-2.0/theme_dlg.c M /branches/S2_2/client/gui-gtk-2.0/tileset_dlg.c M /branches/S2_2/common/vision.c M /branches/S2_2/common/vision.h M /branches/S2_2/data/icons/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Arrows/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Buttons/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Check-Radio/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Combo/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Frame-Gap/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Handles/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Lines/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ListHeaders/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Menu-Menubar/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Others/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Panel/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/ProgressBar/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Range/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Scrollbars/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Shadows/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Spin/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Tabs/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Freeciv/gtk-2.0/Toolbar/Makefile.am M /branches/S2_2/data/themes/gui-gtk-2.0/Makefile.am M /branches/S2_2/data/wonders/Makefile.am M /branches/S2_2/dependencies/lua-5.1/Makefile.am M /branches/S2_2/dependencies/lua-5.1/src/Makefile.am M /branches/S2_2/dependencies/lua-5.1/src/lapi.c M /branches/S2_2/dependencies/lua-5.1/src/lapi.h M /branches/S2_2/dependencies/lua-5.1/src/lauxlib.c M /branches/S2_2/dependencies/lua-5.1/src/lauxlib.h M /branches/S2_2/dependencies/lua-5.1/src/lbaselib.c M /branches/S2_2/dependencies/lua-5.1/src/lcode.c M /branches/S2_2/dependencies/lua-5.1/src/lcode.h M /branches/S2_2/dependencies/lua-5.1/src/ldblib.c M /branches/S2_2/dependencies/lua-5.1/src/ldebug.c M /branches/S2_2/dependencies/lua-5.1/src/ldebug.h M /branches/S2_2/dependencies/lua-5.1/src/ldo.c M /branches/S2_2/dependencies/lua-5.1/src/ldo.h M /branches/S2_2/dependencies/lua-5.1/src/ldump.c M /branches/S2_2/dependencies/lua-5.1/src/lfunc.c M /branches/S2_2/dependencies/lua-5.1/src/lfunc.h M /branches/S2_2/dependencies/lua-5.1/src/lgc.c M /branches/S2_2/dependencies/lua-5.1/src/lgc.h M /branches/S2_2/dependencies/lua-5.1/src/linit.c M /branches/S2_2/dependencies/lua-5.1/src/liolib.c M /branches/S2_2/dependencies/lua-5.1/src/llex.c M /branches/S2_2/dependencies/lua-5.1/src/llex.h M /branches/S2_2/dependencies/lua-5.1/src/llimits.h M /branches/S2_2/dependencies/lua-5.1/src/lmathlib.c M /branches/S2_2/dependencies/lua-5.1/src/lmem.c M /branches/S2_2/dependencies/lua-5.1/src/lmem.h M /branches/S2_2/dependencies/lua-5.1/src/loadlib.c M /branches/S2_2/dependencies/lua-5.1/src/lobject.c M /branches/S2_2/dependencies/lua-5.1/src/lobject.h M /branches/S2_2/dependencies/lua-5.1/src/lopcodes.c M /branches/S2_2/dependencies/lua-5.1/src/lopcodes.h M /branches/S2_2/dependencies/lua-5.1/src/loslib.c M /branches/S2_2/dependencies/lua-5.1/src/lparser.c M /branches/S2_2/dependencies/lua-5.1/src/lparser.h M /branches/S2_2/dependencies/lua-5.1/src/lstate.c M /branches/S2_2/dependencies/lua-5.1/src/lstate.h M /branches/S2_2/dependencies/lua-5.1/src/lstring.c M /branches/S2_2/dependencies/lua-5.1/src/lstring.h M /branches/S2_2/dependencies/lua-5.1/src/lstrlib.c M /branches/S2_2/dependencies/lua-5.1/src/ltable.c M /branches/S2_2/dependencies/lua-5.1/src/ltable.h M /branches/S2_2/dependencies/lua-5.1/src/ltablib.c M /branches/S2_2/dependencies/lua-5.1/src/ltm.c M /branches/S2_2/dependencies/lua-5.1/src/ltm.h M /branches/S2_2/dependencies/lua-5.1/src/lua.c M /branches/S2_2/dependencies/lua-5.1/src/lua.h M /branches/S2_2/dependencies/lua-5.1/src/luac.c M /branches/S2_2/dependencies/lua-5.1/src/luaconf.h M /branches/S2_2/dependencies/lua-5.1/src/lualib.h M /branches/S2_2/dependencies/lua-5.1/src/lundump.c M /branches/S2_2/dependencies/lua-5.1/src/lundump.h M /branches/S2_2/dependencies/lua-5.1/src/lvm.c M /branches/S2_2/dependencies/lua-5.1/src/lvm.h M /branches/S2_2/dependencies/lua-5.1/src/lzio.c M /branches/S2_2/dependencies/lua-5.1/src/lzio.h M /branches/S2_2/dependencies/lua-5.1/src/print.c M /branches/S2_2/dependencies/toluaxx/Makefile.am M /branches/S2_2/dependencies/toluaxx/src/Makefile.am M /branches/S2_2/dependencies/toluaxx/src/bin/Makefile.am M /branches/S2_2/dependencies/toluaxx/src/lib/Makefile.am M /branches/S2_2/doc/ca/Makefile.am Set svn:eol-style (svn property) to native for *.c, *.h, *.am, and *.in files. ------------------------------------------------------------------------ r13965 | cproc | 2007-11-15 18:27:42 +0200 (Thu, 15 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/widget.c Fix selectability of present/supported units in the city dialog. Reported by Erik Johansson in PR#39825, patch by me. ------------------------------------------------------------------------ r13962 | cproc | 2007-11-15 18:11:06 +0200 (Thu, 15 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/citydlg.c Fix a potential crash after disbanding a unit from the city dialog. Reported by Weston Hanners in PR#39825, patch by me. ------------------------------------------------------------------------ r13959 | wsimpson | 2007-11-15 17:29:31 +0200 (Thu, 15 Nov 2007) | 1 line Changed paths: M /branches/S2_2/common/aicore/path_finding.c M /branches/S2_2/common/aicore/path_finding.h M /branches/S2_2/common/aicore/pf_tools.c (PR#39852) BUG: path finding incorrect air destination calculations -- after comments -- try finding airbase ------------------------------------------------------------------------ r13956 | cproc | 2007-11-15 15:59:50 +0200 (Thu, 15 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/themespec.c add missing "citydlg_common.h" #includes ------------------------------------------------------------------------ r13954 | wsimpson | 2007-11-15 02:33:12 +0200 (Thu, 15 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/text.c (PR#39858) middle click on unexplored territory causes SDL crash -- reverted/revised ------------------------------------------------------------------------ r13951 | jdorje | 2007-11-14 23:34:55 +0200 (Wed, 14 Nov 2007) | 4 lines Changed paths: M /branches/S2_2/client/text.c Fix crash when tile info is taken on an unknown tile. Patch by me in PR#39858. ------------------------------------------------------------------------ r13949 | wsimpson | 2007-11-14 18:23:54 +0200 (Wed, 14 Nov 2007) | 17 lines Changed paths: M /branches/S2_2/ai/advdomestic.c M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aiair.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aidata.c M /branches/S2_2/ai/aidiplomat.c M /branches/S2_2/ai/aiexplorer.c M /branches/S2_2/ai/aiferry.c M /branches/S2_2/ai/aihunt.c M /branches/S2_2/ai/ailog.c M /branches/S2_2/ai/aiparatrooper.c M /branches/S2_2/ai/aisettler.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aiunit.c M /branches/S2_2/client/agents/sha.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/control.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/goto.c M /branches/S2_2/client/gui-ftwl/citydlg.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/diplomat_dialog.c M /branches/S2_2/client/gui-gtk-2.0/mapctrl.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-stub/citydlg.c M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/cityrep.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/diplomat_dialog.c M /branches/S2_2/client/gui-xaw/menu.c M /branches/S2_2/client/helpdata.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/messagewin_common.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/repodlgs_common.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/Makefile.am M /branches/S2_2/common/aicore/caravan.c M /branches/S2_2/common/aicore/citymap.c M /branches/S2_2/common/aicore/path_finding.c M /branches/S2_2/common/aicore/pf_tools.c M /branches/S2_2/common/base.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/combat.c M /branches/S2_2/common/effects.c M /branches/S2_2/common/fc_types.h M /branches/S2_2/common/map.c M /branches/S2_2/common/map.h M /branches/S2_2/common/movement.c M /branches/S2_2/common/player.c M /branches/S2_2/common/player.h M /branches/S2_2/common/requirements.c M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/unit.c M /branches/S2_2/common/unit.h A /branches/S2_2/common/vision.c A /branches/S2_2/common/vision.h M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/server/edithand.c M /branches/S2_2/server/gamehand.c M /branches/S2_2/server/generator/height_map.h M /branches/S2_2/server/generator/mapgen.c M /branches/S2_2/server/generator/startpos.c M /branches/S2_2/server/generator/temperature_map.c M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/gotohand.c M /branches/S2_2/server/gotohand.h M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/settlers.h M /branches/S2_2/server/stdinhand.c M /branches/S2_2/server/unithand.c M /branches/S2_2/server/unittools.c (PR#39862) Cleanup some tile_* accessor functions; and is_ocean; add vision.[ch] Use tile accessor functions for (existing): *_city *_continent *_resource *_terrain Replaced most ptile->index with new tile_index(ptile). Converted most is_ocean() macro calls to new is_ocean_tile() for compactness. Combined vision definitions in common/vision.[ch], and renamed vision_base to vision_site for easier searching. ------------------------------------------------------------------------ r13942 | wsimpson | 2007-11-12 18:44:45 +0200 (Mon, 12 Nov 2007) | 1 line Changed paths: M /branches/S2_2/common/aicore/pf_tools.c (PR#39852) BUG: path finding incorrect air destination calculations ------------------------------------------------------------------------ r13940 | wsimpson | 2007-11-10 14:34:25 +0200 (Sat, 10 Nov 2007) | 1 line Changed paths: M /branches/S2_2/configure.ac M /branches/S2_2/server/ruleset.c M /branches/S2_2/utility/support.c M /branches/S2_2/utility/support.h (PR#39851) mystrcasestr ------------------------------------------------------------------------ r13937 | wsimpson | 2007-11-10 10:47:13 +0200 (Sat, 10 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/packhand.c (PR#39817) goto interrupted by sentry ------------------------------------------------------------------------ r13932 | jdorje | 2007-11-09 20:29:15 +0200 (Fri, 09 Nov 2007) | 1 line Changed paths: M /branches/S2_2/data/icons M /branches/S2_2/doc/ca M /branches/S2_2/server Fix svn:ignore for various directories. ------------------------------------------------------------------------ r13929 | wsimpson | 2007-11-09 13:01:21 +0200 (Fri, 09 Nov 2007) | 1 line Changed paths: M /branches/S2_2/client/gui-sdl/citydlg.c (PR#39848) SDL client city_owner() compile error ------------------------------------------------------------------------ r13926 | wsimpson | 2007-11-08 19:05:40 +0200 (Thu, 08 Nov 2007) | 1 line Changed paths: M /branches/S2_2/ai/advdiplomacy.c M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aiferry.c M /branches/S2_2/ai/aihunt.c M /branches/S2_2/ai/aisettler.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aitools.h M /branches/S2_2/ai/aiunit.c M /branches/S2_2/client/agents/sha.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/control.c M /branches/S2_2/client/editor.c M /branches/S2_2/client/goto.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-ftwl/mapview.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/dialogs.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-gtk-2.0/happiness.c M /branches/S2_2/client/gui-gtk-2.0/menu.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/mapview.c M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/dialogs.c M /branches/S2_2/client/gui-win32/happiness.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/overview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/text.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/common/aicore/caravan.c M /branches/S2_2/common/aicore/cm.c M /branches/S2_2/common/city.c M /branches/S2_2/common/combat.c M /branches/S2_2/common/map.c M /branches/S2_2/common/movement.c M /branches/S2_2/common/player.c M /branches/S2_2/common/tile.c M /branches/S2_2/common/tile.h M /branches/S2_2/common/unit.c M /branches/S2_2/server/barbarian.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplhand.c M /branches/S2_2/server/edithand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/plrhand.c M /branches/S2_2/server/sanitycheck.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c M /branches/S2_2/server/settlers.c M /branches/S2_2/server/srv_main.c M /branches/S2_2/server/unithand.c Cleanup city, unit, and tile accessor functions for *_owner (and others) ------------------------------------------------------------------------ r13922 | wsimpson | 2007-11-08 00:16:04 +0200 (Thu, 08 Nov 2007) | 1 line Changed paths: M /branches/S2_2/server/cityhand.c (PR#39840) 2.2/trunk changing production doesn't work ------------------------------------------------------------------------ r13920 | wsimpson | 2007-11-06 21:52:24 +0200 (Tue, 06 Nov 2007) | 16 lines Changed paths: M /branches/S2_2/server/citytools.c M /branches/S2_2/server/maphand.c M /branches/S2_2/server/maphand.h M /branches/S2_2/server/savegame.c M /branches/S2_2/server/unittools.c (PR#39830) 2.1.0 border expansion acquires destroyed city Fix primary bug, apparently deliberate code that breaks upon border expansion, that had the truthful (unhelpful) comment: /* Use tile owner information not city owner information. */ Now, although the defunct city still appears inside the border, it won't appear in the player's list of cities. Revise the dumb_city code, now uses struct vision_base. Use city, unit, and tile accessor functions for *_owner (and others). Add tile_special_type_iterate() in passing. ------------------------------------------------------------------------ r13917 | wsimpson | 2007-11-04 20:32:50 +0200 (Sun, 04 Nov 2007) | 10 lines Changed paths: M /branches/S2_2/client/climap.h M /branches/S2_2/client/packhand.c M /branches/S2_2/common/aicore/path_finding.h M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/common/tile.h M /branches/S2_2/server/maphand.c (PR#39828) 2.1.0 crash shared vision in send_tile_info() Treat terrain just like resources: when the pointer is NULL, send -1. Add some terrain validity checking to the client. Move enum known_type from terrain.h to tile.h, and adjust other #includes. Add tile_special_type_iterate() in passing. ------------------------------------------------------------------------ r13914 | wsimpson | 2007-11-04 15:40:48 +0200 (Sun, 04 Nov 2007) | 17 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aitools.h M /branches/S2_2/ai/aiunit.c M /branches/S2_2/common/city.h (PR#39835) BUG: 2.2.0-test fix PR#39562 and PR#39565 Fix PR#39562 ASSERT_CHOICE() "!= CT_NONE", and use standardized *_count() access functions. Undo PR#39565 removal of error detection (from PR#39553). Fix original problem that old code didn't check for a valid improvement. Maybe now we can discover the underlying problem(s). Add ai_choice_rule_name() to replace 3 switches (from PR#39827). Change the name of ai_unit_task_rule_name() to conform to practice. Check simple_ai_types[] for "A_NEVER != punittype->require_advance" in its update function, rather than at every use of its iterator. (Some didn't check.) ------------------------------------------------------------------------ r13912 | wsimpson | 2007-11-03 19:09:51 +0200 (Sat, 03 Nov 2007) | 18 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/citydlg_common.h M /branches/S2_2/client/cityrepdata.c M /branches/S2_2/client/climisc.c M /branches/S2_2/client/gui-gtk-2.0/citydlg.c M /branches/S2_2/client/gui-gtk-2.0/happiness.c M /branches/S2_2/client/gui-sdl/citydlg.c M /branches/S2_2/client/gui-sdl/gui_tilespec.h M /branches/S2_2/client/gui-win32/citydlg.c M /branches/S2_2/client/gui-win32/happiness.c M /branches/S2_2/client/gui-xaw/citydlg.c M /branches/S2_2/client/gui-xaw/mapview.c M /branches/S2_2/client/gui-xaw/mapview.h M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/client/tilespec.c M /branches/S2_2/client/tilespec.h M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/savegame.c M /branches/S2_2/server/score.c (PR#39829) 2.1.0 assert bad city size Fix city dialog popup assert() for city_short_info (virtual) cities. Replace assert() with LOG_ERROR, and return the actual number of citizens found to allow the sprite routines to function. The discovered problem was packhand.c handle_city_short_info() setting the city->size in the final citizen feeling entry -- immediately wiped by the city.c generic_city_refresh(). The solution was to set the default specialist instead. On the way to finding the cause, add more city error checking to packhand.c and savegame.c, use enums to replace numeric constants for arrays of citizen feelings, and harmonize specialist handling with S2_2 and trunk to allow easier comparison and parallel testing. ------------------------------------------------------------------------ r13909 | wsimpson | 2007-11-02 07:46:06 +0200 (Fri, 02 Nov 2007) | 1171 lines Changed paths: M /branches/S2_2/ai/advmilitary.c M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aitools.c M /branches/S2_2/ai/aitools.h M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/gui-gtk-2.0/cityrep.c M /branches/S2_2/client/mapctrl_common.c M /branches/S2_2/client/mapview_common.c M /branches/S2_2/client/packhand.c M /branches/S2_2/common/city.c M /branches/S2_2/common/city.h M /branches/S2_2/common/packets.def M /branches/S2_2/common/requirements.c M /branches/S2_2/server/cityhand.c M /branches/S2_2/server/citytools.c M /branches/S2_2/server/cityturn.c M /branches/S2_2/server/diplomats.c M /branches/S2_2/version.in Index: version.in =================================================================== --- version.in (revision 13908) +++ version.in (working copy) @@ -23,4 +23,4 @@ # - Avoid adding a new mandatory capbility to the development branch for # as long as possible. We want to maintain network compatibility with # the stable branch for as long as possible. -NETWORK_CAPSTRING="+Freeciv.Devel.2007.Oct.12" +NETWORK_CAPSTRING="+Freeciv.Devel.2007.Nov.01" Index: server/cityhand.c =================================================================== --- server/cityhand.c (revision 13908) +++ server/cityhand.c (working copy) @@ -324,14 +324,30 @@ /************************************************************************** ... **************************************************************************/ -void handle_city_change(struct player *pplayer, int city_id, int build_id, - bool is_build_id_unit_id) +void handle_city_change(struct player *pplayer, int city_id, + int production_kind, int production_value) { + struct universal prod; struct city *pcity = player_find_city_by_id(pplayer, city_id); - struct universal prod = - universal_by_number(is_build_id_unit_id ? VUT_UTYPE : VUT_IMPROVEMENT, - build_id); + if (production_kind < VUT_NONE || production_kind >= VUT_LAST) { + freelog(LOG_ERROR, "handle_city_change()" + " bad production_kind %d.", + production_kind); + prod.kind = VUT_NONE; + return; + } else { + prod = universal_by_number(production_kind, production_value); + if (prod.kind < VUT_NONE || prod.kind >= VUT_LAST) { + freelog(LOG_ERROR, "handle_city_change()" + " production_kind %d with bad production_value %d.", + production_kind, + production_value); + prod.kind = VUT_NONE; + } + return; + } + if (!pcity) { return; } Index: server/citytools.c =================================================================== --- server/citytools.c (revision 13908) +++ server/citytools.c (working copy) @@ -1913,7 +1913,7 @@ notify_player(NULL, pcity->tile, E_WONDER_STOPPED, _("The %s have stopped building The %s in %s."), nation_plural_for_player(pplayer), - city_improvement_name_translation(pcity, pcity->production.value.building), + city_production_name_translation(pcity), pcity->name); } @@ -1925,11 +1925,7 @@ pcity->production = target; /* What's the name of the target? */ - if (VUT_UTYPE == target.kind) { - name = utype_name_translation(pcity->production.value.utype); - } else { - name = improvement_name_translation(pcity->production.value.building); - } + name = city_production_name_translation(pcity); switch (event) { case E_WORKLIST: source = _(" from the worklist"); break; @@ -1943,19 +1939,19 @@ /* FIXME: this may give bad grammar when translated if the 'source' * string can have multiple values. */ notify_player(pplayer, pcity->tile, event, - /* TRANS: " is building ." */ - _("%s is building %s%s."), - pcity->name, name, source); + /* TRANS: " is building ." */ + _("%s is building %s%s."), + pcity->name, name, source); /* If the city is building a wonder, tell the rest of the world about it. */ if (VUT_IMPROVEMENT == pcity->production.kind && is_great_wonder(pcity->production.value.building)) { notify_player(NULL, pcity->tile, E_WONDER_STARTED, - _("The %s have started building The %s in %s."), - nation_plural_for_player(pplayer), - city_improvement_name_translation(pcity, pcity->production.value.building), - pcity->name); + _("The %s have started building The %s in %s."), + nation_plural_for_player(pplayer), + name, + pcity->name); } } Index: server/cityturn.c =================================================================== --- server/cityturn.c (revision 13908) +++ server/cityturn.c (working copy) @@ -156,7 +156,7 @@ { /* The caller had better check this! */ if (!cmr->found_a_valid) { - freelog(LOG_ERROR, "apply_cmresult_to_city() called with non-valid " + freelog(LOG_FATAL, "apply_cmresult_to_city() called with invalid " "cm_result"); assert(0); return; @@ -669,6 +669,7 @@ static bool worklist_change_build_target(struct player *pplayer, struct city *pcity) { + struct universal target; bool success = FALSE; int i; @@ -677,25 +678,21 @@ return FALSE; i = 0; - while (TRUE) { - struct universal target; + while (!success && worklist_peek_ith(&pcity->worklist, &target, i++)) { + success = can_city_build_now(pcity, target); + if (success) { + break; /* while */ + } - /* What's the next item in the worklist? */ - if (!worklist_peek_ith(&pcity->worklist, &target, i)) - /* Nothing more in the worklist. Ah, well. */ - break; - - i++; - - /* Sanity checks */ - if (VUT_UTYPE == target.kind && - !can_city_build_unit_now(pcity, target.value.utype)) { + switch (target.kind) { + case VUT_UTYPE: + { struct unit_type *ptarget = target.value.utype; struct unit_type *pupdate = unit_upgrades_to(pcity, ptarget); /* Maybe we can just upgrade the target to what the city /can/ build. */ if (U_NOT_OBSOLETED == pupdate) { - /* Nope, we're stuck. Dump this item from the worklist. */ + /* Nope, we're stuck. Skip this item from the worklist. */ notify_player(pplayer, pcity->tile, E_CITY_CANTBUILD, _("%s can't build %s from the worklist; " "tech not yet available. Postponing..."), @@ -705,8 +702,10 @@ API_TYPE_UNIT_TYPE, ptarget, API_TYPE_CITY, pcity, API_TYPE_STRING, "need_tech"); - continue; - } else if (!can_city_build_unit_later(pcity, pupdate)) { + break; + } + success = can_city_build_unit_later(pcity, pupdate); + if (!success) { /* If the city can never build this unit or its descendants, * drop it. */ notify_player(pplayer, pcity->tile, E_CITY_CANTBUILD, @@ -722,11 +721,7 @@ API_TYPE_CITY, pcity, API_TYPE_STRING, "never"); /* Purge this worklist item. */ - worklist_remove(&pcity->worklist, i-1); - /* Reset i to index to the now-next element. */ - i--; - - continue; + worklist_remove(&pcity->worklist, --i); } else { /* Yep, we can go after pupdate instead. Joy! */ notify_player(pplayer, pcity->tile, E_WORKLIST, @@ -736,13 +731,16 @@ pcity->name); target.value.utype = pupdate; } - } else if (VUT_IMPROVEMENT == target.kind - && !can_city_build_improvement_now(pcity, target.value.building)) { + break; + } + case VUT_IMPROVEMENT: + { struct impr_type *ptarget = target.value.building; struct impr_type *pupdate = building_upgrades_to(pcity, ptarget); /* If the city can never build this improvement, drop it. */ - if (!can_city_build_improvement_later(pcity, pupdate)) { + success = can_city_build_improvement_later(pcity, pupdate); + if (!success) { /* Nope, never in a million years. */ notify_player(pplayer, pcity->tile, E_CITY_CANTBUILD, _("%s can't build %s from the worklist. " @@ -755,14 +753,10 @@ API_TYPE_STRING, "never"); /* Purge this worklist item. */ - worklist_remove(&pcity->worklist, i-1); - /* Reset i to index to the now-next element. */ - i--; - - continue; + worklist_remove(&pcity->worklist, --i); + break; } - /* Maybe this improvement has been obsoleted by something that we can build. */ if (pupdate == ptarget) { @@ -850,14 +844,6 @@ API_TYPE_CITY, pcity, API_TYPE_STRING, "need_nation"); break; - case VUT_UTYPE: - case VUT_UTFLAG: - case VUT_UCLASS: - case VUT_UCFLAG: - case VUT_OTYPE: - case VUT_SPECIALIST: - /* Will only happen with a bogus ruleset. */ - break; case VUT_MINSIZE: notify_player(pplayer, pcity->tile, E_CITY_CANTBUILD, _("%s can't build %s from the worklist; " @@ -897,12 +883,24 @@ API_TYPE_CITY, pcity, API_TYPE_STRING, "need_terrainclass"); break; + case VUT_UTYPE: + case VUT_UTFLAG: + case VUT_UCLASS: + case VUT_UCFLAG: + case VUT_OTYPE: + case VUT_SPECIALIST: + /* Will only happen with a bogus ruleset. */ + freelog(LOG_ERROR, "worklist_change_build_target()" + " has bogus preq"); + break; case VUT_NONE: case VUT_LAST: default: + freelog(LOG_FATAL, "worklist_change_build_target()" + " called with invalid preq"); assert(0); break; - } + }; break; } } requirement_vector_iterate_end; @@ -915,7 +913,6 @@ pcity->name, city_improvement_name_translation(pcity, ptarget)); } - continue; } else { /* Hey, we can upgrade the improvement! */ notify_player(pplayer, pcity->tile, E_WORKLIST, @@ -924,17 +921,23 @@ city_improvement_name_translation(pcity, pupdate), pcity->name); target.value.building = pupdate; + success = TRUE; } + break; } + default: + /* skip useless target */ + freelog(LOG_ERROR, "worklist_change_build_target()" + " has unrecognized target kind (%d)", + target.kind); + break; + }; + } /* while */ + if (success) { /* All okay. Switch targets. */ change_build_target(pplayer, pcity, target, E_WORKLIST); - success = TRUE; - break; - } - - if (success) { /* i is the index immediately _after_ the item we're changing to. Remove the (i-1)th item from the worklist. */ worklist_remove(&pcity->worklist, i-1); @@ -966,15 +969,23 @@ /* Try building the same thing again. Repeat building doesn't require a * call to change_build_target, so just return. */ - if (VUT_UTYPE == pcity->production.kind) { + switch (pcity->production.kind) { + case VUT_UTYPE: /* We can build a unit again unless it's unique. */ if (!utype_has_flag(pcity->production.value.utype, F_UNIQUE)) { return; } - } else if (can_city_build_improvement_now(pcity, pcity->production.value.building)) { - /* We can build space and coinage again, and possibly others. */ - return; - } + break; + case VUT_IMPROVEMENT: + if (can_city_build_improvement_now(pcity, pcity->production.value.building)) { + /* We can build space and coinage again, and possibly others. */ + return; + } + break; + default: + /* fallthru */ + break; + }; /* Find *something* to do! */ freelog(LOG_DEBUG, "Trying advisor_choose_build."); @@ -1355,6 +1366,7 @@ case VUT_UTYPE: return city_build_unit(pplayer, pcity); default: + /* must never happen! */ assert(0); break; }; Index: server/diplomats.c =================================================================== --- server/diplomats.c (revision 13908) +++ server/diplomats.c (working copy) @@ -793,7 +793,6 @@ struct player *cplayer; struct impr_type *ptarget; int count, which; - const char *prod; /* Twice as difficult if target is specified. */ int success_prob = (improvement >= B_LAST ? game.info.diplchance : game.info.diplchance / 2); @@ -938,17 +937,14 @@ /* Now, the fun stuff! Do the sabotage! */ if (NULL == ptarget) { - /* Sabotage current production. */ + char prod[256]; /* Do it. */ pcity->shield_stock = 0; nullify_prechange_production(pcity); /* Make it impossible to recover */ /* Report it. */ - if (VUT_UTYPE == pcity->production.kind) - prod = utype_name_translation(pcity->production.value.utype); - else - prod = improvement_name_translation(pcity->production.value.building); + universal_name_translation(&pcity->production, prod, sizeof(prod)); notify_player(pplayer, pcity->tile, E_MY_DIPLOMAT_SABOTAGE, _("Your %s succeeded in destroying" Index: common/packets.def =================================================================== --- common/packets.def (revision 13908) +++ common/packets.def (working copy) @@ -575,8 +575,8 @@ PACKET_CITY_CHANGE=25;cs,dsend CITY city_id; - UINT8 build_id; - BOOL is_build_id_unit_id; + UINT8 production_kind; + UINT8 production_value; end PACKET_CITY_WORKLIST=26;cs,dsend @@ -861,7 +861,7 @@ PACKET_UNIT_DIPLOMAT_QUERY=66;cs,handle-per-conn,dsend UNIT diplomat_id; - UNIT target_id; # city_id or unit_id target_id; + UNIT target_id; # city_id or unit_id SINT16 value; DIPLOMAT_ACTION action_type; end @@ -874,14 +874,14 @@ PACKET_UNIT_DIPLOMAT_ACTION=70;cs,dsend UNIT diplomat_id; - UNIT target_id; # city_id or unit_id target_id; + UNIT target_id; # city_id or unit_id SINT16 value; DIPLOMAT_ACTION action_type; end PACKET_UNIT_DIPLOMAT_ANSWER=71;sc,dsend,lsend UNIT diplomat_id; - UNIT target_id; # city_id or unit_id target_id; + UNIT target_id; # city_id or unit_id GOLD cost; DIPLOMAT_ACTION action_type; end Index: common/city.c =================================================================== --- common/city.c (revision 13908) +++ common/city.c (working copy) @@ -381,16 +381,16 @@ **************************************************************************/ const char *city_production_name_translation(const struct city *pcity) { + static char buffer[256]; + switch (pcity->production.kind) { case VUT_IMPROVEMENT: return city_improvement_name_translation(pcity, pcity->production.value.building); - case VUT_UTYPE: - return utype_name_translation(pcity->production.value.utype); default: - /* FIXME: use universal_name_translation() */ + /* fallthru */ break; - } - return _("(unknown)"); + }; + return universal_name_translation(&pcity->production, buffer, sizeof(buffer)); } /************************************************************************** @@ -427,7 +427,7 @@ build); default: break; - } + }; return FC_INFINITY; } @@ -580,11 +580,15 @@ bool can_city_build_direct(const struct city *pcity, struct universal target) { - if (VUT_UTYPE == target.kind) { + switch (target.kind) { + case VUT_UTYPE: return can_city_build_unit_direct(pcity, target.value.utype); - } else { + case VUT_IMPROVEMENT: return can_city_build_improvement_direct(pcity, target.value.building); - } + default: + break; + }; + return FALSE; } /************************************************************************** @@ -593,11 +597,15 @@ bool can_city_build_now(const struct city *pcity, struct universal target) { - if (VUT_UTYPE == target.kind) { + switch (target.kind) { + case VUT_UTYPE: return can_city_build_unit_now(pcity, target.value.utype); - } else { + case VUT_IMPROVEMENT: return can_city_build_improvement_now(pcity, target.value.building); - } + default: + break; + }; + return FALSE; } /************************************************************************** @@ -606,11 +614,15 @@ bool can_city_build_later(const struct city *pcity, struct universal target) { - if (VUT_UTYPE == target.kind) { + switch (target.kind) { + case VUT_UTYPE: return can_city_build_unit_later(pcity, target.value.utype); - } else { + case VUT_IMPROVEMENT: return can_city_build_improvement_later(pcity, target.value.building); - } + default: + break; + }; + return FALSE; } /**************************************************************************** @@ -1260,7 +1272,7 @@ /************************************************************************** Compute and optionally apply the change-production penalty for the given - production change (to target,is_unit) in the given city (pcity). + production change (to target) in the given city (pcity). Always returns the number of shields which would be in the stock if the penalty had been applied. @@ -1277,24 +1289,41 @@ enum production_class_type new_class; int unpenalized_shields = 0, penalized_shields = 0; - if (VUT_UTYPE == pcity->changed_from.kind) { - orig_class = TYPE_UNIT; - } else if (is_wonder(pcity->changed_from.value.building)) { - orig_class = TYPE_WONDER; - } else { - orig_class = TYPE_NORMAL_IMPROVEMENT; - } + switch (pcity->changed_from.kind) { + case VUT_IMPROVEMENT: + if (is_wonder(pcity->changed_from.value.building)) { + orig_class = PCT_WONDER; + } else { + orig_class = PCT_NORMAL_IMPROVEMENT; + } + break; + case VUT_UTYPE: + orig_class = PCT_UNIT; + break; + default: + orig_class = PCT_LAST; + break; + }; - if (VUT_UTYPE == target.kind) { - new_class = TYPE_UNIT; - } else if (is_wonder(target.value.building)) { - new_class = TYPE_WONDER; - } else { - new_class = TYPE_NORMAL_IMPROVEMENT; - } + switch (target.kind) { + case VUT_IMPROVEMENT: + if (is_wonder(pcity->changed_from.value.building)) { + new_class = PCT_WONDER; + } else { + new_class = PCT_NORMAL_IMPROVEMENT; + } + break; + case VUT_UTYPE: + new_class = PCT_UNIT; + break; + default: + new_class = PCT_LAST; + break; + }; /* Changing production is penalized under certain circumstances. */ - if (orig_class == new_class) { + if (orig_class == new_class + || orig_class == PCT_LAST) { /* There's never a penalty for building something of the same class. */ unpenalized_shields = pcity->before_change_shields; } else if (city_built_last_turn(pcity)) { @@ -1315,7 +1344,7 @@ /* Caravan shields are penalized (just as if you disbanded the caravan) * if you're not building a wonder. */ - if (new_class == TYPE_WONDER) { + if (new_class == PCT_WONDER) { unpenalized_shields += pcity->caravan_shields; } else { penalized_shields += pcity->caravan_shields; Index: common/city.h =================================================================== --- common/city.h (revision 13908) +++ common/city.h (working copy) @@ -20,11 +20,16 @@ #include "worklist.h" enum production_class_type { - TYPE_UNIT, TYPE_NORMAL_IMPROVEMENT, TYPE_WONDER + PCT_UNIT, + PCT_NORMAL_IMPROVEMENT, + PCT_WONDER, + PCT_LAST }; enum city_tile_type { - C_TILE_EMPTY, C_TILE_WORKER, C_TILE_UNAVAILABLE + C_TILE_EMPTY, + C_TILE_WORKER, + C_TILE_UNAVAILABLE }; /* Various city options. These are stored by the server and can be Index: common/requirements.c =================================================================== --- common/requirements.c (revision 13908) +++ common/requirements.c (working copy) @@ -1156,7 +1156,7 @@ { switch (psource->kind) { case VUT_NONE: - return "(none)"; + return N_("(none)"); case VUT_ADVANCE: return advance_rule_name(psource->value.advance); case VUT_GOVERNMENT: @@ -1182,7 +1182,7 @@ case VUT_SPECIALIST: return specialist_rule_name(psource->value.specialist); case VUT_MINSIZE: - return "Size %d"; + return N_("Size %d"); case VUT_AI_LEVEL: return ai_level_name(psource->value.ai_level); case VUT_TERRAINCLASS: @@ -1258,10 +1258,11 @@ cat_snprintf(buf, bufsz, _("%s AI"), ai_level_name(psource->value.ai_level)); /* FIXME */ break; - case VUT_TERRAINCLASS: - cat_snprintf(buf, bufsz, _("%s terrain"), - terrain_class_name_translation(psource->value.terrainclass)); - break; + case VUT_TERRAINCLASS: + /* TRANS: "Land terrain" */ + cat_snprintf(buf, bufsz, _("%s terrain"), + terrain_class_name_translation(psource->value.terrainclass)); + break; case VUT_LAST: assert(0); break; Index: ai/aitools.c =================================================================== --- ai/aitools.c (revision 13908) +++ ai/aitools.c (working copy) @@ -1156,21 +1156,6 @@ } /************************************************************************** - ... -**************************************************************************/ -void city_production_from_ai_choice(struct universal *product, - struct ai_choice *choice) -{ - if (is_unit_choice_type(choice->type)) { - product->kind = VUT_UTYPE; - product->value.utype = choice->value.utype; - } else { - product->kind = VUT_IMPROVEMENT; - product->value.building = choice->value.building; - } -} - -/************************************************************************** Calls ai_wants_role_unit to choose the best unit with the given role and set tech wants. Sets choice->value.utype when we can build something. **************************************************************************/ Index: ai/aitools.h =================================================================== --- ai/aitools.h (revision 13908) +++ ai/aitools.h (working copy) @@ -94,8 +94,6 @@ void copy_if_better_choice(struct ai_choice *cur, struct ai_choice *best); bool is_unit_choice_type(enum choice_type type); -void city_production_from_ai_choice(struct universal *product, - struct ai_choice *choice); bool ai_choose_role_unit(struct player *pplayer, struct city *pcity, struct ai_choice *choice, enum choice_type type, Index: ai/aicity.c =================================================================== --- ai/aicity.c (revision 13908) +++ ai/aicity.c (working copy) @@ -89,8 +89,8 @@ || pcity->food_stock + pcity->surplus[O_FOOD] < 0) #define LOG_BUY LOG_DEBUG +static void ai_sell_obsolete_buildings(struct city *pcity); static void resolve_city_emergency(struct player *pplayer, struct city *pcity); -static void ai_sell_obsolete_buildings(struct city *pcity); /************************************************************************** Return the number of "luxury specialists". This is the number of @@ -1382,41 +1382,67 @@ } } - if (pcity->ai.choice.want != 0) { + if (pcity->ai.choice.want != 0) { + const char *name = "(unknown)"; ASSERT_CHOICE(pcity->ai.choice); + switch (pcity->ai.choice.type) { + case CT_CIVILIAN: + case CT_ATTACKER: + case CT_DEFENDER: + name = utype_rule_name(pcity->ai.choice.value.utype); + break; + case CT_BUILDING: + name = improvement_rule_name(pcity->ai.choice.value.building); + break; + case CT_NONE: + case CT_LAST: + break; + }; CITY_LOG(LOG_DEBUG, pcity, "wants %s with desire %d.", - is_unit_choice_type(pcity->ai.choice.type) - ? utype_rule_name(pcity->ai.choice.value.utype) - : improvement_rule_name(pcity->ai.choice.value.building), + name, pcity->ai.choice.want); + /* parallel to citytools change_build_target() */ if (VUT_IMPROVEMENT == pcity->production.kind && is_great_wonder(pcity->production.value.building) - && (is_unit_choice_type(pcity->ai.choice.type) + && (CT_BUILDING != pcity->ai.choice.type || pcity->ai.choice.value.building != pcity->production.value.building)) { notify_player(NULL, pcity->tile, E_WONDER_STOPPED, - _("The %s have stopped building The %s in %s."), - nation_plural_for_player(pplayer), - city_improvement_name_translation(pcity, pcity->production.value.building), - pcity->name); + _("The %s have stopped building The %s in %s."), + nation_plural_for_player(pplayer), + city_production_name_translation(pcity), + pcity->name); } - if (pcity->ai.choice.type == CT_BUILDING - && is_wonder(pcity->ai.choice.value.building) - && (VUT_UTYPE == pcity->production.kind - || pcity->production.value.building != pcity->ai.choice.value.building)) { - if (is_great_wonder(pcity->ai.choice.value.building)) { - notify_player(NULL, pcity->tile, E_WONDER_STARTED, - _("The %s have started building The %s in %s."), - nation_plural_translation(nation_of_city(pcity)), - city_improvement_name_translation(pcity, pcity->ai.choice.value.building), - pcity->name); - } - city_production_from_ai_choice(&pcity->production, &pcity->ai.choice); - } else { - /* FIXME: same code twice (zero want values?) */ - city_production_from_ai_choice(&pcity->production, &pcity->ai.choice); + if (CT_BUILDING == pcity->ai.choice.type + && is_great_wonder(pcity->ai.choice.value.building) + && (VUT_IMPROVEMENT != pcity->production.kind + || pcity->production.value.building != pcity->ai.choice.value.building)) { + notify_player(NULL, pcity->tile, E_WONDER_STARTED, + _("The %s have started building The %s in %s."), + nation_plural_translation(nation_of_city(pcity)), + city_improvement_name_translation(pcity, pcity->ai.choice.value.building), + pcity->name); } + + switch (pcity->ai.choice.type) { + case CT_CIVILIAN: + case CT_ATTACKER: + case CT_DEFENDER: + pcity->production.kind = VUT_UTYPE; + pcity->production.value.utype = pcity->ai.choice.value.utype; + break; + case CT_BUILDING: + pcity->production.kind = VUT_IMPROVEMENT; + pcity->production.value.building = pcity->ai.choice.value.building; + break; + case CT_NONE: + pcity->production.kind = VUT_NONE; + break; + case CT_LAST: + pcity->production.kind = VUT_LAST; + break; + }; } } @@ -1511,10 +1537,11 @@ } city_list_iterate_end; do { + bool expensive; /* don't buy when it costs x2 unless we must */ + int buycost; int limit = cached_limit; /* cached_limit is our gold reserve */ struct city *pcity = NULL; - bool expensive; /* don't buy when it costs x2 unless we must */ - int buycost; + const char *name = "(unknown)"; /* Find highest wanted item on the buy list */ init_choice(&bestchoice); @@ -1565,7 +1592,7 @@ continue; /* Already completed */ } - if (bestchoice.type != CT_BUILDING + if (is_unit_choice_type(bestchoice.type) && utype_has_flag(bestchoice.value.utype, F_CITIES)) { if (get_city_bonus(pcity, EFT_GROWTH_FOOD) == 0 && pcity->size == 1 @@ -1600,6 +1627,20 @@ continue; } + switch (bestchoice.type) { + case CT_CIVILIAN: + case CT_ATTACKER: + case CT_DEFENDER: + name = utype_rule_name(bestchoice.value.utype); + break; + case CT_BUILDING: + name = improvement_rule_name(bestchoice.value.building); + break; + case CT_NONE: + case CT_LAST: + break; + }; + /* FIXME: Here Syela wanted some code to check if * pcity was doomed, and we should therefore attempt * to sell everything in it of non-military value */ @@ -1610,9 +1651,7 @@ || (bestchoice.want > 200 && pcity->ai.urgency > 1))) { /* Buy stuff */ CITY_LOG(LOG_BUY, pcity, "Crash buy of %s for %d (want %d)", - bestchoice.type != CT_BUILDING - ? utype_rule_name(bestchoice.value.utype) - : improvement_rule_name(bestchoice.value.building), + name, buycost, bestchoice.want); really_handle_city_buy(pplayer, pcity); @@ -1621,7 +1660,7 @@ && assess_defense(pcity) == 0) { /* We have no gold but MUST have a defender */ CITY_LOG(LOG_BUY, pcity, "must have %s but can't afford it (%d < %d)!", - utype_rule_name(bestchoice.value.utype), + name, pplayer->economic.gold, buycost); try_to_sell_stuff(pplayer, pcity); if (pplayer->economic.gold - pplayer->ai.est_upkeep >= buycost) { Index: ai/advmilitary.c =================================================================== --- ai/advmilitary.c (revision 13908) +++ ai/advmilitary.c (working copy) @@ -1491,13 +1491,24 @@ if (choice->want <= 0) { CITY_LOG(LOGLEVEL_BUILD, pcity, "military advisor has no advice"); - } else if (is_unit_choice_type(choice->type)) { - CITY_LOG(LOGLEVEL_BUILD, pcity, "military advisor choice: %s (want %d)", - utype_rule_name(choice->value.utype), - choice->want); } else { + const char *name = "(unknown)"; + + switch (pcity->ai.choice.type) { + case CT_CIVILIAN: + case CT_ATTACKER: + case CT_DEFENDER: + name = utype_rule_name(choice->value.utype); + break; + case CT_BUILDING: + name = improvement_rule_name(choice->value.building); + break; + case CT_NONE: + case CT_LAST: + break; + }; CITY_LOG(LOGLEVEL_BUILD, pcity, "military advisor choice: %s (want %d)", - improvement_rule_name(choice->value.building), + name, choice->want); } } Index: client/citydlg_common.c =================================================================== --- client/citydlg_common.c (revision 13908) +++ client/citydlg_common.c (working copy) @@ -259,29 +259,33 @@ struct universal target, struct city *pcity) { - if (VUT_IMPROVEMENT == target.kind - && improvement_has_flag(target.value.building, IF_GOLD)) { - my_snprintf(buffer, buffer_len, _("%s (XX) %d/turn"), - city_improvement_name_translation(pcity, target.value.building), - MAX(0, pcity->surplus[O_SHIELD])); - } else { - const char *name; - int turns = city_turns_to_build(pcity, target, TRUE); - int cost= universal_build_shield_cost(&target); + int turns = city_turns_to_build(pcity, target, TRUE); + int cost = universal_build_shield_cost(&target); - if (VUT_UTYPE == target.kind) { - name = utype_values_translation(target.value.utype); - } else { - name = city_improvement_name_translation(pcity, target.value.building); + switch (target.kind) { + case VUT_IMPROVEMENT: + my_snprintf(buffer, buffer_len, + city_improvement_name_translation(pcity, target.value.building)); + + if (improvement_has_flag(target.value.building, IF_GOLD)) { + cat_snprintf(buffer, buffer_len, " (--) "); + cat_snprintf(buffer, buffer_len, _("%d/turn"), + MAX(0, pcity->surplus[O_SHIELD])); + return; } + break; + default: + universal_name_translation(&target, buffer, buffer_len); + break; + }; + cat_snprintf(buffer, buffer_len, " (%d) ", cost); - if (turns < FC_INFINITY) { - my_snprintf(buffer, buffer_len, - PL_("%s (%d) %d turn", "%s (%d) %d turns", turns), - name, cost, turns); - } else { - my_snprintf(buffer, buffer_len, "%s (%d) never", name, cost); - } + if (turns < FC_INFINITY) { + cat_snprintf(buffer, buffer_len, + PL_("%d turn", "%d turns", turns), + turns); + } else { + cat_snprintf(buffer, buffer_len, "never"); } } @@ -294,24 +298,27 @@ struct universal target, struct city *pcity) { - if (VUT_UTYPE == target.kind) { + universal_name_translation(&target, buf[0], column_size); + + switch (target.kind) { + case VUT_UTYPE: + { struct unit_type *ptype = target.value.utype; - my_snprintf(buf[0], column_size, utype_name_translation(ptype)); my_snprintf(buf[1], column_size, utype_values_string(ptype)); my_snprintf(buf[2], column_size, "(%d)", utype_build_shield_cost(ptype)); - } else { + break; + } + case VUT_IMPROVEMENT: + { struct player *pplayer = pcity ? pcity->owner : game.player_ptr; struct impr_type *pimprove = target.value.building; /* Total & turns left meaningless on capitalization */ - if (improvement_has_flag(target.value.building, IF_GOLD)) { - my_snprintf(buf[0], column_size, improvement_name_translation(pimprove)); + if (improvement_has_flag(pimprove, IF_GOLD)) { buf[1][0] = '\0'; my_snprintf(buf[2], column_size, "---"); } else { - my_snprintf(buf[0], column_size, improvement_name_translation(pimprove)); - /* from city.c city_improvement_name_translation() */ if (pcity && is_building_replaced(pcity, pimprove, RPT_CERTAIN)) { my_snprintf(buf[1], column_size, "*"); @@ -335,13 +342,19 @@ state = _("Small Wonder"); } } - my_snprintf(buf[1], column_size, "%s", state); + my_snprintf(buf[1], column_size, state); } my_snprintf(buf[2], column_size, "%d", impr_build_shield_cost(pimprove)); } + break; } + default: + buf[1][0] = '\0'; + buf[2][0] = '\0'; + break; + }; /* Add the turns-to-build entry in the 4th position */ if (pcity) { @@ -355,7 +368,7 @@ if (turns < FC_INFINITY) { my_snprintf(buf[3], column_size, "%d", turns); } else { - my_snprintf(buf[3], column_size, "%s", _("never")); + my_snprintf(buf[3], column_size, _("never")); } } } else { @@ -587,8 +600,8 @@ int city_change_production(struct city *pcity, struct universal target) { return dsend_packet_city_change(&aconnection, pcity->id, - universal_number(&target), - VUT_UTYPE == target.kind); + target.kind, + universal_number(&target)); } /************************************************************************** Index: client/gui-gtk-2.0/cityrep.c =================================================================== --- client/gui-gtk-2.0/cityrep.c (revision 13908) +++ client/gui-gtk-2.0/cityrep.c (working copy) @@ -976,11 +976,11 @@ itree_get(&it, 0, &res, -1); pcity = res; - if ( (which == TYPE_UNIT && VUT_UTYPE == pcity->production.kind) - || (which == TYPE_NORMAL_IMPROVEMENT + if ( (which == PCT_UNIT && VUT_UTYPE == pcity->production.kind) + || (which == PCT_NORMAL_IMPROVEMENT && VUT_IMPROVEMENT == pcity->production.kind && !is_wonder(pcity->production.value.building)) - || (which == TYPE_WONDER + || (which == PCT_WONDER && VUT_IMPROVEMENT == pcity->production.kind && is_wonder(pcity->production.value.building)) ) { itree_select(city_selection, &it); @@ -1406,19 +1406,19 @@ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(city_select_building_callback), - GINT_TO_POINTER(TYPE_UNIT)); + GINT_TO_POINTER(PCT_UNIT)); item = gtk_menu_item_new_with_label( _("Building Improvements")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(city_select_building_callback), - GINT_TO_POINTER(TYPE_NORMAL_IMPROVEMENT)); + GINT_TO_POINTER(PCT_NORMAL_IMPROVEMENT)); item = gtk_menu_item_new_with_label(_("Building Wonders")); gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); g_signal_connect(item, "activate", G_CALLBACK(city_select_building_callback), - GINT_TO_POINTER(TYPE_WONDER)); + GINT_TO_POINTER(PCT_WONDER)); item = gtk_separator_menu_item_new(); Index: client/packhand.c =================================================================== --- client/packhand.c (revision 13908) +++ client/packhand.c (working copy) @@ -426,14 +426,17 @@ } if (packet->production_kind < VUT_NONE || packet->production_kind >= VUT_LAST) { - freelog(LOG_ERROR, "handle_city_info() bad production_kind %d.", + freelog(LOG_ERROR, "handle_city_info()" + " bad production_kind %d.", packet->production_kind); product.kind = VUT_NONE; } else { product = universal_by_number(packet->production_kind, - packet->production_value); - if (product.kind < VUT_NONE || product.kind >= VUT_LAST) { - freelog(LOG_ERROR, "handle_city_info() bad production_value %d.", + packet->production_value); + if (product.kind < VUT_NONE || product.kind >= VUT_LAST) { + freelog(LOG_ERROR, "handle_city_info()" + " production_kind %d with bad production_value %d.", + packet->production_kind, packet->production_value); product.kind = VUT_NONE; } Index: client/mapctrl_common.c =================================================================== --- client/mapctrl_common.c (revision 13908) +++ client/mapctrl_common.c (working copy) @@ -364,6 +364,7 @@ **************************************************************************/ void clipboard_copy_production(struct tile *ptile) { + char buffer[256]; struct city *pcity = ptile->city; if (!can_client_issue_orders()) { @@ -393,9 +394,7 @@ create_event(ptile, E_CITY_PRODUCTION_CHANGED, /* ? */ _("Copy %s to clipboard."), - VUT_UTYPE == clipboard.kind - ? utype_name_translation(clipboard.value.utype) - : improvement_name_translation(clipboard.value.building)); + universal_name_translation(&clipboard, buffer, sizeof(buffer))); } /************************************************************************** @@ -439,8 +438,8 @@ } dsend_packet_city_change(&aconnection, pcity->id, - universal_number(&clipboard), - VUT_UTYPE == clipboard.kind); + clipboard.kind, + universal_number(&clipboard)); } /************************************************************************** Index: client/mapview_common.c =================================================================== --- client/mapview_common.c (revision 13908) +++ client/mapview_common.c (working copy) @@ -1912,35 +1912,23 @@ void get_city_mapview_production(struct city *pcity, char *buffer, size_t buffer_len) { - int turns = city_production_turns_to_build(pcity, TRUE); - /* FIXME: rewrite with universal_name_translation and concatenation */ - - if (VUT_UTYPE == pcity->production.kind) { - struct unit_type *punit_type = pcity->production.value.utype; - if (turns < 999) { - my_snprintf(buffer, buffer_len, "%s %d", - utype_name_translation(punit_type), - turns); - } else { - my_snprintf(buffer, buffer_len, "%s -", - utype_name_translation(punit_type)); - } + int turns; + + universal_name_translation(&pcity->production, buffer, buffer_len); + + if (city_production_has_flag(pcity, IF_GOLD)) { + return; + } + turns = city_production_turns_to_build(pcity, TRUE); + + if (999 < turns) { + cat_snprintf(buffer, buffer_len, " -"); } else { - struct impr_type *pimprove = pcity->production.value.building; - if (improvement_has_flag(pimprove, IF_GOLD)) { - my_snprintf(buffer, buffer_len, "%s", - improvement_name_translation(pimprove)); - } else if (turns < 999) { - my_snprintf(buffer, buffer_len, "%s %d", - improvement_name_translation(pimprove), - turns); - } else { - my_snprintf(buffer, buffer_len, "%s -", - improvement_name_translation(pimprove)); - } + cat_snprintf(buffer, buffer_len, " %d", turns); } } +/***************************************************************************/ static enum update_type needed_updates = UPDATE_NONE; static bool callback_queued = FALSE; ------------------------------------------------------------------------ r13907 | wsimpson | 2007-10-31 02:28:32 +0200 (Wed, 31 Oct 2007) | 1 line Changed paths: M /branches/S2_2/ai/aicity.c M /branches/S2_2/ai/aiunit.h M /branches/S2_2/client/agents/cma_core.c M /branches/S2_2/client/citydlg_common.c M /branches/S2_2/client/mapview_common.h M /branches/S2_2/common/terrain.c M /branches/S2_2/common/unitlist.h M /branches/S2_2/server/generator/utilities.c M /branches/S2_2/server/generator/utilities.h BUG: oddball iterators ------------------------------------------------------------------------ r13904 | wsimpson | 2007-10-30 13:54:10 +0200 (Tue, 30 Oct 2007) | 1 line Changed paths: M /branches/S2_2/data/nation/azeri.ruleset M /branches/S2_2/data/nation/byzantium.ruleset M /branches/S2_2/data/nation/hellenic.ruleset M /branches/S2_2/data/nation/kurd.ruleset M /branches/S2_2/data/nation/moldovan.ruleset M /branches/S2_2/data/nation/ottoman.ruleset M /branches/S2_2/data/nation/phoenician.ruleset M /branches/S2_2/data/nation/serbian.ruleset M /branches/S2_2/data/nation/syrian.ruleset M /branches/S2_2/data/nation/thracian.ruleset M /branches/S2_2/data/nation/uyghur.ruleset M /branches/S2_2/data/scenario/europe-200x100-v2.sav M /branches/S2_2/po/ar.po M /branches/S2_2/po/ca.po M /branches/S2_2/po/cs.po M /branches/S2_2/po/da.po M /branches/S2_2/po/de.po M /branches/S2_2/po/el.po M /branches/S2_2/po/en_GB.po M /branches/S2_2/po/es.po M /branches/S2_2/po/et.po M /branches/S2_2/po/fa.po M /branches/S2_2/po/fi.po M /branches/S2_2/po/fr.po M /branches/S2_2/po/he.po M /branches/S2_2/po/hu.po M /branches/S2_2/po/ja.po M /branches/S2_2/po/lt.po M /branches/S2_2/po/nl.po M /branches/S2_2/po/no.po M /branches/S2_2/po/pl.po M /branches/S2_2/po/pt.po M /branches/S2_2/po/pt_BR.po M /branches/S2_2/po/ro.po M /branches/S2_2/po/ru.po M /branches/S2_2/po/sv.po M /branches/S2_2/po/uk.po M /branches/S2_2/po/zh_CN.po (PR#39813) civil war nations turk and bosnia unknown + po ------------------------------------------------------------------------ r13900 | wsimpson | 2007-10-30 11:02:57 +0200 (Tue, 30 Oct 2007) | 13 lines Changed paths: M /branches/S2_2/client/climap.h M /branches/S2_2/client/climisc.c M /branches/S2_2/client/control.c M /branches/S2_2/client/control.h M /branches/S2_2/client/goto.c M /branches/S2_2/client/goto.h M /branches/S2_2/client/gui-ftwl/gotodlg.c M /branches/S2_2/client/gui-ftwl/gui_text.c M /branches/S2_2/client/gui-gtk-2.0/gui_main.c M /branches/S2_2/client/gui-sdl/dialogs.c M /branches/S2_2/client/gui-sdl/diplomat_dialog.c M /branches/S2_2/client/gui-sdl/gotodlg.c M /branches/S2_2/client/gui-sdl/gui_main.c M /branches/S2_2/client/gui-sdl/mapctrl.c M /branches/S2_2/client/gui-sdl/menu.c M /branches/S2_2/client/gui-win32/gotodlg.c M /branches/S2_2/client/gui-win32/menu.c M /branches/S2_2/client/gui-xaw/gui_main.c M /branches/S2_2/common/map.h M /branches/S2_2/common/unit.h (PR#39801) harmonize goto_map_list with focus_units Added goto_unit_killed() to keep them synchronized whenever a unit is killed. Fixed memory leak that occurred upon freeing at the end of every client goto -- the pf structures in the part weren't freed. New head_of_units_in_focus() -- all that was needed was the head of the list. These probably need more examination (several already had FIXMEs). Also, swapped the struct unit_order out of map.h into unit.h, where it more properly belongs (where its enums are also). ------------------------------------------------------------------------ r13897 | wsimpson | 2007-10-27 21:18:44 +0300 (Sat, 27 Oct 2007) | 6 lines Changed paths: M /branches/S2_2/client/colors_common.c M /branches/S2_2/client/colors_common.h M /branches/S2_2/client/tilespec.c M /branches/S2_2/data/amplio.tilespec M /branches/S2_2/data/hex2t.tilespec M /branches/S2_2/data/isophex.tilespec M /branches/S2_2/data/isotrident.tilespec M /branches/S2_2/data/misc/colors.tilespec M /branches/S2_2/data/trident.tilespec (PR#39795) terrain color in tilespec should be tile color Easily changed to use the [tile_*] tags. However, color.tilespec is included by the other tilespecs; all of them require an update to the capability: tilespec4+2007.Oct.26 ------------------------------------------------------------------------ r13896 | wsimpson | 2007-10-27 19:52:43 +0300 (Sat, 27 Oct 2007) | 20 lines Changed paths: M /branches/S2_2/common/terrain.c M /branches/S2_2/common/terrain.h M /branches/S2_2/data/civ1/terrain.ruleset M /branches/S2_2/data/civ2/terrain.ruleset M /branches/S2_2/data/default/terrain.rules