From fe5a8c4629fd6e39c235c9343478b1f3ec50db9c Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 15 Aug 2015 23:37:30 +0200 Subject: [PATCH] Updated progress bar values --- po/colobot.pot | 3 --- po/de.po | 3 --- po/fr.po | 3 --- po/pl.po | 6 +++--- po/ru.po | 3 --- src/common/restext.cpp | 1 - src/common/restext.h | 1 - src/level/robotmain.cpp | 20 ++++--------------- .../implementation/program_storage_impl.cpp | 2 +- 9 files changed, 8 insertions(+), 34 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 291a4423..4528e30f 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -270,9 +270,6 @@ msgstr "" msgid "Restoring saved objects" msgstr "" -msgid "Loading programs" -msgstr "" - msgid "Restoring CBot execution state" msgstr "" diff --git a/po/de.po b/po/de.po index 2f753bb1..69d3bd0c 100644 --- a/po/de.po +++ b/po/de.po @@ -826,9 +826,6 @@ msgstr "" msgid "Loading objects" msgstr "Liste der Objekte" -msgid "Loading programs" -msgstr "" - msgid "Loading terrain" msgstr "" diff --git a/po/fr.po b/po/fr.po index 19899c39..f0bffa55 100644 --- a/po/fr.po +++ b/po/fr.po @@ -820,9 +820,6 @@ msgstr "" msgid "Loading objects" msgstr "Liste des objets" -msgid "Loading programs" -msgstr "" - msgid "Loading terrain" msgstr "" diff --git a/po/pl.po b/po/pl.po index 7ad72cda..d16e4679 100644 --- a/po/pl.po +++ b/po/pl.po @@ -826,9 +826,6 @@ msgstr "Wczytywanie muzyki" msgid "Loading objects" msgstr "Wczytywanie obiektów" -msgid "Loading programs" -msgstr "Wczytywanie programów" - msgid "Loading terrain" msgstr "Wczytywanie terenu" @@ -1885,6 +1882,9 @@ msgstr "www.epsitec.com" #~ msgstr "" #~ "Pomoc dot. słów kluczowych\\Dokładniejsza pomoc na temat słów kluczowych" +#~ msgid "Loading programs" +#~ msgstr "Wczytywanie programów" + #~ msgid "Marks on the ground\\Marks on the ground" #~ msgstr "Znaki na ziemi\\Znaki na ziemi" diff --git a/po/ru.po b/po/ru.po index ad899276..e42c7b77 100644 --- a/po/ru.po +++ b/po/ru.po @@ -819,9 +819,6 @@ msgstr "" msgid "Loading objects" msgstr "Список объектов" -msgid "Loading programs" -msgstr "" - msgid "Loading terrain" msgstr "" diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 81a01632..d630efdf 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -152,7 +152,6 @@ void InitializeRestext() stringsText[RT_LOADING_TERRAIN] = TR("Loading terrain"); stringsText[RT_LOADING_OBJECTS] = TR("Loading objects"); stringsText[RT_LOADING_OBJECTS_SAVED] = TR("Restoring saved objects"); - stringsText[RT_LOADING_PROGRAMS] = TR("Loading programs"); stringsText[RT_LOADING_CBOT_SAVE] = TR("Restoring CBot execution state"); stringsText[RT_LOADING_FINISHED] = TR("Loading finished!"); stringsText[RT_LOADING_TERRAIN_RELIEF] = TR("Terrain relief"); diff --git a/src/common/restext.h b/src/common/restext.h index c7929258..e2ceccfa 100644 --- a/src/common/restext.h +++ b/src/common/restext.h @@ -150,7 +150,6 @@ enum ResTextType RT_LOADING_TERRAIN = 214, RT_LOADING_OBJECTS = 215, RT_LOADING_OBJECTS_SAVED = 216, - RT_LOADING_PROGRAMS = 217, RT_LOADING_CBOT_SAVE = 218, RT_LOADING_FINISHED = 219, RT_LOADING_TERRAIN_RELIEF = 220, diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 4580bf54..ef9b453f 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -110,25 +110,13 @@ #include -template<> CRobotMain* CSingleton::m_instance = nullptr; - - -// TODO: remove once using std::string -const int MAX_FNAME = 255; - - - -const float UNIT = 4.0f; - - - // Global variables. +const float UNIT = 4.0f; // default for g_unit float g_unit; // conversion factor - - +template<> CRobotMain* CSingleton::m_instance = nullptr; //! Constructor of robot application CRobotMain::CRobotMain() @@ -3285,7 +3273,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) // Object categories may spoil the level a bit, so hide them in release builds details += ": "+CLevelParserParam::FromObjectType(params.type); #endif - m_ui->GetLoadingScreen()->SetProgress(0.25f+objectProgress*0.5f, RT_LOADING_OBJECTS, details); + m_ui->GetLoadingScreen()->SetProgress(0.25f+objectProgress*0.75f, RT_LOADING_OBJECTS, details); try { @@ -4630,7 +4618,7 @@ CObject* CRobotMain::IOReadObject(CLevelParserLine *line, const std::string& pro // Object categories may spoil the level a bit, so hide them in release builds details += ": "+CLevelParserParam::FromObjectType(params.type); #endif - m_ui->GetLoadingScreen()->SetProgress(0.25f+objectProgress*0.5f, RT_LOADING_OBJECTS_SAVED, details); + m_ui->GetLoadingScreen()->SetProgress(0.25f+objectProgress*0.7f, RT_LOADING_OBJECTS_SAVED, details); CObject* obj = m_objMan->CreateObject(params); diff --git a/src/object/implementation/program_storage_impl.cpp b/src/object/implementation/program_storage_impl.cpp index c4802e8f..e69c16b5 100644 --- a/src/object/implementation/program_storage_impl.cpp +++ b/src/object/implementation/program_storage_impl.cpp @@ -248,7 +248,7 @@ void CProgramStorageObjectImpl::SaveAllUserPrograms(const std::string& userSourc if (i < m_program.size() && !m_program[i]->loadedFromLevel) { - GetLogger()->Trace("Loading program '%s' into user directory\n", filename.c_str()); + GetLogger()->Trace("Saving program '%s' into user directory\n", filename.c_str()); WriteProgram(m_program[i].get(), filename); } else