editor: File/Save creates a savegame when the original scenario was one

Günther Brammer 2011-05-15 19:38:47 +02:00
parent 8bb2afc477
commit 3c943479ab
7 changed files with 6 additions and 15 deletions

View File

@ -64,7 +64,6 @@ IDS_CNS_NAMES=Namen
IDS_CNS_NEWPLRVIEWPORT=Neu für %s
IDS_CNS_NOCHILDSAVE=%s befindet sich in einem Rundenordner.\nSzenarien können nicht in geschlossenen Gruppendateien gespeichert werden.
IDS_CNS_NOFULLSCREENPLRS=Im Vollbildmodus kann nur gestartet werden, wenn Spieler am Spiel teilnehmen.
IDS_CNS_NOGAMEOVERSCEN=Ein Spiel sollte nicht über die Datei des ursprünglichen Szenarios gespeichert werden.
IDS_CNS_NOMATDEF=Zeichnen nicht möglich, da die angegebene\nMaterial-Textur-Kombination '%s-%s'\nnicht in der geladenen Texturtabelle definiert ist.
IDS_CNS_NONETEDIT=Bei Wiedergabe einer Aufnahme kann nicht editiert werden.
IDS_CNS_NOOBJECT=Kein Objekt ausgewählt.

View File

@ -64,7 +64,6 @@ IDS_CNS_NAMES=Names
IDS_CNS_NEWPLRVIEWPORT=New for %s
IDS_CNS_NOCHILDSAVE=%s is located in a group folder.\nScenarios cannot be saved in closed group folders.
IDS_CNS_NOFULLSCREENPLRS=Fullscreen mode requires at least one participating player.
IDS_CNS_NOGAMEOVERSCEN=You should not overwrite the original scenario file with a save game.
IDS_CNS_NOMATDEF=Cannot draw because selected\nmaterial-texture combination '%s-%s'\nis not defined in the texture table.
IDS_CNS_NONETEDIT=No editing while replaying.
IDS_CNS_NOOBJECT=No selected objects.

View File

@ -216,17 +216,10 @@ bool C4Console::SaveGame(bool fSaveGame)
return fOkay;
}
bool C4Console::FileSave(bool fSaveGame)
bool C4Console::FileSave()
{
// Don't quicksave games over scenarios
if (fSaveGame)
if (!Game.C4S.Head.SaveGame)
{
Message(LoadResStr("IDS_CNS_NOGAMEOVERSCEN"));
return false;
}
// Save game
return SaveGame(fSaveGame);
return SaveGame(Game.C4S.Head.SaveGame);
}
bool C4Console::FileSaveAs(bool fSaveGame)

View File

@ -85,7 +85,7 @@ public:
bool FileSelect(StdStrBuf *sFilename, const char *szFilter, DWORD dwFlags, bool fSave=false);
bool SaveGame(bool fSaveGame);
bool FileSaveAs(bool fSaveGame);
bool FileSave(bool fSaveGame);
bool FileSave();
bool FileOpen();
bool FileOpenWPlrs();
bool FileCommand();

View File

@ -1522,7 +1522,7 @@ void C4ConsoleGUI::State::OnFileOpenWPlrs(GtkWidget* item, gpointer data)
void C4ConsoleGUI::State::OnFileSave(GtkWidget* item, gpointer data)
{
Console.FileSave(false);
Console.FileSave();
}
void C4ConsoleGUI::State::OnFileSaveAs(GtkWidget* item, gpointer data)

View File

@ -252,7 +252,7 @@ INT_PTR CALLBACK ConsoleDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lPara
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_SAVEAS: Console.FileSaveAs(false); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_SAVE: Console.FileSave(false); return true;
case IDM_FILE_SAVE: Console.FileSave(); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
case IDM_FILE_SAVEGAMEAS: Console.FileSaveAs(true); return true;
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

View File

@ -52,7 +52,7 @@
- (IBAction) saveScenario:(id)sender
{
Console.FileSave(false);
Console.FileSave();
}
- (IBAction) saveScenarioAs:(id)sender