[Stratagus-CVS] stratagus/src/stratagus ccl_spell.c construct.c...

[address@hidden]

CVSROOT:        /home/strat
Module name:    stratagus
Changes by:      <address@hidden>       04/01/03 11:30:48

Modified files:
        src/stratagus  : ccl_spell.c construct.c groups.c player.c 
                         selection.c 

Log message:
        Load/Save updates

Patches:
Index: stratagus/src/stratagus/ccl_spell.c
diff -u stratagus/src/stratagus/ccl_spell.c:1.33 
stratagus/src/stratagus/ccl_spell.c:1.34
--- stratagus/src/stratagus/ccl_spell.c:1.33    Fri Jan  2 08:24:15 2004
+++ stratagus/src/stratagus/ccl_spell.c Sat Jan  3 11:30:47 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: ccl_spell.c,v 1.33 2004/01/01 21:24:15 jsalmon3 Exp $
+//     $Id: ccl_spell.c,v 1.34 2004/01/03 00:30:47 jsalmon3 Exp $
 //@{
 
 /*----------------------------------------------------------------------------
@@ -927,6 +927,7 @@
 */
 global void SaveSpells(CLFile* file)
 {
+#if 0
        SpellType* spell;
        SpellActionType* act;
 
@@ -973,12 +974,12 @@
                //  Save the action(effect of the spell)
                //
                CLprintf(file, "        'action '(\n");
-               act=spell->Action;
+               act = spell->Action;
                while (act) {
                        CLprintf(file,"         ");
                        SaveSpellAction(file, act);
                        CLprintf(file,"\n");
-                       act=act->Next;
+                       act = act->Next;
                }
                CLprintf(file, ")\n");
                //
@@ -1007,6 +1008,7 @@
                }
                CLprintf(file, ")\n");
        }
+#endif
 }
 
 //@}
Index: stratagus/src/stratagus/construct.c
diff -u stratagus/src/stratagus/construct.c:1.43 
stratagus/src/stratagus/construct.c:1.44
--- stratagus/src/stratagus/construct.c:1.43    Fri Jan  2 08:24:15 2004
+++ stratagus/src/stratagus/construct.c Sat Jan  3 11:30:47 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: construct.c,v 1.43 2004/01/01 21:24:15 jsalmon3 Exp $
+//     $Id: construct.c,v 1.44 2004/01/03 00:30:47 jsalmon3 Exp $
 
 //@{
 
@@ -134,12 +134,13 @@
 }
 
 /**
-**             Save state of constructions to file.
+**  Save state of constructions to file.
 **
-**             @param file             Output file.
+**  @param file  Output file.
 */
 global void SaveConstructions(CLFile* file)
 {
+#if 0
        int j;
        int i;
        char** cp;
@@ -147,12 +148,12 @@
        ConstructionFrame* cframe;
 
        CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: constructions $Id: construct.c,v 1.43 
2004/01/01 21:24:15 jsalmon3 Exp $\n\n");
+       CLprintf(file, ";;; MODULE: constructions $Id: construct.c,v 1.44 
2004/01/03 00:30:47 jsalmon3 Exp $\n\n");
 
        // FIXME: needed?
 
        //
-       //              Dump table wc2 construction numbers -> internal symbol.
+       //  Dump table wc2 construction numbers -> internal symbol.
        //
        if ((cp = ConstructionWcNames)) {
                CLprintf(file, "(define-construction-wc-names");
@@ -168,7 +169,7 @@
        }
 
        //
-       //              Dump table of all constructions
+       //  Dump table of all constructions
        //
        if ((cop = Constructions)) {
                while (*cop) {
@@ -215,6 +216,7 @@
                        ++cop;
                }
        }
+#endif
 }
 
 /**
Index: stratagus/src/stratagus/groups.c
diff -u stratagus/src/stratagus/groups.c:1.30 
stratagus/src/stratagus/groups.c:1.31
--- stratagus/src/stratagus/groups.c:1.30       Fri Jan  2 08:24:15 2004
+++ stratagus/src/stratagus/groups.c    Sat Jan  3 11:30:48 2004
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: groups.c,v 1.30 2004/01/01 21:24:15 jsalmon3 Exp $
+//     $Id: groups.c,v 1.31 2004/01/03 00:30:48 jsalmon3 Exp $
 
 //@{
 
@@ -78,9 +78,9 @@
 }
 
 /**
-**             Save groups.
+**  Save groups.
 **
-**             @param file             Output file.
+**  @param file  Output file.
 */
 global void SaveGroups(CLFile* file)
 {
@@ -88,17 +88,17 @@
        int g;
        char* ref;
 
-       CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: groups $Id: groups.c,v 1.30 2004/01/01 
21:24:15 jsalmon3 Exp $\n\n");
+       CLprintf(file, "\n--- -----------------------------------------\n");
+       CLprintf(file, "--- MODULE: groups $Id: groups.c,v 1.31 2004/01/03 
00:30:48 jsalmon3 Exp $\n\n");
 
        for (g = 0; g < NUM_GROUPS; ++g) {
-               CLprintf(file, "(group %d %d '(", g, Groups[g].NumUnits);
+               CLprintf(file, "Group(%d, %d, {", g, Groups[g].NumUnits);
                for (i = 0; i < Groups[g].NumUnits; ++i) {
                        ref = UnitReference(Groups[g].Units[i]);
-                       CLprintf(file, "%s ", ref);
+                       CLprintf(file, "\"%s\", ", ref);
                        free(ref);
                }
-               CLprintf(file, "))\n");
+               CLprintf(file, "})\n");
        }
 }
 
Index: stratagus/src/stratagus/player.c
diff -u stratagus/src/stratagus/player.c:1.107 
stratagus/src/stratagus/player.c:1.108
--- stratagus/src/stratagus/player.c:1.107      Sat Jan  3 09:53:29 2004
+++ stratagus/src/stratagus/player.c    Sat Jan  3 11:30:48 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//      $Id: player.c,v 1.107 2004/01/02 22:53:29 jsalmon3 Exp $
+//      $Id: player.c,v 1.108 2004/01/03 00:30:48 jsalmon3 Exp $
 
 //@{
 
@@ -220,7 +220,7 @@
        int j;
 
        CLprintf(file, "\n--- -----------------------------------------\n");
-       CLprintf(file, "--- MODULE: players $Id: player.c,v 1.107 2004/01/02 
22:53:29 jsalmon3 Exp $\n\n");
+       CLprintf(file, "--- MODULE: players $Id: player.c,v 1.108 2004/01/03 
00:30:48 jsalmon3 Exp $\n\n");
 
 #if 0
        //
@@ -391,9 +391,7 @@
                        }
                        CLprintf(file, "%d,", 
Players[i].UpgradeTimers.Upgrades[j]);
                }
-               CLprintf(file, "},");
-
-               CLprintf(file, ")\n\n");
+               CLprintf(file, "})\n\n");
        }
 
        DebugLevel0Fn("FIXME: must save unit-stats?\n");
Index: stratagus/src/stratagus/selection.c
diff -u stratagus/src/stratagus/selection.c:1.64 
stratagus/src/stratagus/selection.c:1.65
--- stratagus/src/stratagus/selection.c:1.64    Fri Jan  2 08:24:15 2004
+++ stratagus/src/stratagus/selection.c Sat Jan  3 11:30:48 2004
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: selection.c,v 1.64 2004/01/01 21:24:15 jsalmon3 Exp $
+//     $Id: selection.c,v 1.65 2004/01/03 00:30:48 jsalmon3 Exp $
 
 //@{
 
@@ -968,26 +968,26 @@
 }
 
 /**
-**             Save current selection state.
+**  Save current selection state.
 **
-**             @param file             Output file.
+**  @param file  Output file.
 */
 global void SaveSelections(CLFile* file)
 {
        int i;
        char* ref;
 
-       CLprintf(file, "\n;;; -----------------------------------------\n");
-       CLprintf(file, ";;; MODULE: selection $Id: selection.c,v 1.64 
2004/01/01 21:24:15 jsalmon3 Exp $\n\n");
+       CLprintf(file, "\n--- -----------------------------------------\n");
+       CLprintf(file, "--- MODULE: selection $Id: selection.c,v 1.65 
2004/01/03 00:30:48 jsalmon3 Exp $\n\n");
 
-       CLprintf(file, "(set-group-id! %d)\n", GroupId);
-       CLprintf(file, "(selection %d '(", NumSelected);
+       CLprintf(file, "SetGroupId(%d)\n", GroupId);
+       CLprintf(file, "Selection(%d, {", NumSelected);
        for (i = 0; i < NumSelected; ++i) {
                ref = UnitReference(Selected[i]);
-               CLprintf(file, "%s ", ref);
+               CLprintf(file, "\"%s\", ", ref);
                free(ref);
        }
-       CLprintf(file, "))\n");
+       CLprintf(file, "})\n");
 }
 
 /**