Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Bug : -e switch doesn't work

Browse source
This commit is contained in:
mr-russ 2003-09-23 06:02:56 +00:00
parent ed288ae27e
commit d88d06faec
4 changed files with 25 additions and 7 deletions

7
doc/ChangeLog.html
View file

@ -21,21 +21,22 @@
---- 02111-1307, USA.
-->
<title>ChangeLog: Stratagus Version 1.18</title>
<title>ChangeLog: Stratagus Version 2.00</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<h1>ChangeLog: Stratagus Version 1.18</h1>
<h1>ChangeLog: Stratagus Version 2.00</h1>
<hr>
<a href="#current">Current</a><p>
<ul>
<li>Future 1.19 Release<p>
<li>Future 2.00 Release<p>
<ul>
<li>++
<li>Fixed Bug #5294: -e switch doesn't work (from Russell Smith).
<li>Merged Jarod spell patch. Still buggy, and saving not complete yet (from Joris Dauphin).
<li>Made regeneration available to all units (from Russell Smith).
<li>Made damage display missile configurable in ccl (from Russell Smith).

2
src/include/menus.h
View file

@ -406,6 +406,8 @@ extern void EditorEditAiProperties(void);
extern int EditorSaveMenu(void);
/// Load map from the editor
extern void EditorLoadMenu(void);
/// Setup Editor Paths
extern void SetupEditor(void);
/// Error menu
extern void ErrorMenu(char *);

7
src/stratagus/stratagus.cpp
View file

@ -1094,6 +1094,9 @@ global void MenuLoop(char* filename, WorldMap* map)
GuiGameStarted = 0;
while (GuiGameStarted == 0) {
if( EditorRunning == 2 ) {
SetupEditor();
}
if( EditorRunning ) {
ProcessMenu("menu-editor-select", 1);
} else {
@ -1104,6 +1107,8 @@ global void MenuLoop(char* filename, WorldMap* map)
EnableRedraw=RedrawEverything;
DebugLevel0Fn("Menu start: NetPlayers %d\n" _C_ NetPlayers);
filename = CurrentMapPath;
} else {
strcpy(CurrentMapPath,filename);
}
if( NetworkFildes!=-1 && NetPlayers<2 ) {
ExitNetwork1();
@ -1426,7 +1431,7 @@ global int main(int argc,char** argv)
StratagusLibPath=optarg;
continue;
case 'e':
EditorRunning=1;
EditorRunning=2;
continue;
case 'E':
EditorStartFile=optarg;

16
src/ui/menus.cpp
View file

@ -5033,13 +5033,24 @@ global void NetClientUpdateState(void)
*/
local void StartEditor(void)
{
char* s;
VideoLockScreen();
MenusSetBackground();
VideoUnlockScreen();
Invalidate();
SetupEditor();
EditorRunning = 1;
EndMenu();
}
/**
** Setup Editor Paths
*/
global void SetupEditor(void)
{
char *s;
//
// Create a default path + map.
//
@ -5066,10 +5077,9 @@ local void StartEditor(void)
*ScenSelectDisplayPath = '\0';
}
EditorRunning = 1;
EndMenu();
}
/**
** Editor select cancel button callback
*/