Author: cazfi
Date: Thu Dec 25 02:01:38 2014
New Revision: 27402
URL: http://svn.gna.org/viewcvs/freeciv?rev=27402&view=rev
Log:
Read script.lua and default.lua in in right order, so the script.lua has
control over
default.lua.
See bug #23101
Modified:
trunk/server/ruleset.c
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=27402&r1=27401&r2=27402&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Thu Dec 25 02:01:38 2014
@@ -6601,17 +6601,17 @@
}
if (ok) {
+ char **buffer = save_script ? &script_buffer : NULL;
+
script_server_free();
script_server_init();
+ ok = openload_script_file("script", rsdir, buffer);
+ }
+
+ if (ok) {
ok = openload_script_file("default", rsdir, NULL);
- }
-
- if (ok) {
- char **buffer = save_script ? &script_buffer : NULL;
-
- ok = openload_script_file("script", rsdir, buffer);
}
if (ok && act) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
