[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src ui/menus.c game/loadgame.c game/g...
From: |
address@hidden |
Subject: |
[Stratagus-CVS] stratagus/src ui/menus.c game/loadgame.c game/g... |
Date: |
27 Jan 2004 22:03:27 +1100 |
CVSROOT: /home/strat
Module name: stratagus
Changes by: <address@hidden> 04/01/27 22:03:27
Modified files:
src/ui : menus.c
src/game : loadgame.c game.c
Log message:
Fixed Restart Scenario Crashes with load games
Patches:
Index: stratagus/src/game/game.c
diff -u stratagus/src/game/game.c:1.130 stratagus/src/game/game.c:1.131
--- stratagus/src/game/game.c:1.130 Tue Jan 27 21:15:22 2004
+++ stratagus/src/game/game.c Tue Jan 27 22:03:26 2004
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: game.c,v 1.130 2004/01/27 10:15:22 wizzard Exp $
+// $Id: game.c,v 1.131 2004/01/27 11:03:26 wizzard Exp $
//@{
@@ -305,7 +305,7 @@
int j;
char* s;
- if (filename && !*filename) {
+ if (SaveGameLoading) {
// Load game, already created game with Init/LoadModules
return;
}
Index: stratagus/src/game/loadgame.c
diff -u stratagus/src/game/loadgame.c:1.83 stratagus/src/game/loadgame.c:1.84
--- stratagus/src/game/loadgame.c:1.83 Tue Jan 27 21:15:22 2004
+++ stratagus/src/game/loadgame.c Tue Jan 27 22:03:26 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: loadgame.c,v 1.83 2004/01/27 10:15:22 wizzard Exp $
+// $Id: loadgame.c,v 1.84 2004/01/27 11:03:26 wizzard Exp $
//@{
@@ -242,7 +242,6 @@
GameCycle = game_cycle;
SelectionChanged();
MustRedraw = RedrawEverything;
- SaveGameLoading = 0;
}
/**
Index: stratagus/src/ui/menus.c
diff -u stratagus/src/ui/menus.c:1.612 stratagus/src/ui/menus.c:1.613
--- stratagus/src/ui/menus.c:1.612 Mon Jan 26 10:07:06 2004
+++ stratagus/src/ui/menus.c Tue Jan 27 22:03:25 2004
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menus.c,v 1.612 2004/01/25 23:07:06 wizzard Exp $
+// $Id: menus.c,v 1.613 2004/01/27 11:03:25 wizzard Exp $
//@{
@@ -1416,11 +1416,11 @@
if (i < mi->d.listbox.noptions) {
fl = mi->d.listbox.options;
sprintf(TempPathBuf, "%s/%s", SaveDir, fl[i].name);
+ SaveGameLoading = 1;
LoadGame(TempPathBuf);
Callbacks = &GameCallbacks;
SetMessage("Loaded game: %s", TempPathBuf);
GuiGameStarted = 1;
- CurrentMapPath[0] = '\0';
GameMenuReturn();
}
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src ui/menus.c game/loadgame.c game/g...,
address@hidden <=