[colobot] 17/390: Removed some old stuff related to Ceebot-Teen
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit 9a6c06665cc35f22b2e0400897b91fd65d0bdee5
Author: krzys-h <krzys_h at interia.pl>
Date: Thu Jul 10 17:39:45 2014 +0200
Removed some old stuff related to Ceebot-Teen
---
po/colobot.pot | 5 +----
po/de.po | 8 ++++----
po/fr.po | 8 ++++----
po/pl.po | 8 ++++----
po/ru.po | 8 ++++----
src/common/event.cpp | 1 -
src/common/event.h | 1 -
src/common/restext.cpp | 3 ---
src/common/restext.h | 2 --
src/object/robotmain.h | 1 -
src/ui/maindialog.cpp | 20 +-------------------
11 files changed, 18 insertions(+), 47 deletions(-)
diff --git a/po/colobot.pot b/po/colobot.pot
index 4695600..dcab349 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: 2014-07-10 16:50+0200\n"
+"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -110,9 +110,6 @@ msgstr ""
msgid " Missions on this level:"
msgstr ""
-msgid " Free game on this chapter:"
-msgstr ""
-
msgid " Summary:"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 9f4c3bd..e5f8507 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-10 16:50+0200\n"
+"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,9 +24,6 @@ msgstr " Driver:"
msgid " Exercises in the chapter:"
msgstr " Liste der Übungen des Kapitels:"
-msgid " Free game on this chapter:"
-msgstr " Liste der freien Levels des Kapitel:"
-
msgid " Free game on this planet:"
msgstr " Liste der freien Levels des Planeten:"
@@ -1831,6 +1828,9 @@ msgstr ""
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
+#~ msgid " Free game on this chapter:"
+#~ msgstr " Liste der freien Levels des Kapitel:"
+
#~ msgid "< none >"
#~ msgstr "< keine >"
diff --git a/po/fr.po b/po/fr.po
index 291193c..ccd618c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-10 16:50+0200\n"
+"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"PO-Revision-Date: 2012-12-27 14:07+0100\n"
"Last-Translator: Didier Raboud <odyx at debian.org>\n"
"Language: fr\n"
@@ -29,9 +29,6 @@ msgstr " Pilotes :"
msgid " Exercises in the chapter:"
msgstr " Liste des exercices du chapitre :"
-msgid " Free game on this chapter:"
-msgstr " Liste des jeux libres du chapitre :"
-
msgid " Free game on this planet:"
msgstr " Liste des jeux libres du chapitre :"
@@ -1838,6 +1835,9 @@ msgstr ""
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
+#~ msgid " Free game on this chapter:"
+#~ msgstr " Liste des jeux libres du chapitre :"
+
#~ msgid "< none >"
#~ msgstr "< aucune >"
diff --git a/po/pl.po b/po/pl.po
index 06ca367..3713163 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-10 16:50+0200\n"
+"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -25,9 +25,6 @@ msgstr " Sterowniki:"
msgid " Exercises in the chapter:"
msgstr " Ćwiczenia w tym rozdziale:"
-msgid " Free game on this chapter:"
-msgstr " Swobodna gra na tej planecie:"
-
msgid " Free game on this planet:"
msgstr " Swobodna gra na tej planecie:"
@@ -1841,6 +1838,9 @@ msgstr ""
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
+#~ msgid " Free game on this chapter:"
+#~ msgstr " Swobodna gra na tej planecie:"
+
#~ msgid "< none >"
#~ msgstr "< brak >"
diff --git a/po/ru.po b/po/ru.po
index 8d2a257..09bb3c8 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: 2014-07-10 16:50+0200\n"
+"POT-Creation-Date: 2014-07-10 17:39+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -34,9 +34,6 @@ msgstr " Драйверы:"
msgid " Exercises in the chapter:"
msgstr " Упражнения в разделе:"
-msgid " Free game on this chapter:"
-msgstr " Свободная игра на этой главе:"
-
msgid " Free game on this planet:"
msgstr " Свободная игра на этой планете:"
@@ -1842,6 +1839,9 @@ msgstr "посетить"
msgid "www.epsitec.com"
msgstr "www.epsitec.com"
+#~ msgid " Free game on this chapter:"
+#~ msgstr " Свободная игра на этой главе:"
+
#~ msgid "GetResource event num out of range: %d\n"
#~ msgstr "событие GetResource, число вне диапазона: %d\n"
diff --git a/src/common/event.cpp b/src/common/event.cpp
index 9e23b18..fc5bc98 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -169,7 +169,6 @@ void InitializeEventTypeTexts()
EVENT_TYPE_TEXT[EVENT_INTERFACE_READ] = "EVENT_INTERFACE_READ";
EVENT_TYPE_TEXT[EVENT_INTERFACE_ABORT] = "EVENT_INTERFACE_ABORT";
EVENT_TYPE_TEXT[EVENT_INTERFACE_USER] = "EVENT_INTERFACE_USER";
- EVENT_TYPE_TEXT[EVENT_INTERFACE_TEEN] = "EVENT_INTERFACE_TEEN";
EVENT_TYPE_TEXT[EVENT_INTERFACE_CHAP] = "EVENT_INTERFACE_CHAP";
EVENT_TYPE_TEXT[EVENT_INTERFACE_LIST] = "EVENT_INTERFACE_LIST";
diff --git a/src/common/event.h b/src/common/event.h
index 1d2dbc9..220b807 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -192,7 +192,6 @@ enum EventType
EVENT_INTERFACE_READ = 411,
EVENT_INTERFACE_ABORT = 412,
EVENT_INTERFACE_USER = 413,
- EVENT_INTERFACE_TEEN = 414,
EVENT_INTERFACE_CHAP = 420,
EVENT_INTERFACE_LIST = 421,
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 37b1e9c..2248f2b 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -61,7 +61,6 @@ void InitializeRestext()
stringsText[RT_TITLE_DEFI] = "Challenges";
stringsText[RT_TITLE_MISSION] = "Missions";
stringsText[RT_TITLE_FREE] = "Free game";
- stringsText[RT_TITLE_TEEN] = "Free game";
stringsText[RT_TITLE_USER] = "User levels";
stringsText[RT_TITLE_SETUP] = "Options";
stringsText[RT_TITLE_NAME] = "Player's name";
@@ -80,7 +79,6 @@ void InitializeRestext()
stringsText[RT_PLAY_LISTm] = " Missions on this planet:";
stringsText[RT_PLAY_LISTf] = " Free game on this planet:";
stringsText[RT_PLAY_LISTu] = " Missions on this level:";
- stringsText[RT_PLAY_LISTk] = " Free game on this chapter:";
stringsText[RT_PLAY_RESUME] = " Summary:";
stringsText[RT_SETUP_DEVICE] = " Drivers:";
@@ -149,7 +147,6 @@ void InitializeRestext()
stringsEvent[EVENT_INTERFACE_DEFI] = "Challenges\\Programming challenges";
stringsEvent[EVENT_INTERFACE_MISSION] = "Missions\\Select mission";
stringsEvent[EVENT_INTERFACE_FREE] = "Free game\\Free game without a specific goal";
- stringsEvent[EVENT_INTERFACE_TEEN] = "Free game\\Free game without a specific goal";
stringsEvent[EVENT_INTERFACE_USER] = "User\\User levels";
stringsEvent[EVENT_INTERFACE_NAME] = "Change player\\Change player";
stringsEvent[EVENT_INTERFACE_SETUP] = "Options\\Preferences";
diff --git a/src/common/restext.h b/src/common/restext.h
index cde7203..d145f24 100644
--- a/src/common/restext.h
+++ b/src/common/restext.h
@@ -72,7 +72,6 @@ enum ResTextType
RT_TITLE_WRITE = 50,
RT_TITLE_READ = 51,
RT_TITLE_USER = 52,
- RT_TITLE_TEEN = 53,
RT_PLAY_CHAPt = 60,
RT_PLAY_CHAPd = 61,
@@ -86,7 +85,6 @@ enum ResTextType
RT_PLAY_CHAPu = 71,
RT_PLAY_LISTu = 72,
RT_PLAY_CHAPte = 73,
- RT_PLAY_LISTk = 74,
RT_SETUP_DEVICE = 80,
RT_SETUP_MODE = 81,
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 71ad455..19e9e7d 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -44,7 +44,6 @@ enum Phase
PHASE_DEFI,
PHASE_MISSION,
PHASE_FREE,
- PHASE_TEEN,
PHASE_USER,
PHASE_LOADING,
PHASE_SIMUL,
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index e09e5a0..39e7aa9 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -703,7 +703,6 @@ void CMainDialog::ChangePhase(Phase phase)
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
if ( m_phase == PHASE_TRAINER ) m_index = 0;
@@ -711,7 +710,6 @@ void CMainDialog::ChangePhase(Phase phase)
if ( m_phase == PHASE_MISSION ) m_index = 2;
if ( m_phase == PHASE_FREE ) m_index = 3;
if ( m_phase == PHASE_USER ) m_index = 4;
- if ( m_phase == PHASE_TEEN ) m_index = 6;
if ( m_phase == PHASE_FREE )
{
@@ -724,7 +722,6 @@ void CMainDialog::ChangePhase(Phase phase)
if ( m_phase == PHASE_DEFI ) strcpy(m_sceneName, "defi" );
if ( m_phase == PHASE_MISSION ) strcpy(m_sceneName, "scene");
if ( m_phase == PHASE_FREE ) strcpy(m_sceneName, "free");
- if ( m_phase == PHASE_TEEN ) strcpy(m_sceneName, "teen");
if ( m_phase == PHASE_USER ) strcpy(m_sceneName, "user");
ReadGamerInfo();
@@ -739,7 +736,6 @@ void CMainDialog::ChangePhase(Phase phase)
if ( m_phase == PHASE_DEFI ) res = RT_TITLE_DEFI;
if ( m_phase == PHASE_MISSION ) res = RT_TITLE_MISSION;
if ( m_phase == PHASE_FREE ) res = RT_TITLE_FREE;
- if ( m_phase == PHASE_TEEN ) res = RT_TITLE_TEEN;
if ( m_phase == PHASE_USER ) res = RT_TITLE_USER;
GetResource(RES_TEXT, res, name);
pw->SetName(name);
@@ -764,7 +760,6 @@ void CMainDialog::ChangePhase(Phase phase)
if ( m_phase == PHASE_DEFI ) res = RT_PLAY_CHAPd;
if ( m_phase == PHASE_MISSION ) res = RT_PLAY_CHAPm;
if ( m_phase == PHASE_FREE ) res = RT_PLAY_CHAPf;
- if ( m_phase == PHASE_TEEN ) res = RT_PLAY_CHAPte;
if ( m_phase == PHASE_USER ) res = RT_PLAY_CHAPu;
GetResource(RES_TEXT, res, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL11, name);
@@ -787,7 +782,6 @@ void CMainDialog::ChangePhase(Phase phase)
if ( m_phase == PHASE_DEFI ) res = RT_PLAY_LISTd;
if ( m_phase == PHASE_MISSION ) res = RT_PLAY_LISTm;
if ( m_phase == PHASE_FREE ) res = RT_PLAY_LISTf;
- if ( m_phase == PHASE_TEEN ) res = RT_PLAY_LISTk;
if ( m_phase == PHASE_USER ) res = RT_PLAY_LISTu;
GetResource(RES_TEXT, res, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name);
@@ -824,8 +818,7 @@ void CMainDialog::ChangePhase(Phase phase)
// Button displays the "soluce":
if ( m_phase != PHASE_TRAINER &&
- m_phase != PHASE_FREE &&
- m_phase != PHASE_TEEN )
+ m_phase != PHASE_FREE )
{
pos.x = ox+sx*9.5f;
pos.y = oy+sy*5.8f;
@@ -1684,7 +1677,6 @@ void CMainDialog::ChangePhase(Phase phase)
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg ||
@@ -1948,10 +1940,6 @@ bool CMainDialog::EventProcess(const Event &event)
m_main->ChangePhase(PHASE_FREE);
break;
- case EVENT_INTERFACE_TEEN:
- m_main->ChangePhase(PHASE_TEEN);
- break;
-
case EVENT_INTERFACE_USER:
m_main->ChangePhase(PHASE_USER);
break;
@@ -2158,7 +2146,6 @@ bool CMainDialog::EventProcess(const Event &event)
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
@@ -2177,7 +2164,6 @@ bool CMainDialog::EventProcess(const Event &event)
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
switch( event.type )
@@ -2820,7 +2806,6 @@ void CMainDialog::GlintMove()
m_phase == PHASE_TRAINER ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl));
@@ -3045,7 +3030,6 @@ void CMainDialog::FrameParticle(float rTime)
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg ||
@@ -4394,7 +4378,6 @@ void CMainDialog::AllMissionUpdate()
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
UpdateSceneChap(m_chap[m_index]);
@@ -4655,7 +4638,6 @@ void CMainDialog::ShowSoluceUpdate()
m_phase == PHASE_DEFI ||
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
- m_phase == PHASE_TEEN ||
m_phase == PHASE_USER )
{
m_bSceneSoluce = false;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list