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

Updated progress bar values

master
krzys-h 2015-08-15 23:37:30 +02:00
parent bc7d0c1c51
commit fe5a8c4629
9 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/colobot.pot
View File

@ -270,9 +270,6 @@ msgstr ""
msgid "Restoring saved objects"
msgstr ""
msgid "Loading programs"
msgstr ""
msgid "Restoring CBot execution state"
msgstr ""

3
po/de.po
View File

@ -826,9 +826,6 @@ msgstr ""
msgid "Loading objects"
msgstr "Liste der Objekte"
msgid "Loading programs"
msgstr ""
msgid "Loading terrain"
msgstr ""

3
po/fr.po
View File

@ -820,9 +820,6 @@ msgstr ""
msgid "Loading objects"
msgstr "Liste des objets"
msgid "Loading programs"
msgstr ""
msgid "Loading terrain"
msgstr ""

6
po/pl.po
View File

@ -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"

3
po/ru.po
View File

@ -819,9 +819,6 @@ msgstr ""
msgid "Loading objects"
msgstr "Список объектов"
msgid "Loading programs"
msgstr ""
msgid "Loading terrain"
msgstr ""

1
src/common/restext.cpp
View File

@ -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");

1
src/common/restext.h
View File

@ -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,

20
src/level/robotmain.cpp
View File

@ -110,25 +110,13 @@
#include <boost/lexical_cast.hpp>
template<> CRobotMain* CSingleton<CRobotMain>::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<CRobotMain>::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);

2
src/object/implementation/program_storage_impl.cpp
View File

@ -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