[Freeciv-commits] r34910 - in /trunk/server: savegame2.c savegame3.c

[cazfi74]

Author: cazfi
Date: Mon Jan 30 11:10:53 2017
New Revision: 34910

URL: http://svn.gna.org/viewcvs/freeciv?rev=34910&view=rev
Log:
Always lookup unit orders related keys when loading a savegame.

Reported by Christian Knoke <chrisk>

See bug #25405

Modified:
    trunk/server/savegame2.c
    trunk/server/savegame3.c

Modified: trunk/server/savegame2.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=34910&r1=34909&r2=34910&view=diff
==============================================================================
--- trunk/server/savegame2.c    (original)
+++ trunk/server/savegame2.c    Mon Jan 30 11:10:53 2017
@@ -4295,6 +4295,14 @@
     } else {
       punit->has_orders = FALSE;
       punit->orders.list = NULL;
+
+      (void) secfile_entry_lookup(loading->file, "%s.orders_index", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_repeat", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_vigilant", 
unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.dir_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.activity_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.tgt_list", unitstr);
     }
   }
 

Modified: trunk/server/savegame3.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=34910&r1=34909&r2=34910&view=diff
==============================================================================
--- trunk/server/savegame3.c    (original)
+++ trunk/server/savegame3.c    Mon Jan 30 11:10:53 2017
@@ -5572,6 +5572,14 @@
     } else {
       punit->has_orders = FALSE;
       punit->orders.list = NULL;
+
+      (void) secfile_entry_lookup(loading->file, "%s.orders_index", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_repeat", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_vigilant", 
unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.orders_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.dir_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.activity_list", unitstr);
+      (void) secfile_entry_lookup(loading->file, "%s.tgt_list", unitstr);
     }
   }
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits