[Freeciv-commits] r31907 - /branches/S2_6/utility/shared.c
Author: cazfi Date: Sun Feb 14 09:20:50 2016 New Revision: 31907 URL: http://svn.gna.org/viewcvs/freeciv?rev=31907&view=rev Log: Always use ';' as PATH_SEPARATOR for WIN32_NATIVE builds. See patch #6954 Modified: branches/S2_6/utility/shared.c Modified: branches/S2_6/utility/shared.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=31907&r1=31906&r2=31907&view=diff == --- branches/S2_6/utility/shared.c (original) +++ branches/S2_6/utility/shared.c Sun Feb 14 09:20:50 2016 @@ -70,7 +70,7 @@ #include "shared.h" #ifndef PATH_SEPARATOR -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ +#if defined(WIN32_NATIVE) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define PATH_SEPARATOR ";" #else ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31906 - /trunk/utility/shared.c
Author: cazfi Date: Sun Feb 14 09:20:44 2016 New Revision: 31906 URL: http://svn.gna.org/viewcvs/freeciv?rev=31906&view=rev Log: Always use ';' as PATH_SEPARATOR for WIN32_NATIVE builds. See patch #6954 Modified: trunk/utility/shared.c Modified: trunk/utility/shared.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=31906&r1=31905&r2=31906&view=diff == --- trunk/utility/shared.c (original) +++ trunk/utility/shared.c Sun Feb 14 09:20:44 2016 @@ -70,7 +70,7 @@ #include "shared.h" #ifndef PATH_SEPARATOR -#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ +#if defined(WIN32_NATIVE) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define PATH_SEPARATOR ";" #else ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31908 - /trunk/server/ruleset.c
Author: cazfi Date: Sun Feb 14 09:27:16 2016 New Revision: 31908 URL: http://svn.gna.org/viewcvs/freeciv?rev=31908&view=rev Log: Load Goods names in the ruleset names loading round. See patch #6909 Modified: trunk/server/ruleset.c Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=31908&r1=31907&r2=31908&view=diff == --- trunk/server/ruleset.c (original) +++ trunk/server/ruleset.c Sun Feb 14 09:27:16 2016 @@ -1040,6 +1040,40 @@ } section_list_destroy(sec); + + if (ok) { +sec = secfile_sections_by_name_prefix(file, GOODS_SECTION_PREFIX); + +nval = (NULL != sec ? section_list_size(sec) : 0); +if (nval > MAX_GOODS_TYPES) { + int num = nval; /* No "size_t" to printf */ + + ruleset_error(LOG_ERROR, "\"%s\": Too many goods types (%d, max %d)", +filename, num, MAX_GOODS_TYPES); + section_list_destroy(sec); + ok = FALSE; +} else if (nval < 1) { + ruleset_error(LOG_ERROR, "\"%s\": At least one goods type needed", +filename); + section_list_destroy(sec); + ok = FALSE; +} else { + game.control.num_goods_types = nval; +} + +if (ok) { + goods_type_iterate(pgood) { +const char *sec_name = section_name(section_list_get(sec, goods_index(pgood))); + +if (!ruleset_load_names(&pgood->name, NULL, file, sec_name)) { + ruleset_error(LOG_ERROR, "\"%s\": Cannot load goods names", +filename); + ok = FALSE; + break; +} + } goods_type_iterate_end; +} + } return ok; } @@ -6183,36 +6217,11 @@ } else { if (ok) { sec = secfile_sections_by_name_prefix(file, GOODS_SECTION_PREFIX); - nval = (NULL != sec ? section_list_size(sec) : 0); - if (nval > MAX_GOODS_TYPES) { -int num = nval; /* No "size_t" to printf */ - -ruleset_error(LOG_ERROR, "\"%s\": Too many goods types (%d, max %d)", - filename, num, MAX_GOODS_TYPES); -section_list_destroy(sec); -ok = FALSE; - } else if (nval < 1) { -ruleset_error(LOG_ERROR, "\"%s\": At least one goods type needed", - filename); -section_list_destroy(sec); -ok = FALSE; - } else { -game.control.num_goods_types = nval; - } -} - -if (ok) { + goods_type_iterate(pgood) { int id = goods_index(pgood); const char *sec_name = section_name(section_list_get(sec, id)); struct requirement_vector *reqs; - -if (!ruleset_load_names(&pgood->name, NULL, file, sec_name)) { - ruleset_error(LOG_ERROR, "\"%s\": Cannot load goods names", -filename); - ok = FALSE; - break; -} reqs = lookup_req_list(file, compat, sec_name, "reqs", goods_rule_name(pgood)); if (reqs == NULL) { ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31909 - in /trunk: client/options.c common/events.c common/events.h data/misc/events.spec data/stdsounds.soundspec fc_version
Author: cazfi Date: Sun Feb 14 09:41:03 2016 New Revision: 31909 URL: http://svn.gna.org/viewcvs/freeciv?rev=31909&view=rev Log: Added Deprecation Warning event type. It's not sent in any situation yet. See patch #6948 Modified: trunk/client/options.c trunk/common/events.c trunk/common/events.h trunk/data/misc/events.spec trunk/data/stdsounds.soundspec trunk/fc_version Modified: trunk/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/client/options.c (original) +++ trunk/client/options.c Sun Feb 14 09:41:03 2016 @@ -4852,7 +4852,7 @@ E_LOG_ERROR, E_SETTING, E_VOTE_NEW, E_VOTE_RESOLVED, E_VOTE_ABORTED }; int all[] = { -E_LOG_FATAL, E_SCRIPT +E_LOG_FATAL, E_SCRIPT, E_DEPRECATION_WARNING }; int i; Modified: trunk/common/events.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/events.c?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/common/events.c (original) +++ trunk/common/events.c Sun Feb 14 09:41:03 2016 @@ -211,6 +211,7 @@ GEN_EV(E_SCRIPT, E_S_XYZZY, N_("Scenario/ruleset script message")), /* TRANS: Event name for when the game year changes. */ GEN_EV(E_NEXT_YEAR, E_S_XYZZY, N_("Year Advance")), + GEN_EV(E_DEPRECATION_WARNING, E_S_XYZZY, N_("Deprecated Modpack syntax warnings")), GEN_EV(E_SPONTANEOUS_EXTRA, E_S_XYZZY, N_("Extra Appears or Disappears")), GEN_EV(E_UNIT_ILLEGAL_ACTION, E_S_UNIT, N_("Unit Illegal Action")), GEN_EV(E_UNIT_ESCAPED, E_S_UNIT, N_("Unit escaped")) Modified: trunk/common/events.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/events.h?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/common/events.h (original) +++ trunk/common/events.h Sun Feb 14 09:41:03 2016 @@ -161,6 +161,7 @@ #define SPECENUM_VALUE123 E_UNIT_DID_EXPEL #define SPECENUM_VALUE124 E_UNIT_ACTION_FAILED #define SPECENUM_VALUE125 E_UNIT_ESCAPED +#define SPECENUM_VALUE126 E_DEPRECATION_WARNING /* * Note: If you add a new event, make sure you make a similar change * to the events array in "common/events.c" using GEN_EV, to Modified: trunk/data/misc/events.spec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/misc/events.spec?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/data/misc/events.spec (original) +++ trunk/data/misc/events.spec Sun Feb 14 09:41:03 2016 @@ -56,6 +56,7 @@ 1, 2, "e_report" 1, 2, "e_chat_msg" 1, 2, "e_log_error" + 1, 2, "e_deprecation_warning" 1, 3, "e_log_fatal" 1, 3, "e_chat_error" Modified: trunk/data/stdsounds.soundspec URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/stdsounds.soundspec?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/data/stdsounds.soundspec (original) +++ trunk/data/stdsounds.soundspec Sun Feb 14 09:41:03 2016 @@ -195,6 +195,7 @@ ; This list contains all events up to E_ACHIEVEMENT +; and at least some of the later ones (E_DEPRECATION_WARNING) ; (as numbered in common/events.h), in the sorted order. ; Alphabetical sorting is based on these tag names, ; as the message names and contents change. {was} @@ -227,6 +228,7 @@ ;e_city_plague = "" ;e_civil_war = "" ;e_connection = "" +;e_deprecation_warning = "" ;e_destroyed = "" ;e_diplomacy = "" ;e_diplomatic_incident = "" Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=31909&r1=31908&r2=31909&view=diff == --- trunk/fc_version(original) +++ trunk/fc_versionSun Feb 14 09:41:03 2016 @@ -55,7 +55,7 @@ # - Avoid adding a new mandatory capability 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_MANDATORY="+Freeciv.Devel-3.0-2016.Feb.12b" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2016.Feb.14" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31910 - in /branches/S2_6: ./ client/ common/ data/ data/misc/
Author: cazfi Date: Sun Feb 14 09:41:19 2016 New Revision: 31910 URL: http://svn.gna.org/viewcvs/freeciv?rev=31910&view=rev Log: Added Deprecation Warning event type. It's not sent in any situation yet. See patch #6948 Modified: branches/S2_6/client/options.c branches/S2_6/common/events.c branches/S2_6/common/events.h branches/S2_6/data/misc/events.spec branches/S2_6/data/stdsounds.soundspec branches/S2_6/fc_version Modified: branches/S2_6/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/client/options.c (original) +++ branches/S2_6/client/options.c Sun Feb 14 09:41:19 2016 @@ -4604,7 +4604,7 @@ E_LOG_ERROR, E_SETTING, E_VOTE_NEW, E_VOTE_RESOLVED, E_VOTE_ABORTED }; int all[] = { -E_LOG_FATAL, E_SCRIPT +E_LOG_FATAL, E_SCRIPT, E_DEPRECATION_WARNING }; int i; Modified: branches/S2_6/common/events.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/events.c?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/common/events.c (original) +++ branches/S2_6/common/events.c Sun Feb 14 09:41:19 2016 @@ -204,6 +204,7 @@ GEN_EV(E_SCRIPT, E_S_XYZZY, N_("Scenario/ruleset script message")), /* TRANS: Event name for when the game year changes. */ GEN_EV(E_NEXT_YEAR, E_S_XYZZY, N_("Year Advance")), + GEN_EV(E_DEPRECATION_WARNING, E_S_XYZZY, N_("Deprecated Modpack syntax warnings")), GEN_EV(E_UNIT_ILLEGAL_ACTION, E_S_UNIT, N_("Unit Illegal Action")) /* The sound system also generates "e_game_quit", although there's no * corresponding identifier E_GAME_QUIT. */ Modified: branches/S2_6/common/events.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/events.h?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/common/events.h (original) +++ branches/S2_6/common/events.h Sun Feb 14 09:41:19 2016 @@ -152,6 +152,7 @@ #define SPECENUM_VALUE114 E_MY_SPY_STEAL_GOLD #define SPECENUM_VALUE115 E_ENEMY_SPY_STEAL_GOLD #define SPECENUM_VALUE116 E_UNIT_ILLEGAL_ACTION +#define SPECENUM_VALUE117 E_DEPRECATION_WARNING /* * Note: If you add a new event, make sure you make a similar change Modified: branches/S2_6/data/misc/events.spec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/misc/events.spec?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/data/misc/events.spec (original) +++ branches/S2_6/data/misc/events.spec Sun Feb 14 09:41:19 2016 @@ -56,6 +56,7 @@ 1, 2, "e_report" 1, 2, "e_chat_msg" 1, 2, "e_log_error" + 1, 2, "e_deprecation_warning" 1, 3, "e_log_fatal" 1, 3, "e_chat_error" Modified: branches/S2_6/data/stdsounds.soundspec URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/stdsounds.soundspec?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/data/stdsounds.soundspec (original) +++ branches/S2_6/data/stdsounds.soundspec Sun Feb 14 09:41:19 2016 @@ -195,6 +195,7 @@ ; This list contains all events up to E_ACHIEVEMENT +; and at least some of the later ones (E_DEPRECATION_WARNING) ; (as numbered in common/events.h), in the sorted order. ; Alphabetical sorting is based on these tag names, ; as the message names and contents change. {was} @@ -227,6 +228,7 @@ ;e_city_plague = "" ;e_civil_war = "" ;e_connection = "" +;e_deprecation_warning = "" ;e_destroyed = "" ;e_diplomacy = "" ;e_diplomatic_incident = "" Modified: branches/S2_6/fc_version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=31910&r1=31909&r2=31910&view=diff == --- branches/S2_6/fc_version(original) +++ branches/S2_6/fc_versionSun Feb 14 09:41:19 2016 @@ -55,7 +55,7 @@ # - Avoid adding a new mandatory capability 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_MANDATORY="+Freeciv.Devel-2.6-2016.Feb.12" +NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2016.Feb.14" NETWORK_CAPSTRING_OPTIONAL="" FREECIV_DISTRIBUTOR="" ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31912 - /branches/S2_6/data/helpdata.txt
Author: cazfi Date: Sun Feb 14 09:46:06 2016 New Revision: 31912 URL: http://svn.gna.org/viewcvs/freeciv?rev=31912&view=rev Log: Make clear the plus-part of the fact that freeciv is licensed under GPLv2+ in the Copying menu item header text. See patch #6951 Modified: branches/S2_6/data/helpdata.txt Modified: branches/S2_6/data/helpdata.txt URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/helpdata.txt?rev=31912&r1=31911&r2=31912&view=diff == --- branches/S2_6/data/helpdata.txt (original) +++ branches/S2_6/data/helpdata.txt Sun Feb 14 09:46:06 2016 @@ -1965,7 +1965,10 @@ name = _("Copying") text = _("\ -Freeciv is covered by the GPL, which is included here: \ +Freeciv is released under the GNU General Public License (version 2 \ +or, at your option, any later version). In short, you may copy this \ +program (including source) freely, but see the the full license text \ +below for full details.\ "), "\ GNU GENERAL PUBLIC LICENSE\n\ Version 2, June 1991\n\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31911 - /trunk/data/helpdata.txt
Author: cazfi Date: Sun Feb 14 09:46:01 2016 New Revision: 31911 URL: http://svn.gna.org/viewcvs/freeciv?rev=31911&view=rev Log: Make clear the plus-part of the fact that freeciv is licensed under GPLv2+ in the Copying menu item header text. See patch #6951 Modified: trunk/data/helpdata.txt Modified: trunk/data/helpdata.txt URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/helpdata.txt?rev=31911&r1=31910&r2=31911&view=diff == --- trunk/data/helpdata.txt (original) +++ trunk/data/helpdata.txt Sun Feb 14 09:46:01 2016 @@ -1976,7 +1976,10 @@ name = _("Copying") text = _("\ -Freeciv is covered by the GPL, which is included here: \ +Freeciv is released under the GNU General Public License (version 2 \ +or, at your option, any later version). In short, you may copy this \ +program (including source) freely, but see the the full license text \ +below for full details.\ "), "\ GNU GENERAL PUBLIC LICENSE\n\ Version 2, June 1991\n\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31913 - /branches/S2_5/data/helpdata.txt
Author: cazfi Date: Sun Feb 14 09:46:12 2016 New Revision: 31913 URL: http://svn.gna.org/viewcvs/freeciv?rev=31913&view=rev Log: Make clear the plus-part of the fact that freeciv is licensed under GPLv2+ in the Copying menu item header text. See patch #6951 Modified: branches/S2_5/data/helpdata.txt Modified: branches/S2_5/data/helpdata.txt URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/helpdata.txt?rev=31913&r1=31912&r2=31913&view=diff == --- branches/S2_5/data/helpdata.txt (original) +++ branches/S2_5/data/helpdata.txt Sun Feb 14 09:46:12 2016 @@ -1979,7 +1979,10 @@ name = _("Copying") text = _("\ -Freeciv is covered by the GPL, which is included here: \ +Freeciv is released under the GNU General Public License (version 2 \ +or, at your option, any later version). In short, you may copy this \ +program (including source) freely, but see the the full license text \ +below for full details.\ "), "\ GNU GENERAL PUBLIC LICENSE\n\ Version 2, June 1991\n\ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31914 - in /branches/S2_5/client/gui-qt: menu.cpp menu.h
Author: mir3x Date: Sun Feb 14 09:50:11 2016 New Revision: 31914 URL: http://svn.gna.org/viewcvs/freeciv?rev=31914&view=rev Log: Renamed Auto Settler to Auto Worker - for non settlers units. Fixed "go and build city" enabled for workers. Fixed "revolution" enabled for observers. Fixed "tax rates" enabled for observers. See bug #24396 Modified: branches/S2_5/client/gui-qt/menu.cpp branches/S2_5/client/gui-qt/menu.h Modified: branches/S2_5/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.cpp?rev=31914&r1=31913&r2=31914&view=diff == --- branches/S2_5/client/gui-qt/menu.cpp(original) +++ branches/S2_5/client/gui-qt/menu.cppSun Feb 14 09:50:11 2016 @@ -196,15 +196,16 @@ gov_mapper->deleteLater(); gov_mapper = new QSignalMapper(); + gov_count = government_count(); + actions.reserve(gov_count + 1); action = addAction(_("Revolution...")); connect(action, &QAction::triggered, this, &gov_menu::revolution); + actions.append(action); addSeparator(); // Add an action for each government. There is no icon yet. - gov_count = government_count(); revol_gov = game.government_during_revolution; - actions.reserve(gov_count); for (i = 0; i < gov_count; ++i) { gov = government_by_number(i); if (gov != revol_gov) { // Skip revolution goverment @@ -235,11 +236,13 @@ if (gov != revol_gov) { // Skip revolution goverment sprite = get_government_sprite(tileset, gov); if (sprite != NULL) { -actions[j]->setIcon(QIcon(*(sprite->pm))); +actions[j + 1]->setIcon(QIcon(*(sprite->pm))); } - actions[j]->setEnabled( - can_change_to_government(client.conn.playing, gov)); + actions[j + 1]->setEnabled( +can_change_to_government(client.conn.playing, gov)); ++j; +} else { + actions[0]->setEnabled(!client_is_observer()); } } } @@ -715,7 +718,7 @@ menu_list.insertMulti(BUILD, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_build_city())); act = menu->addAction(_("Go And Build City")); - menu_list.insertMulti(AUTOSETTLER, act); + menu_list.insertMulti(GO_AND_BUILD_CITY, act); act->setShortcut(QKeySequence(tr("shift+b"))); connect(act, SIGNAL(triggered()), this, SLOT(slot_go_build_city())); act = menu->addAction(_("Auto Settler")); @@ -773,6 +776,7 @@ /* Civilization menu */ menu = this->addMenu(_("Civilization")); act = menu->addAction(_("Tax Rates...")); + menu_list.insertMulti(NOT_4_OBS, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_popup_tax_rates())); menu->addSeparator(); @@ -979,6 +983,10 @@ i.value()->setEnabled(true); } break; + case NOT_4_OBS: +if (client_is_observer() == false) { + i.value()->setEnabled(true); +} default: break; } @@ -1202,8 +1210,17 @@ if (can_units_do(punits, can_unit_do_autosettlers)) { i.value()->setEnabled(true); } -break; - +if (units_have_type_flag(punits, UTYF_CITIES, true)) { + i.value()->setText(_("Auto Settler")); +} else { + i.value()->setText(_("Auto Worker")); +} +break; + case GO_AND_BUILD_CITY: +if (units_have_type_flag(punits, UTYF_CITIES, TRUE)) { + i.value()->setEnabled(true); +} +break; case CONNECT_ROAD: proad = road_by_compat_special(ROCO_ROAD); if (proad != NULL) { Modified: branches/S2_5/client/gui-qt/menu.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/menu.h?rev=31914&r1=31913&r2=31914&view=diff == --- branches/S2_5/client/gui-qt/menu.h (original) +++ branches/S2_5/client/gui-qt/menu.h Sun Feb 14 09:50:11 2016 @@ -34,8 +34,8 @@ class QSignalMapper; class QScrollArea; -/** used for indicating menu about current option - for renaming - * and enabling disbaling */ +/** used for indicating menu about current option - for renaming + * and enabling, disabling */ enum munit { STANDARD, EXPLORE, @@ -68,6 +68,8 @@ ORDER_DIPLOMAT_DLG, NUKE, UPGRADE, + GO_AND_BUILD_CITY, + NOT_4_OBS, SAVE }; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31915 - in /branches/S2_6/client/gui-qt: menu.cpp menu.h
Author: mir3x Date: Sun Feb 14 09:50:34 2016 New Revision: 31915 URL: http://svn.gna.org/viewcvs/freeciv?rev=31915&view=rev Log: Renamed Auto Settler to Auto Worker - for non settlers units. Fixed "go and build city" enabled for workers. Fixed "revolution" enabled for observers. Fixed "tax rates" enabled for observers. See bug #24396 Modified: branches/S2_6/client/gui-qt/menu.cpp branches/S2_6/client/gui-qt/menu.h Modified: branches/S2_6/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=31915&r1=31914&r2=31915&view=diff == --- branches/S2_6/client/gui-qt/menu.cpp(original) +++ branches/S2_6/client/gui-qt/menu.cppSun Feb 14 09:50:34 2016 @@ -225,15 +225,16 @@ gov_mapper->deleteLater(); gov_mapper = new QSignalMapper(); + gov_count = government_count(); + actions.reserve(gov_count + 1); action = addAction(_("Revolution...")); connect(action, &QAction::triggered, this, &gov_menu::revolution); + actions.append(action); addSeparator(); // Add an action for each government. There is no icon yet. - gov_count = government_count(); revol_gov = game.government_during_revolution; - actions.reserve(gov_count); for (i = 0; i < gov_count; ++i) { gov = government_by_number(i); if (gov != revol_gov) { // Skip revolution goverment @@ -264,11 +265,13 @@ if (gov != revol_gov) { // Skip revolution goverment sprite = get_government_sprite(tileset, gov); if (sprite != NULL) { -actions[j]->setIcon(QIcon(*(sprite->pm))); +actions[j + 1]->setIcon(QIcon(*(sprite->pm))); } - actions[j]->setEnabled( - can_change_to_government(client.conn.playing, gov)); + actions[j + 1]->setEnabled( +can_change_to_government(client.conn.playing, gov)); ++j; +} else { + actions[0]->setEnabled(!client_is_observer()); } } } @@ -797,7 +800,7 @@ menu_list.insertMulti(BUILD, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_build_city())); act = menu->addAction(_("Go And Build City")); - menu_list.insertMulti(AUTOSETTLER, act); + menu_list.insertMulti(GO_AND_BUILD_CITY, act); act->setShortcut(QKeySequence(tr("shift+b"))); connect(act, SIGNAL(triggered()), this, SLOT(slot_go_build_city())); act = menu->addAction(_("Auto Settler")); @@ -866,6 +869,7 @@ /* Civilization menu */ menu = this->addMenu(_("Civilization")); act = menu->addAction(_("Tax Rates...")); + menu_list.insertMulti(NOT_4_OBS, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_popup_tax_rates())); menu->addSeparator(); @@ -1086,6 +1090,10 @@ i.value()->setEnabled(true); } break; + case NOT_4_OBS: +if (client_is_observer() == false) { + i.value()->setEnabled(true); +} default: break; } @@ -1346,8 +1354,17 @@ if (can_units_do(punits, can_unit_do_autosettlers)) { i.value()->setEnabled(true); } -break; - +if (units_have_type_flag(punits, UTYF_CITIES, true)) { + i.value()->setText(_("Auto Settler")); +} else { + i.value()->setText(_("Auto Worker")); +} +break; + case GO_AND_BUILD_CITY: +if (units_have_type_flag(punits, UTYF_CITIES, TRUE)) { + i.value()->setEnabled(true); +} +break; case CONNECT_ROAD: proad = road_by_compat_special(ROCO_ROAD); if (proad != NULL) { Modified: branches/S2_6/client/gui-qt/menu.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.h?rev=31915&r1=31914&r2=31915&view=diff == --- branches/S2_6/client/gui-qt/menu.h (original) +++ branches/S2_6/client/gui-qt/menu.h Sun Feb 14 09:50:34 2016 @@ -34,8 +34,8 @@ class QSignalMapper; class QScrollArea; -/** used for indicating menu about current option - for renaming - * and enabling disbaling */ +/** used for indicating menu about current option - for renaming + * and enabling, disabling */ enum munit { STANDARD, EXPLORE, @@ -69,6 +69,8 @@ ORDER_DIPLOMAT_DLG, NUKE, UPGRADE, + GO_AND_BUILD_CITY, + NOT_4_OBS, SAVE }; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31916 - in /trunk/client/gui-qt: menu.cpp menu.h
Author: mir3x Date: Sun Feb 14 09:53:01 2016 New Revision: 31916 URL: http://svn.gna.org/viewcvs/freeciv?rev=31916&view=rev Log: Renamed Auto Settler to Auto Worker - for non settlers units. Fixed "go and build city" enabled for workers. Fixed "revolution" enabled for observers. Fixed "tax rates" enabled for observers. See bug #24396 Modified: trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/menu.h Modified: trunk/client/gui-qt/menu.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=31916&r1=31915&r2=31916&view=diff == --- trunk/client/gui-qt/menu.cpp(original) +++ trunk/client/gui-qt/menu.cppSun Feb 14 09:53:01 2016 @@ -229,15 +229,16 @@ gov_mapper->deleteLater(); gov_mapper = new QSignalMapper(); + gov_count = government_count(); + actions.reserve(gov_count + 1); action = addAction(_("Revolution...")); connect(action, &QAction::triggered, this, &gov_menu::revolution); + actions.append(action); addSeparator(); // Add an action for each government. There is no icon yet. - gov_count = government_count(); revol_gov = game.government_during_revolution; - actions.reserve(gov_count); for (i = 0; i < gov_count; ++i) { gov = government_by_number(i); if (gov != revol_gov) { // Skip revolution goverment @@ -268,11 +269,13 @@ if (gov != revol_gov) { // Skip revolution goverment sprite = get_government_sprite(tileset, gov); if (sprite != NULL) { -actions[j]->setIcon(QIcon(*(sprite->pm))); +actions[j + 1]->setIcon(QIcon(*(sprite->pm))); } - actions[j]->setEnabled( - can_change_to_government(client.conn.playing, gov)); + actions[j + 1]->setEnabled( +can_change_to_government(client.conn.playing, gov)); ++j; +} else { + actions[0]->setEnabled(!client_is_observer()); } } } @@ -969,7 +972,7 @@ menu_list.insertMulti(BUILD, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_build_city())); act = menu->addAction(_("Go And Build City")); - menu_list.insertMulti(AUTOSETTLER, act); + menu_list.insertMulti(GO_AND_BUILD_CITY, act); act->setShortcut(QKeySequence(tr("shift+b"))); connect(act, SIGNAL(triggered()), this, SLOT(slot_go_build_city())); act = menu->addAction(_("Go And Join City")); @@ -1042,6 +1045,7 @@ /* Civilization menu */ menu = this->addMenu(_("Civilization")); act = menu->addAction(_("Tax Rates...")); + menu_list.insertMulti(NOT_4_OBS, act); connect(act, SIGNAL(triggered()), this, SLOT(slot_popup_tax_rates())); menu->addSeparator(); @@ -1262,6 +1266,10 @@ i.value()->setEnabled(true); } break; + case NOT_4_OBS: +if (client_is_observer() == false) { + i.value()->setEnabled(true); +} default: break; } @@ -1526,8 +1534,17 @@ if (can_units_do(punits, can_unit_do_autosettlers)) { i.value()->setEnabled(true); } -break; - +if (units_contain_cityfounder(punits)) { + i.value()->setText(_("Auto Settler")); +} else { + i.value()->setText(_("Auto Worker")); +} +break; + case GO_AND_BUILD_CITY: +if (units_contain_cityfounder(punits)) { + i.value()->setEnabled(true); +} +break; case CONNECT_ROAD: proad = road_by_compat_special(ROCO_ROAD); if (proad != NULL) { Modified: trunk/client/gui-qt/menu.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.h?rev=31916&r1=31915&r2=31916&view=diff == --- trunk/client/gui-qt/menu.h (original) +++ trunk/client/gui-qt/menu.h Sun Feb 14 09:53:01 2016 @@ -34,8 +34,8 @@ class QSignalMapper; class QScrollArea; -/** used for indicating menu about current option - for renaming - * and enabling disbaling */ +/** used for indicating menu about current option - for renaming + * and enabling, disabling */ enum munit { STANDARD, EXPLORE, @@ -70,6 +70,8 @@ NUKE, UPGRADE, MIGRANT, + GO_AND_BUILD_CITY, + NOT_4_OBS, SAVE }; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31917 - in /trunk/client: gui-qt/fc_client.cpp gui-qt/gui_main.cpp options.c options.h
Author: mir3x Date: Sun Feb 14 10:01:43 2016 New Revision: 31917 URL: http://svn.gna.org/viewcvs/freeciv?rev=31917&view=rev Log: Added default font to qt client. See patch #6941 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/gui_main.cpp trunk/client/options.c trunk/client/options.h Modified: trunk/client/gui-qt/fc_client.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.cpp?rev=31917&r1=31916&r2=31917&view=diff == --- trunk/client/gui-qt/fc_client.cpp (original) +++ trunk/client/gui-qt/fc_client.cpp Sun Feb 14 10:01:43 2016 @@ -765,9 +765,13 @@ / Adds new font or overwrite old one / -void fc_font::set_font(QString name, QFont * qf) -{ - font_map.insert(name,qf); +void fc_font::set_font(QString name, QFont *qf) +{ + font_map.insert(name, qf); + /* Automatically set default font */ + if (name == "gui_qt_font_default") { +QApplication::setFont(*qf); + } } / Modified: trunk/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/gui_main.cpp?rev=31917&r1=31916&r2=31917&view=diff == --- trunk/client/gui-qt/gui_main.cpp(original) +++ trunk/client/gui-qt/gui_main.cppSun Feb 14 10:01:43 2016 @@ -202,6 +202,8 @@ } option_var_set_callback(gui_qt_font_city_names, + apply_font); + option_var_set_callback(gui_qt_font_default, apply_font); option_var_set_callback(gui_qt_font_city_productions, apply_font); Modified: trunk/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=31917&r1=31916&r2=31917&view=diff == --- trunk/client/options.c (original) +++ trunk/client/options.c Sun Feb 14 10:01:43 2016 @@ -309,6 +309,7 @@ /* gui-qt client specific options. */ .gui_qt_fullscreen = FALSE, .gui_qt_font_city_label = "Monospace,8,-1,5,50,0,0,0,0,0", + .gui_qt_font_default = "Sans Serif,10,-1,5,75,0,0,0,0,0", .gui_qt_font_notify_label = "Monospace,8,-1,5,75,0,0,0,0,0", .gui_qt_font_spaceship_label = "Monospace,8,-1,5,50,0,0,0,0,0", .gui_qt_font_help_label = "Sans Serif,9,-1,5,50,0,0,0,0,0", @@ -3041,6 +3042,11 @@ "dialogs."), COC_FONT, GUI_QT, "Monospace,8,-1,5,50,0,0,0,0,0", font_changed_callback), + GEN_FONT_OPTION(gui_qt_font_default, "default_font", + N_("Default font"), + N_("This is default font"), + COC_FONT, GUI_QT, + "Sans Serif,10,-1,5,75,0,0,0,0,0", font_changed_callback), GEN_FONT_OPTION(gui_qt_font_notify_label, "notify_label", N_("Notify Label"), N_("This font is used to display server reports such " Modified: trunk/client/options.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/options.h?rev=31917&r1=31916&r2=31917&view=diff == --- trunk/client/options.h (original) +++ trunk/client/options.h Sun Feb 14 10:01:43 2016 @@ -326,6 +326,7 @@ bool gui_qt_fullscreen; bool gui_qt_allied_chat_only; char gui_qt_font_city_label[512]; + char gui_qt_font_default[512]; char gui_qt_font_notify_label[512]; char gui_qt_font_spaceship_label[512]; char gui_qt_font_help_label[512]; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31918 - in /branches/S2_6/client: gui-qt/fc_client.cpp gui-qt/gui_main.cpp options.c options.h
Author: mir3x Date: Sun Feb 14 10:11:44 2016 New Revision: 31918 URL: http://svn.gna.org/viewcvs/freeciv?rev=31918&view=rev Log: Added default font to qt client. See patch #6941 Modified: branches/S2_6/client/gui-qt/fc_client.cpp branches/S2_6/client/gui-qt/gui_main.cpp branches/S2_6/client/options.c branches/S2_6/client/options.h Modified: branches/S2_6/client/gui-qt/fc_client.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=31918&r1=31917&r2=31918&view=diff == --- branches/S2_6/client/gui-qt/fc_client.cpp (original) +++ branches/S2_6/client/gui-qt/fc_client.cpp Sun Feb 14 10:11:44 2016 @@ -765,9 +765,13 @@ / Adds new font or overwrite old one / -void fc_font::set_font(QString name, QFont * qf) -{ - font_map.insert(name,qf); +void fc_font::set_font(QString name, QFont *qf) +{ + font_map.insert(name, qf); + /* Automatically set default font */ + if (name == "gui_qt_font_default") { +QApplication::setFont(*qf); + } } / Modified: branches/S2_6/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=31918&r1=31917&r2=31918&view=diff == --- branches/S2_6/client/gui-qt/gui_main.cpp(original) +++ branches/S2_6/client/gui-qt/gui_main.cppSun Feb 14 10:11:44 2016 @@ -202,6 +202,8 @@ } option_var_set_callback(gui_qt_font_city_names, + apply_font); + option_var_set_callback(gui_qt_font_default, apply_font); option_var_set_callback(gui_qt_font_city_productions, apply_font); Modified: branches/S2_6/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=31918&r1=31917&r2=31918&view=diff == --- branches/S2_6/client/options.c (original) +++ branches/S2_6/client/options.c Sun Feb 14 10:11:44 2016 @@ -274,6 +274,7 @@ /* gui-qt client specific options. */ .gui_qt_fullscreen = FALSE, .gui_qt_font_city_label = "Monospace,8,-1,5,50,0,0,0,0,0", + .gui_qt_font_default = "Sans Serif,10,-1,5,75,0,0,0,0,0", .gui_qt_font_notify_label = "Monospace,8,-1,5,75,0,0,0,0,0", .gui_qt_font_spaceship_label = "Monospace,8,-1,5,50,0,0,0,0,0", .gui_qt_font_help_label = "Sans Serif,9,-1,5,50,0,0,0,0,0", @@ -2793,6 +2794,11 @@ "dialogs."), COC_FONT, GUI_QT, "Monospace,8,-1,5,50,0,0,0,0,0", font_changed_callback), + GEN_FONT_OPTION(gui_qt_font_default, "default_font", + N_("Default font"), + N_("This is default font"), + COC_FONT, GUI_QT, + "Sans Serif,10,-1,5,75,0,0,0,0,0", font_changed_callback), GEN_FONT_OPTION(gui_qt_font_notify_label, "notify_label", N_("Notify Label"), N_("This font is used to display server reports such " Modified: branches/S2_6/client/options.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.h?rev=31918&r1=31917&r2=31918&view=diff == --- branches/S2_6/client/options.h (original) +++ branches/S2_6/client/options.h Sun Feb 14 10:11:44 2016 @@ -290,6 +290,7 @@ bool gui_qt_fullscreen; bool gui_qt_allied_chat_only; char gui_qt_font_city_label[512]; + char gui_qt_font_default[512]; char gui_qt_font_notify_label[512]; char gui_qt_font_spaceship_label[512]; char gui_qt_font_help_label[512]; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31920 - in /branches/S2_6: Makefile.am configure.ac data/Makefile.am data/database.lua lua/ lua/Makefile.am lua/database.lua
Author: cazfi Date: Sun Feb 14 12:52:58 2016 New Revision: 31920 URL: http://svn.gna.org/viewcvs/freeciv?rev=31920&view=rev Log: Moved database.lua from data/ to lua/ in source tree. See patch #6929 Added: branches/S2_6/lua/ branches/S2_6/lua/Makefile.am branches/S2_6/lua/database.lua - copied unchanged from r31919, branches/S2_6/data/database.lua Removed: branches/S2_6/data/database.lua Modified: branches/S2_6/Makefile.am branches/S2_6/configure.ac branches/S2_6/data/Makefile.am Modified: branches/S2_6/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/Makefile.am?rev=31920&r1=31919&r2=31920&view=diff == --- branches/S2_6/Makefile.am (original) +++ branches/S2_6/Makefile.am Sun Feb 14 12:52:58 2016 @@ -25,7 +25,7 @@ DSUBDIRS = endif -SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) translations doc tools gen_headers bootstrap +SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) translations doc tools gen_headers lua bootstrap ## Automake should distribute config.rpath automatically - and new ## versions probably do. We still support versions that do not, so Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=31920&r1=31919&r2=31920&view=diff == --- branches/S2_6/configure.ac (original) +++ branches/S2_6/configure.ac Sun Feb 14 12:52:58 2016 @@ -1611,6 +1611,7 @@ bootstrap/Makefile freeciv.spec:bootstrap/freeciv.spec.in data/Freeciv + lua/Makefile client/freeciv.desktop:bootstrap/freeciv.desktop.in client/freeciv-gtk2.desktop:bootstrap/freeciv-gtk2.desktop.in client/freeciv-sdl.desktop:bootstrap/freeciv-sdl.desktop.in Modified: branches/S2_6/data/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/Makefile.am?rev=31920&r1=31919&r2=31920&view=diff == --- branches/S2_6/data/Makefile.am (original) +++ branches/S2_6/data/Makefile.am Sun Feb 14 12:52:58 2016 @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in - -pkgsysconfdir = $(sysconfdir)/$(PACKAGE) if CLIENT CLIENT_FILES = \ @@ -42,18 +40,14 @@ if SERVER SERVER_FILES = $(SRV_RE_FILES) -SERVER_CONF = database.lua else if RULEDIT SERVER_FILES = $(SRV_RE_FILES) -SERVER_CONF = else SERVER_FILES = -SERVER_CONF = endif endif -pkgsysconf_DATA = $(SERVER_CONF) pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) EXTRA_DIST = \ Removed: branches/S2_6/data/database.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/database.lua?rev=31919&view=auto == --- branches/S2_6/data/database.lua (original) +++ branches/S2_6/data/database.lua (removed) @@ -1,402 +0,0 @@ --- Freeciv - Copyright (C) 2011 - The Freeciv Project --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 2, or (at your option) --- any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. - --- This file is the Freeciv server`s interface to the database backend --- when authentication is enabled. See doc/README.fcdb. - -local dbh = nil - --- Machinery for debug logging of options -local seen_options -local function options_init() - seen_options = {} -end -local function option_log(name, val, is_sensitive, source) - if not seen_options[name] then -seen_options[name] = true -if is_sensitive then - log.debug('Database option \'%s\': %s', name, source) -else - log.debug('Database option \'%s\': %s: value \'%s\'', name, source, val) -end - end -end - --- Get an option from configuration file, falling back to sensible --- defaults where they exist -local function get_option(name, is_sensitive) - local defaults = { -backend= "sqlite", -table_user = "fcdb_auth", -table_log = "fcdb_log" - } - local val = fcdb.option(name) - if val then -option_log(name, val, is_sensitive, 'read from file') - else -val = defaults[name] -if val then - option_log(name, val, is_sensitive, 'using default') -end - end - if not val then -log.error('Database option \'%s\' not specified in configuration file', - name) - end - return val -end - --- connect to a MySQL database (or stop with an error) -local fu
[Freeciv-commits] r31919 - in /trunk: Makefile.am configure.ac data/Makefile.am data/database.lua lua/ lua/Makefile.am lua/database.lua
Author: cazfi Date: Sun Feb 14 12:52:52 2016 New Revision: 31919 URL: http://svn.gna.org/viewcvs/freeciv?rev=31919&view=rev Log: Moved database.lua from data/ to lua/ in source tree. See patch #6929 Added: trunk/lua/ trunk/lua/Makefile.am trunk/lua/database.lua - copied unchanged from r31918, trunk/data/database.lua Removed: trunk/data/database.lua Modified: trunk/Makefile.am trunk/configure.ac trunk/data/Makefile.am Modified: trunk/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=31919&r1=31918&r2=31919&view=diff == --- trunk/Makefile.am (original) +++ trunk/Makefile.am Sun Feb 14 12:52:52 2016 @@ -25,7 +25,7 @@ DSUBDIRS = endif -SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) translations doc tools gen_headers bootstrap +SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) translations doc tools gen_headers lua bootstrap ## Automake should distribute config.rpath automatically - and new ## versions probably do. We still support versions that do not, so Modified: trunk/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=31919&r1=31918&r2=31919&view=diff == --- trunk/configure.ac (original) +++ trunk/configure.ac Sun Feb 14 12:52:52 2016 @@ -1646,6 +1646,7 @@ doc/nl/Makefile doc/sv/Makefile bootstrap/Makefile + lua/Makefile freeciv.spec:bootstrap/freeciv.spec.in client/freeciv.desktop:bootstrap/freeciv.desktop.in client/freeciv-gtk2.desktop:bootstrap/freeciv-gtk2.desktop.in Modified: trunk/data/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/Makefile.am?rev=31919&r1=31918&r2=31919&view=diff == --- trunk/data/Makefile.am (original) +++ trunk/data/Makefile.am Sun Feb 14 12:52:52 2016 @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in - -pkgsysconfdir = $(sysconfdir)/$(PACKAGE) if CLIENT CLIENT_FILES = \ @@ -45,18 +43,14 @@ if SERVER SERVER_FILES = $(SRV_RE_FILES) -SERVER_CONF = database.lua else if RULEDIT SERVER_FILES = $(SRV_RE_FILES) -SERVER_CONF = else SERVER_FILES = -SERVER_CONF = endif endif -pkgsysconf_DATA = $(SERVER_CONF) pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) EXTRA_DIST = \ Removed: trunk/data/database.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/database.lua?rev=31918&view=auto == --- trunk/data/database.lua (original) +++ trunk/data/database.lua (removed) @@ -1,402 +0,0 @@ --- Freeciv - Copyright (C) 2011 - The Freeciv Project --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 2, or (at your option) --- any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. - --- This file is the Freeciv server`s interface to the database backend --- when authentication is enabled. See doc/README.fcdb. - -local dbh = nil - --- Machinery for debug logging of options -local seen_options -local function options_init() - seen_options = {} -end -local function option_log(name, val, is_sensitive, source) - if not seen_options[name] then -seen_options[name] = true -if is_sensitive then - log.debug('Database option \'%s\': %s', name, source) -else - log.debug('Database option \'%s\': %s: value \'%s\'', name, source, val) -end - end -end - --- Get an option from configuration file, falling back to sensible --- defaults where they exist -local function get_option(name, is_sensitive) - local defaults = { -backend= "sqlite", -table_user = "fcdb_auth", -table_log = "fcdb_log" - } - local val = fcdb.option(name) - if val then -option_log(name, val, is_sensitive, 'read from file') - else -val = defaults[name] -if val then - option_log(name, val, is_sensitive, 'using default') -end - end - if not val then -log.error('Database option \'%s\' not specified in configuration file', - name) - end - return val -end - --- connect to a MySQL database (or stop with an error) -local function mysql_connect() - local err -- error message - - if dbh then -dbh:close() - end - - local sql = ls_mysql.mysql() - - log.verbose('MySQL database version is %s.', ls_mysql._MYSQLVERSION) - - -- Load the database parame
[Freeciv-commits] r31921 - in /branches/S2_5: Makefile.am configure.ac data/Makefile.am data/database.lua lua/ lua/Makefile.am lua/database.lua
Author: cazfi Date: Sun Feb 14 12:53:03 2016 New Revision: 31921 URL: http://svn.gna.org/viewcvs/freeciv?rev=31921&view=rev Log: Moved database.lua from data/ to lua/ in source tree. See patch #6929 Added: branches/S2_5/lua/ branches/S2_5/lua/Makefile.am branches/S2_5/lua/database.lua - copied unchanged from r31920, branches/S2_5/data/database.lua Removed: branches/S2_5/data/database.lua Modified: branches/S2_5/Makefile.am branches/S2_5/configure.ac branches/S2_5/data/Makefile.am Modified: branches/S2_5/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/Makefile.am?rev=31921&r1=31920&r2=31921&view=diff == --- branches/S2_5/Makefile.am (original) +++ branches/S2_5/Makefile.am Sun Feb 14 12:53:03 2016 @@ -20,13 +20,14 @@ DSUBDIRS = endif -SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) translations doc tools +SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS) $(CSUBDIRS) \ + translations doc tools lua ## Automake should distribute config.rpath automatically - and new ## versions probably do. We still support versions that do not, so ## it's in the list below. ## It should also install it automatically when running autogen.sh. -EXTRA_DIST=autogen.sh \ +EXTRA_DIST = autogen.sh \ configure.ac\ diff_ignore \ bootstrap/fcgui.in \ Modified: branches/S2_5/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=31921&r1=31920&r2=31921&view=diff == --- branches/S2_5/configure.ac (original) +++ branches/S2_5/configure.ac Sun Feb 14 12:53:03 2016 @@ -1576,6 +1576,7 @@ doc/sv/Makefile freeciv.spec:bootstrap/freeciv.spec.in data/Freeciv + lua/Makefile client/freeciv.desktop:bootstrap/freeciv.desktop.in client/freeciv-gtk2.desktop:bootstrap/freeciv-gtk2.desktop.in client/freeciv-sdl.desktop:bootstrap/freeciv-sdl.desktop.in Modified: branches/S2_5/data/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/Makefile.am?rev=31921&r1=31920&r2=31921&view=diff == --- branches/S2_5/data/Makefile.am (original) +++ branches/S2_5/data/Makefile.am Sun Feb 14 12:53:03 2016 @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in - -pkgsysconfdir = $(sysconfdir)/$(PACKAGE) if CLIENT CLIENT_FILES = \ @@ -38,15 +36,10 @@ experimental.serv \ multiplayer.serv \ civ2civ3.serv - -SERVER_CONF = database.lua - else SERVER_FILES = -SERVER_CONF = endif -pkgsysconf_DATA = $(SERVER_CONF) pkgdata_DATA = $(SERVER_FILES) $(CLIENT_FILES) EXTRA_DIST = \ @@ -57,7 +50,6 @@ civserver.dsc.in\ civclient.dsc.in\ civserver.room.in \ - database.lua\ hex2t.tilespec \ amplio2.tilespec \ cimpletoon.tilespec \ Removed: branches/S2_5/data/database.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/database.lua?rev=31920&view=auto == --- branches/S2_5/data/database.lua (original) +++ branches/S2_5/data/database.lua (removed) @@ -1,402 +0,0 @@ --- Freeciv - Copyright (C) 2011 - The Freeciv Project --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 2, or (at your option) --- any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. - --- This file is the Freeciv server`s interface to the database backend --- when authentication is enabled. See doc/README.fcdb. - -local dbh = nil - --- Machinery for debug logging of options -local seen_options -local function options_init() - seen_options = {} -end -local function option_log(name, val, is_sensitive, source) - if not seen_options[name] then -seen_options[name] = true -if is_sensitive then - log.debug('Database option \'%s\': %s', name, source) -else - log.debug('Database option \'%s\': %s: value \'%s\'', name, source, val) -end - end -end - --- Get an option from configuration file, falling back to sensible --- defaults where they exist -local function get_option(name, is_sensitive) - local defaults = { -backend= "sqlite", -
[Freeciv-commits] r31922 - /trunk/client/gui-gtk-3.0/
Author: cazfi Date: Sun Feb 14 14:30:32 2016 New Revision: 31922 URL: http://svn.gna.org/viewcvs/freeciv?rev=31922&view=rev Log: Replaced all uses of GtkMisc from gtk3-client with more modern constructs. See bug #24398 Modified: trunk/client/gui-gtk-3.0/citydlg.c trunk/client/gui-gtk-3.0/cityrep.c trunk/client/gui-gtk-3.0/cma_fe.c trunk/client/gui-gtk-3.0/dialogs.c trunk/client/gui-gtk-3.0/diplodlg.c trunk/client/gui-gtk-3.0/editgui.c trunk/client/gui-gtk-3.0/editprop.c trunk/client/gui-gtk-3.0/gtkpixcomm.c trunk/client/gui-gtk-3.0/gui_main.c trunk/client/gui-gtk-3.0/gui_stuff.c trunk/client/gui-gtk-3.0/happiness.c trunk/client/gui-gtk-3.0/helpdlg.c trunk/client/gui-gtk-3.0/inteldlg.c trunk/client/gui-gtk-3.0/pages.c trunk/client/gui-gtk-3.0/repodlgs.c trunk/client/gui-gtk-3.0/spaceshipdlg.c trunk/client/gui-gtk-3.0/voteinfo_bar.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/gui-gtk-3.0/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citydlg.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/cityrep.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/cma_fe.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/diplodlg.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editgui.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/editprop.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/gtkpixcomm.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gtkpixcomm.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_stuff.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/happiness.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/happiness.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/inteldlg.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/repodlgs.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/spaceshipdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/spaceshipdlg.c?rev=31922&r1=31921&r2=31922&view=diff Modified: trunk/client/gui-gtk-3.0/voteinfo_bar.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/voteinfo_bar.c?rev=31922&r1=31921&r2=31922&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31923 - /branches/S2_6/client/gui-gtk-3.0/
Author: cazfi Date: Sun Feb 14 14:30:41 2016 New Revision: 31923 URL: http://svn.gna.org/viewcvs/freeciv?rev=31923&view=rev Log: Replaced all uses of GtkMisc from gtk3-client with more modern constructs. See bug #24398 Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c branches/S2_6/client/gui-gtk-3.0/cityrep.c branches/S2_6/client/gui-gtk-3.0/cma_fe.c branches/S2_6/client/gui-gtk-3.0/dialogs.c branches/S2_6/client/gui-gtk-3.0/diplodlg.c branches/S2_6/client/gui-gtk-3.0/editgui.c branches/S2_6/client/gui-gtk-3.0/editprop.c branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c branches/S2_6/client/gui-gtk-3.0/gui_main.c branches/S2_6/client/gui-gtk-3.0/gui_stuff.c branches/S2_6/client/gui-gtk-3.0/happiness.c branches/S2_6/client/gui-gtk-3.0/helpdlg.c branches/S2_6/client/gui-gtk-3.0/inteldlg.c branches/S2_6/client/gui-gtk-3.0/pages.c branches/S2_6/client/gui-gtk-3.0/repodlgs.c branches/S2_6/client/gui-gtk-3.0/spaceshipdlg.c branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/cityrep.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/cma_fe.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/dialogs.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/diplodlg.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editgui.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_stuff.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/happiness.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/happiness.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/helpdlg.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/inteldlg.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/pages.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/repodlgs.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/spaceshipdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/spaceshipdlg.c?rev=31923&r1=31922&r2=31923&view=diff Modified: branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/voteinfo_bar.c?rev=31923&r1=31922&r2=31923&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31924 - /branches/S2_5/client/gui-gtk-3.0/
Author: cazfi Date: Sun Feb 14 14:30:49 2016 New Revision: 31924 URL: http://svn.gna.org/viewcvs/freeciv?rev=31924&view=rev Log: Replaced all uses of GtkMisc from gtk3-client with more modern constructs. See bug #24398 Modified: branches/S2_5/client/gui-gtk-3.0/citydlg.c branches/S2_5/client/gui-gtk-3.0/cityrep.c branches/S2_5/client/gui-gtk-3.0/cma_fe.c branches/S2_5/client/gui-gtk-3.0/dialogs.c branches/S2_5/client/gui-gtk-3.0/diplodlg.c branches/S2_5/client/gui-gtk-3.0/editgui.c branches/S2_5/client/gui-gtk-3.0/editprop.c branches/S2_5/client/gui-gtk-3.0/gtkpixcomm.c branches/S2_5/client/gui-gtk-3.0/gui_main.c branches/S2_5/client/gui-gtk-3.0/gui_stuff.c branches/S2_5/client/gui-gtk-3.0/happiness.c branches/S2_5/client/gui-gtk-3.0/helpdlg.c branches/S2_5/client/gui-gtk-3.0/inteldlg.c branches/S2_5/client/gui-gtk-3.0/pages.c branches/S2_5/client/gui-gtk-3.0/repodlgs.c branches/S2_5/client/gui-gtk-3.0/spaceshipdlg.c branches/S2_5/client/gui-gtk-3.0/voteinfo_bar.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/client/gui-gtk-3.0/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/citydlg.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/cityrep.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/cma_fe.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/dialogs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/dialogs.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/diplodlg.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/editgui.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editgui.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/editprop.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/editprop.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/gtkpixcomm.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gtkpixcomm.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/gui_stuff.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_stuff.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/happiness.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/happiness.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/helpdlg.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/inteldlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/inteldlg.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/pages.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/repodlgs.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/spaceshipdlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/spaceshipdlg.c?rev=31924&r1=31923&r2=31924&view=diff Modified: branches/S2_5/client/gui-gtk-3.0/voteinfo_bar.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/voteinfo_bar.c?rev=31924&r1=31923&r2=31924&view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31926 - in /branches/S2_6/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/ sandbox/ stub/
Author: cazfi Date: Sun Feb 14 15:15:28 2016 New Revision: 31926 URL: http://svn.gna.org/viewcvs/freeciv?rev=31926&view=rev Log: Documented effect field "multiplier" in comments of supplied rulesets. See patch #6952 Modified: branches/S2_6/data/alien/effects.ruleset branches/S2_6/data/civ1/effects.ruleset branches/S2_6/data/civ2/effects.ruleset branches/S2_6/data/civ2civ3/effects.ruleset branches/S2_6/data/classic/effects.ruleset branches/S2_6/data/experimental/effects.ruleset branches/S2_6/data/multiplayer/effects.ruleset branches/S2_6/data/sandbox/effects.ruleset branches/S2_6/data/stub/effects.ruleset Modified: branches/S2_6/data/alien/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/alien/effects.ruleset?rev=31926&r1=31925&r2=31926&view=diff == --- branches/S2_6/data/alien/effects.ruleset(original) +++ branches/S2_6/data/alien/effects.rulesetSun Feb 14 15:15:28 2016 @@ -24,6 +24,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: branches/S2_6/data/civ1/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ1/effects.ruleset?rev=31926&r1=31925&r2=31926&view=diff == --- branches/S2_6/data/civ1/effects.ruleset (original) +++ branches/S2_6/data/civ1/effects.ruleset Sun Feb 14 15:15:28 2016 @@ -22,6 +22,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: branches/S2_6/data/civ2/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2/effects.ruleset?rev=31926&r1=31925&r2=31926&view=diff == --- branches/S2_6/data/civ2/effects.ruleset (original) +++ branches/S2_6/data/civ2/effects.ruleset Sun Feb 14 15:15:28 2016 @@ -22,6 +22,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: branches/S2_6/data/civ2civ3/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/civ2civ3/effects.ruleset?rev=31926&r1=31925&r2=31926&view=diff == --- branches/S2_6/data/civ2civ3/effects.ruleset (original) +++ branches/S2_6/data/civ2civ3/effects.ruleset Sun Feb 14 15:15:28 2016 @@ -22,6 +22,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: branches/S2_6/data/classic/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/classic/effects.ruleset?rev=31926&r1=31925&r2=31926&view=diff == --- branches/S2_6/data/classic/effects.ruleset (original) +++ branches/S2_6/data/classic/effects.ruleset Sun Feb 14 15:15:28 2016 @@ -22,6 +22,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on req
[Freeciv-commits] r31925 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/ sandbox/ stub/
Author: cazfi Date: Sun Feb 14 15:15:21 2016 New Revision: 31925 URL: http://svn.gna.org/viewcvs/freeciv?rev=31925&view=rev Log: Documented effect field "multiplier" in comments of supplied rulesets. See patch #6952 Modified: trunk/data/alien/effects.ruleset trunk/data/civ1/effects.ruleset trunk/data/civ2/effects.ruleset trunk/data/civ2civ3/effects.ruleset trunk/data/classic/effects.ruleset trunk/data/experimental/effects.ruleset trunk/data/multiplayer/effects.ruleset trunk/data/sandbox/effects.ruleset trunk/data/stub/effects.ruleset Modified: trunk/data/alien/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff == --- trunk/data/alien/effects.ruleset(original) +++ trunk/data/alien/effects.rulesetSun Feb 14 15:15:21 2016 @@ -25,6 +25,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: trunk/data/civ1/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff == --- trunk/data/civ1/effects.ruleset (original) +++ trunk/data/civ1/effects.ruleset Sun Feb 14 15:15:21 2016 @@ -23,6 +23,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: trunk/data/civ2/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff == --- trunk/data/civ2/effects.ruleset (original) +++ trunk/data/civ2/effects.ruleset Sun Feb 14 15:15:21 2016 @@ -22,6 +22,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: trunk/data/civ2civ3/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff == --- trunk/data/civ2civ3/effects.ruleset (original) +++ trunk/data/civ2civ3/effects.ruleset Sun Feb 14 15:15:21 2016 @@ -23,6 +23,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: trunk/data/classic/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff == --- trunk/data/classic/effects.ruleset (original) +++ trunk/data/classic/effects.ruleset Sun Feb 14 15:15:21 2016 @@ -23,6 +23,7 @@ ; See README.effects for list of possible types ; value = Value added for the effect type when this effect is active, ; i.e., all requirements are fulfilled +; multiplier = Name of the policy that gives a multiplier for effect's value ; reqs= Requirements for the effect to be active. ; See README.effects for help on requirements ; Modified: trunk/data/experimental/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/effects.ruleset?rev=31925&r1=31924&r2=31925&view=diff =