This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit c22e55b99a38d405fb79184106261229bd2d1855
Author: krzys-h <krzy...@interia.pl>
Date: Thu Jul 10 16:52:29 2014 +0200
Removed some unused code related to Quit button
The button itself has been removed a long time ago
---
po/colobot.pot | 34 +++++++++++++++++++++++++---------
po/de.po | 41 +++++++++++++++++++++++++++++++++--------
po/fr.po | 41 +++++++++++++++++++++++++++++++++--------
po/pl.po | 41 +++++++++++++++++++++++++++++++++--------
po/ru.po | 44 ++++++++++++++++++++++++++++++++++++--------
src/common/event.cpp | 1 -
src/common/event.h | 1 -
src/common/restext.cpp | 1 -
src/object/robotmain.cpp | 40 ----------------------------------------
src/ui/maindialog.cpp | 12 ------------
src/ui/studio.cpp | 10 ----------
11 files changed, 160 insertions(+), 106 deletions(-)
diff --git a/po/colobot.pot b/po/colobot.pot
index f062658..4695600 100644
--- a/po/colobot.pot
+++ b/po/colobot.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -255,9 +255,6 @@ msgstr ""
msgid "Previous"
msgstr ""
-msgid "Menu (\\key quit;)"
-msgstr ""
-
msgid "Exercises\\Programming exercises"
msgstr ""
@@ -641,6 +638,9 @@ msgstr ""
msgid "Take off to finish the mission"
msgstr ""
+msgid "Destroy"
+msgstr ""
+
msgid "Build a derrick"
msgstr ""
@@ -680,6 +680,9 @@ msgstr ""
msgid "Build a exchange post"
msgstr ""
+msgid "Build a destroyer"
+msgstr ""
+
msgid "Show if the ground is flat"
msgstr ""
@@ -809,6 +812,9 @@ msgstr ""
msgid "Shoot (\\key action;)"
msgstr ""
+msgid "Explode (\\key action;)"
+msgstr ""
+
msgid "Recycle (\\key action;)"
msgstr ""
@@ -1280,6 +1286,9 @@ msgstr ""
msgid "Lunar Roving Vehicle"
msgstr ""
+msgid "Internal error - tell the developers"
+msgstr ""
+
msgid "Unknown command"
msgstr ""
@@ -1340,6 +1349,12 @@ msgstr ""
msgid "Too close to a building"
msgstr ""
+msgid "Can not produce this object in this mission"
+msgstr ""
+
+msgid "Can not produce not researched object"
+msgstr ""
+
msgid "Ground inappropriate"
msgstr ""
@@ -1445,6 +1460,12 @@ msgstr ""
msgid "No flag nearby"
msgstr ""
+msgid "Not found anything to destroy"
+msgstr ""
+
+msgid "Inappropriate object"
+msgstr ""
+
msgid ""
"The mission is not accomplished yet (press \\key help; for more details)"
msgstr ""
@@ -1789,10 +1810,6 @@ msgstr ""
msgid "speed20;"
msgstr ""
-#, c-format
-msgid "GetResource event num out of range: %d\n"
-msgstr ""
-
msgid "Ctrl"
msgstr ""
@@ -1810,4 +1827,3 @@ msgstr ""
msgid "%1"
msgstr ""
-
diff --git a/po/de.po b/po/de.po
index 93a1d7b..9f4c3bd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -203,6 +203,10 @@ msgstr "Baut einen Geschützturm"
msgid "Build a derrick"
msgstr "Baut einen Bohrturm"
+#, fuzzy
+msgid "Build a destroyer"
+msgstr "Gebäude zerstört"
+
msgid "Build a exchange post"
msgstr "Baut einen Infoserver"
@@ -338,6 +342,12 @@ msgstr "Kamera rechts"
msgid "Can not create this; there are too many objects"
msgstr "Kein neues Objekt kann erstellt werden (zu viele vorhanden)"
+msgid "Can not produce not researched object"
+msgstr ""
+
+msgid "Can not produce this object in this mission"
+msgstr ""
+
msgid "Can't open file"
msgstr "Die Datei kann nicht geöffnet werden"
@@ -446,6 +456,10 @@ msgstr "Bohrturm"
msgid "Descend\\Reduces the power of the jet"
msgstr "Sinken\\Leistung des Triebwerks drosseln"
+#, fuzzy
+msgid "Destroy"
+msgstr "Einstampfer"
+
msgid "Destroy the building"
msgstr "Gebäude sprengen"
@@ -525,6 +539,10 @@ msgstr "Programmieren\\Programmierübungen"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Zurücksetzen \\Kleine Show beim Zurücksetzen in den Übungen"
+#, fuzzy
+msgid "Explode (\\key action;)"
+msgstr "Recyceln (\\key action;)"
+
msgid "Explosive"
msgstr "Sprengstoff"
@@ -622,10 +640,6 @@ msgstr "Spiel\\Gameplay Einstellungen"
msgid "Gantry crane"
msgstr "Träger"
-#, c-format
-msgid "GetResource event num out of range: %d\n"
-msgstr ""
-
msgid "Goto: destination occupied"
msgstr "Ziel ist schon besetzt"
@@ -695,6 +709,10 @@ msgstr "Roboter ungeeignet"
msgid "Inappropriate cell type"
msgstr "Falscher Batterietyp"
+#, fuzzy
+msgid "Inappropriate object"
+msgstr "Roboter ungeeignet"
+
msgid "Incorrect index type"
msgstr "Falscher Typ für einen Index"
@@ -731,6 +749,9 @@ msgstr "Anweisungen von Houston"
msgid "Instructions\\Shows the instructions for the current mission"
msgstr "Anweisungen\\Anweisungen für die Mission oder Übung"
+msgid "Internal error - tell the developers"
+msgstr ""
+
msgid "Jet temperature"
msgstr "Triebwerktemperatur"
@@ -800,9 +821,6 @@ msgstr "Markierungen\\Markierungen auf dem Boden"
msgid "Maximize"
msgstr "Großes Fenster"
-msgid "Menu (\\key quit;)"
-msgstr "Menü (\\key quit;)"
-
msgid "Minimize"
msgstr "Reduzieren"
@@ -911,6 +929,10 @@ msgstr "Nicht genug Energie"
msgid "Not enough energy yet"
msgstr "Noch nicht genug Energie"
+#, fuzzy
+msgid "Not found anything to destroy"
+msgstr "Nichts abzulegen"
+
msgid "Not yet enough energy"
msgstr "Noch nicht genug Energie"
@@ -1947,6 +1969,9 @@ msgstr "www.epsitec.com"
#~ msgid "Left Windows"
#~ msgstr "Left Windows"
+#~ msgid "Menu (\\key quit;)"
+#~ msgstr "Menü (\\key quit;)"
+
#~ msgid "Mini-map"
#~ msgstr "Minikarte"
diff --git a/po/fr.po b/po/fr.po
index e6be922..291193c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"PO-Revision-Date: 2012-12-27 14:07+0100\n"
"Last-Translator: Didier Raboud <o...@debian.org>\n"
"Language: fr\n"
@@ -207,6 +207,10 @@ msgstr "Construit une tour"
msgid "Build a derrick"
msgstr "Construit un derrick"
+#, fuzzy
+msgid "Build a destroyer"
+msgstr "Bâtiment détruit"
+
msgid "Build a exchange post"
msgstr "Construit une borne d'information"
@@ -342,6 +346,12 @@ msgstr "Caméra à droite"
msgid "Can not create this; there are too many objects"
msgstr "Création impossible; il y a trop d'objets"
+msgid "Can not produce not researched object"
+msgstr ""
+
+msgid "Can not produce this object in this mission"
+msgstr ""
+
msgid "Can't open file"
msgstr "Ouverture du fichier impossible"
@@ -450,6 +460,10 @@ msgstr "Derrick"
msgid "Descend\\Reduces the power of the jet"
msgstr "Descendre\\Diminuer la puissance du réacteur"
+#, fuzzy
+msgid "Destroy"
+msgstr "Destructeur"
+
msgid "Destroy the building"
msgstr "Démolit le bâtiment"
@@ -529,6 +543,10 @@ msgstr "Programmation\\Exercices de programmation"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Retour animé\\Retour animé dans les exercices"
+#, fuzzy
+msgid "Explode (\\key action;)"
+msgstr "Recycle (\\key action;)"
+
msgid "Explosive"
msgstr "Explosif"
@@ -626,10 +644,6 @@ msgstr "Jeu\\Options de jouabilité"
msgid "Gantry crane"
msgstr "Portique"
-#, c-format
-msgid "GetResource event num out of range: %d\n"
-msgstr ""
-
msgid "Goto: destination occupied"
msgstr "Goto: Destination occupée"
@@ -699,6 +713,10 @@ msgstr "Robot inadapté"
msgid "Inappropriate cell type"
msgstr "Pas le bon type de pile"
+#, fuzzy
+msgid "Inappropriate object"
+msgstr "Robot inadapté"
+
msgid "Incorrect index type"
msgstr "Mauvais type d'index"
@@ -735,6 +753,9 @@ msgstr "Instructions de Houston"
msgid "Instructions\\Shows the instructions for the current mission"
msgstr "Instructions mission\\Marche à suivre"
+msgid "Internal error - tell the developers"
+msgstr ""
+
msgid "Jet temperature"
msgstr "Température du réacteur"
@@ -804,9 +825,6 @@ msgstr "Marques sur le sol\\Marques dessinées sur le sol"
msgid "Maximize"
msgstr "Taille maximale"
-msgid "Menu (\\key quit;)"
-msgstr "Menu (\\key quit;)"
-
msgid "Minimize"
msgstr "Taille réduite"
@@ -917,6 +935,10 @@ msgstr "Pas assez d'énergie"
msgid "Not enough energy yet"
msgstr "Pas encore assez d'énergie"
+#, fuzzy
+msgid "Not found anything to destroy"
+msgstr "Rien à déposer"
+
msgid "Not yet enough energy"
msgstr "Pas encore assez d'énergie"
@@ -1954,6 +1976,9 @@ msgstr "www.epsitec.com"
#~ msgid "Left Windows"
#~ msgstr "Left Windows"
+#~ msgid "Menu (\\key quit;)"
+#~ msgstr "Menu (\\key quit;)"
+
#~ msgid "Mini-map"
#~ msgstr "Mini-carte"
diff --git a/po/pl.po b/po/pl.po
index 0b13dbb..06ca367 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -205,6 +205,10 @@ msgstr "Zbuduj wieżę obronną"
msgid "Build a derrick"
msgstr "Zbuduj kopalnię"
+#, fuzzy
+msgid "Build a destroyer"
+msgstr "Budynek zniszczony"
+
msgid "Build a exchange post"
msgstr "Zbuduj stację przekaźnikową"
@@ -340,6 +344,12 @@ msgstr "Camera to right"
msgid "Can not create this; there are too many objects"
msgstr "Nie można tego utworzyć, za dużo obiektów"
+msgid "Can not produce not researched object"
+msgstr ""
+
+msgid "Can not produce this object in this mission"
+msgstr ""
+
msgid "Can't open file"
msgstr "Nie można otworzyć pliku"
@@ -448,6 +458,10 @@ msgstr "Kopalnia"
msgid "Descend\\Reduces the power of the jet"
msgstr "W dół\\Zmniejsza moc silnika"
+#, fuzzy
+msgid "Destroy"
+msgstr "Destroyer"
+
msgid "Destroy the building"
msgstr "Zniszcz budynek"
@@ -527,6 +541,10 @@ msgstr "Ćwiczenia\\Ćwiczenia programistyczne"
msgid "Exit film\\Film at the exit of exercises"
msgstr "Końcowy film\\Film na zakończenie ćwiczeń"
+#, fuzzy
+msgid "Explode (\\key action;)"
+msgstr "Odzyskaj (\\key action;)"
+
msgid "Explosive"
msgstr "Materiały wybuchowe"
@@ -624,10 +642,6 @@ msgstr "Gra\\Ustawienia gry"
msgid "Gantry crane"
msgstr "Żuraw przesuwalny"
-#, c-format
-msgid "GetResource event num out of range: %d\n"
-msgstr ""
-
msgid "Goto: destination occupied"
msgstr "Goto: miejsce docelowe zajęte"
@@ -698,6 +712,10 @@ msgstr "Nieodpowiedni robot"
msgid "Inappropriate cell type"
msgstr "Nieodpowiedni rodzaj ogniw"
+#, fuzzy
+msgid "Inappropriate object"
+msgstr "Nieodpowiedni robot"
+
msgid "Incorrect index type"
msgstr "Nieprawidłowy typ indeksu"
@@ -734,6 +752,9 @@ msgstr "Rozkazy z Houston"
msgid "Instructions\\Shows the instructions for the current mission"
msgstr "Rozkazy\\Pokazuje rozkazy dotyczące bieżącej misji"
+msgid "Internal error - tell the developers"
+msgstr ""
+
msgid "Jet temperature"
msgstr "Temperatura silnika"
@@ -805,9 +826,6 @@ msgstr "Znaki na ziemi\\Znaki na ziemi"
msgid "Maximize"
msgstr "Powiększ"
-msgid "Menu (\\key quit;)"
-msgstr "Menu (\\key quit;)"
-
msgid "Minimize"
msgstr "Pomniejsz"
@@ -916,6 +934,10 @@ msgstr "Za mało energii"
msgid "Not enough energy yet"
msgstr "Wciąż za mało energii"
+#, fuzzy
+msgid "Not found anything to destroy"
+msgstr "Nie ma nic do upuszczenia"
+
msgid "Not yet enough energy"
msgstr "Wciąż za mało energii"
@@ -1957,6 +1979,9 @@ msgstr "www.epsitec.com"
#~ msgid "Left Windows"
#~ msgstr "Lewy klawisz Windows"
+#~ msgid "Menu (\\key quit;)"
+#~ msgstr "Menu (\\key quit;)"
+
#~ msgid "Mini-map"
#~ msgstr "Mapka"
diff --git a/po/ru.po b/po/ru.po
index 22f84a8..8d2a257 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 17:09+0100\n"
+"POT-Creation-Date: 2014-07-10 16:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -210,6 +210,10 @@ msgstr "Построить защитную башню"
msgid "Build a derrick"
msgstr "Построить буровую вышку"
+#, fuzzy
+msgid "Build a destroyer"
+msgstr "Здание разрушено"
+
msgid "Build a exchange post"
msgstr "Построить пост по обмену сообщениями"
@@ -345,6 +349,12 @@ msgstr "Камеру вправо"
msgid "Can not create this; there are too many objects"
msgstr "Не удается это создать, слишком много объектов"
+msgid "Can not produce not researched object"
+msgstr ""
+
+msgid "Can not produce this object in this mission"
+msgstr ""
+
msgid "Can't open file"
msgstr "Невозможно открыть файл"
@@ -453,6 +463,10 @@ msgstr "Космический корабль"
msgid "Descend\\Reduces the power of the jet"
msgstr "Снижение и посадка\\Понижение мощности реактивного двигателя"
+#, fuzzy
+msgid "Destroy"
+msgstr "Уничтожитель"
+
msgid "Destroy the building"
msgstr "Уничтожить здание"
@@ -532,6 +546,10 @@ msgstr "Упражнения\\Упражнения по программиров
msgid "Exit film\\Film at the exit of exercises"
msgstr "Ролик при выходе\\Ролик во время выхода из упражнения"
+#, fuzzy
+msgid "Explode (\\key action;)"
+msgstr "Утилизация (\\key action;)"
+
msgid "Explosive"
msgstr "Взрывчатка"
@@ -629,10 +647,6 @@ msgstr "Игра\\Настройки игры"
msgid "Gantry crane"
msgstr "Козловой кран"
-#, c-format
-msgid "GetResource event num out of range: %d\n"
-msgstr "событие GetResource, число вне диапазона: %d\n"
-
msgid "Goto: destination occupied"
msgstr "Перейти: место занято"
@@ -702,6 +716,10 @@ msgstr "Неверный бот"
msgid "Inappropriate cell type"
msgstr "Батарея не подходит"
+#, fuzzy
+msgid "Inappropriate object"
+msgstr "Неверный бот"
+
msgid "Incorrect index type"
msgstr "Неверный тип индекса"
@@ -738,6 +756,9 @@ msgstr "Инструкции из Хьюстона"
msgid "Instructions\\Shows the instructions for the current mission"
msgstr "Инструкции\\Показывает инструкции по текущей миссии"
+msgid "Internal error - tell the developers"
+msgstr ""
+
msgid "Jet temperature"
msgstr "Температура реактивного двигателя"
@@ -807,9 +828,6 @@ msgstr "Метки на земле\\Метки на земле"
msgid "Maximize"
msgstr "Развернуть"
-msgid "Menu (\\key quit;)"
-msgstr "Меню (\\key выйти;)"
-
msgid "Minimize"
msgstr "Свернуть"
@@ -918,6 +936,10 @@ msgstr "Не хватает энергии"
msgid "Not enough energy yet"
msgstr "Не хватает энергии"
+#, fuzzy
+msgid "Not found anything to destroy"
+msgstr "Нечего бросить"
+
msgid "Not yet enough energy"
msgstr "Не хватает энергии"
@@ -1819,3 +1841,9 @@ msgstr "посетить"
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
+
+#~ msgid "GetResource event num out of range: %d\n"
+#~ msgstr "событие GetResource, число вне диапазона: %d\n"
+
+#~ msgid "Menu (\\key quit;)"
+#~ msgstr "Меню (\\key выйти;)"
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 9dc3943..9e23b18 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -67,7 +67,6 @@ void InitializeEventTypeTexts()
EVENT_TYPE_TEXT[EVENT_BUTTON_CANCEL] = "EVENT_BUTTON_CANCEL";
EVENT_TYPE_TEXT[EVENT_BUTTON_NEXT] = "EVENT_BUTTON_NEXT";
EVENT_TYPE_TEXT[EVENT_BUTTON_PREV] = "EVENT_BUTTON_PREV";
- EVENT_TYPE_TEXT[EVENT_BUTTON_QUIT] = "EVENT_BUTTON_QUIT";
EVENT_TYPE_TEXT[EVENT_BUTTON0] = "EVENT_BUTTON0";
EVENT_TYPE_TEXT[EVENT_BUTTON1] = "EVENT_BUTTON1";
diff --git a/src/common/event.h b/src/common/event.h
index c5eb615..1d2dbc9 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -90,7 +90,6 @@ enum EventType
EVENT_BUTTON_CANCEL = 41,
EVENT_BUTTON_NEXT = 42,
EVENT_BUTTON_PREV = 43,
- EVENT_BUTTON_QUIT = 44,
EVENT_BUTTON0 = 50,
EVENT_BUTTON1 = 51,
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index b63160d..37b1e9c 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -141,7 +141,6 @@ void InitializeRestext()
stringsEvent[EVENT_BUTTON_CANCEL] = "Cancel";
stringsEvent[EVENT_BUTTON_NEXT] = "Next";
stringsEvent[EVENT_BUTTON_PREV] = "Previous";
- stringsEvent[EVENT_BUTTON_QUIT] = "Menu (\\key quit;)";
stringsEvent[EVENT_DIALOG_OK] = "OK";
stringsEvent[EVENT_DIALOG_CANCEL] = "Cancel";
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 76c234d..83b9fc9 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -859,8 +859,6 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
CBotProgram::DefineNum("ResearchSubber", RESEARCH_SUBM);
CBotProgram::DefineNum("ResearchSniffer", RESEARCH_SNIFFER);
-//? CBotProgram::
-
CBotProgram::DefineNum("PolskiPortalColobota", 1337);
CBotClass* bc;
@@ -1215,14 +1213,6 @@ void CRobotMain::ChangePhase(Phase phase)
m_app->ResetTimeAfterLoading();
- /*Math::Point ddim;
-
- pos.x = 620.0f/640.0f;
- pos.y = 460.0f/480.0f;
- ddim.x = 20.0f/640.0f;
- ddim.y = 20.0f/480.0f;
- m_interface->CreateButton(pos, ddim, 11, EVENT_BUTTON_QUIT);*/
-
if (m_immediatSatCom && !loading &&
m_infoFilename[SATCOM_HUSTON][0] != 0)
StartDisplayInfo(SATCOM_HUSTON, false); // shows the instructions
@@ -1638,18 +1628,6 @@ bool CRobotMain::ProcessEvent(Event &event)
m_cameraZoom = 0.0f;
break;
- case EVENT_BUTTON_QUIT:
- if (m_movie->IsExist())
- StartDisplayInfo(SATCOM_HUSTON, false);
- else if (m_winDelay > 0.0f)
- ChangePhase(PHASE_WIN);
- else if (m_lostDelay > 0.0f)
-
- ChangePhase(PHASE_LOST);
- else
- m_dialog->StartAbort(); // do you want to leave?
- break;
-
case EVENT_OBJECT_LIMIT:
StartShowLimit();
break;
@@ -2189,12 +2167,6 @@ void CRobotMain::StartDisplayInfo(const char *filename,
int index)
m_sound->MuteAll(true);
}
- Ui::CButton* pb =
static_cast<Ui::CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if (pb != nullptr)
- {
- pb->ClearState(Ui::STATE_VISIBLE);
- }
-
bool soluce = m_dialog->GetSceneSoluce();
m_displayInfo = new Ui::CDisplayInfo();
@@ -2223,10 +2195,6 @@ void CRobotMain::StopDisplayInfo()
if (!m_editLock)
{
- Ui::CButton* pb =
static_cast<Ui::CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if (pb != nullptr)
- pb->SetState(Ui::STATE_VISIBLE);
-
SelectObject(m_infoObject, false); // gives the command buttons
m_displayText->HideText(false);
@@ -2264,20 +2232,12 @@ void CRobotMain::StartSuspend()
m_infoObject = DeselectAll(); // removes the control buttons
m_displayText->HideText(true);
- Ui::CButton* pb =
static_cast<Ui::CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if (pb != nullptr)
- pb->ClearState(Ui::STATE_VISIBLE);
-
m_suspend = true;
}
//! End of dialogue during the game
void CRobotMain::StopSuspend()
{
- Ui::CButton* pb =
static_cast<Ui::CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if (pb != nullptr)
- pb->SetState(Ui::STATE_VISIBLE);
-
SelectObject(m_infoObject, false); // gives the command buttons
m_map->ShowMap(m_mapShow);
m_displayText->HideText(false);
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 11f8f4a..e09e5a0 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -5852,12 +5852,6 @@ void CMainDialog::StartDialog(Math::Point dim, bool
bFire, bool bOK, bool bCance
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW8));
if ( pw != 0 ) pw->ClearState(STATE_ENABLE);
- pb = static_cast<CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if ( pb != 0 )
- {
- pb->ClearState(STATE_VISIBLE);
- }
-
m_bDialogFire = bFire;
std::string name;
@@ -6040,12 +6034,6 @@ void CMainDialog::StopDialog()
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW8));
if ( pw != 0 ) pw->SetState(STATE_ENABLE);
- pb = static_cast<CButton*>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if ( pb != 0 )
- {
- pb->SetState(STATE_VISIBLE);
- }
-
StopSuspend();
m_interface->DeleteControl(EVENT_WINDOW9);
m_bDialog = false;
diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp
index f83704e..91e4ea2 100644
--- a/src/ui/studio.cpp
+++ b/src/ui/studio.cpp
@@ -573,10 +573,6 @@ void CStudio::StartEditScript(CScript *script, std::string
name, int rank)
m_bRealTime = m_bRunning;
m_script->SetStepMode(!m_bRealTime);
- button = static_cast< CButton*
>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if (button != nullptr)
- button->ClearState(STATE_VISIBLE);
-
pos = m_editFinalPos = m_editActualPos = m_main->GetWindowPos();
dim = m_editFinalDim = m_editActualDim = m_main->GetWindowDim();
pw = m_interface->CreateWindows(pos, dim, 8, EVENT_WINDOW3);
@@ -877,12 +873,6 @@ bool CStudio::StopEditScript(bool bCancel)
m_interface->DeleteControl(EVENT_WINDOW3);
- button = static_cast< CButton*
>(m_interface->SearchControl(EVENT_BUTTON_QUIT));
- if ( button != 0 )
- {
- button->SetState(STATE_VISIBLE);
- }
-
m_pause->SetPause(m_bInitPause);
m_sound->MuteAll(false);
m_main->SetEditLock(false, true);
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/colobot.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
