From 9fd57de38e1944974e5756dccaacabba7bb1df0c Mon Sep 17 00:00:00 2001
From: jarod42 <>
Date: Sun, 24 Oct 2004 14:27:33 +0000
Subject: [PATCH] Add const and fix crash when returning to main menu.
---
src/game/game.cpp | 2 +-
src/include/menus.h | 2 +-
src/include/settings.h | 2 +-
src/stratagus/stratagus.cpp | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/game/game.cpp b/src/game/game.cpp
index e9546f03c..2f5ea9728 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -320,7 +320,7 @@ static void GameTypeManTeamVsMachine(void)
**
** @todo FIXME: use in this function InitModules / LoadModules!!!
*/
-void CreateGame(char* filename, WorldMap* map)
+void CreateGame(const char* filename, WorldMap* map)
{
int i;
int j;
diff --git a/src/include/menus.h b/src/include/menus.h
index de93370bf..cae312a0f 100644
--- a/src/include/menus.h
+++ b/src/include/menus.h
@@ -393,7 +393,7 @@ extern void SetupEditor(void);
extern void ErrorMenu(char*);
/// Menu Loop
-extern void MenuLoop(char* filename, struct _world_map_* map);
+extern void MenuLoop(const char* filename, struct _world_map_* map);
/// Pre menu setup
extern void PreMenuSetup(void);
diff --git a/src/include/settings.h b/src/include/settings.h
index 1f6efebbb..99a17e45a 100644
--- a/src/include/settings.h
+++ b/src/include/settings.h
@@ -178,7 +178,7 @@ extern void ObjectivesCclRegister(void);
/// Save the objectives
extern void SaveObjectives(struct _CL_File_* file);
/// Create a game
-extern void CreateGame(char* filename, struct _world_map_* map);
+extern void CreateGame(const char* filename, struct _world_map_* map);
/// Init Setting to default values
extern void InitSettings(void);
diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp
index 42f481164..f4d6f8303 100644
--- a/src/stratagus/stratagus.cpp
+++ b/src/stratagus/stratagus.cpp
@@ -647,7 +647,7 @@ void PreMenuSetup(void)
** @param filename map filename
** @param map map loaded
*/
-void MenuLoop(char* filename, WorldMap* map)
+void MenuLoop(const char* filename, WorldMap* map)
{
for (;;) {
//
@@ -751,7 +751,7 @@ void MenuLoop(char* filename, WorldMap* map)
filename = NextChapter();
sprintf(CurrentMapPath, "%s/%s", StratagusLibPath, filename);
- filename = CurrentMapPath;
+// filename = CurrentMapPath;
DebugPrint("Next chapter %s\n" _C_ CurrentMapPath);
}
}