[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/game campaign.c intro.c savegame....
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src/game campaign.c intro.c savegame.... |
Date: |
3 Jan 2004 11:27:33 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/03 11:27:33
Modified files:
src/game : campaign.c intro.c savegame.c trigger.c
Log message:
Load/Save updates
Patches:
Index: stratagus/src/game/campaign.c
diff -u stratagus/src/game/campaign.c:1.41 stratagus/src/game/campaign.c:1.42
--- stratagus/src/game/campaign.c:1.41 Fri Jan 2 08:24:06 2004
+++ stratagus/src/game/campaign.c Sat Jan 3 11:27:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: campaign.c,v 1.41 2004/01/01 21:24:06 jsalmon3 Exp $
+// $Id: campaign.c,v 1.42 2004/01/03 00:27:32 jsalmon3 Exp $
//@{
@@ -560,8 +560,8 @@
ChapterPictureText* text;
int i;
- CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: campaign $Id: campaign.c,v 1.41 2004/01/01
21:24:06 jsalmon3 Exp $\n\n");
+ CLprintf(file, "\n--- -----------------------------------------\n");
+ CLprintf(file, "--- MODULE: campaign $Id: campaign.c,v 1.42 2004/01/03
00:27:32 jsalmon3 Exp $\n\n");
if (!CurrentCampaign) {
return;
}
Index: stratagus/src/game/intro.c
diff -u stratagus/src/game/intro.c:1.118 stratagus/src/game/intro.c:1.119
--- stratagus/src/game/intro.c:1.118 Fri Jan 2 08:24:06 2004
+++ stratagus/src/game/intro.c Sat Jan 3 11:27:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: intro.c,v 1.118 2004/01/01 21:24:06 jsalmon3 Exp $
+// $Id: intro.c,v 1.119 2004/01/03 00:27:32 jsalmon3 Exp $
//@{
@@ -1692,14 +1692,19 @@
/**
** Save the objectives.
+**
+** @param file Output file.
*/
global void SaveObjectives(CLFile* file)
{
int i;
if (GameIntro.Objectives[0]) {
- CLprintf(file, "(set-objectives!");
+ CLprintf(file, "SetObjectives(");
for (i = 0; i < MAX_OBJECTIVES && GameIntro.Objectives[i]; ++i)
{
+ if (i) {
+ CLprintf(file, ",");
+ }
CLprintf(file, "\n \"%s\"", GameIntro.Objectives[i]);
}
CLprintf(file, ")\n");
Index: stratagus/src/game/savegame.c
diff -u stratagus/src/game/savegame.c:1.40 stratagus/src/game/savegame.c:1.41
--- stratagus/src/game/savegame.c:1.40 Sun Dec 21 21:51:31 2003
+++ stratagus/src/game/savegame.c Sat Jan 3 11:27:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: savegame.c,v 1.40 2003/12/21 10:51:31 wizzard Exp $
+// $Id: savegame.c,v 1.41 2004/01/03 00:27:32 jsalmon3 Exp $
//@{
@@ -97,23 +97,23 @@
//
// Parseable header
//
- CLprintf(file, ";;;(save-game\n");
- CLprintf(file, ";;; 'comment\t\"Generated by Stratagus Version "
VERSION "\"\n");
- CLprintf(file, ";;; 'comment\t\"Visit http://Stratagus.Org for more
informations\"\n");
- CLprintf(file, ";;; 'comment\t\"$Id: savegame.c,v 1.40 2003/12/21
10:51:31 wizzard Exp $\"\n");
- CLprintf(file, ";;; 'type\t\"%s\"\n", "single-player");
- CLprintf(file, ";;; 'date\t\"%s\"\n", s);
- CLprintf(file, ";;; 'map\t\"%s\"\n", TheMap.Description);
- CLprintf(file, ";;; 'engine\t'(%d %d %d)\n",
+ CLprintf(file, "---SaveGame(\n");
+ CLprintf(file, "--- \"comment\", \"Generated by Stratagus Version "
VERSION "\",\n");
+ CLprintf(file, "--- \"comment\", \"Visit http://Stratagus.Org for more
informations\",\n");
+ CLprintf(file, "--- \"comment\", \"$Id: savegame.c,v 1.41 2004/01/03
00:27:32 jsalmon3 Exp $\",\n");
+ CLprintf(file, "--- \"type\", \"%s\",\n", "single-player");
+ CLprintf(file, "--- \"date\", \"%s\",\n", s);
+ CLprintf(file, "--- \"map\", \"%s\",\n", TheMap.Description);
+ CLprintf(file, "--- \"engine\", {%d, %d, %d},\n",
StratagusMajorVersion, StratagusMinorVersion,
StratagusPatchLevel);
- CLprintf(file, ";;; 'savefile\t'(%d %d %d)\n",
+ CLprintf(file, "--- \"savefile\" {%d, %d, %d},\n",
StratagusMajorVersion, StratagusMinorVersion,
StratagusPatchLevel);
// Save media type
{
#if defined(USE_GUILE) || defined(USE_SIOD)
SCM var;
- CLprintf(file, ";;; 'media\t'");
+ CLprintf(file, "--- 'media\t'");
var = gh_symbol2scm("media-version");
// FIXME : guile todo
#if 0
@@ -127,27 +127,27 @@
#elif defined(USE_LUA)
#endif
}
- CLprintf(file, "\n;;; 'preview\t\"%s.pam\"\n", filename);
- CLprintf(file, ";;; )\n");
+ CLprintf(file, "\n--- \"preview\", \"%s.pam\",\n", filename);
+ CLprintf(file, "--- )\n\n");
// FIXME: probably not the right place for this
- CLprintf(file, "(set-game-cycle! %lu)\n", GameCycle);
+ CLprintf(file, "SetGameCycle(%lu)\n", GameCycle);
SaveCcl(file);
- SaveIcons(file);
- SaveCursors(file);
+// SaveIcons(file);
+// SaveCursors(file);
SaveUserInterface(file);
- SaveTilesets(file);
- SaveConstructions(file);
- SaveDecorations(file);
- SaveMissileTypes(file);
- SaveFlags(file);
- SaveUnitTypeDefs(file);
- SaveSpells(file);
+// SaveTilesets(file);
+// SaveConstructions(file);
+// SaveDecorations(file);
+// SaveMissileTypes(file);
+// SaveFlags(file);
+// SaveUnitTypeDefs(file);
+// SaveSpells(file);
SaveUnitTypes(file);
SaveUpgrades(file);
- SaveDependencies(file);
- SaveButtons(file);
+// SaveDependencies(file);
+// SaveButtons(file);
SavePlayers(file);
SaveMap(file);
SaveUnits(file);
Index: stratagus/src/game/trigger.c
diff -u stratagus/src/game/trigger.c:1.53 stratagus/src/game/trigger.c:1.54
--- stratagus/src/game/trigger.c:1.53 Fri Jan 2 08:24:07 2004
+++ stratagus/src/game/trigger.c Sat Jan 3 11:27:32 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: trigger.c,v 1.53 2004/01/01 21:24:07 jsalmon3 Exp $
+// $Id: trigger.c,v 1.54 2004/01/03 00:27:32 jsalmon3 Exp $
//@{
@@ -1314,7 +1314,7 @@
int trigger;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: trigger $Id: trigger.c,v 1.53 2004/01/01
21:24:07 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: trigger $Id: trigger.c,v 1.54 2004/01/03
00:27:32 jsalmon3 Exp $\n\n");
i = 0;
trigger = -1;
@@ -1335,10 +1335,10 @@
// CLprintf(file, "(set-trigger-number! %d)\n", trigger);
if (GameTimer.Init) {
- CLprintf(file, "(action-set-timer %ld %d)\n",
+ CLprintf(file, "ActionSetTimer(%ld, %d)\n",
GameTimer.Cycles, GameTimer.Increasing);
if (GameTimer.Running) {
- CLprintf(file, "(action-start-timer)\n");
+ CLprintf(file, "ActionStartTimer()\n");
}
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src/game campaign.c intro.c savegame....,
address@hidden <=