[Freeciv-commits] r33403 - in /branches/S2_6/client: gui-gtk-2.0/ gui-gtk-3.0/ gui-qt/ gui-sdl/ gui-sdl2/ gui-xaw/
Author: sveinung
Date: Mon Aug 1 02:40:23 2016
New Revision: 33403
URL: http://svn.gna.org/viewcvs/freeciv?rev=33403&view=rev
Log:
act sel dlg: keep moving isn't Diplomat only.
See patch #7521
Modified:
branches/S2_6/client/gui-gtk-2.0/action_dialog.c
branches/S2_6/client/gui-gtk-3.0/action_dialog.c
branches/S2_6/client/gui-qt/dialogs.cpp
branches/S2_6/client/gui-sdl/action_dialog.c
branches/S2_6/client/gui-sdl2/action_dialog.c
branches/S2_6/client/gui-xaw/action_dialog.c
Modified: branches/S2_6/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==
--- branches/S2_6/client/gui-gtk-2.0/action_dialog.c(original)
+++ branches/S2_6/client/gui-gtk-2.0/action_dialog.cMon Aug 1 02:40:23 2016
@@ -929,11 +929,11 @@
}
/**
- Callback from diplomat/spy dialog for "keep moving".
+ Callback from action selection dialog for "keep moving".
(This should only occur when entering a tile that has an allied city or
an allied unit.)
**/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
{
struct action_data *args = (struct action_data *)data;
@@ -1210,7 +1210,7 @@
action_button_map[BUTTON_MOVE] =
choice_dialog_get_number_of_buttons(shl);
choice_dialog_add(shl, _("_Keep moving"),
- (GCallback)diplomat_keep_moving_callback,
+ (GCallback)act_sel_keep_moving_callback,
data, FALSE, NULL);
}
Modified: branches/S2_6/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/action_dialog.c(original)
+++ branches/S2_6/client/gui-gtk-3.0/action_dialog.cMon Aug 1 02:40:23 2016
@@ -1021,11 +1021,11 @@
}
/**
- Callback from diplomat/spy dialog for "keep moving".
+ Callback from action selection dialog for "keep moving".
(This should only occur when entering a tile that has an allied city or
an allied unit.)
**/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
{
struct action_data *args = (struct action_data *)data;
@@ -1302,7 +1302,7 @@
action_button_map[BUTTON_MOVE] =
choice_dialog_get_number_of_buttons(shl);
choice_dialog_add(shl, _("_Keep moving"),
- (GCallback)diplomat_keep_moving_callback,
+ (GCallback)act_sel_keep_moving_callback,
data, FALSE, NULL);
}
Modified: branches/S2_6/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/dialogs.cpp?rev=33403&r1=33402&r2=33403&view=diff
==
--- branches/S2_6/client/gui-qt/dialogs.cpp (original)
+++ branches/S2_6/client/gui-qt/dialogs.cpp Mon Aug 1 02:40:23 2016
@@ -62,7 +62,7 @@
extern void popdown_city_report();
extern void popdown_endgame_report();
-static void diplomat_keep_moving(QVariant data1, QVariant data2);
+static void act_sel_keep_moving(QVariant data1, QVariant data2);
static void diplomat_incite(QVariant data1, QVariant data2);
static void spy_request_sabotage_list(QVariant data1, QVariant data2);
static void spy_sabotage(QVariant data1, QVariant data2);
@@ -1400,7 +1400,7 @@
|| (!target_city && unit_has_type_flag(actor_unit, UTYF_CAPTURER))) {
qv2 = target_tile->index;
-func = diplomat_keep_moving;
+func = act_sel_keep_moving;
cd->add_item(QString(_("Keep moving")), func, qv1, qv2,
"", BUTTON_MOVE);
}
@@ -1745,9 +1745,9 @@
}
/***
- Action keep moving with diplomat for choice dialog
-***/
-static void diplomat_keep_moving(QVariant data1, QVariant data2)
+ Action keep moving with actor unit for choice dialog
+***/
+static void act_sel_keep_moving(QVariant data1, QVariant data2)
{
struct unit *punit;
struct tile *ptile;
Modified: branches/S2_6/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialo
[Freeciv-commits] r33402 - in /trunk/client: gui-gtk-2.0/ gui-gtk-3.0/ gui-gtk-3.x/ gui-qt/ gui-sdl2/
Author: sveinung
Date: Mon Aug 1 02:33:34 2016
New Revision: 33402
URL: http://svn.gna.org/viewcvs/freeciv?rev=33402&view=rev
Log:
act sel dlg: keep moving isn't Diplomat only.
See patch #7521
Modified:
trunk/client/gui-gtk-2.0/action_dialog.c
trunk/client/gui-gtk-3.0/action_dialog.c
trunk/client/gui-gtk-3.x/action_dialog.c
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-sdl2/action_dialog.c
Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==
--- trunk/client/gui-gtk-2.0/action_dialog.c(original)
+++ trunk/client/gui-gtk-2.0/action_dialog.cMon Aug 1 02:33:34 2016
@@ -1132,11 +1132,11 @@
}
/**
- Callback from diplomat/spy dialog for "keep moving".
+ Callback from action selection dialog for "keep moving".
(This should only occur when entering a tile that has an allied city or
an allied unit.)
**/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
{
struct action_data *args = (struct action_data *)data;
@@ -1481,7 +1481,7 @@
action_button_map[BUTTON_MOVE] =
choice_dialog_get_number_of_buttons(shl);
choice_dialog_add(shl, _("_Keep moving"),
- (GCallback)diplomat_keep_moving_callback,
+ (GCallback)act_sel_keep_moving_callback,
data, FALSE, NULL);
}
Modified: trunk/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==
--- trunk/client/gui-gtk-3.0/action_dialog.c(original)
+++ trunk/client/gui-gtk-3.0/action_dialog.cMon Aug 1 02:33:34 2016
@@ -1224,11 +1224,11 @@
}
/**
- Callback from diplomat/spy dialog for "keep moving".
+ Callback from action selection dialog for "keep moving".
(This should only occur when entering a tile that has an allied city or
an allied unit.)
**/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
{
struct action_data *args = (struct action_data *)data;
@@ -1573,7 +1573,7 @@
action_button_map[BUTTON_MOVE] =
choice_dialog_get_number_of_buttons(shl);
choice_dialog_add(shl, _("_Keep moving"),
- (GCallback)diplomat_keep_moving_callback,
+ (GCallback)act_sel_keep_moving_callback,
data, FALSE, NULL);
}
Modified: trunk/client/gui-gtk-3.x/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==
--- trunk/client/gui-gtk-3.x/action_dialog.c(original)
+++ trunk/client/gui-gtk-3.x/action_dialog.cMon Aug 1 02:33:34 2016
@@ -1218,11 +1218,11 @@
}
/**
- Callback from diplomat/spy dialog for "keep moving".
+ Callback from action selection dialog for "keep moving".
(This should only occur when entering a tile that has an allied city or
an allied unit.)
**/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
{
struct action_data *args = (struct action_data *)data;
@@ -1567,7 +1567,7 @@
action_button_map[BUTTON_MOVE] =
choice_dialog_get_number_of_buttons(shl);
choice_dialog_add(shl, _("_Keep moving"),
- (GCallback)diplomat_keep_moving_callback,
+ (GCallback)act_sel_keep_moving_callback,
data, FALSE, NULL);
}
Modified: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=33402&r1=33401&r2=33402&view=diff
==
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Mon Aug 1 02:33:34 2016
@@ -62,7 +62,7 @@
extern void popdown_city_report();
extern void popdown_endgame_report();
-static void diplomat_keep_moving(QVariant data1, QVariant data2);
+static void act_sel_keep_moving(QVariant data1, QVariant data2);
static void diplomat_incite(QVariant data
[Freeciv-commits] r33401 - in /trunk: ./ common/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/experimental/ data/multip...
Author: sveinung Date: Mon Aug 1 02:33:23 2016 New Revision: 33401 URL: http://svn.gna.org/viewcvs/freeciv?rev=33401&view=rev Log: Introduce the EvacuateFirst unit type flag. The only remaining hard coded function of the "Undisbandable" unit type flag is to make the game try to rescue units with it before units without it when their transport is destroyed and to use teleportation to save them. Rename "Undisbandable" to "EvacuateFirst". Have the ruleset upgrading code rename it. See patch #6575 Modified: trunk/common/unittype.h trunk/data/alien/cities.ruleset trunk/data/alien/game.ruleset trunk/data/alien/units.ruleset trunk/data/civ1/cities.ruleset trunk/data/civ1/game.ruleset trunk/data/civ2/cities.ruleset trunk/data/civ2/game.ruleset trunk/data/civ2civ3/cities.ruleset trunk/data/civ2civ3/game.ruleset trunk/data/civ2civ3/units.ruleset trunk/data/classic/cities.ruleset trunk/data/classic/game.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/cities.ruleset trunk/data/experimental/game.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/cities.ruleset trunk/data/multiplayer/game.ruleset trunk/data/multiplayer/units.ruleset trunk/data/ruledit/comments.txt trunk/data/sandbox/game.ruleset trunk/data/sandbox/units.ruleset trunk/data/stub/cities.ruleset trunk/data/stub/units.ruleset trunk/data/webperimental/cities.ruleset trunk/data/webperimental/game.ruleset trunk/data/webperimental/units.ruleset trunk/fc_version trunk/server/rscompat.c trunk/server/unittools.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/common/unittype.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/alien/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/alien/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ1/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ2/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ2civ3/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ2civ3/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/civ2civ3/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/units.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/classic/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/classic/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/classic/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/units.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/experimental/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/experimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/multiplayer/cities.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/cities.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/multiplayer/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/multiplayer/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/units.ruleset?rev=33401&r1=33400&r2=33401&view=diff Modified: trunk/data/ruledit/comments.txt URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/ruledit/comments.txt?rev=33401&r1=33400&r2=33401&view=diff
[Freeciv-commits] r33400 - in /trunk/win32: installer/ installer_msys2/
Author: cazfi Date: Sun Jul 31 22:07:00 2016 New Revision: 33400 URL: http://svn.gna.org/viewcvs/freeciv?rev=33400&view=rev Log: Set CRLF eol-style for .cmd files where it was missing. Reported by haut See bug #24901 Modified: trunk/win32/installer/freeciv-mp-qt.cmd (props changed) trunk/win32/installer/freeciv-qt.cmd (contents, props changed) trunk/win32/installer/freeciv-ruledit.cmd (props changed) trunk/win32/installer/freeciv-sdl2.cmd (contents, props changed) trunk/win32/installer_msys2/freeciv-gtk3x.cmd (props changed) trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd (props changed) trunk/win32/installer_msys2/freeciv-mp-qt.cmd (props changed) trunk/win32/installer_msys2/freeciv-qt.cmd (contents, props changed) trunk/win32/installer_msys2/freeciv-ruledit.cmd (props changed) Propchange: trunk/win32/installer/freeciv-mp-qt.cmd -- svn:eol-style = CRLF Modified: trunk/win32/installer/freeciv-qt.cmd URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/freeciv-qt.cmd?rev=33400&r1=33399&r2=33400&view=diff == --- trunk/win32/installer/freeciv-qt.cmd(original) +++ trunk/win32/installer/freeciv-qt.cmdSun Jul 31 22:07:00 2016 @@ -1,4 +1,4 @@ -@echo off -if %1 NEQ auto set LANG=%1 -set QT_PLUGIN_PATH=./plugins -start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +set QT_PLUGIN_PATH=./plugins +start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: trunk/win32/installer/freeciv-qt.cmd -- svn:eol-style = CRLF Propchange: trunk/win32/installer/freeciv-ruledit.cmd -- svn:eol-style = CRLF Modified: trunk/win32/installer/freeciv-sdl2.cmd URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/freeciv-sdl2.cmd?rev=33400&r1=33399&r2=33400&view=diff == --- trunk/win32/installer/freeciv-sdl2.cmd (original) +++ trunk/win32/installer/freeciv-sdl2.cmd Sun Jul 31 22:07:00 2016 @@ -1,3 +1,3 @@ -@echo off -if %1 NEQ auto set LANG=%1 -start freeciv-sdl2.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +start freeciv-sdl2.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: trunk/win32/installer/freeciv-sdl2.cmd -- svn:eol-style = CRLF Propchange: trunk/win32/installer_msys2/freeciv-gtk3x.cmd -- svn:eol-style = CRLF Propchange: trunk/win32/installer_msys2/freeciv-mp-gtk3x.cmd -- svn:eol-style = CRLF Propchange: trunk/win32/installer_msys2/freeciv-mp-qt.cmd -- svn:eol-style = CRLF Modified: trunk/win32/installer_msys2/freeciv-qt.cmd URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/freeciv-qt.cmd?rev=33400&r1=33399&r2=33400&view=diff == --- trunk/win32/installer_msys2/freeciv-qt.cmd (original) +++ trunk/win32/installer_msys2/freeciv-qt.cmd Sun Jul 31 22:07:00 2016 @@ -1,4 +1,4 @@ -@echo off -if %1 NEQ auto set LANG=%1 -set QT_PLUGIN_PATH=./plugins -start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +set QT_PLUGIN_PATH=./plugins +start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: trunk/win32/installer_msys2/freeciv-qt.cmd -- svn:eol-style = CRLF Propchange: trunk/win32/installer_msys2/freeciv-ruledit.cmd -- svn:eol-style = CRLF ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33399 - in /branches/S2_6/win32: installer/ installer_msys2/
Author: cazfi Date: Sun Jul 31 22:05:30 2016 New Revision: 33399 URL: http://svn.gna.org/viewcvs/freeciv?rev=33399&view=rev Log: Set CRLF eol-style for .cmd files where it was missing. Reported by haut See bug #24901 Modified: branches/S2_6/win32/installer/freeciv-mp-qt.cmd (props changed) branches/S2_6/win32/installer/freeciv-qt.cmd (contents, props changed) branches/S2_6/win32/installer/freeciv-ruledit.cmd (props changed) branches/S2_6/win32/installer/freeciv-sdl2.cmd (contents, props changed) branches/S2_6/win32/installer_msys2/freeciv-mp-qt.cmd (props changed) branches/S2_6/win32/installer_msys2/freeciv-qt.cmd (contents, props changed) branches/S2_6/win32/installer_msys2/freeciv-ruledit.cmd (props changed) Propchange: branches/S2_6/win32/installer/freeciv-mp-qt.cmd -- svn:eol-style = CRLF Modified: branches/S2_6/win32/installer/freeciv-qt.cmd URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/freeciv-qt.cmd?rev=33399&r1=33398&r2=33399&view=diff == --- branches/S2_6/win32/installer/freeciv-qt.cmd(original) +++ branches/S2_6/win32/installer/freeciv-qt.cmdSun Jul 31 22:05:30 2016 @@ -1,4 +1,4 @@ -@echo off -if %1 NEQ auto set LANG=%1 -set QT_PLUGIN_PATH=./plugins -start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +set QT_PLUGIN_PATH=./plugins +start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: branches/S2_6/win32/installer/freeciv-qt.cmd -- svn:eol-style = CRLF Propchange: branches/S2_6/win32/installer/freeciv-ruledit.cmd -- svn:eol-style = CRLF Modified: branches/S2_6/win32/installer/freeciv-sdl2.cmd URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/freeciv-sdl2.cmd?rev=33399&r1=33398&r2=33399&view=diff == --- branches/S2_6/win32/installer/freeciv-sdl2.cmd (original) +++ branches/S2_6/win32/installer/freeciv-sdl2.cmd Sun Jul 31 22:05:30 2016 @@ -1,3 +1,3 @@ -@echo off -if %1 NEQ auto set LANG=%1 -start freeciv-sdl2.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +start freeciv-sdl2.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: branches/S2_6/win32/installer/freeciv-sdl2.cmd -- svn:eol-style = CRLF Propchange: branches/S2_6/win32/installer_msys2/freeciv-mp-qt.cmd -- svn:eol-style = CRLF Modified: branches/S2_6/win32/installer_msys2/freeciv-qt.cmd URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/freeciv-qt.cmd?rev=33399&r1=33398&r2=33399&view=diff == --- branches/S2_6/win32/installer_msys2/freeciv-qt.cmd (original) +++ branches/S2_6/win32/installer_msys2/freeciv-qt.cmd Sun Jul 31 22:05:30 2016 @@ -1,4 +1,4 @@ -@echo off -if %1 NEQ auto set LANG=%1 -set QT_PLUGIN_PATH=./plugins -start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 +@echo off +if %1 NEQ auto set LANG=%1 +set QT_PLUGIN_PATH=./plugins +start freeciv-qt.exe %2 %3 %4 %5 %6 %7 %8 %9 Propchange: branches/S2_6/win32/installer_msys2/freeciv-qt.cmd -- svn:eol-style = CRLF Propchange: branches/S2_6/win32/installer_msys2/freeciv-ruledit.cmd -- svn:eol-style = CRLF ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33397 - /branches/S2_5/server/settings.c
Author: cazfi
Date: Sun Jul 31 15:31:33 2016
New Revision: 33397
URL: http://svn.gna.org/viewcvs/freeciv?rev=33397&view=rev
Log:
Made settings.c to compile with tcc.
See patch #7519
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=33397&r1=33396&r2=33397&view=diff
==
--- branches/S2_5/server/settings.c (original)
+++ branches/S2_5/server/settings.c Sun Jul 31 15:31:33 2016
@@ -1063,16 +1063,16 @@
_default) \
{name, sclass, to_client, short_help, extra_help, NULL, SSET_BOOL,\
scateg, slevel, \
- {.boolean = {&value, _default, func_validate, bool_name, \
- FALSE}}, func_action, FALSE},
+ .boolean = {&value, _default, func_validate, bool_name, \
+ FALSE}, func_action, FALSE},
#define GEN_INT(name, value, sclass, scateg, slevel, to_client, \
short_help, extra_help, func_validate, func_action, \
_min, _max, _default) \
{name, sclass, to_client, short_help, extra_help, NULL, SSET_INT, \
scateg, slevel, \
- {.integer = {(int *) &value, _default, _min, _max, func_validate, \
- 0}}, \
+ .integer = {(int *) &value, _default, _min, _max, func_validate, \
+ 0}, \
func_action, FALSE},
#define GEN_STRING(name, value, sclass, scateg, slevel, to_client, \
@@ -1080,7 +1080,7 @@
_default)\
{name, sclass, to_client, short_help, extra_help, NULL, SSET_STRING, \
scateg, slevel, \
- {.string = {value, _default, sizeof(value), func_validate, ""}}, \
+ .string = {value, _default, sizeof(value), func_validate, ""},\
func_action, FALSE},
#define GEN_ENUM(name, value, sclass, scateg, slevel, to_client,\
@@ -1088,17 +1088,17 @@
func_action, func_name, _default) \
{ name, sclass, to_client, short_help, extra_help, func_help, SSET_ENUM, \
scateg, slevel, \
- { .enumerator = { &value, sizeof(value), _default, \
- func_validate, \
- (val_name_func_t) func_name, 0 }}, func_action, FALSE},
+ .enumerator = { &value, sizeof(value), _default,\
+func_validate, \
+ (val_name_func_t) func_name, 0 }, func_action, FALSE},
#define GEN_BITWISE(name, value, sclass, scateg, slevel, to_client, \
short_help, extra_help, func_validate, func_action, \
func_name, _default) \
{ name, sclass, to_client, short_help, extra_help, NULL, SSET_BITWISE,\
scateg, slevel, \
- { .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
- func_name, 0 }}, func_action, FALSE},
+ .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
+ func_name, 0 }, func_action, FALSE},
/* game settings */
static struct setting settings[] = {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33395 - /trunk/server/settings.c
Author: cazfi
Date: Sun Jul 31 15:31:21 2016
New Revision: 33395
URL: http://svn.gna.org/viewcvs/freeciv?rev=33395&view=rev
Log:
Made settings.c to compile with tcc.
See patch #7519
Modified:
trunk/server/settings.c
Modified: trunk/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=33395&r1=33394&r2=33395&view=diff
==
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Sun Jul 31 15:31:21 2016
@@ -1240,8 +1240,8 @@
_default) \
{name, sclass, al_read, al_write, short_help, extra_help, NULL, SSET_BOOL,\
scateg, slevel, \
- {.boolean = {&value, _default, func_validate, bool_name, \
- FALSE}}, func_action, FALSE},
+ .boolean = {&value, _default, func_validate, bool_name, \
+ FALSE}, func_action, FALSE},
#define GEN_INT(name, value, sclass, scateg, slevel, al_read, al_write, \
short_help, extra_help, func_help, \
@@ -1249,8 +1249,8 @@
_min, _max, _default) \
{name, sclass, al_read, al_write, short_help, extra_help, func_help, \
SSET_INT, scateg, slevel, \
- {.integer = {(int *) &value, _default, _min, _max, func_validate, \
- 0}}, \
+ .integer = {(int *) &value, _default, _min, _max, func_validate, \
+ 0}, \
func_action, FALSE},
#define GEN_STRING(name, value, sclass, scateg, slevel, al_read, al_write, \
@@ -1258,7 +1258,7 @@
_default)\
{name, sclass, al_read, al_write, short_help, extra_help, NULL, \
SSET_STRING, scateg, slevel, \
- {.string = {value, _default, sizeof(value), func_validate, ""}}, \
+ .string = {value, _default, sizeof(value), func_validate, ""},\
func_action, FALSE},
#define GEN_ENUM(name, value, sclass, scateg, slevel, al_read, al_write,\
@@ -1266,17 +1266,17 @@
func_action, func_name, _default) \
{ name, sclass, al_read, al_write, short_help, extra_help, func_help, \
SSET_ENUM, scateg, slevel,\
- { .enumerator = { &value, sizeof(value), _default, \
+ .enumerator = { &value, sizeof(value), _default, \
func_validate, \
- (val_name_func_t) func_name, 0 }}, func_action, FALSE},
+ (val_name_func_t) func_name, 0 }, func_action, FALSE},
#define GEN_BITWISE(name, value, sclass, scateg, slevel, al_read, al_write, \
short_help, extra_help, func_validate, func_action, \
func_name, _default) \
{ name, sclass, al_read, al_write, short_help, extra_help, NULL, \
SSET_BITWISE, scateg, slevel, \
- { .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
- func_name, 0 }}, func_action, FALSE},
+ .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
+ func_name, 0 }, func_action, FALSE},
/* game settings */
static struct setting settings[] = {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33396 - /branches/S2_6/server/settings.c
Author: cazfi
Date: Sun Jul 31 15:31:28 2016
New Revision: 33396
URL: http://svn.gna.org/viewcvs/freeciv?rev=33396&view=rev
Log:
Made settings.c to compile with tcc.
See patch #7519
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=33396&r1=33395&r2=33396&view=diff
==
--- branches/S2_6/server/settings.c (original)
+++ branches/S2_6/server/settings.c Sun Jul 31 15:31:28 2016
@@ -1216,8 +1216,8 @@
_default) \
{name, sclass, to_client, short_help, extra_help, NULL, SSET_BOOL,\
scateg, slevel, \
- {.boolean = {&value, _default, func_validate, bool_name, \
- FALSE}}, func_action, FALSE},
+ .boolean = {&value, _default, func_validate, bool_name, \
+ FALSE}, func_action, FALSE},
#define GEN_INT(name, value, sclass, scateg, slevel, to_client, \
short_help, extra_help, func_help, \
@@ -1225,8 +1225,8 @@
_min, _max, _default) \
{name, sclass, to_client, short_help, extra_help, func_help, SSET_INT, \
scateg, slevel, \
- {.integer = {(int *) &value, _default, _min, _max, func_validate, \
- 0}}, \
+ .integer = {(int *) &value, _default, _min, _max, func_validate, \
+ 0}, \
func_action, FALSE},
#define GEN_STRING(name, value, sclass, scateg, slevel, to_client, \
@@ -1234,7 +1234,7 @@
_default)\
{name, sclass, to_client, short_help, extra_help, NULL, SSET_STRING, \
scateg, slevel, \
- {.string = {value, _default, sizeof(value), func_validate, ""}}, \
+ .string = {value, _default, sizeof(value), func_validate, ""},\
func_action, FALSE},
#define GEN_ENUM(name, value, sclass, scateg, slevel, to_client,\
@@ -1242,17 +1242,17 @@
func_action, func_name, _default) \
{ name, sclass, to_client, short_help, extra_help, func_help, SSET_ENUM, \
scateg, slevel, \
- { .enumerator = { &value, sizeof(value), _default, \
- func_validate, \
- (val_name_func_t) func_name, 0 }}, func_action, FALSE},
+ .enumerator = { &value, sizeof(value), _default,\
+func_validate, \
+ (val_name_func_t) func_name, 0 }, func_action, FALSE},
#define GEN_BITWISE(name, value, sclass, scateg, slevel, to_client, \
short_help, extra_help, func_validate, func_action, \
func_name, _default) \
{ name, sclass, to_client, short_help, extra_help, NULL, SSET_BITWISE,\
scateg, slevel, \
- { .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
- func_name, 0 }}, func_action, FALSE},
+ .bitwise = { (unsigned *) (void *) &value, _default, func_validate, \
+ func_name, 0 }, func_action, FALSE},
/* game settings */
static struct setting settings[] = {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33394 - /branches/S2_6/doc/man/freeciv-client.6.in
Author: cazfi Date: Sun Jul 31 10:56:58 2016 New Revision: 33394 URL: http://svn.gna.org/viewcvs/freeciv?rev=33394&view=rev Log: Client man page update - Added documentation about gtk3-client commandline option --resolution See bug #24254 Modified: branches/S2_6/doc/man/freeciv-client.6.in Modified: branches/S2_6/doc/man/freeciv-client.6.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/man/freeciv-client.6.in?rev=33394&r1=33393&r2=33394&view=diff == --- branches/S2_6/doc/man/freeciv-client.6.in (original) +++ branches/S2_6/doc/man/freeciv-client.6.in Sun Jul 31 10:56:58 2016 @@ -42,7 +42,8 @@ accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk documentation. It also accepts .B [ \-g|\-\-gtk-warnings ] \ -[ \-h|\-\-help ] +[ \-h|\-\-help ] \ +[ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ] .B freeciv-qt accepts the standard Qt parameters following \fB\-\-\fP; see the Qt @@ -218,14 +219,18 @@ \fBfreeciv-sdl\fP client under Linux or BeOS. .TP .BI "\-\- \-f, \-\- \-\-fullscreen" -Starts the client in full screen mode. Only implemented in the +Starts the client in full screen mode. Only implemented in the \fBfreeciv-sdl\fP and \fBfreeciv-sdl2\fP client. .TP .BI "\-\- \-h, \-\- \-\-help" Print the client-specific parameter help. .TP +.BI "\-\- \-r \fIWIDTHxHEIGHT\fP, \-\- \-\-resolution \fIWIDTHxHEIGHT\fP" +Behave as if screen resolution were WIDTHxHEIGHT. Only implemented in the +\fBfreeciv-gtk3\fP client. +.TP .BI "\-\- \-t \fItheme\fP, \-\- \-\-theme \fItheme\fP" -Use a particular GUI theme. Only implemented in the \fBfreeciv-sdl\fP and +Use a particular GUI theme. Only implemented in the \fBfreeciv-sdl\fP and \fBfreeciv-sdl2\fP clients. .SH "EXAMPLES" .TP ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33393 - /trunk/doc/man/freeciv-client.6.in
Author: cazfi Date: Sun Jul 31 10:56:21 2016 New Revision: 33393 URL: http://svn.gna.org/viewcvs/freeciv?rev=33393&view=rev Log: Client man page update - Added documentation about gtk3x-client - Added documentation about gtk3/x-client commandline option --resolution - Typofixes See bug #24254 Modified: trunk/doc/man/freeciv-client.6.in Modified: trunk/doc/man/freeciv-client.6.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/man/freeciv-client.6.in?rev=33393&r1=33392&r2=33393&view=diff == --- trunk/doc/man/freeciv-client.6.in (original) +++ trunk/doc/man/freeciv-client.6.in Sun Jul 31 10:56:21 2016 @@ -11,10 +11,10 @@ .\" .TH FREECIV 6 "June 25th 2016" .SH NAME -freeciv-gtk2, freeciv-gtk3, freeciv-sdl2, freeciv-qt \ +freeciv-gtk2, freeciv-gtk3, freeciv-gtk3x, freeciv-sdl2, freeciv-qt \ \- The clients for the Freeciv game .SH SYNOPSIS -.B freeciv-gtk2|freeciv-gtk3|freeciv-sdl2|freeciv-qt \ +.B freeciv-gtk2|freeciv-gtk3|freeciv-gtk3x|freeciv-sdl2|freeciv-qt \ [ \-A|\-\-Announce \fIprotocol\fP ] \ [ \-a|\-\-autoconnect ] \ [ \-d|\-\-debug \fIlevel_number\fP ] \ @@ -42,7 +42,15 @@ accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk documentation. It also accepts .B [ \-g|\-\-gtk-warnings ] \ -[ \-h|\-\-help ] +[ \-h|\-\-help ] \ +[ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ] + +.B freeciv-gtk3x +accepts the standard Gtk parameters following \fB\-\-\fP; see the Gtk +documentation. It also accepts +.B [ \-g|\-\-gtk-warnings ] \ +[ \-h|\-\-help ] \ +[ \-r|\-\-resolution \fIWIDTHxHEIGHT\fP ] .B freeciv-qt accepts the standard Qt parameters following \fB\-\-\fP; see the Qt @@ -68,12 +76,12 @@ This is the client program used to connect to a Freeciv server - see also .IR freeciv-server (6) -\&. \fBfreeciv-gtk2\fP, \fBfreeciv-gtk3\fP, \fBfreeciv-qt\fP, and +\&. \fBfreeciv-gtk2\fP, \fBfreeciv-gtk3\fP, \fBfreeciv-gtk3x\fP, \fBfreeciv-qt\fP, and \fBfreeciv-sdl2\fP can also spawn their own local server for single-player games. This manual page only lists the command line arguments. For more details -about using \fBfreeciv-gtk2\fP, \fBfreeciv-gtk3\fP, +about using \fBfreeciv-gtk2\fP, \fBfreeciv-gtk3\fP, \fBfreeciv-gtk3x\fP, \fBfreeciv-sdl2\fP, or \fBfreeciv-qt\fP, see the Client Manual which can be found at .UR @WIKI_URL@ @@ -207,9 +215,13 @@ .BI "\-\- \-h, \-\- \-\-help" Print the client-specific parameter help. .TP +.BI "\-\- \-r \fIWIDTHxHEIGHT\fP, \-\- \-\-resolution \fIWIDTHxHEIGHT\fP" +Behave as if screen resolution were WIDTHxHEIGHT. Only implemented in the +\fBfreeciv-gtk3\fP and \fBfreeciv-gtk3x\fP clients. +.TP .BI "\-\- \-t \fItheme\fP, \-\- \-\-theme \fItheme\fP" -Use a particular GUI theme. Only implemented in the -\fBfreeciv-sdl2\fP clients. +Use a particular GUI theme. Only implemented in the +\fBfreeciv-sdl2\fP client. .SH "EXAMPLES" .TP .B "freeciv-gtk3 \-\-name ""King Richard"" \-\-server io.daimi.aau.dk" ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
