-
Notifications
You must be signed in to change notification settings - Fork 42
/
freeciv-2.6.patch
417 lines (385 loc) · 15.3 KB
/
freeciv-2.6.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
diff -ru freeciv-2.6.0.orig/client/client_main.c freeciv-2.6.0/client/client_main.c
--- freeciv-2.6.0.orig/client/client_main.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/client_main.c 2018-07-22 19:45:50.000000000 +0200
@@ -107,6 +107,7 @@
#include "script_client.h"
#include "client_main.h"
+#include "pyclient.h"
static enum known_type mapimg_client_tile_known(const struct tile *ptile,
@@ -575,6 +576,9 @@
log_init(logfile, loglevel, NULL, NULL, fatal_assertions);
backtrace_init();
+ custom_log_init();
+ PyObject* ret = PY_CALL("s", "change_log_method_to_freeciv_utility_log_c");
+ Py_DECREF(ret);
/* after log_init: */
diff -ru freeciv-2.6.0.orig/client/mapview_common.c freeciv-2.6.0/client/mapview_common.c
--- freeciv-2.6.0.orig/client/mapview_common.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/mapview_common.c 2018-07-22 19:45:50.000000000 +0200
@@ -78,7 +78,7 @@
struct tile *center_tile = NULL;
-static void base_canvas_to_map_pos(int *map_x, int *map_y,
+void base_canvas_to_map_pos(int *map_x, int *map_y,
float canvas_x, float canvas_y);
enum update_type {
@@ -706,7 +706,7 @@
Finds the map coordinates corresponding to pixel coordinates. The
resulting position is unwrapped and may be unreal.
****************************************************************************/
-static void base_canvas_to_map_pos(int *map_x, int *map_y,
+void base_canvas_to_map_pos(int *map_x, int *map_y,
float canvas_x, float canvas_y)
{
gui_to_map_pos(tileset, map_x, map_y,
@@ -826,7 +826,7 @@
Move the GUI origin to the given normalized, clipped origin. This may
be called many times when sliding the mapview.
****************************************************************************/
-static void base_set_mapview_origin(float gui_x0, float gui_y0)
+void base_set_mapview_origin(float gui_x0, float gui_y0)
{
float old_gui_x0, old_gui_y0;
float dx, dy;
@@ -959,6 +959,7 @@
void set_mapview_origin(float gui_x0, float gui_y0)
{
if (!calc_mapview_origin(&gui_x0, &gui_y0)) {
+ base_set_mapview_origin(gui_x0, gui_y0);
return;
}
@@ -3571,7 +3572,7 @@
size_changed = (width != old_width || height != old_height);
/* If the tile size has changed, resize the canvas. */
- if (tile_size_changed) {
+ if (tile_size_changed || size_changed) {
if (mapview.store) {
canvas_free(mapview.store);
canvas_free(mapview.tmp_store);
@@ -3587,7 +3588,7 @@
}
if (map_exists() && can_client_change_view()) {
- if (tile_size_changed) {
+ if (tile_size_changed || size_changed) {
if (center_tile != NULL) {
int x_left, y_top;
float gui_x, gui_y;
diff -ru freeciv-2.6.0.orig/client/options.c freeciv-2.6.0/client/options.c
--- freeciv-2.6.0.orig/client/options.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/options.c 2018-07-22 19:45:50.000000000 +0200
@@ -496,7 +496,8 @@
/* Volatile. */
void *gui_data;
};
-
+#define INIT_BRACE_BEGIN {
+#define INIT_BRACE_END }
#define OPTION(poption) ((struct option *) (poption))
#define OPTION_INIT(optset, spec_type, spec_table_var, common_table, \
@@ -6220,7 +6221,7 @@
****************************************************************************/
static void client_option_adjust_defaults(void)
{
- adjust_default_options();
+ //adjust_default_options();
}
/****************************************************************************
diff -ru freeciv-2.6.0.orig/client/reqtree.c freeciv-2.6.0/client/reqtree.c
--- freeciv-2.6.0.orig/client/reqtree.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/reqtree.c 2018-07-22 19:45:50.000000000 +0200
@@ -1051,7 +1051,7 @@
canvas_put_line(pcanvas,
get_color(tileset, edge_color(node, NULL)),
LINE_GOTO,
- startx, starty, width, 0);
+ startx + tt_x, starty + tt_y, width, 0);
} else {
const char *text = research_advance_name_translation
(research_get(client_player()), node->tech);
@@ -1060,11 +1060,11 @@
canvas_put_rectangle(pcanvas,
get_color(tileset, COLOR_REQTREE_BACKGROUND),
- startx, starty, width, height);
+ startx + tt_x, starty + tt_y, width, height);
/* Print color rectangle with text inside. */
canvas_put_rectangle(pcanvas, get_color(tileset, node_color(node)),
- startx + 1, starty + 1,
+ startx + tt_x + 1, starty + tt_y + 1,
width - 2, height - 2);
/* The following code is similar to the one in
* node_rectangle_minimum_size(). If you change something here,
@@ -1074,8 +1074,8 @@
get_text_size(&text_w, &text_h, FONT_REQTREE_TEXT, text);
canvas_put_text(pcanvas,
- startx + (width - text_w) / 2,
- starty + 4,
+ startx + tt_x + (width - text_w) / 2,
+ starty + tt_y + 4,
FONT_REQTREE_TEXT,
get_color(tileset, COLOR_REQTREE_TEXT),
text);
@@ -1090,8 +1090,8 @@
direction8_invalid(), TRUE);
get_sprite_dimensions(sprite, &swidth, &sheight);
canvas_put_sprite_full(pcanvas,
- icon_startx,
- starty + text_h + 4
+ icon_startx + tt_x,
+ starty + tt_y + text_h + 4
+ (height - text_h - 4 - sheight) / 2,
sprite);
icon_startx += swidth + 2;
@@ -1106,8 +1106,8 @@
if (sprite) {
get_sprite_dimensions(sprite, &swidth, &sheight);
canvas_put_sprite_full(pcanvas,
- icon_startx,
- starty + text_h + 4
+ icon_startx + tt_x,
+ starty + tt_y + text_h + 4
+ (height - text_h - 4 - sheight) / 2,
sprite);
icon_startx += swidth + 2;
@@ -1123,8 +1123,8 @@
sprite = get_government_sprite(tileset, gov);
get_sprite_dimensions(sprite, &swidth, &sheight);
canvas_put_sprite_full(pcanvas,
- icon_startx,
- starty + text_h + 4
+ icon_startx + tt_x,
+ starty + tt_y + text_h + 4
+ (height - text_h - 4 - sheight) / 2,
sprite);
icon_startx += swidth + 2;
@@ -1146,11 +1146,11 @@
if (gui_options.reqtree_curved_lines) {
canvas_put_curved_line(pcanvas, color, LINE_GOTO,
- startx, starty, endx - startx,
+ startx + tt_x, starty + tt_y, endx - startx,
endy - starty);
} else {
canvas_put_line(pcanvas, color, LINE_GOTO,
- startx, starty, endx - startx,
+ startx + tt_x, starty + tt_y, endx - startx,
endy - starty);
}
}
diff -ru freeciv-2.6.0.orig/client/servers.c freeciv-2.6.0/client/servers.c
--- freeciv-2.6.0.orig/client/servers.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/servers.c 2018-07-22 19:45:50.000000000 +0200
@@ -139,19 +139,19 @@
_("Latest %s release of Freeciv is %s, this is %s."),
Q_(followtag), latest_ver, my_comparable);
- version_message(vertext);
+// version_message(vertext);
} else if (comment == NULL) {
fc_snprintf(vertext, sizeof(vertext),
_("There is no newer %s release of Freeciv available."),
FOLLOWTAG);
- version_message(vertext);
+// version_message(vertext);
}
}
if (comment != NULL) {
log_verbose("Mesaserver comment about '" FOLLOWTAG "': %s", comment);
- version_message(comment);
+// version_message(comment);
}
server_list = server_list_new();
diff -ru freeciv-2.6.0.orig/client/tilespec.c freeciv-2.6.0/client/tilespec.c
--- freeciv-2.6.0.orig/client/tilespec.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/tilespec.c 2018-07-22 19:45:50.000000000 +0200
@@ -1270,6 +1270,9 @@
/* Make local copies since these values may be freed down below */
sz_strlcpy(tileset_name, name);
+ if (!strcmp("trident", tileset_name)) {
+ sz_strlcpy(tileset_name, "amplio2");
+ }
sz_strlcpy(old_name, tileset->name);
log_normal(_("Loading tileset \"%s\"."), tileset_name);
@@ -1457,6 +1460,10 @@
}
}
+ s = load_gfxfile(gfx_filename);
+ if (s) {
+ return s;
+ }
log_error("Could not load gfx file \"%s\".", gfx_filename);
return NULL;
}
@@ -1665,6 +1672,7 @@
***********************************************************************/
static char *tilespec_gfx_filename(const char *gfx_filename)
{
+#ifdef TILESPEC_SEARCH_FILENAME
const char *gfx_current_fileext;
const char **gfx_fileexts = gfx_fileextensions();
@@ -1687,6 +1695,9 @@
gfx_filename);
return NULL;
+#else
+ return strdup(gfx_filename);
+#endif
}
/**********************************************************************
diff -ru freeciv-2.6.0.orig/client/update_queue.c freeciv-2.6.0/client/update_queue.c
--- freeciv-2.6.0.orig/client/update_queue.c 2018-07-21 23:42:11.000000000 +0200
+++ freeciv-2.6.0/client/update_queue.c 2018-07-22 19:45:50.000000000 +0200
@@ -571,7 +571,7 @@
****************************************************************************/
void multipliers_dialog_update(void)
{
- update_queue_add(UQ_CALLBACK(real_multipliers_dialog_update), NULL);
+// update_queue_add(UQ_CALLBACK(real_multipliers_dialog_update), NULL);
}
/****************************************************************************
@@ -699,5 +699,5 @@
****************************************************************************/
void unit_select_dialog_update(void)
{
- update_queue_add(UQ_CALLBACK(unit_select_dialog_update_real), NULL);
+// update_queue_add(UQ_CALLBACK(unit_select_dialog_update_real), NULL);
}
diff -ru freeciv-2.6.0.orig/dependencies/lua-5.3/src/lmathlib.c freeciv-2.6.0/dependencies/lua-5.3/src/lmathlib.c
--- freeciv-2.6.0.orig/dependencies/lua-5.3/src/lmathlib.c 2018-07-21 23:42:13.000000000 +0200
+++ freeciv-2.6.0/dependencies/lua-5.3/src/lmathlib.c 2018-07-22 19:45:50.000000000 +0200
@@ -183,7 +183,8 @@
res = l_mathop(log)(x);
else {
lua_Number base = luaL_checknumber(L, 2);
-#if !defined(LUA_USE_C89)
+//if !defined(LUA_USE_C89) Why "!defined" ???
+#if defined(LUA_USE_LOG2)
if (base == l_mathop(2.0))
res = l_mathop(log2)(x); else
#endif
diff -ru freeciv-2.6.0.orig/dependencies/lua-5.3/src/luaconf.h freeciv-2.6.0/dependencies/lua-5.3/src/luaconf.h
--- freeciv-2.6.0.orig/dependencies/lua-5.3/src/luaconf.h 2018-07-21 23:42:13.000000000 +0200
+++ freeciv-2.6.0/dependencies/lua-5.3/src/luaconf.h 2018-07-22 19:45:50.000000000 +0200
@@ -669,7 +669,7 @@
** macro must include header 'locale.h'.)
*/
#if !defined(lua_getlocaledecpoint)
-#define lua_getlocaledecpoint() (localeconv()->decimal_point[0])
+#define lua_getlocaledecpoint() ('.')
#endif
/* }================================================================== */
diff -ru freeciv-2.6.0.orig/server/connecthand.c freeciv-2.6.0/server/connecthand.c
--- freeciv-2.6.0.orig/server/connecthand.c 2018-07-21 23:42:13.000000000 +0200
+++ freeciv-2.6.0/server/connecthand.c 2018-07-22 19:45:50.000000000 +0200
@@ -456,6 +456,13 @@
****************************************************************************/
void lost_connection_to_client(struct connection *pconn)
{
+ log_normal(_("Freeciv Android: Lost connection to player!"));
+ if(getenv("FREECIV_QUIT_ON_DISCONNECT")) {
+ log_normal(_("Freeciv Android: Server quit."));
+ exit(3);
+ } else {
+ log_normal(_("Freeciv Android: Not quiting."));
+ }
const char *desc = conn_description(pconn);
fc_assert_ret(TRUE == pconn->server.is_closing);
diff -ru freeciv-2.6.0.orig/server/settings.c freeciv-2.6.0/server/settings.c
--- freeciv-2.6.0.orig/server/settings.c 2018-07-21 23:42:13.000000000 +0200
+++ freeciv-2.6.0/server/settings.c 2018-07-22 19:45:50.000000000 +0200
@@ -1211,7 +1211,8 @@
}
return TRUE;
}
-
+#define INIT_BRACE_BEGIN {
+#define INIT_BRACE_END }
#define GEN_BOOL(name, value, sclass, scateg, slevel, to_client, \
short_help, extra_help, func_validate, func_action, \
_default) \
diff -ru freeciv-2.6.0.orig/utility/fcintl.c freeciv-2.6.0/utility/fcintl.c
--- freeciv-2.6.0.orig/utility/fcintl.c 2018-07-21 23:42:14.000000000 +0200
+++ freeciv-2.6.0/utility/fcintl.c 2018-07-22 19:45:50.000000000 +0200
@@ -99,10 +99,3 @@
return autocap;
}
-/**********************************************************************
- Return directory containing locales.
-***********************************************************************/
-const char *get_locale_dir(void)
-{
- return LOCALEDIR;
-}
diff -ru freeciv-2.6.0.orig/data/hexemplio/cities.spec freeciv-2.6.0/data/hexemplio/cities.spec
--- freeciv-2.6.0.orig/data/hexemplio/cities.spec 2018-07-21 23:42:12.000000000 +0200
+++ freeciv-2.6.0/data/hexemplio/cities.spec 2018-09-15 18:33:03.850516832 +0200
@@ -77,42 +77,42 @@
2, 8, "city.classical_wall_3"
2, 9, "city.classical_wall_4"
;[E][TVK]
- 3, 0, "city.babylonian_city_0"
- 3, 1, "city.babylonian_city_1"
- 3, 2, "city.babylonian_city_2"
- 3, 3, "city.babylonian_city_3"
- 3, 4, "city.babylonian_city_4"
-;[E][TVK][HH]
- 3, 5, "city.babylonian_wall_0"
- 3, 6, "city.babylonian_wall_1"
- 3, 7, "city.babylonian_wall_2"
- 3, 8, "city.babylonian_wall_3"
- 3, 9, "city.babylonian_wall_4"
-;[TVK]
- 4, 0, "city.asian_city_0"
- 4, 1, "city.asian_city_1"
- 4, 2, "city.asian_city_2"
- 4, 3, "city.asian_city_3"
- 4, 4, "city.asian_city_4"
+ 3, 0, "city.asian_city_0"
+ 3, 1, "city.asian_city_1"
+ 3, 2, "city.asian_city_2"
+ 3, 3, "city.asian_city_3"
+ 3, 4, "city.asian_city_4"
;[TVK][HH]
- 4, 5, "city.asian_wall_0"
- 4, 6, "city.asian_wall_1"
- 4, 7, "city.asian_wall_2"
- 4, 8, "city.asian_wall_3"
- 4, 9, "city.asian_wall_4"
+ 3, 5, "city.asian_wall_0"
+ 3, 6, "city.asian_wall_1"
+ 3, 7, "city.asian_wall_2"
+ 3, 8, "city.asian_wall_3"
+ 3, 9, "city.asian_wall_4"
;[TVK]
- 5, 0, "city.tropical_city_0"
- 5, 1, "city.tropical_city_1"
- 5, 2, "city.tropical_city_2"
- 5, 3, "city.tropical_city_3"
- 5, 4, "city.tropical_city_4"
+ 4, 0, "city.tropical_city_0"
+ 4, 1, "city.tropical_city_1"
+ 4, 2, "city.tropical_city_2"
+ 4, 3, "city.tropical_city_3"
+ 4, 4, "city.tropical_city_4"
;[TVK][HH]
- 5, 5, "city.tropical_wall_0"
- 5, 6, "city.tropical_wall_1"
- 5, 7, "city.tropical_wall_2"
- 5, 8, "city.tropical_wall_3"
- 5, 9, "city.tropical_wall_4"
+ 4, 5, "city.tropical_wall_0"
+ 4, 6, "city.tropical_wall_1"
+ 4, 7, "city.tropical_wall_2"
+ 4, 8, "city.tropical_wall_3"
+ 4, 9, "city.tropical_wall_4"
;[S]
+ 5, 0, "city.babylonian_city_0"
+ 5, 1, "city.babylonian_city_1"
+ 5, 2, "city.babylonian_city_2"
+ 5, 3, "city.babylonian_city_3"
+ 5, 4, "city.babylonian_city_4"
+;[E][TVK][HH]
+ 5, 5, "city.babylonian_wall_0"
+ 5, 6, "city.babylonian_wall_1"
+ 5, 7, "city.babylonian_wall_2"
+ 5, 8, "city.babylonian_wall_3"
+ 5, 9, "city.babylonian_wall_4"
+;[TVK]
6, 0, "city.industrial_city_0"
6, 1, "city.industrial_city_1"
6, 2, "city.industrial_city_2"