immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display warning if no quicksave slot is found

dev-buzzingcars
tomangelo2 2017-06-11 23:29:50 +02:00
parent d63ed865f4
commit 75d9f8573b
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/colobot.pot
View File

@ -1527,6 +1527,9 @@ msgstr ""
msgid "Inappropriate bot" msgid "Inappropriate bot"
msgstr "" msgstr ""
msgid "Quicksave slot not found"
msgstr ""
msgid "Building completed" msgid "Building completed"
msgstr "" msgstr ""

7
po/de.po
View File

@ -1211,6 +1211,10 @@ msgstr ""
msgid "Quick save\\Immediately save game" msgid "Quick save\\Immediately save game"
msgstr "" msgstr ""
#, fuzzy
msgid "Quicksave slot not found"
msgstr "Das Objekt existiert nicht"
msgid "Quit\\Quit Colobot: Gold Edition" msgid "Quit\\Quit Colobot: Gold Edition"
msgstr "Beenden\\Colobot: Gold Edition schließen" msgstr "Beenden\\Colobot: Gold Edition schließen"
@ -1939,9 +1943,6 @@ msgstr "epsitec.com"
#~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgid "Num of decorative objects\\Number of purely ornamental objects"
#~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion" #~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion"
#~ msgid "Object not found"
#~ msgstr "Das Objekt existiert nicht"
#~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgid "Planets and stars\\Astronomical objects in the sky"
#~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne" #~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne"

7
po/fr.po
View File

@ -1208,6 +1208,10 @@ msgstr ""
msgid "Quick save\\Immediately save game" msgid "Quick save\\Immediately save game"
msgstr "" msgstr ""
#, fuzzy
msgid "Quicksave slot not found"
msgstr "Objet n'existe pas"
msgid "Quit\\Quit Colobot: Gold Edition" msgid "Quit\\Quit Colobot: Gold Edition"
msgstr "Quitter\\Quitter Colobot : Édition Gold" msgstr "Quitter\\Quitter Colobot : Édition Gold"
@ -1941,9 +1945,6 @@ msgstr "epsitec.com"
#~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgid "Num of decorative objects\\Number of purely ornamental objects"
#~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables" #~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables"
#~ msgid "Object not found"
#~ msgstr "Objet n'existe pas"
#~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgid "Planets and stars\\Astronomical objects in the sky"
#~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel" #~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel"

3
po/pl.po
View File

@ -1194,6 +1194,9 @@ msgstr "Szybkie wczytywanie\\Natychmiastowo wczytuje zapisaną grę"
msgid "Quick save\\Immediately save game" msgid "Quick save\\Immediately save game"
msgstr "Szybki zapis\\Natychmiastowo zapisuje grę" msgstr "Szybki zapis\\Natychmiastowo zapisuje grę"
msgid "Quicksave slot not found"
msgstr "Nie odnaleziono slotu szybkiego zapisu"
msgid "Quit\\Quit Colobot: Gold Edition" msgid "Quit\\Quit Colobot: Gold Edition"
msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition" msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition"

7
po/ru.po
View File

@ -1220,6 +1220,10 @@ msgstr ""
msgid "Quick save\\Immediately save game" msgid "Quick save\\Immediately save game"
msgstr "" msgstr ""
#, fuzzy
msgid "Quicksave slot not found"
msgstr "Объект не найден"
msgid "Quit\\Quit Colobot: Gold Edition" msgid "Quit\\Quit Colobot: Gold Edition"
msgstr "Выход\\Выйти из Colobot: Gold Edition" msgstr "Выход\\Выйти из Colobot: Gold Edition"
@ -1951,9 +1955,6 @@ msgstr "epsitec.com"
#~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgid "Num of decorative objects\\Number of purely ornamental objects"
#~ msgstr "Количество декораций\\Количество декоративных объектов" #~ msgstr "Количество декораций\\Количество декоративных объектов"
#~ msgid "Object not found"
#~ msgstr "Объект не найден"
#~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgid "Planets and stars\\Astronomical objects in the sky"
#~ msgstr "Планеты и звезды\\Астрономические объекты в небе" #~ msgstr "Планеты и звезды\\Астрономические объекты в небе"

1
src/common/error.h
View File

@ -112,6 +112,7 @@ enum Error
ERR_PROHIBITEDTOKEN = 801, //!< instruction prohibited ERR_PROHIBITEDTOKEN = 801, //!< instruction prohibited
ERR_AIM_IMPOSSIBLE = 900, //!< cannot aim at specified angle(s) ERR_AIM_IMPOSSIBLE = 900, //!< cannot aim at specified angle(s)
ERR_WRONG_BOT = 910, //!< inappropriate bot ERR_WRONG_BOT = 910, //!< inappropriate bot
ERR_NO_QUICK_SLOT = 920, //!< quicksave slot not found
INFO_FIRST = 10000, //! < first information INFO_FIRST = 10000, //! < first information
INFO_BUILD = 10001, //! < construction builded INFO_BUILD = 10001, //! < construction builded

1
src/common/restext.cpp
View File

@ -641,6 +641,7 @@ void InitializeRestext()
stringsErr[ERR_DELETEBUILDING] = TR("Building destroyed"); stringsErr[ERR_DELETEBUILDING] = TR("Building destroyed");
stringsErr[ERR_ENEMY_OBJECT] = TR("Unable to control enemy objects"); stringsErr[ERR_ENEMY_OBJECT] = TR("Unable to control enemy objects");
stringsErr[ERR_WRONG_BOT] = TR("Inappropriate bot"); stringsErr[ERR_WRONG_BOT] = TR("Inappropriate bot");
stringsErr[ERR_NO_QUICK_SLOT] = TR("Quicksave slot not found");
stringsErr[INFO_BUILD] = TR("Building completed"); stringsErr[INFO_BUILD] = TR("Building completed");
stringsErr[INFO_CONVERT] = TR("Titanium available"); stringsErr[INFO_CONVERT] = TR("Titanium available");

1
src/level/robotmain.cpp
View File

@ -5575,6 +5575,7 @@ void CRobotMain::QuickLoad()
std::string dir = m_playerProfile->GetSaveFile(std::string("quicksave")); std::string dir = m_playerProfile->GetSaveFile(std::string("quicksave"));
if(!CResourceManager::Exists(dir)) if(!CResourceManager::Exists(dir))
{ {
m_displayText->DisplayError(ERR_NO_QUICK_SLOT, Math::Vector(0.0f,0.0f,0.0f), 15.0f, 60.0f, 1000.0f);
GetLogger()->Debug("Quicksave slot not found\n"); GetLogger()->Debug("Quicksave slot not found\n");
return; return;
} }