From 6f91442db11d76d012e5c22dc0ec6a4c963b3082 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 21 Nov 2015 17:10:14 +0100 Subject: [PATCH] Removed some more unused strings --- po/colobot.pot | 29 ++++-------------------- po/de.po | 42 +++++++++++++++++------------------ po/fr.po | 42 +++++++++++++++++------------------ po/pl.po | 42 +++++++++++++++++------------------ po/ru.po | 42 +++++++++++++++++------------------ src/common/error.h | 12 ---------- src/common/restext.cpp | 12 ---------- src/object/task/taskbuild.cpp | 20 ++--------------- src/object/task/taskbuild.h | 2 +- src/object/task/tasktake.cpp | 2 +- src/ui/displaytext.cpp | 1 - 11 files changed, 92 insertions(+), 154 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 60ef1bad..453930ac 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -1356,9 +1356,6 @@ msgstr "" msgid "Place occupied" msgstr "" -msgid "No other robot" -msgstr "" - msgid "You can not carry a radioactive object" msgstr "" @@ -1371,9 +1368,6 @@ msgstr "" msgid "Impossible under water" msgstr "" -msgid "Not enough energy" -msgstr "" - msgid "Titanium too far away" msgstr "" @@ -1401,13 +1395,7 @@ msgstr "" msgid "Can not produce not researched object" msgstr "" -msgid "Ground inappropriate" -msgstr "" - -msgid "Building too close" -msgstr "" - -msgid "Object too close" +msgid "Not enough energy" msgstr "" msgid "Nothing to recycle" @@ -1419,9 +1407,6 @@ msgstr "" msgid "Error in instruction move" msgstr "" -msgid "Object not found" -msgstr "" - msgid "Goto: inaccessible destination" msgstr "" @@ -1470,9 +1455,6 @@ msgstr "" msgid "Analysis already performed" msgstr "" -msgid "Not yet enough energy" -msgstr "" - msgid "No uranium to transform" msgstr "" @@ -1482,6 +1464,9 @@ msgstr "" msgid "No titanium" msgstr "" +msgid "Object too close" +msgstr "" + msgid "No information exchange post within range" msgstr "" @@ -1522,9 +1507,6 @@ msgstr "" msgid "Building destroyed" msgstr "" -msgid "Can not create this; there are too many objects" -msgstr "" - msgid "Unable to control enemy objects" msgstr "" @@ -1601,9 +1583,6 @@ msgstr "" msgid "Current mission saved" msgstr "" -msgid "Checkpoint crossed" -msgstr "" - msgid "Alien Queen killed" msgstr "" diff --git a/po/de.po b/po/de.po index 476e5e0b..ce9cf97a 100644 --- a/po/de.po +++ b/po/de.po @@ -313,9 +313,6 @@ msgstr "Gebäude fertiggestellt" msgid "Building destroyed" msgstr "Gebäude zerstört" -msgid "Building too close" -msgstr "Gebäude zu nahe" - msgid "Button %1" msgstr "Knopf %1" @@ -349,9 +346,6 @@ msgstr "Kamera rechts" msgid "Camera up\\Increase camera angle while visiting message origin" msgstr "" -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 "Das erforschte Objekt kann nicht produziert werden" @@ -379,9 +373,6 @@ msgstr "Anderer Spieler\\Spielername ändern" msgid "Checkpoint" msgstr "Checkpoint" -msgid "Checkpoint crossed" -msgstr "Checkpoint erreicht" - msgid "Climb\\Increases the power of the jet" msgstr "Steigen\\Leistung des Triebwerks steigern" @@ -660,9 +651,6 @@ msgstr "Grün" msgid "Green flag" msgstr "Grüne Fahne" -msgid "Ground inappropriate" -msgstr "Boden ungeeignet" - msgid "Ground not flat enough" msgstr "Boden nicht eben genug" @@ -917,9 +905,6 @@ msgstr "Keine Energie mehr" msgid "No ore in the subsoil" msgstr "Keine unterirdische Erzlagerstätte" -msgid "No other robot" -msgstr "Kein anderer Roboter" - msgid "No power cell" msgstr "Keine Batterie" @@ -959,9 +944,6 @@ msgstr "Noch nicht genug Energie" msgid "Not found anything to destroy" msgstr "Nichts zum Zerstampfen gefunden" -msgid "Not yet enough energy" -msgstr "Noch nicht genug Energie" - msgid "Nothing to analyze" msgstr "Nichts zu analysieren" @@ -1001,9 +983,6 @@ msgstr "OK\\Spieler auswählen" msgid "OK\\Close program editor and return to game" msgstr "OK\\Programm kompilieren" -msgid "Object not found" -msgstr "Das Objekt existiert nicht" - msgid "Object too close" msgstr "Gegenstand zu nahe" @@ -1826,15 +1805,24 @@ msgstr "www.epsitec.com" #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "3D-Geräusche\\Orten der Geräusche im Raum" +#~ msgid "Building too close" +#~ msgstr "Gebäude zu nahe" + #~ msgid "COLOBOT" #~ msgstr "COLOBOT" +#~ msgid "Can not create this; there are too many objects" +#~ msgstr "Kein neues Objekt kann erstellt werden (zu viele vorhanden)" + #~ msgid "Can't open file" #~ msgstr "Die Datei kann nicht geöffnet werden" #~ msgid "Cancel\\Keep current player name" #~ msgstr "Abbrechen\\Behält den bisherigen Spieler bei" +#~ msgid "Checkpoint crossed" +#~ msgstr "Checkpoint erreicht" + #~ msgid "Compass" #~ msgstr "Kompass" @@ -1863,6 +1851,9 @@ msgstr "www.epsitec.com" #~ msgid "Friendly fire\\Your shooting can damage your own objects " #~ msgstr "Eigenbeschuss\\Ihre Einheiten werden von Ihren Waffen beschädigt" +#~ msgid "Ground inappropriate" +#~ msgstr "Boden ungeeignet" + #~ msgid "Instructions after the final closing brace" #~ msgstr "Hier ist eine Anweisung nach dem Ende des Programms" @@ -1875,9 +1866,18 @@ msgstr "www.epsitec.com" #~ msgid "Mouse shadow\\Gives the mouse a shadow" #~ msgstr "Schatten unter der Maus\\Ein Schatten erscheint unter der Maus" +#~ msgid "No other robot" +#~ msgstr "Kein anderer Roboter" + +#~ msgid "Not yet enough energy" +#~ msgstr "Noch nicht genug Energie" + #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion" +#~ msgid "Object not found" +#~ msgstr "Das Objekt existiert nicht" + #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne" diff --git a/po/fr.po b/po/fr.po index 3293ab45..ed5d83d4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -306,9 +306,6 @@ msgstr "Bâtiment terminé" msgid "Building destroyed" msgstr "Bâtiment détruit" -msgid "Building too close" -msgstr "Bâtiment trop proche" - msgid "Button %1" msgstr "Bouton %1" @@ -346,9 +343,6 @@ msgstr "" "Caméra plus haute\\Augmente l'angle de caméra lors de la vue de l'origine " "des messages" -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 "Impossible de créer un objet n'ayant pas été recherché" @@ -376,9 +370,6 @@ msgstr "Autre joueur\\Choix du nom du joueur" msgid "Checkpoint" msgstr "Indicateur" -msgid "Checkpoint crossed" -msgstr "Indicateur atteint" - msgid "Climb\\Increases the power of the jet" msgstr "Monter\\Augmenter la puissance du réacteur" @@ -655,9 +646,6 @@ msgstr "Vert" msgid "Green flag" msgstr "Drapeau vert" -msgid "Ground inappropriate" -msgstr "Terrain inadapté" - msgid "Ground not flat enough" msgstr "Sol pas assez plat" @@ -909,9 +897,6 @@ msgstr "Plus d'énergie" msgid "No ore in the subsoil" msgstr "Pas de minerai en sous-sol" -msgid "No other robot" -msgstr "Pas d'autre robot" - msgid "No power cell" msgstr "Pas de pile" @@ -951,9 +936,6 @@ msgstr "Pas encore assez d'énergie" msgid "Not found anything to destroy" msgstr "Rien trouvé à détruire" -msgid "Not yet enough energy" -msgstr "Pas encore assez d'énergie" - msgid "Nothing to analyze" msgstr "Rien à analyser" @@ -993,9 +975,6 @@ msgstr "D'accord\\Choisir le joueur" msgid "OK\\Close program editor and return to game" msgstr "D'accord\\Compiler le programme" -msgid "Object not found" -msgstr "Objet n'existe pas" - msgid "Object too close" msgstr "Objet trop proche" @@ -1813,15 +1792,24 @@ msgstr "www.epsitec.com" #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "Bruitages 3D\\Positionnement sonore dans l'espace" +#~ msgid "Building too close" +#~ msgstr "Bâtiment trop proche" + #~ msgid "COLOBOT" #~ msgstr "COLOBOT" +#~ msgid "Can not create this; there are too many objects" +#~ msgstr "Création impossible; il y a trop d'objets" + #~ msgid "Can't open file" #~ msgstr "Ouverture du fichier impossible" #~ msgid "Cancel\\Keep current player name" #~ msgstr "Annuler\\Conserver le joueur actuel" +#~ msgid "Checkpoint crossed" +#~ msgstr "Indicateur atteint" + #~ msgid "Compass" #~ msgstr "Boussole" @@ -1850,6 +1838,9 @@ msgstr "www.epsitec.com" #~ msgid "Friendly fire\\Your shooting can damage your own objects " #~ msgstr "Dégâts à soi-même\\Vos tirs infligent des dommages à vos unités" +#~ msgid "Ground inappropriate" +#~ msgstr "Terrain inadapté" + #~ msgid "Instructions after the final closing brace" #~ msgstr "Instructions après la fin" @@ -1862,9 +1853,18 @@ msgstr "www.epsitec.com" #~ msgid "Mouse shadow\\Gives the mouse a shadow" #~ msgstr "Souris ombrée\\Jolie souris avec une ombre" +#~ msgid "No other robot" +#~ msgstr "Pas d'autre robot" + +#~ msgid "Not yet enough energy" +#~ msgstr "Pas encore assez d'énergie" + #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables" +#~ msgid "Object not found" +#~ msgstr "Objet n'existe pas" + #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel" diff --git a/po/pl.po b/po/pl.po index a88c90f5..d4572786 100644 --- a/po/pl.po +++ b/po/pl.po @@ -316,9 +316,6 @@ msgstr "Budowa zakończona" msgid "Building destroyed" msgstr "Budynek zniszczony" -msgid "Building too close" -msgstr "Budynek za blisko" - msgid "Button %1" msgstr "Przycisk %1" @@ -352,9 +349,6 @@ msgstr "Camera to right" msgid "Camera up\\Increase camera angle while visiting message origin" msgstr "Kamera w górę\\Podnieś kamerę podczas sprawdzania źródła wiadomości" -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 "Nie można wyprodukować nie wynalezionego obiektu" @@ -382,9 +376,6 @@ msgstr "Zmień gracza\\Zmień gracza" msgid "Checkpoint" msgstr "Punkt kontrolny" -msgid "Checkpoint crossed" -msgstr "Przekroczono punkt kontrolny" - msgid "Climb\\Increases the power of the jet" msgstr "W górę\\Zwiększa moc silnika" @@ -661,9 +652,6 @@ msgstr "Zielony" msgid "Green flag" msgstr "Zielona flaga" -msgid "Ground inappropriate" -msgstr "Nieodpowiedni teren" - msgid "Ground not flat enough" msgstr "Powierzchnia nie jest wystarczająco płaska" @@ -915,9 +903,6 @@ msgstr "Nie ma więcej energii" msgid "No ore in the subsoil" msgstr "W ziemi nie ma żadnej rudy" -msgid "No other robot" -msgstr "Brak innego robota" - msgid "No power cell" msgstr "Brak ogniwa elektrycznego" @@ -957,9 +942,6 @@ msgstr "Wciąż za mało energii" msgid "Not found anything to destroy" msgstr "Nie znaleziono nic do zniszczenia" -msgid "Not yet enough energy" -msgstr "Wciąż za mało energii" - msgid "Nothing to analyze" msgstr "Nie ma niczego do zanalizowania" @@ -999,9 +981,6 @@ msgstr "OK\\Wybiera zaznaczonego gracza" msgid "OK\\Close program editor and return to game" msgstr "OK\\Zamyka edytor programu i powraca do gry" -msgid "Object not found" -msgstr "Obiekt nieznany" - msgid "Object too close" msgstr "Obiekt za blisko" @@ -1811,12 +1790,21 @@ msgstr "www.epsitec.com" #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "Dźwięk 3D\\Przestrzenne pozycjonowanie dźwięków" +#~ msgid "Building too close" +#~ msgstr "Budynek za blisko" + +#~ msgid "Can not create this; there are too many objects" +#~ msgstr "Nie można tego utworzyć, za dużo obiektów" + #~ msgid "Can't open file" #~ msgstr "Nie można otworzyć pliku" #~ msgid "Cancel\\Keep current player name" #~ msgstr "Anuluj\\Zachowuje bieżące imię gracza" +#~ msgid "Checkpoint crossed" +#~ msgstr "Przekroczono punkt kontrolny" + #~ msgid "Compass" #~ msgstr "Kompas" @@ -1841,6 +1829,9 @@ msgstr "www.epsitec.com" #~ msgid "Friendly fire\\Your shooting can damage your own objects " #~ msgstr "Przyjacielski ogień\\Własne strzały uszkadzają Twoje obiekty" +#~ msgid "Ground inappropriate" +#~ msgstr "Nieodpowiedni teren" + #~ msgid "Instructions after the final closing brace" #~ msgstr "Polecenie po końcowej klamrze zamykającej" @@ -1857,10 +1848,19 @@ msgstr "www.epsitec.com" #~ msgid "Mouse shadow\\Gives the mouse a shadow" #~ msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy" +#~ msgid "No other robot" +#~ msgstr "Brak innego robota" + +#~ msgid "Not yet enough energy" +#~ msgstr "Wciąż za mało energii" + #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "" #~ "Ilość elementów dekoracyjnych \\Ilość elementów czysto dekoracyjnych" +#~ msgid "Object not found" +#~ msgstr "Obiekt nieznany" + #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Planety i gwiazdy\\Obiekty astronomiczne na niebie" diff --git a/po/ru.po b/po/ru.po index a1d01eb7..dad69058 100644 --- a/po/ru.po +++ b/po/ru.po @@ -308,9 +308,6 @@ msgstr "Здание построено" msgid "Building destroyed" msgstr "Здание разрушено" -msgid "Building too close" -msgstr "Здание слишком близко" - msgid "Button %1" msgstr "Кнопка %1" @@ -344,9 +341,6 @@ msgstr "Камеру вправо" msgid "Camera up\\Increase camera angle while visiting message origin" msgstr "" -msgid "Can not create this; there are too many objects" -msgstr "Не удается это создать, слишком много объектов" - msgid "Can not produce not researched object" msgstr "" @@ -374,9 +368,6 @@ msgstr "Новый игрок\\Выберите имя для игрока" msgid "Checkpoint" msgstr "Контрольная точка" -msgid "Checkpoint crossed" -msgstr "Вы прошли контрольную точку" - msgid "Climb\\Increases the power of the jet" msgstr "Взлет и подъем\\Увеличивает мощность реактивного двигателя" @@ -654,9 +645,6 @@ msgstr "Зеленый" msgid "Green flag" msgstr "Зеленый флаг" -msgid "Ground inappropriate" -msgstr "Земля не подходит" - msgid "Ground not flat enough" msgstr "Земля недостаточно плоская" @@ -910,9 +898,6 @@ msgstr "Нет энергии" msgid "No ore in the subsoil" msgstr "" -msgid "No other robot" -msgstr "Нет робота" - msgid "No power cell" msgstr "Нет батареи" @@ -952,9 +937,6 @@ msgstr "Не хватает энергии" msgid "Not found anything to destroy" msgstr "" -msgid "Not yet enough energy" -msgstr "Не хватает энергии" - msgid "Nothing to analyze" msgstr "Нечего анализировать" @@ -994,9 +976,6 @@ msgstr "ОК\\Выбрать игрока" msgid "OK\\Close program editor and return to game" msgstr "ОК\\Закрыть редактор программ и вернуться к игре" -msgid "Object not found" -msgstr "Объект не найден" - msgid "Object too close" msgstr "Объект слишком близок" @@ -1817,15 +1796,24 @@ msgstr "www.epsitec.com" #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "3D-звук\\Стерео звук" +#~ msgid "Building too close" +#~ msgstr "Здание слишком близко" + #~ msgid "COLOBOT" #~ msgstr "КОЛОБОТ" +#~ msgid "Can not create this; there are too many objects" +#~ msgstr "Не удается это создать, слишком много объектов" + #~ msgid "Can't open file" #~ msgstr "Невозможно открыть файл" #~ msgid "Cancel\\Keep current player name" #~ msgstr "Отмена\\Отмена" +#~ msgid "Checkpoint crossed" +#~ msgstr "Вы прошли контрольную точку" + #~ msgid "Compass" #~ msgstr "Компас" @@ -1854,6 +1842,9 @@ msgstr "www.epsitec.com" #~ msgid "Friendly fire\\Your shooting can damage your own objects " #~ msgstr "Огонь по своим\\Вы можете повредить собственные объекты" +#~ msgid "Ground inappropriate" +#~ msgstr "Земля не подходит" + #~ msgid "Instructions after the final closing brace" #~ msgstr "Инструкция после последней закрывающей фигурной скобки" @@ -1866,9 +1857,18 @@ msgstr "www.epsitec.com" #~ msgid "Mouse shadow\\Gives the mouse a shadow" #~ msgstr "Тень мыши\\Мышь отбрасывает тень" +#~ msgid "No other robot" +#~ msgstr "Нет робота" + +#~ msgid "Not yet enough energy" +#~ msgstr "Не хватает энергии" + #~ msgid "Num of decorative objects\\Number of purely ornamental objects" #~ msgstr "Количество декораций\\Количество декоративных объектов" +#~ msgid "Object not found" +#~ msgstr "Объект не найден" + #~ msgid "Planets and stars\\Astronomical objects in the sky" #~ msgstr "Планеты и звезды\\Астрономические объекты в небе" diff --git a/src/common/error.h b/src/common/error.h index f638a06d..d7352980 100644 --- a/src/common/error.h +++ b/src/common/error.h @@ -36,13 +36,11 @@ enum Error ERR_MANIP_NIL = 103, //! < taking: nothing has to take ERR_MANIP_MOTOR = 105, //! < busy: impossible to move ERR_MANIP_OCC = 106, //! < busy: location already occupied - ERR_MANIP_FRIEND = 107, //! < no other vehicle ERR_MANIP_RADIO = 108, //! < impossible because radioactive ERR_MANIP_WATER = 109, //! < not possible under water ERR_MANIP_EMPTY = 110, //! < nothing to deposit ERR_BUILD_FLY = 120, //! < not possible in flight ERR_BUILD_WATER = 121, //! < not possible under water - ERR_BUILD_ENERGY = 122, //! < not enough energy ERR_BUILD_METALAWAY = 123, //! < lack of metal (too far) ERR_BUILD_METALNEAR = 124, //! < lack of metal (too close) ERR_BUILD_METALINEX = 125, //! < lack of metal @@ -57,17 +55,12 @@ enum Error ERR_SEARCH_FLY = 140, //! < not possible in flight ERR_SEARCH_MOTOR = 142, //! < impossible in movement ERR_TERRA_ENERGY = 151, //! < not enough energy - ERR_TERRA_FLOOR = 152, //! < inappropriate ground - ERR_TERRA_BUILDING = 153, //! < building too close - ERR_TERRA_OBJECT = 154, //! < object too close ERR_FIRE_ENERGY = 161, //! < not enough energy - ERR_FIRE_FLY = 162, //! < not possible in flight ERR_RECOVER_ENERGY = 171, //! < not enough energy ERR_RECOVER_NULL = 172, //! < lack of ruin ERR_CONVERT_EMPTY = 180, //! < no stone was transformed ERR_SHIELD_ENERGY = 191, //! < not enough energy ERR_MOVE_IMPOSSIBLE = 200, //! < move impossible - ERR_FIND_IMPOSSIBLE = 201, //! < find impossible ERR_GOTO_IMPOSSIBLE = 210, //! < goto impossible ERR_GOTO_ITER = 211, //! < goto too complicated ERR_GOTO_BUSY = 212, //! < goto destination occupied @@ -88,13 +81,10 @@ enum Error ERR_LABO_NULL = 350, //! < nothing to analyze ERR_LABO_BAD = 351, //! < analyzes only organic ball ERR_LABO_ALREADY = 352, //! < analysis already made - ERR_NUCLEAR_NULL = 360, //! < no energy underground - ERR_NUCLEAR_LOW = 361, //! < not enough energy ERR_NUCLEAR_EMPTY = 362, //! < lack of uranium ERR_NUCLEAR_BAD = 363, //! < transforms only uranium ERR_FACTORY_NULL = 370, //! < no metal ERR_FACTORY_NEAR = 371, //! < vehicle too close - ERR_RESET_NEAR = 380, //! < vehicle too close ERR_INFO_NULL = 390, //! < no information terminal ERR_VEH_VIRUS = 400, //! < vehicle infected by a virus ERR_BAT_VIRUS = 401, //! < building infected by a virus @@ -112,7 +102,6 @@ enum Error ERR_MISSION_NOTERM = 600, //! < Mission not completed ERR_DELETEMOBILE = 700, //! < vehicle destroyed ERR_DELETEBUILDING = 701, //! < building destroyed - ERR_TOOMANY = 702, //! < too many objects ERR_ENEMY_OBJECT = 703, //! < can't control enemy object ERR_OBLIGATORYTOKEN = 800, //! < compulsory instruction missing ERR_PROHIBITEDTOKEN = 801, //! < instruction prohibited @@ -147,7 +136,6 @@ enum Error INFO_LOST = 10041, //! < lost INFO_LOSTq = 10042, //! < lost immediately INFO_WRITEOK = 10043, //! < record done - INFO_DELETEPATH = 10050, //! < way mark deleted INFO_DELETEMOTHER = 10100, //! < insect killed INFO_DELETEANT = 10101, //! < insect killed INFO_DELETEBEE = 10102, //! < insect killed diff --git a/src/common/restext.cpp b/src/common/restext.cpp index abba791b..67ac2158 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -563,13 +563,11 @@ void InitializeRestext() stringsErr[ERR_MANIP_NIL] = TR("Nothing to grab"); stringsErr[ERR_MANIP_MOTOR] = TR("Impossible when moving"); stringsErr[ERR_MANIP_OCC] = TR("Place occupied"); - stringsErr[ERR_MANIP_FRIEND] = TR("No other robot"); stringsErr[ERR_MANIP_RADIO] = TR("You can not carry a radioactive object"); stringsErr[ERR_MANIP_WATER] = TR("You can not carry an object under water"); stringsErr[ERR_MANIP_EMPTY] = TR("Nothing to drop"); stringsErr[ERR_BUILD_FLY] = TR("Impossible when flying"); stringsErr[ERR_BUILD_WATER] = TR("Impossible under water"); - stringsErr[ERR_BUILD_ENERGY] = TR("Not enough energy"); stringsErr[ERR_BUILD_METALAWAY] = TR("Titanium too far away"); stringsErr[ERR_BUILD_METALNEAR] = TR("Titanium too close"); stringsErr[ERR_BUILD_METALINEX] = TR("No titanium around"); @@ -584,19 +582,14 @@ void InitializeRestext() stringsErr[ERR_BUILD_RESEARCH] = TR("Can not produce not researched object"); stringsErr[ERR_SEARCH_MOTOR] = TR("Impossible when moving"); stringsErr[ERR_TERRA_ENERGY] = TR("Not enough energy"); - stringsErr[ERR_TERRA_FLOOR] = TR("Ground inappropriate"); - stringsErr[ERR_TERRA_BUILDING] = TR("Building too close"); - stringsErr[ERR_TERRA_OBJECT] = TR("Object too close"); stringsErr[ERR_RECOVER_ENERGY] = TR("Not enough energy"); stringsErr[ERR_RECOVER_NULL] = TR("Nothing to recycle"); stringsErr[ERR_SHIELD_ENERGY] = TR("No more energy"); stringsErr[ERR_MOVE_IMPOSSIBLE] = TR("Error in instruction move"); - stringsErr[ERR_FIND_IMPOSSIBLE] = TR("Object not found"); stringsErr[ERR_GOTO_IMPOSSIBLE] = TR("Goto: inaccessible destination"); stringsErr[ERR_GOTO_ITER] = TR("Goto: inaccessible destination"); stringsErr[ERR_GOTO_BUSY] = TR("Goto: destination occupied"); stringsErr[ERR_FIRE_ENERGY] = TR("Not enough energy"); - stringsErr[ERR_FIRE_FLY] = TR("Impossible when flying"); stringsErr[ERR_CONVERT_EMPTY] = TR("No titanium ore to convert"); stringsErr[ERR_DERRICK_NULL] = TR("No ore in the subsoil"); stringsErr[ERR_STATION_NULL] = TR("No energy in the subsoil"); @@ -615,13 +608,10 @@ void InitializeRestext() stringsErr[ERR_LABO_NULL] = TR("Nothing to analyze"); stringsErr[ERR_LABO_BAD] = TR("Analyzes only organic matter"); stringsErr[ERR_LABO_ALREADY] = TR("Analysis already performed"); - stringsErr[ERR_NUCLEAR_NULL] = TR("No energy in the subsoil"); - stringsErr[ERR_NUCLEAR_LOW] = TR("Not yet enough energy"); stringsErr[ERR_NUCLEAR_EMPTY] = TR("No uranium to transform"); stringsErr[ERR_NUCLEAR_BAD] = TR("Transforms only uranium"); stringsErr[ERR_FACTORY_NULL] = TR("No titanium"); stringsErr[ERR_FACTORY_NEAR] = TR("Object too close"); - stringsErr[ERR_RESET_NEAR] = TR("Place occupied"); stringsErr[ERR_INFO_NULL] = TR("No information exchange post within range"); stringsErr[ERR_VEH_VIRUS] = TR("Program infected by a virus"); stringsErr[ERR_BAT_VIRUS] = TR("Infected by a virus; temporarily out of order"); @@ -639,7 +629,6 @@ void InitializeRestext() stringsErr[ERR_MISSION_NOTERM] = TR("The mission is not accomplished yet (press \\key help; for more details)"); stringsErr[ERR_DELETEMOBILE] = TR("Bot destroyed"); stringsErr[ERR_DELETEBUILDING] = TR("Building destroyed"); - stringsErr[ERR_TOOMANY] = TR("Can not create this; there are too many objects"); stringsErr[ERR_ENEMY_OBJECT] = TR("Unable to control enemy objects"); stringsErr[ERR_OBLIGATORYTOKEN] = TR("\"%s\" missing in this exercise"); stringsErr[ERR_PROHIBITEDTOKEN] = TR("Do not use in this exercise"); @@ -672,7 +661,6 @@ void InitializeRestext() stringsErr[INFO_LOST] = TR("<<< Sorry; mission failed >>>"); stringsErr[INFO_LOSTq] = TR("<<< Sorry; mission failed >>>"); stringsErr[INFO_WRITEOK] = TR("Current mission saved"); - stringsErr[INFO_DELETEPATH] = TR("Checkpoint crossed"); stringsErr[INFO_DELETEMOTHER] = TR("Alien Queen killed"); stringsErr[INFO_DELETEANT] = TR("Ant fatally wounded"); stringsErr[INFO_DELETEBEE] = TR("Wasp fatally wounded"); diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index 7f2ebce4..75851827 100644 --- a/src/object/task/taskbuild.cpp +++ b/src/object/task/taskbuild.cpp @@ -86,7 +86,7 @@ CTaskBuild::~CTaskBuild() // Creates a building. -bool CTaskBuild::CreateBuilding(Math::Vector pos, float angle) +void CTaskBuild::CreateBuilding(Math::Vector pos, float angle) { ObjectCreateParams params; params.pos = pos; @@ -117,7 +117,6 @@ bool CTaskBuild::CreateBuilding(Math::Vector pos, float angle) m_buildingPos = m_building->GetPosition(); m_buildingPos.y -= m_buildingHeight; m_building->SetPosition(m_buildingPos); - return true; } // Creates lights for the effects. @@ -280,22 +279,7 @@ bool CTaskBuild::EventProcess(const Event &event) pos = m_metal->GetPosition(); a = m_object->GetRotationY(); - if ( !CreateBuilding(pos, a+Math::PI) ) - { - m_metal->SetLock(false); // usable again - m_motion->SetAction(-1); - if (m_object->GetType() == OBJECT_HUMAN) - { - m_object->SetObjectParent(14, 0); - m_object->SetPartPosition(14, Math::Vector(-1.5f, 0.3f, -1.35f)); - m_object->SetPartRotationZ(14, Math::PI); - } - m_camera->FlushEffect(); - Abort(); - m_bError = true; - m_main->DisplayError(ERR_TOOMANY, m_object->GetPosition()); - return false; - } + CreateBuilding(pos, a+Math::PI); CreateLight(); } diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 65a19d88..618eb57c 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -61,7 +61,7 @@ public: protected: Error FlatFloor(); - bool CreateBuilding(Math::Vector pos, float angle); + void CreateBuilding(Math::Vector pos, float angle); void CreateLight(); void BlackLight(); CObject* SearchMetalObject(float &angle, float dMin, float dMax, float aLimit, Error &err); diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index 2945ec6b..635ae15d 100644 --- a/src/object/task/tasktake.cpp +++ b/src/object/task/tasktake.cpp @@ -136,7 +136,7 @@ Error CTaskTake::Start() CObject* power = dynamic_cast(other)->GetPower(); type = power->GetType(); if ( type == OBJECT_URANIUM ) return ERR_MANIP_RADIO; - if ( !power->Implements(ObjectInterfaceType::Transportable) ) return ERR_MANIP_FRIEND; // TODO: This makes no sense, probably redundant + assert(power->Implements(ObjectInterfaceType::Transportable)); //? m_camera->StartCentering(m_object, Math::PI*0.3f, -Math::PI*0.1f, 0.0f, 0.8f); m_arm = TTA_FRIEND; } diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 6a04ab65..12154ee3 100644 --- a/src/ui/displaytext.cpp +++ b/src/ui/displaytext.cpp @@ -145,7 +145,6 @@ void CDisplayText::DisplayError(Error err, Math::Vector goal, float height, err == ERR_VEH_VIRUS || err == ERR_DELETEMOBILE || err == ERR_DELETEBUILDING || - err == ERR_TOOMANY || err == INFO_LOST ) { type = TT_ERROR;