[Freeciv-commits] r33419 - in /trunk: common/ data/classic/
Author: cazfi Date: Tue Aug 2 08:18:16 2016 New Revision: 33419 URL: http://svn.gna.org/viewcvs/freeciv?rev=33419&view=rev Log: Made classic ruleset the default in web mode. See patch #7514 Modified: trunk/common/game.h trunk/data/classic/buildings.ruleset trunk/data/classic/cities.ruleset trunk/data/classic/effects.ruleset trunk/data/classic/game.ruleset trunk/data/classic/governments.ruleset trunk/data/classic/nations.ruleset trunk/data/classic/styles.ruleset trunk/data/classic/techs.ruleset trunk/data/classic/terrain.ruleset trunk/data/classic/units.ruleset Modified: trunk/common/game.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/game.h?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/common/game.h (original) +++ trunk/common/game.h Tue Aug 2 08:18:16 2016 @@ -587,7 +587,7 @@ #define GAME_DEFAULT_AUTOATTACK FALSE #ifdef FREECIV_WEB -#define GAME_DEFAULT_RULESETDIR "fcweb" +#define GAME_DEFAULT_RULESETDIR "classic" #else /* FREECIV_WEB */ #define GAME_DEFAULT_RULESETDIR "civ2civ3" #endif /* FREECIV_WEB */ Modified: trunk/data/classic/buildings.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/buildings.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/buildings.ruleset(original) +++ trunk/data/classic/buildings.rulesetTue Aug 2 08:18:16 2016 @@ -12,7 +12,7 @@ [datafile] description="Classic buildings data for Freeciv" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 ; /* <-- avoid gettext warnings Modified: trunk/data/classic/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/cities.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/cities.ruleset (original) +++ trunk/data/classic/cities.ruleset Tue Aug 2 08:18:16 2016 @@ -9,7 +9,7 @@ [datafile] description="Classic cities data for Freeciv" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 ; /* <-- avoid gettext warnings Modified: trunk/data/classic/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/effects.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/effects.ruleset (original) +++ trunk/data/classic/effects.ruleset Tue Aug 2 08:18:16 2016 @@ -11,7 +11,7 @@ [datafile] description="Classic effects data for Freeciv" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 ; /* <-- avoid gettext warnings Modified: trunk/data/classic/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/game.ruleset (original) +++ trunk/data/classic/game.ruleset Tue Aug 2 08:18:16 2016 @@ -11,7 +11,7 @@ [datafile] description="Classic game rules for Freeciv" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 ; This section contains meta information for freeciv-ruledit to recreate the ruleset Modified: trunk/data/classic/governments.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/governments.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/governments.ruleset (original) +++ trunk/data/classic/governments.ruleset Tue Aug 2 08:18:16 2016 @@ -12,7 +12,7 @@ [datafile] description="Classic governments data for Freeciv (as Civ2, minus fundamentalism)" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 [governments] Modified: trunk/data/classic/nations.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/nations.ruleset?rev=33419&r1=33418&r2=33419&view=diff == --- trunk/data/classic/nations.ruleset (original) +++ trunk/data/classic/nations.ruleset Tue Aug 2 08:18:16 2016 @@ -9,7 +9,7 @@ [datafile] description="Classic nations data for Freeciv" -options="+Freeciv-ruleset-Devel-2015.January.14" +options="+Freeciv-ruleset-Devel-2015.January.14 web-compatible" format_version=10 ; This section contains meta information for freeciv-ruledit to recreate the ruleset Modified: trunk/data/classi
[Freeciv-commits] r33418 - /branches/S2_5/server/settings.c
Author: sveinung Date: Tue Aug 2 00:23:34 2016 New Revision: 33418 URL: http://svn.gna.org/viewcvs/freeciv?rev=33418&view=rev Log: Comment fix: refer to correct setting. Modified: branches/S2_5/server/settings.c Modified: branches/S2_5/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/settings.c?rev=33418&r1=33417&r2=33418&view=diff == --- branches/S2_5/server/settings.c (original) +++ branches/S2_5/server/settings.c Tue Aug 2 00:23:34 2016 @@ -940,7 +940,7 @@ } /* - Topology setting validation callback. + Mapsize setting validation callback. */ static bool mapsize_callback(int value, struct connection *caller, char *reject_msg, size_t reject_msg_len) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33417 - /branches/S2_6/server/settings.c
Author: sveinung Date: Tue Aug 2 00:23:06 2016 New Revision: 33417 URL: http://svn.gna.org/viewcvs/freeciv?rev=33417&view=rev Log: Comment fix: refer to correct setting. Modified: branches/S2_6/server/settings.c Modified: branches/S2_6/server/settings.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/settings.c?rev=33417&r1=33416&r2=33417&view=diff == --- branches/S2_6/server/settings.c (original) +++ branches/S2_6/server/settings.c Tue Aug 2 00:23:06 2016 @@ -1093,7 +1093,7 @@ } /* - Topology setting validation callback. + Mapsize setting validation callback. */ static bool mapsize_callback(int value, struct connection *caller, char *reject_msg, size_t reject_msg_len) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33414 - /trunk/data/webperimental/terrain.ruleset
Author: sveinung Date: Mon Aug 1 17:20:53 2016 New Revision: 33414 URL: http://svn.gna.org/viewcvs/freeciv?rev=33414&view=rev Log: Do patch #6644 to webperimental. Ruleset comments about extra activity graphic value "None" was made more verbose in the bundled rulesets after webperimental was posted. Make webperimental match by applying Marko Lindqvist 's patch #6644 to webperimental too. See patch #7527 Modified: trunk/data/webperimental/terrain.ruleset Modified: trunk/data/webperimental/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/webperimental/terrain.ruleset?rev=33414&r1=33413&r2=33414&view=diff == --- trunk/data/webperimental/terrain.ruleset(original) +++ trunk/data/webperimental/terrain.rulesetMon Aug 1 17:20:53 2016 @@ -1020,12 +1020,14 @@ ; graphic_alt = tag for alternate graphic if preferred graphic is ; not present. Can use eg "-" for no alternate ; graphic -; activity_gfx= tag specifying graphic for unit building extra -; (can be "none") +; activity_gfx= tag specifying graphic for unit building extra. +; This can be "None" to indicate that graphic sprite +; is not needed. ; act_gfx_alt = tag for alternative graphic for unit building extra ; act_gfx_alt2= tag for second alternative graphic for unit building extra -; rmact_gfx = tag specifying graphic for unit removing extra -; (can be "none") +; rmact_gfx = tag specifying graphic for unit removing extra. +; This can be "None" to indicate that graphic sprite +; is not needed. ; rmact_gfx_alt = tag for alternative graphic for unit removing extra ; reqs= requirements to build the extra (see effects.ruleset ; and README.effects for help on requirements) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33412 - in /trunk/data/sandbox: script.lua units.ruleset
Author: cazfi
Date: Mon Aug 1 16:50:28 2016
New Revision: 33412
URL: http://svn.gna.org/viewcvs/freeciv?rev=33412&view=rev
Log:
Fixed xgettext warnings.
See bug #24898
Modified:
trunk/data/sandbox/script.lua
trunk/data/sandbox/units.ruleset
Modified: trunk/data/sandbox/script.lua
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/script.lua?rev=33412&r1=33411&r2=33412&view=diff
==
--- trunk/data/sandbox/script.lua (original)
+++ trunk/data/sandbox/script.lua Mon Aug 1 16:50:28 2016
@@ -24,7 +24,7 @@
signal.connect("city_destroyed", "city_destroyed_callback")
--- Unit enters Hermit's Nest
+-- Unit enters Hermit`s Nest
function hermit_nest(unit)
if unit.tile:has_extra("Hermit") then
local chance = random(0, 5)
Modified: trunk/data/sandbox/units.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/units.ruleset?rev=33412&r1=33411&r2=33412&view=diff
==
--- trunk/data/sandbox/units.ruleset(original)
+++ trunk/data/sandbox/units.rulesetMon Aug 1 16:50:28 2016
@@ -1978,8 +1978,10 @@
uk_shield = 1
uk_food = 1
uk_gold = 1
+; /* <-- avoid gettext warnings
; Consensus historical article: "Airplanes Sink a Battleship?
; No, Sir! Declares President" Chicago Daily Tribune, Feb. 26, 1938.
+; */ <-- avoid gettext warnings
flags = "BadCityDefender", "Consensus"
roles = "DefendOk", "DefendOkStartUnit"
helptext = _("\
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33409 - /branches/S2_5/client/gui-qt/chatline.cpp
Author: mir3x
Date: Mon Aug 1 13:23:25 2016
New Revision: 33409
URL: http://svn.gna.org/viewcvs/freeciv?rev=33409&view=rev
Log:
Qt client - tags in chat were incorrectly placed if there were unicode
characters
See bug #24888
Modified:
branches/S2_5/client/gui-qt/chatline.cpp
Modified: branches/S2_5/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/chatline.cpp?rev=33409&r1=33408&r2=33409&view=diff
==
--- branches/S2_5/client/gui-qt/chatline.cpp(original)
+++ branches/S2_5/client/gui-qt/chatline.cppMon Aug 1 13:23:25 2016
@@ -315,14 +315,16 @@
QString str_col;
QString color;
QString final_string;
+ QByteArray qba;
QColor qc;
QMultiMap mm;
if (tags == NULL) {
return str;
}
+ qba = str.toLocal8Bit().data();
text_tag_list_iterate(tags, ptag) {
if ((text_tag_stop_offset(ptag) == FT_OFFSET_UNSET)) {
- stop = str.count();
+ stop = qba.count();
} else {
stop = text_tag_stop_offset(ptag);
}
@@ -410,7 +412,8 @@
while (i != mm.constBegin()) {
--i;
if (i.key() < last_i) {
- final_string = final_string.prepend(str.mid(i.key(), last_i - i.key())
+ final_string = final_string.prepend(QString(qba.mid(i.key(),
+ last_i - i.key()))
.toHtmlEscaped());
}
last_i = i.key();
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33410 - /branches/S2_6/client/gui-qt/chatline.cpp
Author: mir3x
Date: Mon Aug 1 13:23:39 2016
New Revision: 33410
URL: http://svn.gna.org/viewcvs/freeciv?rev=33410&view=rev
Log:
Qt client - tags in chat were incorrectly placed if there were unicode
characters
See bug #24888
Modified:
branches/S2_6/client/gui-qt/chatline.cpp
Modified: branches/S2_6/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/chatline.cpp?rev=33410&r1=33409&r2=33410&view=diff
==
--- branches/S2_6/client/gui-qt/chatline.cpp(original)
+++ branches/S2_6/client/gui-qt/chatline.cppMon Aug 1 13:23:39 2016
@@ -343,14 +343,16 @@
QString str_col;
QString color;
QString final_string;
+ QByteArray qba;
QColor qc;
QMultiMap mm;
if (tags == NULL) {
return str;
}
+ qba = str.toLocal8Bit().data();
text_tag_list_iterate(tags, ptag) {
if ((text_tag_stop_offset(ptag) == FT_OFFSET_UNSET)) {
- stop = str.count();
+ stop = qba.count();
} else {
stop = text_tag_stop_offset(ptag);
}
@@ -438,7 +440,8 @@
while (i != mm.constBegin()) {
--i;
if (i.key() < last_i) {
- final_string = final_string.prepend(str.mid(i.key(), last_i - i.key())
+ final_string = final_string.prepend(QString(qba.mid(i.key(),
+ last_i - i.key()))
.toHtmlEscaped());
}
last_i = i.key();
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33411 - /trunk/client/gui-qt/chatline.cpp
Author: mir3x
Date: Mon Aug 1 13:23:45 2016
New Revision: 33411
URL: http://svn.gna.org/viewcvs/freeciv?rev=33411&view=rev
Log:
Qt client - tags in chat were incorrectly placed if there were unicode
characters
See bug #24888
Modified:
trunk/client/gui-qt/chatline.cpp
Modified: trunk/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/chatline.cpp?rev=33411&r1=33410&r2=33411&view=diff
==
--- trunk/client/gui-qt/chatline.cpp(original)
+++ trunk/client/gui-qt/chatline.cppMon Aug 1 13:23:45 2016
@@ -343,14 +343,16 @@
QString str_col;
QString color;
QString final_string;
+ QByteArray qba;
QColor qc;
QMultiMap mm;
if (tags == NULL) {
return str;
}
+ qba = str.toLocal8Bit().data();
text_tag_list_iterate(tags, ptag) {
if ((text_tag_stop_offset(ptag) == FT_OFFSET_UNSET)) {
- stop = str.count();
+ stop = qba.count();
} else {
stop = text_tag_stop_offset(ptag);
}
@@ -438,7 +440,8 @@
while (i != mm.constBegin()) {
--i;
if (i.key() < last_i) {
- final_string = final_string.prepend(str.mid(i.key(), last_i - i.key())
+ final_string = final_string.prepend(QString(qba.mid(i.key(),
+ last_i - i.key()))
.toHtmlEscaped());
}
last_i = i.key();
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33406 - /branches/S2_5/client/gui-qt/fc_client.cpp
Author: mir3x Date: Mon Aug 1 13:20:07 2016 New Revision: 33406 URL: http://svn.gna.org/viewcvs/freeciv?rev=33406&view=rev Log: Qt client - reset typed history position. See bug #24881 Modified: branches/S2_5/client/gui-qt/fc_client.cpp Modified: branches/S2_5/client/gui-qt/fc_client.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/fc_client.cpp?rev=33406&r1=33405&r2=33406&view=diff == --- branches/S2_5/client/gui-qt/fc_client.cpp (original) +++ branches/S2_5/client/gui-qt/fc_client.cpp Mon Aug 1 13:20:07 2016 @@ -432,6 +432,7 @@ send_chat(chat_line->text().toUtf8().data()); chat_history.prepend(chat_line->text()); chat_line->clear(); + history_pos = -1; } / ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33404 - in /trunk/dependencies/luasql: Version src/ls_postgres.c
Author: cazfi
Date: Mon Aug 1 09:13:14 2016
New Revision: 33404
URL: http://svn.gna.org/viewcvs/freeciv?rev=33404&view=rev
Log:
Updated included luasql to version 2.3.2
See patch #7374
Modified:
trunk/dependencies/luasql/Version
trunk/dependencies/luasql/src/ls_postgres.c
Modified: trunk/dependencies/luasql/Version
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/Version?rev=33404&r1=33403&r2=33404&view=diff
==
--- trunk/dependencies/luasql/Version (original)
+++ trunk/dependencies/luasql/Version Mon Aug 1 09:13:14 2016
@@ -1,5 +1,5 @@
-Sources here are fron luasql git tag v2.3.1
-(https://github.com/keplerproject/luasql/tree/v2.3.1)
+Sources here are fron luasql git tag v2.3.2
+(https://github.com/keplerproject/luasql/tree/v2.3.2)
Only the files needed by freeciv are included here, not entire luasql
source directory hierarchy.
Modified: trunk/dependencies/luasql/src/ls_postgres.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/src/ls_postgres.c?rev=33404&r1=33403&r2=33404&view=diff
==
--- trunk/dependencies/luasql/src/ls_postgres.c (original)
+++ trunk/dependencies/luasql/src/ls_postgres.c Mon Aug 1 09:13:14 2016
@@ -498,30 +498,21 @@
/*
** Connects to a data source.
-** This driver provides two ways to connect to a data source:
-** (1) giving the connection parameters as a set of pairs separated
-** by whitespaces in a string (first method parameter)
-** (2) giving one string for each connection parameter, said
-** datasource, username, password, host and port.
*/
static int env_connect (lua_State *L) {
const char *sourcename = luaL_checkstring(L, 2);
+ const char *username = luaL_optstring(L, 3, NULL);
+ const char *password = luaL_optstring(L, 4, NULL);
+ const char *pghost = luaL_optstring(L, 5, NULL);
+ const char *pgport = luaL_optstring(L, 6, NULL);
PGconn *conn;
getenvironment (L); /* validate environment */
- if ((lua_gettop (L) == 2) && (strchr (sourcename, '=') != NULL))
- conn = PQconnectdb (sourcename);
- else {
- const char *username = luaL_optstring(L, 3, NULL);
- const char *password = luaL_optstring(L, 4, NULL);
- const char *pghost = luaL_optstring(L, 5, NULL);
- const char *pgport = luaL_optstring(L, 6, NULL);
-
- conn = PQsetdbLogin(pghost, pgport, NULL, NULL,
- sourcename, username, password);
- }
-
- if (PQstatus(conn) == CONNECTION_BAD)
+ conn = PQsetdbLogin(pghost, pgport, NULL, NULL, sourcename, username,
password);
+
+ if (PQstatus(conn) == CONNECTION_BAD) {
+ PQfinish(conn);
return luasql_failmsg(L, "error connecting to database.
PostgreSQL: ", PQerrorMessage(conn));
+ }
PQsetNoticeProcessor(conn, notice_processor, NULL);
return create_connection(L, 1, conn);
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
