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

Removed prototypes support

dev-ui
krzys-h 2013-12-27 20:36:11 +01:00
parent ad9b53a02f
commit 246b7e107e
13 changed files with 14 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
po/colobot.pot
View File

@ -68,9 +68,6 @@ msgstr ""
msgid "User levels"
msgstr ""
msgid "Prototypes"
msgstr ""
msgid "Options"
msgstr ""
@ -110,9 +107,6 @@ msgstr ""
msgid " Missions on this level:"
msgstr ""
msgid " Prototypes on this planet:"
msgstr ""
msgid " Free game on this chapter:"
msgstr ""
@ -276,9 +270,6 @@ msgstr ""
msgid "User\\User levels"
msgstr ""
msgid "Proto\\Prototypes under development"
msgstr ""
msgid "Change player\\Change player"
msgstr ""

14
po/de.po
View File

@ -39,9 +39,6 @@ msgstr " Liste der Missionen des Planeten:"
msgid " Planets:"
msgstr " Liste der Planeten:"
msgid " Prototypes on this planet:"
msgstr " Liste der Prototypen des Planeten:"
msgid " Resolution:"
msgstr " Auflösung:"
@ -88,15 +85,12 @@ msgstr "3D-Geräusche\\Orten der Geräusche im Raum"
msgid "<< Back \\Back to the previous screen"
msgstr "<< Zurück \\Zurück zum Hauptmenü"
#, fuzzy
msgid "<<< Sorry; mission failed >>>"
msgstr "<<< Mission gescheitert >>>"
#, fuzzy
msgid "<<< Well done; mission accomplished >>>"
msgstr "<<< Bravo, Mission vollendet >>>"
#, fuzzy
msgid "A label must be followed by \"for\"; \"while\"; \"do\" or \"switch\""
msgstr ""
"Ein Label kann nur vor den Anweisungen \"for\", \"while\", \"do\" oder "
@ -338,7 +332,6 @@ msgstr "Kamera links"
msgid "Camera to right"
msgstr "Kamera rechts"
#, fuzzy
msgid "Can not create this; there are too many objects"
msgstr "Kein neues Objekt kann erstellt werden (zu viele vorhanden)"
@ -702,7 +695,6 @@ msgstr "Falscher Batterietyp"
msgid "Incorrect index type"
msgstr "Falscher Typ für einen Index"
#, fuzzy
msgid "Infected by a virus; temporarily out of order"
msgstr "Von Virus infiziert, zeitweise außer Betrieb"
@ -1114,12 +1106,6 @@ msgstr "Hilfe CBOT-Sprache\\Hilfe über die Programmiersprache CBOT"
msgid "Programs dispatched by Houston"
msgstr "Von Houston übermittelte Programme"
msgid "Proto\\Prototypes under development"
msgstr "Proto\\In Entwicklung befindliche Prototypen"
msgid "Prototypes"
msgstr "Prototypen"
msgid "Public required"
msgstr "Hier muss das Wort \"public\" stehen"

9
po/fr.po
View File

@ -44,9 +44,6 @@ msgstr " Liste des missions du chapitre :"
msgid " Planets:"
msgstr " Liste des planètes :"
msgid " Prototypes on this planet:"
msgstr " Liste des prototypes du chapitre :"
msgid " Resolution:"
msgstr " Résolutions :"
@ -1115,12 +1112,6 @@ msgstr "Instructions programmation\\Explication sur la programmation"
msgid "Programs dispatched by Houston"
msgstr "Programmes envoyés par Houston"
msgid "Proto\\Prototypes under development"
msgstr "Proto\\Prototypes en cours d'élaboration"
msgid "Prototypes"
msgstr "Prototypes"
msgid "Public required"
msgstr "Public requis"

11
po/pl.po
View File

@ -26,7 +26,7 @@ msgid " Exercises in the chapter:"
msgstr " Ćwiczenia w tym rozdziale:"
msgid " Free game on this chapter:"
msgstr " Prototypy na tej planecie:"
msgstr " Swobodna gra na tej planecie:"
msgid " Free game on this planet:"
msgstr " Swobodna gra na tej planecie:"
@ -40,9 +40,6 @@ msgstr " Misje na tej planecie:"
msgid " Planets:"
msgstr " Planety:"
msgid " Prototypes on this planet:"
msgstr " Prototypy na tej planecie:"
msgid " Resolution:"
msgstr " Rozdzielczość:"
@ -1116,12 +1113,6 @@ msgstr "Podręcznik programowania\\Dostarcza szczegółową pomoc w programowani
msgid "Programs dispatched by Houston"
msgstr "Program dostarczony z Houston"
msgid "Proto\\Prototypes under development"
msgstr "Prototypy\\Prototypy w trakcie rozwijania"
msgid "Prototypes"
msgstr "Prototypy"
msgid "Public required"
msgstr "Wymagany publiczny"

12
po/ru.po
View File

@ -49,9 +49,6 @@ msgstr "Миссии на этой планете:"
msgid " Planets:"
msgstr " Планеты:"
msgid " Prototypes on this planet:"
msgstr "Прототипы на этой планете:"
msgid " Resolution:"
msgstr " Разрешение:"
@ -1113,18 +1110,11 @@ msgid "Programming help (\\key prog;)"
msgstr "Помощь в программировании (\\key prog;)"
msgid "Programming help\\Gives more detailed help with programming"
msgstr ""
"Помощь в программировании\\Дает более детальную помощь в программировании"
msgstr "Помощь в программировании\\Дает более детальную помощь в программировании"
msgid "Programs dispatched by Houston"
msgstr "Программы переданные с Хьюстона"
msgid "Proto\\Prototypes under development"
msgstr "Прототипы\\Прототипы в стадии разработки"
msgid "Prototypes"
msgstr "Прототипы"
msgid "Public required"
msgstr "Требуется общественное"

15
src/app/app.cpp
View File

@ -233,8 +233,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
OPT_DATADIR,
OPT_LANGDIR,
OPT_TEXPACK,
OPT_VBO,
OPT_PROTO
OPT_VBO
};
option options[] =
@ -250,7 +249,6 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
{ "langdir", required_argument, nullptr, OPT_LANGDIR },
{ "texpack", required_argument, nullptr, OPT_TEXPACK },
{ "vbo", required_argument, nullptr, OPT_VBO },
{ "proto", no_argument, nullptr, OPT_PROTO },
{ nullptr, 0, nullptr, 0}
};
@ -292,7 +290,6 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
GetLogger()->Message(" -langdir path set custom language directory path\n");
GetLogger()->Message(" -texpack path set path to custom texture pack\n");
GetLogger()->Message(" -vbo mode set OpenGL VBO mode (one of: auto, enable, disable)\n");
GetLogger()->Message(" -proto show prototype levels\n");
return PARSE_ARGS_HELP;
}
case OPT_DEBUG:
@ -391,11 +388,6 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
break;
}
case OPT_PROTO:
{
m_protoMode = true;
break;
}
default:
assert(false); // should never get here
}
@ -1864,11 +1856,6 @@ void CApplication::UpdatePerformanceCountersData()
}
}
bool CApplication::GetProtoMode() const
{
return m_protoMode;
}
bool CApplication::GetSceneTestMode()
{
return m_sceneTest;

2
src/app/app.h
View File

@ -360,8 +360,6 @@ public:
void StopPerformanceCounter(PerformanceCounter counter);
float GetPerformanceCounterData(PerformanceCounter counter) const;
//@}
bool GetProtoMode() const;
bool GetSceneTestMode();

1
src/common/event.cpp
View File

@ -161,7 +161,6 @@ void InitializeEventTypeTexts()
EVENT_TYPE_TEXT[EVENT_INTERFACE_DEFI] = "EVENT_INTERFACE_DEFI";
EVENT_TYPE_TEXT[EVENT_INTERFACE_MISSION] = "EVENT_INTERFACE_MISSION";
EVENT_TYPE_TEXT[EVENT_INTERFACE_FREE] = "EVENT_INTERFACE_FREE";
EVENT_TYPE_TEXT[EVENT_INTERFACE_PROTO] = "EVENT_INTERFACE_PROTO";
EVENT_TYPE_TEXT[EVENT_INTERFACE_NAME] = "EVENT_INTERFACE_NAME";
EVENT_TYPE_TEXT[EVENT_INTERFACE_SETUP] = "EVENT_INTERFACE_SETUP";
EVENT_TYPE_TEXT[EVENT_INTERFACE_QUIT] = "EVENT_INTERFACE_QUIT";

1
src/common/event.h
View File

@ -184,7 +184,6 @@ enum EventType
EVENT_INTERFACE_DEFI = 401,
EVENT_INTERFACE_MISSION = 402,
EVENT_INTERFACE_FREE = 403,
EVENT_INTERFACE_PROTO = 404,
EVENT_INTERFACE_NAME = 405,
EVENT_INTERFACE_SETUP = 406,
EVENT_INTERFACE_QUIT = 407,

4
src/common/restext.cpp
View File

@ -63,7 +63,6 @@ void InitializeRestext()
stringsText[RT_TITLE_FREE] = "Free game";
stringsText[RT_TITLE_TEEN] = "Free game";
stringsText[RT_TITLE_USER] = "User levels";
stringsText[RT_TITLE_PROTO] = "Prototypes";
stringsText[RT_TITLE_SETUP] = "Options";
stringsText[RT_TITLE_NAME] = "Player's name";
stringsText[RT_TITLE_PERSO] = "Customize your appearance";
@ -75,14 +74,12 @@ void InitializeRestext()
stringsText[RT_PLAY_CHAPm] = " Planets:";
stringsText[RT_PLAY_CHAPf] = " Planets:";
stringsText[RT_PLAY_CHAPu] = " User levels:";
stringsText[RT_PLAY_CHAPp] = " Planets:";
stringsText[RT_PLAY_CHAPte] = " Chapters:";
stringsText[RT_PLAY_LISTt] = " Exercises in the chapter:";
stringsText[RT_PLAY_LISTd] = " Challenges in the chapter:";
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_LISTp] = " Prototypes on this planet:";
stringsText[RT_PLAY_LISTk] = " Free game on this chapter:";
stringsText[RT_PLAY_RESUME] = " Summary:";
@ -155,7 +152,6 @@ void InitializeRestext()
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_PROTO] = "Proto\\Prototypes under development";
stringsEvent[EVENT_INTERFACE_NAME] = "Change player\\Change player";
stringsEvent[EVENT_INTERFACE_SETUP] = "Options\\Preferences";
stringsEvent[EVENT_INTERFACE_AGAIN] = "Restart\\Restart the mission from the beginning";

3
src/common/restext.h
View File

@ -66,7 +66,6 @@ enum ResTextType
RT_TITLE_DEFI = 43,
RT_TITLE_MISSION = 44,
RT_TITLE_FREE = 45,
RT_TITLE_PROTO = 46,
RT_TITLE_SETUP = 47,
RT_TITLE_NAME = 48,
RT_TITLE_PERSO = 49,
@ -79,12 +78,10 @@ enum ResTextType
RT_PLAY_CHAPd = 61,
RT_PLAY_CHAPm = 62,
RT_PLAY_CHAPf = 63,
RT_PLAY_CHAPp = 64,
RT_PLAY_LISTt = 65,
RT_PLAY_LISTd = 66,
RT_PLAY_LISTm = 67,
RT_PLAY_LISTf = 68,
RT_PLAY_LISTp = 69,
RT_PLAY_RESUME = 70,
RT_PLAY_CHAPu = 71,
RT_PLAY_LISTu = 72,

1
src/object/robotmain.h
View File

@ -44,7 +44,6 @@ enum Phase
PHASE_FREE,
PHASE_TEEN,
PHASE_USER,
PHASE_PROTO,
PHASE_LOADING,
PHASE_SIMUL,
PHASE_MODEL,

48
src/ui/maindialog.cpp
View File

@ -369,15 +369,11 @@ pb->SetState(STATE_SHADOW);
// #endif
#endif
// TODO: remove?
if (m_app->GetProtoMode())
{
pos.x = 139.0f/640.0f;
pos.y = 313.0f/480.0f;
ddim.x = 0.09f;
pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_PROTO);
pb->SetState(STATE_SHADOW);
}
/*pos.x = 139.0f/640.0f;
pos.y = 313.0f/480.0f;
ddim.x = 0.09f;
pb = pw->CreateButton(pos, ddim, -1, EVENT_INTERFACE_PROTO);
pb->SetState(STATE_SHADOW);*/
pos.x = 0.40f;
ddim.x = 0.20f;
@ -773,15 +769,13 @@ pb->SetState(STATE_SHADOW);
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
if ( m_phase == PHASE_TRAINER ) m_index = 0;
if ( m_phase == PHASE_DEFI ) m_index = 1;
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_PROTO ) m_index = 5;
if ( m_phase == PHASE_TEEN ) m_index = 6;
if ( m_phase == PHASE_FREE )
@ -797,7 +791,6 @@ pb->SetState(STATE_SHADOW);
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");
if ( m_phase == PHASE_PROTO ) strcpy(m_sceneName, "proto");
ReadGamerInfo();
@ -813,7 +806,6 @@ pb->SetState(STATE_SHADOW);
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;
if ( m_phase == PHASE_PROTO ) res = RT_TITLE_PROTO;
GetResource(RES_TEXT, res, name);
pw->SetName(name);
@ -862,7 +854,6 @@ pb->SetState(STATE_SHADOW);
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;
if ( m_phase == PHASE_PROTO ) res = RT_PLAY_CHAPp;
GetResource(RES_TEXT, res, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL11, name);
pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
@ -886,7 +877,6 @@ pb->SetState(STATE_SHADOW);
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;
if ( m_phase == PHASE_PROTO ) res = RT_PLAY_LISTp;
GetResource(RES_TEXT, res, name);
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL12, name);
pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
@ -1949,7 +1939,6 @@ pos.y -= 0.048f;
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO ||
m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg ||
m_phase == PHASE_SETUPp ||
@ -2233,10 +2222,6 @@ bool CMainDialog::EventProcess(const Event &event)
m_main->ChangePhase(PHASE_USER);
break;
case EVENT_INTERFACE_PROTO:
m_main->ChangePhase(PHASE_PROTO);
break;
case EVENT_INTERFACE_SETUP:
m_main->ChangePhase(m_phaseSetup);
break;
@ -2440,8 +2425,7 @@ bool CMainDialog::EventProcess(const Event &event)
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
if ( pw == 0 ) return false;
@ -2460,8 +2444,7 @@ bool CMainDialog::EventProcess(const Event &event)
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
switch( event.type )
{
@ -2488,11 +2471,6 @@ bool CMainDialog::EventProcess(const Event &event)
break;
case EVENT_INTERFACE_PLAY:
if ( m_phase == PHASE_PROTO && m_chap[m_index] == 0 && m_sel[m_index] == 0 )
{
m_main->ChangePhase(PHASE_MODEL);
break;
}
m_sceneRank = (m_chap[m_index]+1)*100+(m_sel[m_index]+1);
m_phaseTerm = m_phase;
m_main->ChangePhase(PHASE_LOADING);
@ -3109,8 +3087,7 @@ void CMainDialog::GlintMove()
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl));
if ( pg != 0 )
@ -3338,7 +3315,6 @@ void CMainDialog::FrameParticle(float rTime)
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO ||
m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg ||
m_phase == PHASE_SETUPp ||
@ -4685,8 +4661,7 @@ void CMainDialog::AllMissionUpdate()
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
UpdateSceneChap(m_chap[m_index]);
UpdateSceneList(m_chap[m_index], m_sel[m_index]);
@ -4989,8 +4964,7 @@ void CMainDialog::ShowSoluceUpdate()
m_phase == PHASE_MISSION ||
m_phase == PHASE_FREE ||
m_phase == PHASE_TEEN ||
m_phase == PHASE_USER ||
m_phase == PHASE_PROTO )
m_phase == PHASE_USER )
{
m_bSceneSoluce = false;