Removed a lot of useless settings (#556)
krzys-h
parent
add93cb778
commit
eda7435eb6
|
|
@ -369,27 +369,12 @@ msgstr ""
|
|||
msgid "Apply changes\\Activates the changed settings"
|
||||
msgstr ""
|
||||
|
||||
msgid "Robbie\\Your assistant"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marks on the ground\\Marks on the ground"
|
||||
msgstr ""
|
||||
|
||||
msgid "Dust\\Dust and dirt on bots and buildings"
|
||||
msgstr ""
|
||||
|
||||
msgid "Fog\\Fog"
|
||||
msgstr ""
|
||||
|
||||
msgid "Sunbeams\\Sunbeams in the sky"
|
||||
msgstr ""
|
||||
|
||||
msgid "Sky\\Clouds and nebulae"
|
||||
msgstr ""
|
||||
|
||||
msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
msgstr ""
|
||||
|
||||
msgid "Dynamic lighting\\Mobile light sources"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -399,9 +384,6 @@ msgstr ""
|
|||
msgid "Render distance\\Maximum visibility"
|
||||
msgstr ""
|
||||
|
||||
msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
msgstr ""
|
||||
|
||||
msgid "Particles in the interface\\Steam clouds and sparks in the interface"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -414,12 +396,6 @@ msgstr ""
|
|||
msgid "Film sequences\\Films before and after the missions"
|
||||
msgstr ""
|
||||
|
||||
msgid "Exit film\\Film at the exit of exercises"
|
||||
msgstr ""
|
||||
|
||||
msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
msgstr ""
|
||||
|
||||
msgid "Scrolling\\Scrolling when the mouse touches right or left border"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -962,9 +938,6 @@ msgstr ""
|
|||
msgid "Transmitted information"
|
||||
msgstr ""
|
||||
|
||||
msgid "Compass"
|
||||
msgstr ""
|
||||
|
||||
msgid "Zoom mini-map"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
|||
54
po/de.po
54
po/de.po
|
|
@ -421,9 +421,6 @@ msgstr "COLOBOT: Gold Edition"
|
|||
msgid "Command line"
|
||||
msgstr "Befehleingabe"
|
||||
|
||||
msgid "Compass"
|
||||
msgstr "Kompass"
|
||||
|
||||
msgid "Compilation ok (0 errors)"
|
||||
msgstr "Kompilieren OK (0 Fehler)"
|
||||
|
||||
|
|
@ -546,9 +543,6 @@ msgstr "Start/Stop"
|
|||
msgid "Exercises\\Programming exercises"
|
||||
msgstr "Programmieren\\Programmierübungen"
|
||||
|
||||
msgid "Exit film\\Film at the exit of exercises"
|
||||
msgstr "Zurücksetzen \\Kleine Show beim Zurücksetzen in den Übungen"
|
||||
|
||||
msgid "Explode (\\key action;)"
|
||||
msgstr "Explodieren (\\key action;)"
|
||||
|
||||
|
|
@ -628,9 +622,6 @@ msgstr "Freestyle"
|
|||
msgid "Free game\\Free game without a specific goal"
|
||||
msgstr "Freestyle\\Freies Spielen ohne vorgegebenes Ziel"
|
||||
|
||||
msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
msgstr "Eigenbeschuss\\Ihre Einheiten werden von Ihren Waffen beschädigt"
|
||||
|
||||
msgid "Full screen\\Full screen or window mode"
|
||||
msgstr "Vollbildschirm\\Vollbildschirm oder Fenster"
|
||||
|
||||
|
|
@ -850,9 +841,6 @@ msgstr "Lunar Roving Vehicle"
|
|||
msgid "MSAA\\Multisample anti-aliasing"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marks on the ground\\Marks on the ground"
|
||||
msgstr "Markierungen\\Markierungen auf dem Boden"
|
||||
|
||||
msgid "Maximize"
|
||||
msgstr "Großes Fenster"
|
||||
|
||||
|
|
@ -1005,9 +993,6 @@ msgstr "Brennstoffzelle verfügbar"
|
|||
msgid "Nuclear power station"
|
||||
msgstr "Brennstoffzellenfabrik"
|
||||
|
||||
msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion"
|
||||
|
||||
msgid "Number missing"
|
||||
msgstr "Es fehlt eine Zahl"
|
||||
|
||||
|
|
@ -1089,9 +1074,6 @@ msgstr "Ansicht der Mission"
|
|||
msgid "Place occupied"
|
||||
msgstr "Stelle schon besetzt"
|
||||
|
||||
msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne"
|
||||
|
||||
msgid "Plans for defense tower available"
|
||||
msgstr "Errichtung eines Geschützturms möglich"
|
||||
|
||||
|
|
@ -1282,9 +1264,6 @@ msgstr "Alles zurücksetzen"
|
|||
msgid "Robbie"
|
||||
msgstr "Robby"
|
||||
|
||||
msgid "Robbie\\Your assistant"
|
||||
msgstr "Robby\\Ihr Assistent"
|
||||
|
||||
msgid "Ruin"
|
||||
msgstr "Gebäuderuine"
|
||||
|
||||
|
|
@ -1401,9 +1380,6 @@ msgstr "Größe 4"
|
|||
msgid "Size 5"
|
||||
msgstr "Größe 5"
|
||||
|
||||
msgid "Sky\\Clouds and nebulae"
|
||||
msgstr "Himmel\\Himmel und Wolken"
|
||||
|
||||
msgid "Sniff (\\key action;)"
|
||||
msgstr "Schnüffeln (\\key action;)"
|
||||
|
||||
|
|
@ -1491,9 +1467,6 @@ msgstr "Farbe des Anzugs:"
|
|||
msgid "Suit\\Astronaut suit"
|
||||
msgstr "Anzug\\Raumfahrtanzug"
|
||||
|
||||
msgid "Sunbeams\\Sunbeams in the sky"
|
||||
msgstr "Sonnenstrahlen\\Sonnenstrahlen"
|
||||
|
||||
msgid "Survival kit"
|
||||
msgstr "Überlebenskit"
|
||||
|
||||
|
|
@ -1898,6 +1871,9 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "COLOBOT"
|
||||
#~ msgstr "COLOBOT"
|
||||
|
||||
#~ msgid "Compass"
|
||||
#~ msgstr "Kompass"
|
||||
|
||||
#~ msgid "Continue\\Continue the game"
|
||||
#~ msgstr "Weitermachen\\Weitermachen"
|
||||
|
||||
|
|
@ -1914,21 +1890,45 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "Do you want to quit Colobot: Gold Edition?"
|
||||
#~ msgstr "Wollen Sie COLOBOT schließen ?"
|
||||
|
||||
#~ msgid "Exit film\\Film at the exit of exercises"
|
||||
#~ msgstr "Zurücksetzen \\Kleine Show beim Zurücksetzen in den Übungen"
|
||||
|
||||
#~ msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
#~ msgstr "Eigenbeschuss\\Ihre Einheiten werden von Ihren Waffen beschädigt"
|
||||
|
||||
#~ msgid "Key word help\\More detailed help about key words"
|
||||
#~ msgstr "Hilfe über Begriff\\Hilfe über einen Begriff"
|
||||
|
||||
#~ msgid "Marks on the ground\\Marks on the ground"
|
||||
#~ msgstr "Markierungen\\Markierungen auf dem Boden"
|
||||
|
||||
#~ msgid "Mouse shadow\\Gives the mouse a shadow"
|
||||
#~ msgstr "Schatten unter der Maus\\Ein Schatten erscheint unter der Maus"
|
||||
|
||||
#~ msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
#~ msgstr "Anzahl Ziergegenstände\\Anzahl Gegenstände ohne Funktion"
|
||||
|
||||
#~ msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
#~ msgstr "Planeten und Sterne\\Kreisende Planeten und Sterne"
|
||||
|
||||
#~ msgid "Quit the mission?"
|
||||
#~ msgstr "Mission abbrechen ?"
|
||||
|
||||
#~ msgid "Quit\\Quit COLOBOT"
|
||||
#~ msgstr "Schließen\\COLOBOT schließen"
|
||||
|
||||
#~ msgid "Robbie\\Your assistant"
|
||||
#~ msgstr "Robby\\Ihr Assistent"
|
||||
|
||||
#~ msgid "Sky\\Clouds and nebulae"
|
||||
#~ msgstr "Himmel\\Himmel und Wolken"
|
||||
|
||||
#~ msgid "Speed 3.0x\\Three times faster"
|
||||
#~ msgstr "Geschwindigkeit 3.0x\\Spielgeschwindigkeit drei Mal schneller"
|
||||
|
||||
#~ msgid "Sunbeams\\Sunbeams in the sky"
|
||||
#~ msgstr "Sonnenstrahlen\\Sonnenstrahlen"
|
||||
|
||||
#~ msgid "Textures\\Quality of textures "
|
||||
#~ msgstr "Qualität der Texturen\\Qualität der Anzeige"
|
||||
|
||||
|
|
|
|||
54
po/fr.po
54
po/fr.po
|
|
@ -416,9 +416,6 @@ msgstr "COLOBOT: Gold Edition"
|
|||
msgid "Command line"
|
||||
msgstr "Console de commande"
|
||||
|
||||
msgid "Compass"
|
||||
msgstr "Boussole"
|
||||
|
||||
msgid "Compilation ok (0 errors)"
|
||||
msgstr "Compilation ok (0 erreur)"
|
||||
|
||||
|
|
@ -541,9 +538,6 @@ msgstr "Démarrer/stopper"
|
|||
msgid "Exercises\\Programming exercises"
|
||||
msgstr "Programmation\\Exercices de programmation"
|
||||
|
||||
msgid "Exit film\\Film at the exit of exercises"
|
||||
msgstr "Retour animé\\Retour animé dans les exercices"
|
||||
|
||||
msgid "Explode (\\key action;)"
|
||||
msgstr "Exploser (\\key action;)"
|
||||
|
||||
|
|
@ -623,9 +617,6 @@ msgstr "Jeu libre"
|
|||
msgid "Free game\\Free game without a specific goal"
|
||||
msgstr "Jeu libre\\Jeu libre sans but précis"
|
||||
|
||||
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 "Full screen\\Full screen or window mode"
|
||||
msgstr "Plein écran\\Plein écran ou fenêtré"
|
||||
|
||||
|
|
@ -844,9 +835,6 @@ msgstr "Lunar Roving Vehicle"
|
|||
msgid "MSAA\\Multisample anti-aliasing"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marks on the ground\\Marks on the ground"
|
||||
msgstr "Marques sur le sol\\Marques dessinées sur le sol"
|
||||
|
||||
msgid "Maximize"
|
||||
msgstr "Taille maximale"
|
||||
|
||||
|
|
@ -1001,9 +989,6 @@ msgstr "Pile nucléaire disponible"
|
|||
msgid "Nuclear power station"
|
||||
msgstr "Centrale nucléaire"
|
||||
|
||||
msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables"
|
||||
|
||||
msgid "Number missing"
|
||||
msgstr "Un nombre est attendu"
|
||||
|
||||
|
|
@ -1085,9 +1070,6 @@ msgstr "Vue de la mission"
|
|||
msgid "Place occupied"
|
||||
msgstr "Emplacement occupé"
|
||||
|
||||
msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel"
|
||||
|
||||
msgid "Plans for defense tower available"
|
||||
msgstr "Construction d'une tour de défense possible"
|
||||
|
||||
|
|
@ -1277,9 +1259,6 @@ msgstr "Remet au départ"
|
|||
msgid "Robbie"
|
||||
msgstr "Robbie"
|
||||
|
||||
msgid "Robbie\\Your assistant"
|
||||
msgstr "Robbie\\Votre assistant"
|
||||
|
||||
msgid "Ruin"
|
||||
msgstr "Bâtiment en ruine"
|
||||
|
||||
|
|
@ -1397,9 +1376,6 @@ msgstr "Taille 4"
|
|||
msgid "Size 5"
|
||||
msgstr "Taille 5"
|
||||
|
||||
msgid "Sky\\Clouds and nebulae"
|
||||
msgstr "Ciel\\Ciel et nuages"
|
||||
|
||||
msgid "Sniff (\\key action;)"
|
||||
msgstr "Cherche (\\key action;)"
|
||||
|
||||
|
|
@ -1487,9 +1463,6 @@ msgstr "Couleur de la combinaison :"
|
|||
msgid "Suit\\Astronaut suit"
|
||||
msgstr "Corps\\Combinaison"
|
||||
|
||||
msgid "Sunbeams\\Sunbeams in the sky"
|
||||
msgstr "Rayons du soleil\\Rayons selon l'orientation"
|
||||
|
||||
msgid "Survival kit"
|
||||
msgstr "Sac de survie"
|
||||
|
||||
|
|
@ -1894,6 +1867,9 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "COLOBOT"
|
||||
#~ msgstr "COLOBOT"
|
||||
|
||||
#~ msgid "Compass"
|
||||
#~ msgstr "Boussole"
|
||||
|
||||
#~ msgid "Continue\\Continue the game"
|
||||
#~ msgstr "Continuer\\Continuer de jouer"
|
||||
|
||||
|
|
@ -1910,21 +1886,45 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "Do you want to quit Colobot: Gold Edition?"
|
||||
#~ msgstr "Voulez-vous quitter COLOBOT ?"
|
||||
|
||||
#~ msgid "Exit film\\Film at the exit of exercises"
|
||||
#~ msgstr "Retour animé\\Retour animé dans les exercices"
|
||||
|
||||
#~ 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 "Key word help\\More detailed help about key words"
|
||||
#~ msgstr "Instructions mot-clé\\Explication sur le mot-clé"
|
||||
|
||||
#~ msgid "Marks on the ground\\Marks on the ground"
|
||||
#~ msgstr "Marques sur le sol\\Marques dessinées sur le sol"
|
||||
|
||||
#~ msgid "Mouse shadow\\Gives the mouse a shadow"
|
||||
#~ msgstr "Souris ombrée\\Jolie souris avec une ombre"
|
||||
|
||||
#~ msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
#~ msgstr "Nb d'objets décoratifs\\Qualité d'objets non indispensables"
|
||||
|
||||
#~ msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
#~ msgstr "Planètes et étoiles\\Motifs mobiles dans le ciel"
|
||||
|
||||
#~ msgid "Quit the mission?"
|
||||
#~ msgstr "Quitter la mission ?"
|
||||
|
||||
#~ msgid "Quit\\Quit COLOBOT"
|
||||
#~ msgstr "Quitter\\Quitter COLOBOT"
|
||||
|
||||
#~ msgid "Robbie\\Your assistant"
|
||||
#~ msgstr "Robbie\\Votre assistant"
|
||||
|
||||
#~ msgid "Sky\\Clouds and nebulae"
|
||||
#~ msgstr "Ciel\\Ciel et nuages"
|
||||
|
||||
#~ msgid "Speed 3.0x\\Three times faster"
|
||||
#~ msgstr "Vitesse 3.0x\\Trois fois plus rapide"
|
||||
|
||||
#~ msgid "Sunbeams\\Sunbeams in the sky"
|
||||
#~ msgstr "Rayons du soleil\\Rayons selon l'orientation"
|
||||
|
||||
#~ msgid "Textures\\Quality of textures "
|
||||
#~ msgstr "Qualité des textures\\Qualité des images"
|
||||
|
||||
|
|
|
|||
55
po/pl.po
55
po/pl.po
|
|
@ -424,9 +424,6 @@ msgstr "Colobot: Gold Edition"
|
|||
msgid "Command line"
|
||||
msgstr "Linia polecenia"
|
||||
|
||||
msgid "Compass"
|
||||
msgstr "Kompas"
|
||||
|
||||
msgid "Compilation ok (0 errors)"
|
||||
msgstr "Program skompilowany (0 błędów)"
|
||||
|
||||
|
|
@ -548,9 +545,6 @@ msgstr "Wykonaj/Zatrzymaj"
|
|||
msgid "Exercises\\Programming exercises"
|
||||
msgstr "Ćwiczenia\\Ćwiczenia programistyczne"
|
||||
|
||||
msgid "Exit film\\Film at the exit of exercises"
|
||||
msgstr "Końcowy film\\Film na zakończenie ćwiczeń"
|
||||
|
||||
msgid "Explode (\\key action;)"
|
||||
msgstr "Wysadź (\\key action;)"
|
||||
|
||||
|
|
@ -630,9 +624,6 @@ msgstr "Swobodna gra"
|
|||
msgid "Free game\\Free game without a specific goal"
|
||||
msgstr "Swobodna gra\\Swobodna gra bez konkretnych celów"
|
||||
|
||||
msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
msgstr "Przyjacielski ogień\\Własne strzały uszkadzają Twoje obiekty"
|
||||
|
||||
msgid "Full screen\\Full screen or window mode"
|
||||
msgstr "Pełny ekran\\Pełny ekran lub tryb okna"
|
||||
|
||||
|
|
@ -851,9 +842,6 @@ msgstr "Pojazd Księżycowy"
|
|||
msgid "MSAA\\Multisample anti-aliasing"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marks on the ground\\Marks on the ground"
|
||||
msgstr "Znaki na ziemi\\Znaki na ziemi"
|
||||
|
||||
msgid "Maximize"
|
||||
msgstr "Powiększ"
|
||||
|
||||
|
|
@ -1004,9 +992,6 @@ msgstr "Wytworzono atomowe ogniwo elektryczne"
|
|||
msgid "Nuclear power station"
|
||||
msgstr "Elektrownia atomowa"
|
||||
|
||||
msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
msgstr "Ilość elementów dekoracyjnych \\Ilość elementów czysto dekoracyjnych"
|
||||
|
||||
msgid "Number missing"
|
||||
msgstr "Brak liczby"
|
||||
|
||||
|
|
@ -1089,9 +1074,6 @@ msgstr "Fotografia"
|
|||
msgid "Place occupied"
|
||||
msgstr "Miejsce zajęte"
|
||||
|
||||
msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
msgstr "Planety i gwiazdy\\Obiekty astronomiczne na niebie"
|
||||
|
||||
msgid "Plans for defense tower available"
|
||||
msgstr "Dostępne plany wieży obronnej"
|
||||
|
||||
|
|
@ -1279,9 +1261,6 @@ msgstr "Powrót do początku"
|
|||
msgid "Robbie"
|
||||
msgstr "Robbie"
|
||||
|
||||
msgid "Robbie\\Your assistant"
|
||||
msgstr "Robbie\\Twój asystent"
|
||||
|
||||
msgid "Ruin"
|
||||
msgstr "Ruiny"
|
||||
|
||||
|
|
@ -1398,9 +1377,6 @@ msgstr "Wielkość 4"
|
|||
msgid "Size 5"
|
||||
msgstr "Wielkość 5"
|
||||
|
||||
msgid "Sky\\Clouds and nebulae"
|
||||
msgstr "Niebo\\Chmury i mgławice"
|
||||
|
||||
msgid "Sniff (\\key action;)"
|
||||
msgstr "Szukaj (\\key action;)"
|
||||
|
||||
|
|
@ -1485,9 +1461,6 @@ msgstr "Kolor skafandra:"
|
|||
msgid "Suit\\Astronaut suit"
|
||||
msgstr "Skafander\\Skafander astronauty"
|
||||
|
||||
msgid "Sunbeams\\Sunbeams in the sky"
|
||||
msgstr "Promienie słoneczne\\Promienie słoneczne na niebie"
|
||||
|
||||
msgid "Survival kit"
|
||||
msgstr "Zestaw przetrwania"
|
||||
|
||||
|
|
@ -1886,6 +1859,9 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "3D sound\\3D positioning of the sound"
|
||||
#~ msgstr "Dźwięk 3D\\Przestrzenne pozycjonowanie dźwięków"
|
||||
|
||||
#~ msgid "Compass"
|
||||
#~ msgstr "Kompas"
|
||||
|
||||
#~ msgid "Continue\\Continue the game"
|
||||
#~ msgstr "Kontynuuj\\Kontynuuje grę"
|
||||
|
||||
|
|
@ -1898,15 +1874,40 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "Do you want to quit Colobot: Gold Edition?"
|
||||
#~ msgstr "Czy na pewno chcesz opuścić grę Colobot: Gold Edition?"
|
||||
|
||||
#~ msgid "Exit film\\Film at the exit of exercises"
|
||||
#~ msgstr "Końcowy film\\Film na zakończenie ćwiczeń"
|
||||
|
||||
#~ msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
#~ msgstr "Przyjacielski ogień\\Własne strzały uszkadzają Twoje obiekty"
|
||||
|
||||
#~ msgid "Key word help\\More detailed help about key words"
|
||||
#~ msgstr ""
|
||||
#~ "Pomoc dot. słów kluczowych\\Dokładniejsza pomoc na temat słów kluczowych"
|
||||
|
||||
#~ msgid "Marks on the ground\\Marks on the ground"
|
||||
#~ msgstr "Znaki na ziemi\\Znaki na ziemi"
|
||||
|
||||
#~ msgid "Mouse shadow\\Gives the mouse a shadow"
|
||||
#~ msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy"
|
||||
|
||||
#~ msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
#~ msgstr ""
|
||||
#~ "Ilość elementów dekoracyjnych \\Ilość elementów czysto dekoracyjnych"
|
||||
|
||||
#~ msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
#~ msgstr "Planety i gwiazdy\\Obiekty astronomiczne na niebie"
|
||||
|
||||
#~ msgid "Quit the mission?"
|
||||
#~ msgstr "Opuścić misję?"
|
||||
|
||||
#~ msgid "Robbie\\Your assistant"
|
||||
#~ msgstr "Robbie\\Twój asystent"
|
||||
|
||||
#~ msgid "Sky\\Clouds and nebulae"
|
||||
#~ msgstr "Niebo\\Chmury i mgławice"
|
||||
|
||||
#~ msgid "Sunbeams\\Sunbeams in the sky"
|
||||
#~ msgstr "Promienie słoneczne\\Promienie słoneczne na niebie"
|
||||
|
||||
#~ msgid "Textures\\Quality of textures "
|
||||
#~ msgstr "Tekstury\\Jakość tekstur "
|
||||
|
|
|
|||
54
po/ru.po
54
po/ru.po
|
|
@ -415,9 +415,6 @@ msgstr ""
|
|||
msgid "Command line"
|
||||
msgstr "Командная строка"
|
||||
|
||||
msgid "Compass"
|
||||
msgstr "Компас"
|
||||
|
||||
msgid "Compilation ok (0 errors)"
|
||||
msgstr "Компиляция завершена (0 ошибок)"
|
||||
|
||||
|
|
@ -540,9 +537,6 @@ msgstr "Выполнить/стоп"
|
|||
msgid "Exercises\\Programming exercises"
|
||||
msgstr "Упражнения\\Упражнения по программированию"
|
||||
|
||||
msgid "Exit film\\Film at the exit of exercises"
|
||||
msgstr "Ролик при выходе\\Ролик во время выхода из упражнения"
|
||||
|
||||
msgid "Explode (\\key action;)"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -622,9 +616,6 @@ msgstr "Свободная игра"
|
|||
msgid "Free game\\Free game without a specific goal"
|
||||
msgstr "Свобод. игра\\Игра без четкой цели"
|
||||
|
||||
msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
msgstr "Огонь по своим\\Вы можете повредить собственные объекты"
|
||||
|
||||
msgid "Full screen\\Full screen or window mode"
|
||||
msgstr "Во весь экран\\Выбор полноэкранного или оконного режима"
|
||||
|
||||
|
|
@ -843,9 +834,6 @@ msgstr "Луноход"
|
|||
msgid "MSAA\\Multisample anti-aliasing"
|
||||
msgstr ""
|
||||
|
||||
msgid "Marks on the ground\\Marks on the ground"
|
||||
msgstr "Метки на земле\\Метки на земле"
|
||||
|
||||
msgid "Maximize"
|
||||
msgstr "Развернуть"
|
||||
|
||||
|
|
@ -998,9 +986,6 @@ msgstr "Доступна атомная батарея"
|
|||
msgid "Nuclear power station"
|
||||
msgstr "Завод атомных батарей (неперезаряж.)"
|
||||
|
||||
msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
msgstr "Количество декораций\\Количество декоративных объектов"
|
||||
|
||||
msgid "Number missing"
|
||||
msgstr "Нет числа"
|
||||
|
||||
|
|
@ -1084,9 +1069,6 @@ msgstr "Фотография"
|
|||
msgid "Place occupied"
|
||||
msgstr "Место занято"
|
||||
|
||||
msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
msgstr "Планеты и звезды\\Астрономические объекты в небе"
|
||||
|
||||
msgid "Plans for defense tower available"
|
||||
msgstr "Доступны схемы защитной башни"
|
||||
|
||||
|
|
@ -1277,9 +1259,6 @@ msgstr "Вернуться в начало"
|
|||
msgid "Robbie"
|
||||
msgstr "Робби"
|
||||
|
||||
msgid "Robbie\\Your assistant"
|
||||
msgstr "Робби\\Ваш помощник"
|
||||
|
||||
msgid "Ruin"
|
||||
msgstr "Руины"
|
||||
|
||||
|
|
@ -1395,9 +1374,6 @@ msgstr "Размер 4"
|
|||
msgid "Size 5"
|
||||
msgstr "Размер 5"
|
||||
|
||||
msgid "Sky\\Clouds and nebulae"
|
||||
msgstr "Небо\\Облака и туманности"
|
||||
|
||||
msgid "Sniff (\\key action;)"
|
||||
msgstr "Искать (\\key action;)"
|
||||
|
||||
|
|
@ -1483,9 +1459,6 @@ msgstr "Костюм:"
|
|||
msgid "Suit\\Astronaut suit"
|
||||
msgstr "Костюм\\Костюм астронавта"
|
||||
|
||||
msgid "Sunbeams\\Sunbeams in the sky"
|
||||
msgstr "Солнечные лучи\\Солнечные лучи в небе"
|
||||
|
||||
msgid "Survival kit"
|
||||
msgstr "Аптечка"
|
||||
|
||||
|
|
@ -1890,6 +1863,9 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "COLOBOT"
|
||||
#~ msgstr "КОЛОБОТ"
|
||||
|
||||
#~ msgid "Compass"
|
||||
#~ msgstr "Компас"
|
||||
|
||||
#~ msgid "Continue\\Continue the game"
|
||||
#~ msgstr "Продолжить\\Продолжить игру"
|
||||
|
||||
|
|
@ -1906,21 +1882,45 @@ msgstr "www.epsitec.com"
|
|||
#~ msgid "Do you want to quit Colobot: Gold Edition?"
|
||||
#~ msgstr "Вы хотите закрыть COLOBOT?"
|
||||
|
||||
#~ msgid "Exit film\\Film at the exit of exercises"
|
||||
#~ msgstr "Ролик при выходе\\Ролик во время выхода из упражнения"
|
||||
|
||||
#~ msgid "Friendly fire\\Your shooting can damage your own objects "
|
||||
#~ msgstr "Огонь по своим\\Вы можете повредить собственные объекты"
|
||||
|
||||
#~ msgid "Key word help\\More detailed help about key words"
|
||||
#~ msgstr "Помощь по командам\\Более подробная справку по командам"
|
||||
|
||||
#~ msgid "Marks on the ground\\Marks on the ground"
|
||||
#~ msgstr "Метки на земле\\Метки на земле"
|
||||
|
||||
#~ msgid "Mouse shadow\\Gives the mouse a shadow"
|
||||
#~ msgstr "Тень мыши\\Мышь отбрасывает тень"
|
||||
|
||||
#~ msgid "Num of decorative objects\\Number of purely ornamental objects"
|
||||
#~ msgstr "Количество декораций\\Количество декоративных объектов"
|
||||
|
||||
#~ msgid "Planets and stars\\Astronomical objects in the sky"
|
||||
#~ msgstr "Планеты и звезды\\Астрономические объекты в небе"
|
||||
|
||||
#~ msgid "Quit the mission?"
|
||||
#~ msgstr "Завершить миссию?"
|
||||
|
||||
#~ msgid "Quit\\Quit COLOBOT"
|
||||
#~ msgstr "Выход\\Выход из COLOBOT"
|
||||
|
||||
#~ msgid "Robbie\\Your assistant"
|
||||
#~ msgstr "Робби\\Ваш помощник"
|
||||
|
||||
#~ msgid "Sky\\Clouds and nebulae"
|
||||
#~ msgstr "Небо\\Облака и туманности"
|
||||
|
||||
#~ msgid "Speed 3.0x\\Three times faster"
|
||||
#~ msgstr "Скорость 3.0х\\В три раза быстрее"
|
||||
|
||||
#~ msgid "Sunbeams\\Sunbeams in the sky"
|
||||
#~ msgstr "Солнечные лучи\\Солнечные лучи в небе"
|
||||
|
||||
#~ msgid "Textures\\Quality of textures "
|
||||
#~ msgstr "Текстуры\\Качество текстур "
|
||||
|
||||
|
|
|
|||
|
|
@ -193,12 +193,8 @@ void InitializeEventTypeTexts()
|
|||
EVENT_TYPE_TEXT[EVENT_INTERFACE_FULL] = "EVENT_INTERFACE_FULL";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_APPLY] = "EVENT_INTERFACE_APPLY";
|
||||
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_TOTO] = "EVENT_INTERFACE_TOTO";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_SHADOW] = "EVENT_INTERFACE_SHADOW";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_DIRTY] = "EVENT_INTERFACE_DIRTY";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_LENS] = "EVENT_INTERFACE_LENS";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_SKY] = "EVENT_INTERFACE_SKY";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_PLANET] = "EVENT_INTERFACE_PLANET";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_LIGHT] = "EVENT_INTERFACE_LIGHT";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_PARTI] = "EVENT_INTERFACE_PARTI";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_CLIP] = "EVENT_INTERFACE_CLIP";
|
||||
|
|
@ -206,14 +202,11 @@ void InitializeEventTypeTexts()
|
|||
EVENT_TYPE_TEXT[EVENT_INTERFACE_GLINT] = "EVENT_INTERFACE_GLINT";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_TOOLTIP] = "EVENT_INTERFACE_TOOLTIP";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_MOVIES] = "EVENT_INTERFACE_MOVIES";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_NICERST] = "EVENT_INTERFACE_NICERST";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_SCROLL] = "EVENT_INTERFACE_SCROLL";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTX] = "EVENT_INTERFACE_INVERTX";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTY] = "EVENT_INTERFACE_INVERTY";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_EFFECT] = "EVENT_INTERFACE_EFFECT";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_MOUSE] = "EVENT_INTERFACE_MOUSE";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_GROUND] = "EVENT_INTERFACE_GROUND";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_GADGET] = "EVENT_INTERFACE_GADGET";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_FOG] = "EVENT_INTERFACE_FOG";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_EDITMODE]= "EVENT_INTERFACE_EDITMODE";
|
||||
EVENT_TYPE_TEXT[EVENT_INTERFACE_EDITVALUE]= "EVENT_INTERFACE_EDITVALUE";
|
||||
|
|
|
|||
|
|
@ -217,12 +217,8 @@ enum EventType
|
|||
EVENT_INTERFACE_FULL = 442,
|
||||
EVENT_INTERFACE_APPLY = 443,
|
||||
|
||||
EVENT_INTERFACE_TOTO = 450,
|
||||
EVENT_INTERFACE_SHADOW = 451,
|
||||
EVENT_INTERFACE_DIRTY = 452,
|
||||
EVENT_INTERFACE_LENS = 453,
|
||||
EVENT_INTERFACE_SKY = 454,
|
||||
EVENT_INTERFACE_PLANET = 456,
|
||||
EVENT_INTERFACE_LIGHT = 457,
|
||||
EVENT_INTERFACE_PARTI = 458,
|
||||
EVENT_INTERFACE_CLIP = 459,
|
||||
|
|
@ -230,14 +226,11 @@ enum EventType
|
|||
EVENT_INTERFACE_GLINT = 463,
|
||||
EVENT_INTERFACE_TOOLTIP = 464,
|
||||
EVENT_INTERFACE_MOVIES = 465,
|
||||
EVENT_INTERFACE_NICERST = 466,
|
||||
EVENT_INTERFACE_SCROLL = 467,
|
||||
EVENT_INTERFACE_INVERTX = 468,
|
||||
EVENT_INTERFACE_INVERTY = 469,
|
||||
EVENT_INTERFACE_EFFECT = 470,
|
||||
EVENT_INTERFACE_MOUSE = 471,
|
||||
EVENT_INTERFACE_GROUND = 472,
|
||||
EVENT_INTERFACE_GADGET = 473,
|
||||
EVENT_INTERFACE_FOG = 474,
|
||||
EVENT_INTERFACE_EDITMODE= 476,
|
||||
EVENT_INTERFACE_EDITVALUE= 477,
|
||||
|
|
|
|||
|
|
@ -194,22 +194,15 @@ void InitializeRestext()
|
|||
stringsEvent[EVENT_INTERFACE_FULL] = TR("Full screen\\Full screen or window mode");
|
||||
stringsEvent[EVENT_INTERFACE_APPLY] = TR("Apply changes\\Activates the changed settings");
|
||||
|
||||
stringsEvent[EVENT_INTERFACE_TOTO] = TR("Robbie\\Your assistant");
|
||||
stringsEvent[EVENT_INTERFACE_GROUND] = TR("Marks on the ground\\Marks on the ground");
|
||||
stringsEvent[EVENT_INTERFACE_DIRTY] = TR("Dust\\Dust and dirt on bots and buildings");
|
||||
stringsEvent[EVENT_INTERFACE_FOG] = TR("Fog\\Fog");
|
||||
stringsEvent[EVENT_INTERFACE_LENS] = TR("Sunbeams\\Sunbeams in the sky");
|
||||
stringsEvent[EVENT_INTERFACE_SKY] = TR("Sky\\Clouds and nebulae");
|
||||
stringsEvent[EVENT_INTERFACE_PLANET] = TR("Planets and stars\\Astronomical objects in the sky");
|
||||
stringsEvent[EVENT_INTERFACE_LIGHT] = TR("Dynamic lighting\\Mobile light sources");
|
||||
stringsEvent[EVENT_INTERFACE_PARTI] = TR("Number of particles\\Explosions, dust, reflections, etc.");
|
||||
stringsEvent[EVENT_INTERFACE_CLIP] = TR("Render distance\\Maximum visibility");
|
||||
stringsEvent[EVENT_INTERFACE_GADGET] = TR("Num of decorative objects\\Number of purely ornamental objects");
|
||||
stringsEvent[EVENT_INTERFACE_RAIN] = TR("Particles in the interface\\Steam clouds and sparks in the interface");
|
||||
stringsEvent[EVENT_INTERFACE_GLINT] = TR("Reflections on the buttons \\Shiny buttons");
|
||||
stringsEvent[EVENT_INTERFACE_TOOLTIP] = TR("Help balloons\\Explain the function of the buttons");
|
||||
stringsEvent[EVENT_INTERFACE_MOVIES] = TR("Film sequences\\Films before and after the missions");
|
||||
stringsEvent[EVENT_INTERFACE_NICERST] = TR("Exit film\\Film at the exit of exercises");
|
||||
stringsEvent[EVENT_INTERFACE_SCROLL] = TR("Scrolling\\Scrolling when the mouse touches right or left border");
|
||||
stringsEvent[EVENT_INTERFACE_INVERTX] = TR("Mouse inversion X\\Inversion of the scrolling direction on the X axis");
|
||||
stringsEvent[EVENT_INTERFACE_INVERTY] = TR("Mouse inversion Y\\Inversion of the scrolling direction on the Y axis");
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ CSettings::CSettings()
|
|||
m_interfaceRain = true;
|
||||
m_soluce4 = true;
|
||||
m_movies = true;
|
||||
m_niceReset = true;
|
||||
m_systemMouse = false;
|
||||
|
||||
m_fontSize = 19.0f;
|
||||
|
|
@ -69,14 +68,11 @@ void CSettings::SaveSettings()
|
|||
Gfx::CCamera* camera = main->GetCamera();
|
||||
CSoundInterface* sound = app->GetSound();
|
||||
|
||||
GetConfigFile().SetIntProperty("Setup", "TotoMode", engine->GetTotoMode());
|
||||
|
||||
GetConfigFile().SetIntProperty("Setup", "Tooltips", m_tooltips);
|
||||
GetConfigFile().SetIntProperty("Setup", "InterfaceGlint", m_interfaceGlint);
|
||||
GetConfigFile().SetIntProperty("Setup", "InterfaceRain", m_interfaceRain);
|
||||
GetConfigFile().SetIntProperty("Setup", "Soluce4", m_soluce4);
|
||||
GetConfigFile().SetIntProperty("Setup", "Movies", m_movies);
|
||||
GetConfigFile().SetIntProperty("Setup", "NiceReset", m_niceReset);
|
||||
GetConfigFile().SetIntProperty("Setup", "CameraScroll", camera->GetCameraScroll());
|
||||
GetConfigFile().SetIntProperty("Setup", "CameraInvertX", camera->GetCameraInvertX());
|
||||
GetConfigFile().SetIntProperty("Setup", "CameraInvertY", camera->GetCameraInvertY());
|
||||
|
|
@ -86,17 +82,12 @@ void CSettings::SaveSettings()
|
|||
GetConfigFile().SetIntProperty("Setup", "AutosaveInterval", main->GetAutosaveInterval());
|
||||
GetConfigFile().SetIntProperty("Setup", "AutosaveSlots", main->GetAutosaveSlots());
|
||||
GetConfigFile().SetIntProperty("Setup", "GroundShadow", engine->GetShadow());
|
||||
GetConfigFile().SetIntProperty("Setup", "GroundSpot", engine->GetGroundSpot());
|
||||
GetConfigFile().SetIntProperty("Setup", "ObjectDirty", engine->GetDirty());
|
||||
GetConfigFile().SetIntProperty("Setup", "FogMode", engine->GetFog());
|
||||
GetConfigFile().SetIntProperty("Setup", "LensMode", engine->GetLensMode());
|
||||
GetConfigFile().SetIntProperty("Setup", "SkyMode", engine->GetSkyMode());
|
||||
GetConfigFile().SetIntProperty("Setup", "PlanetMode", engine->GetPlanetMode());
|
||||
GetConfigFile().SetIntProperty("Setup", "LightMode", engine->GetLightMode());
|
||||
GetConfigFile().SetIntProperty("Setup", "UseJoystick", app->GetJoystickEnabled() ? app->GetJoystick().index : -1);
|
||||
GetConfigFile().SetFloatProperty("Setup", "ParticleDensity", engine->GetParticleDensity());
|
||||
GetConfigFile().SetFloatProperty("Setup", "ClippingDistance", engine->GetClippingDistance());
|
||||
GetConfigFile().SetFloatProperty("Setup", "GadgetQuantity", engine->GetGadgetQuantity());
|
||||
GetConfigFile().SetIntProperty("Setup", "AudioVolume", sound->GetAudioVolume());
|
||||
GetConfigFile().SetIntProperty("Setup", "MusicVolume", sound->GetMusicVolume());
|
||||
GetConfigFile().SetIntProperty("Setup", "EditIndentMode", engine->GetEditIndentMode());
|
||||
|
|
@ -144,10 +135,6 @@ void CSettings::LoadSettings()
|
|||
int iValue;
|
||||
std::string key;
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "TotoMode", iValue))
|
||||
engine->SetTotoMode(iValue);
|
||||
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "Tooltips", iValue))
|
||||
m_tooltips = iValue;
|
||||
|
||||
|
|
@ -163,9 +150,6 @@ void CSettings::LoadSettings()
|
|||
if (GetConfigFile().GetIntProperty("Setup", "Movies", iValue))
|
||||
m_movies = iValue;
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "NiceReset", iValue))
|
||||
m_niceReset = iValue;
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "CameraScroll", iValue))
|
||||
camera->SetCameraScroll(iValue);
|
||||
|
||||
|
|
@ -193,9 +177,6 @@ void CSettings::LoadSettings()
|
|||
if (GetConfigFile().GetIntProperty("Setup", "GroundShadow", iValue))
|
||||
engine->SetShadow(iValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "GroundSpot", iValue))
|
||||
engine->SetGroundSpot(iValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "ObjectDirty", iValue))
|
||||
engine->SetDirty(iValue);
|
||||
|
||||
|
|
@ -205,15 +186,6 @@ void CSettings::LoadSettings()
|
|||
camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok?
|
||||
}
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "LensMode", iValue))
|
||||
engine->SetLensMode(iValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "SkyMode", iValue))
|
||||
engine->SetSkyMode(iValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "PlanetMode", iValue))
|
||||
engine->SetPlanetMode(iValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "LightMode", iValue))
|
||||
engine->SetLightMode(iValue);
|
||||
|
||||
|
|
@ -243,9 +215,6 @@ void CSettings::LoadSettings()
|
|||
if (GetConfigFile().GetFloatProperty("Setup", "ClippingDistance", fValue))
|
||||
engine->SetClippingDistance(fValue);
|
||||
|
||||
if (GetConfigFile().GetFloatProperty("Setup", "GadgetQuantity", fValue))
|
||||
engine->SetGadgetQuantity(fValue);
|
||||
|
||||
if (GetConfigFile().GetIntProperty("Setup", "AudioVolume", iValue))
|
||||
sound->SetAudioVolume(iValue);
|
||||
|
||||
|
|
@ -364,15 +333,6 @@ bool CSettings::GetMovies()
|
|||
return m_movies;
|
||||
}
|
||||
|
||||
void CSettings::SetNiceReset(bool niceReset)
|
||||
{
|
||||
m_niceReset = niceReset;
|
||||
}
|
||||
bool CSettings::GetNiceReset()
|
||||
{
|
||||
return m_niceReset;
|
||||
}
|
||||
|
||||
void CSettings::SetSystemMouse(bool systemMouse)
|
||||
{
|
||||
m_systemMouse = systemMouse;
|
||||
|
|
|
|||
|
|
@ -51,9 +51,6 @@ public:
|
|||
void SetMovies(bool movies);
|
||||
bool GetMovies();
|
||||
|
||||
void SetNiceReset(bool niceReset);
|
||||
bool GetNiceReset();
|
||||
|
||||
void SetSystemMouse(bool systemMouse);
|
||||
bool GetSystemMouse();
|
||||
|
||||
|
|
@ -91,7 +88,6 @@ protected:
|
|||
bool m_interfaceRain;
|
||||
bool m_soluce4;
|
||||
bool m_movies;
|
||||
bool m_niceReset;
|
||||
bool m_systemMouse;
|
||||
|
||||
float m_fontSize;
|
||||
|
|
|
|||
|
|
@ -109,7 +109,6 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
|
|||
m_render = true;
|
||||
m_screenshotMode = false;
|
||||
m_shadowVisible = true;
|
||||
m_groundSpotVisible = true;
|
||||
m_dirty = true;
|
||||
m_fog = true;
|
||||
m_secondTex = "";
|
||||
|
|
@ -136,7 +135,6 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
|
|||
m_lastClippingDistance = 1.0f;
|
||||
m_clippingDistance = 1.0f;
|
||||
m_terrainVision = 1000.0f;
|
||||
m_gadgetQuantity = 1.0f;
|
||||
m_textureMipmapLevel = 1;
|
||||
m_textureAnisotropy = 1;
|
||||
m_shadowMapping = true;
|
||||
|
|
@ -146,12 +144,7 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
|
|||
m_shadowRange = 0.0f;
|
||||
m_multisample = 2;
|
||||
|
||||
m_totoMode = true;
|
||||
m_lensMode = true;
|
||||
m_waterMode = true;
|
||||
m_skyMode = true;
|
||||
m_backForce = true;
|
||||
m_planetMode = true;
|
||||
m_lightMode = true;
|
||||
m_editIndentMode = true;
|
||||
m_editIndentValue = 4;
|
||||
|
|
@ -2112,10 +2105,10 @@ void CEngine::SetState(int state, const Color& color)
|
|||
m_device->SetRenderState(RENDER_STATE_FOG, true);
|
||||
|
||||
|
||||
bool second = m_groundSpotVisible || m_dirty;
|
||||
bool second = m_dirty;
|
||||
|
||||
if ( !m_groundSpotVisible && (state & ENG_RSTATE_SECOND) != 0 ) second = false;
|
||||
if ( !m_dirty && (state & ENG_RSTATE_SECOND) == 0 ) second = false;
|
||||
// TODO: I'm pretty sure this is reversed and should be m_dirty instead of !m_dirty ~krzys_h
|
||||
if ( !m_dirty && (state & ENG_RSTATE_SECOND) == 0 ) second = false;
|
||||
|
||||
if ((state & ENG_RSTATE_DUAL_BLACK) && second)
|
||||
{
|
||||
|
|
@ -2590,16 +2583,6 @@ float CEngine::GetFocus()
|
|||
return m_focus;
|
||||
}
|
||||
|
||||
void CEngine::SetGroundSpot(bool mode)
|
||||
{
|
||||
m_groundSpotVisible = mode;
|
||||
}
|
||||
|
||||
bool CEngine::GetGroundSpot()
|
||||
{
|
||||
return m_groundSpotVisible;
|
||||
}
|
||||
|
||||
void CEngine::SetShadow(bool mode)
|
||||
{
|
||||
m_shadowVisible = mode;
|
||||
|
|
@ -2849,19 +2832,6 @@ float CEngine::GetClippingDistance()
|
|||
return m_clippingDistance;
|
||||
}
|
||||
|
||||
void CEngine::SetGadgetQuantity(float value)
|
||||
{
|
||||
if (value < 0.0f) value = 0.0f;
|
||||
if (value > 1.0f) value = 1.0f;
|
||||
|
||||
m_gadgetQuantity = value;
|
||||
}
|
||||
|
||||
float CEngine::GetGadgetQuantity()
|
||||
{
|
||||
return m_gadgetQuantity;
|
||||
}
|
||||
|
||||
void CEngine::SetTextureFilterMode(TexFilter value)
|
||||
{
|
||||
if(m_defaultTexParams.filter == value && m_terrainTexParams.filter == value) return;
|
||||
|
|
@ -2982,56 +2952,6 @@ bool CEngine::GetShadowMappingQuality()
|
|||
return m_qualityShadows;
|
||||
}
|
||||
|
||||
void CEngine::SetTotoMode(bool present)
|
||||
{
|
||||
m_totoMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetTotoMode()
|
||||
{
|
||||
return m_totoMode;
|
||||
}
|
||||
|
||||
void CEngine::SetLensMode(bool present)
|
||||
{
|
||||
m_lensMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetLensMode()
|
||||
{
|
||||
return m_lensMode;
|
||||
}
|
||||
|
||||
void CEngine::SetWaterMode(bool present)
|
||||
{
|
||||
m_waterMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetWaterMode()
|
||||
{
|
||||
return m_waterMode;
|
||||
}
|
||||
|
||||
void CEngine::SetLightingMode(bool present)
|
||||
{
|
||||
m_lightMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetLightingMode()
|
||||
{
|
||||
return m_lightMode;
|
||||
}
|
||||
|
||||
void CEngine::SetSkyMode(bool present)
|
||||
{
|
||||
m_skyMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetSkyMode()
|
||||
{
|
||||
return m_skyMode;
|
||||
}
|
||||
|
||||
void CEngine::SetBackForce(bool present)
|
||||
{
|
||||
m_backForce = present;
|
||||
|
|
@ -3042,16 +2962,6 @@ bool CEngine::GetBackForce()
|
|||
return m_backForce;
|
||||
}
|
||||
|
||||
void CEngine::SetPlanetMode(bool present)
|
||||
{
|
||||
m_planetMode = present;
|
||||
}
|
||||
|
||||
bool CEngine::GetPlanetMode()
|
||||
{
|
||||
return m_planetMode;
|
||||
}
|
||||
|
||||
void CEngine::SetLightMode(bool present)
|
||||
{
|
||||
m_lightMode = present;
|
||||
|
|
@ -3184,7 +3094,7 @@ void CEngine::Render()
|
|||
m_lightMan->UpdateLights();
|
||||
|
||||
Color color;
|
||||
if (m_skyMode && m_cloud->GetLevel() != 0.0f) // clouds?
|
||||
if (m_cloud->GetLevel() != 0.0f) // clouds?
|
||||
color = m_backgroundCloudDown;
|
||||
else
|
||||
color = m_backgroundColorDown;
|
||||
|
|
@ -3220,11 +3130,10 @@ void CEngine::Draw3DScene()
|
|||
{
|
||||
m_device->SetRenderState(RENDER_STATE_DEPTH_TEST, false);
|
||||
|
||||
if (m_groundSpotVisible)
|
||||
UpdateGroundSpotTextures();
|
||||
UpdateGroundSpotTextures();
|
||||
|
||||
if (m_planetMode) DrawPlanet(); // draws the planets
|
||||
if (m_skyMode) m_cloud->Draw(); // draws the clouds
|
||||
DrawPlanet(); // draws the planets
|
||||
m_cloud->Draw(); // draws the clouds
|
||||
|
||||
|
||||
// Display the objects
|
||||
|
|
@ -3240,7 +3149,7 @@ void CEngine::Draw3DScene()
|
|||
m_device->SetTransform(TRANSFORM_PROJECTION, m_matProj);
|
||||
m_device->SetTransform(TRANSFORM_VIEW, m_matView);
|
||||
|
||||
if (m_waterMode) m_water->DrawBack(); // draws water background
|
||||
m_water->DrawBack(); // draws water background
|
||||
|
||||
m_app->StartPerformanceCounter(PCNT_RENDER_TERRAIN);
|
||||
|
||||
|
|
@ -3437,12 +3346,9 @@ void CEngine::Draw3DScene()
|
|||
m_lightMan->DebugDumpLights();
|
||||
}
|
||||
|
||||
if (m_waterMode)
|
||||
{
|
||||
m_app->StartPerformanceCounter(PCNT_RENDER_WATER);
|
||||
m_water->DrawSurf(); // draws water surface
|
||||
m_app->StopPerformanceCounter(PCNT_RENDER_WATER);
|
||||
}
|
||||
m_app->StartPerformanceCounter(PCNT_RENDER_WATER);
|
||||
m_water->DrawSurf(); // draws water surface
|
||||
m_app->StopPerformanceCounter(PCNT_RENDER_WATER);
|
||||
|
||||
m_device->SetRenderState(RENDER_STATE_LIGHTING, false);
|
||||
|
||||
|
|
@ -3454,7 +3360,7 @@ void CEngine::Draw3DScene()
|
|||
|
||||
m_lightning->Draw(); // draws lightning
|
||||
|
||||
if (m_lensMode) DrawForegroundImage(); // draws the foreground
|
||||
DrawForegroundImage(); // draws the foreground
|
||||
|
||||
if (! m_overFront) DrawOverColor(); // draws the foreground color
|
||||
}
|
||||
|
|
@ -4458,7 +4364,7 @@ void CEngine::DrawShadow()
|
|||
|
||||
void CEngine::DrawBackground()
|
||||
{
|
||||
if (m_skyMode && m_cloud->GetLevel() != 0.0f) // clouds ?
|
||||
if (m_cloud->GetLevel() != 0.0f) // clouds ?
|
||||
{
|
||||
if (m_backgroundCloudUp != m_backgroundCloudDown) // degraded?
|
||||
DrawBackgroundGradient(m_backgroundCloudUp, m_backgroundCloudDown);
|
||||
|
|
@ -4469,7 +4375,7 @@ void CEngine::DrawBackground()
|
|||
DrawBackgroundGradient(m_backgroundColorUp, m_backgroundColorDown);
|
||||
}
|
||||
|
||||
if (m_backForce || (m_skyMode && !m_backgroundName.empty()) )
|
||||
if (m_backForce || !m_backgroundName.empty() )
|
||||
{
|
||||
DrawBackgroundImage(); // image
|
||||
}
|
||||
|
|
|
|||
|
|
@ -956,26 +956,23 @@ public:
|
|||
float GetFocus();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of the global mode of marking
|
||||
void SetGroundSpot(bool mode);
|
||||
bool GetGroundSpot();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of the global mode of shading
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetShadow(bool mode);
|
||||
bool GetShadow();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of the global mode of contamination
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetDirty(bool mode);
|
||||
bool GetDirty();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of the global mode of horizontal fog patches
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetFog(bool mode);
|
||||
bool GetFog();
|
||||
//@}
|
||||
|
|
@ -1052,6 +1049,7 @@ public:
|
|||
|
||||
//@{
|
||||
//! Management of the particle density
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetParticleDensity(float value);
|
||||
float GetParticleDensity();
|
||||
//@}
|
||||
|
|
@ -1061,36 +1059,35 @@ public:
|
|||
|
||||
//@{
|
||||
//! Management of the distance of clipping.
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetClippingDistance(float value);
|
||||
float GetClippingDistance();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! The amount of management objects gadgets
|
||||
void SetGadgetQuantity(float value);
|
||||
float GetGadgetQuantity();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the texture filter mode
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetTextureFilterMode(TexFilter value);
|
||||
TexFilter GetTextureFilterMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the mipmap level for textures
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetTextureMipmapLevel(int value);
|
||||
int GetTextureMipmapLevel();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the anisotropy level for textures
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetTextureAnisotropyLevel(int value);
|
||||
int GetTextureAnisotropyLevel();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of shadow mapping
|
||||
// NOTE: These are user configuration settings
|
||||
bool IsShadowMappingSupported();
|
||||
void SetShadowMapping(bool value);
|
||||
bool GetShadowMapping();
|
||||
|
|
@ -1105,77 +1102,50 @@ public:
|
|||
|
||||
//@{
|
||||
//! Management of shadow color
|
||||
// NOTE: This is a setting configurable only in INI file
|
||||
void SetShadowColor(float value);
|
||||
float GetShadowColor();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of shadow range
|
||||
// NOTE: This is a setting configurable only in INI file
|
||||
void SetShadowRange(float value);
|
||||
float GetShadowRange();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management of shadow range
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetMultiSample(int value);
|
||||
int GetMultiSample();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management mode of toto
|
||||
void SetTotoMode(bool present);
|
||||
bool GetTotoMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the mode of foreground
|
||||
void SetLensMode(bool present);
|
||||
bool GetLensMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the mode of water
|
||||
void SetWaterMode(bool present);
|
||||
bool GetWaterMode();
|
||||
//@}
|
||||
|
||||
void SetLightingMode(bool present);
|
||||
bool GetLightingMode();
|
||||
|
||||
//@{
|
||||
//! Management the mode of sky
|
||||
void SetSkyMode(bool present);
|
||||
bool GetSkyMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the mode of background
|
||||
void SetBackForce(bool present);
|
||||
bool GetBackForce();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Management the mode of planets
|
||||
void SetPlanetMode(bool present);
|
||||
bool GetPlanetMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
//! Managing the mode of dynamic lights.
|
||||
// NOTE: This is an user configuration setting
|
||||
void SetLightMode(bool present);
|
||||
bool GetLightMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
// TODO: move to more appropriate class ?
|
||||
//! Management of the indentation mode while editing (CEdit)
|
||||
// NOTE: This is an user configuration setting
|
||||
// TODO: Move to CSettings
|
||||
void SetEditIndentMode(bool autoIndent);
|
||||
bool GetEditIndentMode();
|
||||
//@}
|
||||
|
||||
//@{
|
||||
// TODO: move to more appropriate class ?
|
||||
//! Management of tab indent when editing (CEdit)
|
||||
// NOTE: This is an user configuration setting
|
||||
// TODO: Move to CSettings
|
||||
void SetEditIndentValue(int value);
|
||||
int GetEditIndentValue();
|
||||
//@}
|
||||
|
|
@ -1390,10 +1360,6 @@ protected:
|
|||
Math::Vector m_statisticPos;
|
||||
bool m_updateGeometry;
|
||||
bool m_updateStaticBuffers;
|
||||
bool m_groundSpotVisible;
|
||||
bool m_shadowVisible;
|
||||
bool m_dirty;
|
||||
bool m_fog;
|
||||
bool m_firstGroundSpot;
|
||||
std::string m_secondTex;
|
||||
bool m_backgroundFull;
|
||||
|
|
@ -1411,21 +1377,19 @@ protected:
|
|||
Texture m_foregroundTex;
|
||||
bool m_drawWorld;
|
||||
bool m_drawFront;
|
||||
float m_terrainVision;
|
||||
bool m_backForce;
|
||||
float m_tracePrecision;
|
||||
|
||||
bool m_shadowVisible;
|
||||
bool m_dirty;
|
||||
bool m_fog;
|
||||
float m_particleDensity;
|
||||
float m_clippingDistance;
|
||||
float m_lastClippingDistance;
|
||||
float m_terrainVision;
|
||||
float m_gadgetQuantity;
|
||||
bool m_totoMode;
|
||||
bool m_lensMode;
|
||||
bool m_waterMode;
|
||||
bool m_skyMode;
|
||||
bool m_backForce;
|
||||
bool m_planetMode;
|
||||
bool m_lightMode;
|
||||
bool m_editIndentMode;
|
||||
int m_editIndentValue;
|
||||
float m_tracePrecision;
|
||||
|
||||
Texture m_shadowMap;
|
||||
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ bool CTerrain::CreateMosaic(int ox, int oy, int step, int objRank,
|
|||
std::string texName1;
|
||||
std::string texName2;
|
||||
|
||||
if ( step == 1 && m_engine->GetGroundSpot() )
|
||||
if ( step == 1 )
|
||||
{
|
||||
int i = (ox/5) + (oy/5)*(m_mosaicCount/5);
|
||||
std::stringstream s;
|
||||
|
|
@ -1885,4 +1885,3 @@ float CTerrain::GetFlyingLimit(Math::Vector pos, bool noLimit)
|
|||
|
||||
|
||||
} // namespace Gfx
|
||||
|
||||
|
|
|
|||
|
|
@ -1305,48 +1305,6 @@ void CRobotMain::ExecuteCmd(char *cmd)
|
|||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invshadow") == 0)
|
||||
{
|
||||
m_engine->SetShadow(!m_engine->GetShadow());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invdirty") == 0)
|
||||
{
|
||||
m_engine->SetDirty(!m_engine->GetDirty());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invfog") == 0)
|
||||
{
|
||||
m_engine->SetFog(!m_engine->GetFog());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invlens") == 0)
|
||||
{
|
||||
m_engine->SetLensMode(!m_engine->GetLensMode());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invwater") == 0)
|
||||
{
|
||||
m_engine->SetWaterMode(!m_engine->GetWaterMode());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invsky") == 0)
|
||||
{
|
||||
m_engine->SetSkyMode(!m_engine->GetSkyMode());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "invplanet") == 0)
|
||||
{
|
||||
m_engine->SetPlanetMode(!m_engine->GetPlanetMode());
|
||||
return;
|
||||
}
|
||||
|
||||
if (strcmp(cmd, "selectinsect") == 0)
|
||||
{
|
||||
m_selectInsect = !m_selectInsect;
|
||||
|
|
@ -3351,29 +3309,6 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
|
|||
{
|
||||
ObjectType type = line->GetParam("type")->AsObjectType();
|
||||
|
||||
int gadget = line->GetParam("gadget")->AsInt(-1);
|
||||
if ( gadget == -1 )
|
||||
{
|
||||
gadget = 0;
|
||||
if ( type == OBJECT_TECH ||
|
||||
(type >= OBJECT_PLANT0 &&
|
||||
type <= OBJECT_PLANT19 ) ||
|
||||
(type >= OBJECT_TREE0 &&
|
||||
type <= OBJECT_TREE5 ) ||
|
||||
(type >= OBJECT_QUARTZ0 &&
|
||||
type <= OBJECT_QUARTZ3 ) ||
|
||||
(type >= OBJECT_ROOT0 &&
|
||||
type <= OBJECT_ROOT4 ) ) // not ROOT5!
|
||||
{
|
||||
gadget = 1;
|
||||
}
|
||||
}
|
||||
if (gadget != 0) // is this a gadget?
|
||||
{
|
||||
if (!TestGadgetQuantity(rankGadget++)) continue;
|
||||
}
|
||||
|
||||
|
||||
float objectProgress = static_cast<float>(rankObj) / static_cast<float>(numObjects);
|
||||
std::string details = StrUtils::ToString<int>(rankObj+1)+" / "+StrUtils::ToString<int>(numObjects);
|
||||
#if DEV_BUILD
|
||||
|
|
@ -3402,16 +3337,8 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
|
|||
}
|
||||
catch (const CObjectCreateException& e)
|
||||
{
|
||||
if (gadget)
|
||||
{
|
||||
GetLogger()->Warn("Error loading decorative object: %s\n", e.what());
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
GetLogger()->Error("Error loading level object: %s\n", e.what());
|
||||
throw;
|
||||
}
|
||||
GetLogger()->Error("Error loading level object: %s\n", e.what());
|
||||
throw;
|
||||
}
|
||||
|
||||
if (m_fixScene && type == OBJECT_HUMAN)
|
||||
|
|
@ -4091,39 +4018,6 @@ void CRobotMain::ChangeColor()
|
|||
m_engine->LoadAllTextures();
|
||||
}
|
||||
|
||||
//! Updates the number of unnecessary objects
|
||||
bool CRobotMain::TestGadgetQuantity(int rank)
|
||||
{
|
||||
static int table10[10] = {0,1,0,0,0,0,0,0,0,0};
|
||||
static int table20[10] = {0,1,0,0,0,1,0,0,0,0};
|
||||
static int table30[10] = {0,1,0,1,0,1,0,0,0,0};
|
||||
static int table40[10] = {0,1,0,1,0,1,0,1,0,0};
|
||||
static int table50[10] = {0,1,0,1,0,1,0,1,0,1};
|
||||
static int table60[10] = {0,1,0,1,1,1,0,1,0,1};
|
||||
static int table70[10] = {0,1,0,1,1,1,0,1,1,1};
|
||||
static int table80[10] = {0,1,1,1,1,1,0,1,1,1};
|
||||
static int table90[10] = {0,1,1,1,1,1,1,1,1,1};
|
||||
|
||||
float percent = m_engine->GetGadgetQuantity();
|
||||
if (percent == 0.0f) return false;
|
||||
if (percent == 1.0f) return true;
|
||||
|
||||
int *table;
|
||||
if (percent <= 0.15f) table = table10;
|
||||
else if (percent <= 0.25f) table = table20;
|
||||
else if (percent <= 0.35f) table = table30;
|
||||
else if (percent <= 0.45f) table = table40;
|
||||
else if (percent <= 0.55f) table = table50;
|
||||
else if (percent <= 0.65f) table = table60;
|
||||
else if (percent <= 0.75f) table = table70;
|
||||
else if (percent <= 0.85f) table = table80;
|
||||
else table = table90;
|
||||
|
||||
return table[rank%10];
|
||||
}
|
||||
|
||||
|
||||
|
||||
//! Calculates the distance to the nearest object
|
||||
float CRobotMain::SearchNearestObject(Math::Vector center, CObject *exclu)
|
||||
{
|
||||
|
|
@ -5336,8 +5230,6 @@ void CRobotMain::ResetCreate()
|
|||
{
|
||||
CreateScene(m_ui->GetSceneSoluce(), false, true);
|
||||
|
||||
if (!GetNiceReset()) return;
|
||||
|
||||
for (CObject* obj : m_objMan->GetAllObjects())
|
||||
{
|
||||
if (obj->GetAnimateOnReset())
|
||||
|
|
@ -5665,11 +5557,6 @@ bool CRobotMain::GetMovies()
|
|||
return m_settings->GetMovies();
|
||||
}
|
||||
|
||||
bool CRobotMain::GetNiceReset()
|
||||
{
|
||||
return m_settings->GetNiceReset();
|
||||
}
|
||||
|
||||
bool CRobotMain::GetShowSoluce()
|
||||
{
|
||||
return m_showSoluce;
|
||||
|
|
|
|||
|
|
@ -234,7 +234,6 @@ public:
|
|||
bool GetInterfaceGlint();
|
||||
bool GetSoluce4();
|
||||
bool GetMovies();
|
||||
bool GetNiceReset();
|
||||
bool GetShowSoluce();
|
||||
bool GetSceneSoluce();
|
||||
bool GetShowAll();
|
||||
|
|
@ -408,7 +407,6 @@ protected:
|
|||
void FrameVisit(float rTime);
|
||||
void StopDisplayVisit();
|
||||
void ExecuteCmd(char *cmd);
|
||||
bool TestGadgetQuantity(int rank);
|
||||
void UpdateSpeedLabel();
|
||||
|
||||
int AutosaveRotate(bool freeOne);
|
||||
|
|
|
|||
|
|
@ -258,13 +258,6 @@ bool CMotionToto::EventFrame(const Event &event)
|
|||
{
|
||||
bHidden = true;
|
||||
}
|
||||
if ( !m_engine->GetTotoMode() )
|
||||
{
|
||||
if ( !m_main->GetEditLock() ) // current edition?
|
||||
{
|
||||
bHidden = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( bHidden )
|
||||
|
|
|
|||
|
|
@ -1670,12 +1670,6 @@ void CObjectInterface::UpdateInterface()
|
|||
EnableInterface(pw, EVENT_OBJECT_BDESTROYER,bEnable);
|
||||
}
|
||||
|
||||
pb = static_cast< CButton* >(pw->SearchControl(EVENT_OBJECT_GFLAT));
|
||||
if ( pb != 0 )
|
||||
{
|
||||
pb->SetState(STATE_VISIBLE, m_engine->GetGroundSpot());
|
||||
}
|
||||
|
||||
if ( type == OBJECT_HUMAN || // builder?
|
||||
type == OBJECT_TECH )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -64,9 +64,6 @@ void CScreenSetupGame::CreateInterface()
|
|||
ddim.y = dim.y*0.5f;
|
||||
pos.x = ox+sx*3;
|
||||
pos.y = 0.65f;
|
||||
//? pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_TOTO);
|
||||
//? pc->SetState(STATE_SHADOW);
|
||||
//? pos.y -= 0.048f;
|
||||
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_MOVIES);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
|
|
@ -148,12 +145,6 @@ bool CScreenSetupGame::EventProcess(const Event &event)
|
|||
|
||||
switch( event.type )
|
||||
{
|
||||
case EVENT_INTERFACE_TOTO:
|
||||
m_engine->SetTotoMode(!m_engine->GetTotoMode());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_TOOLTIP:
|
||||
m_settings->SetTooltips(!m_settings->GetTooltips());
|
||||
ChangeSetupButtons();
|
||||
|
|
@ -211,12 +202,6 @@ bool CScreenSetupGame::EventProcess(const Event &event)
|
|||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_NICERST:
|
||||
m_settings->SetNiceReset(!m_settings->GetNiceReset());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_SCROLL:
|
||||
m_camera->SetCameraScroll(!m_camera->GetCameraScroll());
|
||||
ChangeSetupButtons();
|
||||
|
|
@ -280,12 +265,6 @@ void CScreenSetupGame::UpdateSetupButtons()
|
|||
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
|
||||
if ( pw == 0 ) return;
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_TOTO));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_engine->GetTotoMode());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_TOOLTIP));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
|
|
@ -334,12 +313,6 @@ void CScreenSetupGame::UpdateSetupButtons()
|
|||
pc->SetState(STATE_CHECK, m_settings->GetMovies());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_NICERST));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_settings->GetNiceReset());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SCROLL));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -67,25 +67,9 @@ void CScreenSetupGraphics::CreateInterface()
|
|||
ddim.y = dim.y*0.5f;
|
||||
pos.x = ox+sx*3;
|
||||
pos.y = 0.65f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_GROUND);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
if ( m_simulationSetup )
|
||||
{
|
||||
pc->SetState(STATE_DEAD);
|
||||
}
|
||||
pos.y -= 0.048f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_DIRTY);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
pos.y -= 0.048f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_SKY);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
pos.y -= 0.048f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_LENS);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
pos.y -= 0.048f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_PLANET);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
pos.y -= 0.048f;
|
||||
pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_FOG);
|
||||
pc->SetState(STATE_SHADOW);
|
||||
pos.y -= 0.048f;
|
||||
|
|
@ -130,21 +114,7 @@ void CScreenSetupGraphics::CreateInterface()
|
|||
pos.y = 0.53f;
|
||||
ddim.x = dim.x*2.2f;
|
||||
ddim.y = 18.0f/480.0f;
|
||||
pv = pw->CreateEditValue(pos, ddim, 0, EVENT_INTERFACE_GADGET);
|
||||
pv->SetState(STATE_SHADOW);
|
||||
if ( m_simulationSetup )
|
||||
{
|
||||
pv->SetState(STATE_DEAD);
|
||||
}
|
||||
pv->SetMinValue(0.0f);
|
||||
pv->SetMaxValue(1.0f);
|
||||
pos.x += 0.13f;
|
||||
pos.y -= 0.015f;
|
||||
ddim.x = 0.40f;
|
||||
GetResource(RES_EVENT, EVENT_INTERFACE_GADGET, name);
|
||||
pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL13, name);
|
||||
pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
|
||||
|
||||
//
|
||||
|
||||
pos.x = ox+sx*8.5f;
|
||||
pos.y = 0.475f;
|
||||
|
|
@ -289,12 +259,6 @@ bool CScreenSetupGraphics::EventProcess(const Event &event)
|
|||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_GROUND:
|
||||
m_engine->SetGroundSpot(!m_engine->GetGroundSpot());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_DIRTY:
|
||||
m_engine->SetDirty(!m_engine->GetDirty());
|
||||
ChangeSetupButtons();
|
||||
|
|
@ -308,24 +272,6 @@ bool CScreenSetupGraphics::EventProcess(const Event &event)
|
|||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_LENS:
|
||||
m_engine->SetLensMode(!m_engine->GetLensMode());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_SKY:
|
||||
m_engine->SetSkyMode(!m_engine->GetSkyMode());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_PLANET:
|
||||
m_engine->SetPlanetMode(!m_engine->GetPlanetMode());
|
||||
ChangeSetupButtons();
|
||||
UpdateSetupButtons();
|
||||
break;
|
||||
|
||||
case EVENT_INTERFACE_LIGHT:
|
||||
m_engine->SetLightMode(!m_engine->GetLightMode());
|
||||
ChangeSetupButtons();
|
||||
|
|
@ -334,7 +280,6 @@ bool CScreenSetupGraphics::EventProcess(const Event &event)
|
|||
|
||||
case EVENT_INTERFACE_PARTI:
|
||||
case EVENT_INTERFACE_CLIP:
|
||||
case EVENT_INTERFACE_GADGET:
|
||||
ChangeSetupButtons();
|
||||
break;
|
||||
|
||||
|
|
@ -449,12 +394,6 @@ void CScreenSetupGraphics::UpdateSetupButtons()
|
|||
pc->SetState(STATE_CHECK, !m_engine->GetShadowMapping() && m_engine->GetShadow());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_GROUND));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_engine->GetGroundSpot());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_DIRTY));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
|
|
@ -467,24 +406,6 @@ void CScreenSetupGraphics::UpdateSetupButtons()
|
|||
pc->SetState(STATE_CHECK, m_engine->GetFog());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_LENS));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_engine->GetLensMode());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SKY));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_engine->GetSkyMode());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_PLANET));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
pc->SetState(STATE_CHECK, m_engine->GetPlanetMode());
|
||||
}
|
||||
|
||||
pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_LIGHT));
|
||||
if ( pc != 0 )
|
||||
{
|
||||
|
|
@ -504,13 +425,6 @@ void CScreenSetupGraphics::UpdateSetupButtons()
|
|||
value = m_engine->GetClippingDistance();
|
||||
pv->SetValue(value);
|
||||
}
|
||||
|
||||
pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_GADGET));
|
||||
if ( pv != 0 )
|
||||
{
|
||||
value = m_engine->GetGadgetQuantity();
|
||||
pv->SetValue(value);
|
||||
}
|
||||
}
|
||||
|
||||
// Updates the engine function of the buttons after the setup phase.
|
||||
|
|
@ -539,13 +453,6 @@ void CScreenSetupGraphics::ChangeSetupButtons()
|
|||
m_engine->SetClippingDistance(value);
|
||||
}
|
||||
|
||||
pv = static_cast<CEditValue*>(pw->SearchControl(EVENT_INTERFACE_GADGET));
|
||||
if ( pv != 0 )
|
||||
{
|
||||
value = pv->GetValue();
|
||||
m_engine->SetGadgetQuantity(value);
|
||||
}
|
||||
|
||||
pes = static_cast<CEnumSlider*>(pw->SearchControl(EVENT_INTERFACE_TEXTURE_FILTER));
|
||||
if ( pes != 0 )
|
||||
{
|
||||
|
|
@ -600,12 +507,8 @@ void CScreenSetupGraphics::ChangeSetupQuality(int quality)
|
|||
|
||||
bEnable = true; //(quality >= 0);
|
||||
m_engine->SetShadow(bEnable);
|
||||
m_engine->SetGroundSpot(bEnable);
|
||||
m_engine->SetDirty(bEnable);
|
||||
m_engine->SetFog(bEnable);
|
||||
m_engine->SetLensMode(bEnable);
|
||||
m_engine->SetSkyMode(bEnable);
|
||||
m_engine->SetPlanetMode(bEnable);
|
||||
m_engine->SetLightMode(bEnable);
|
||||
m_camera->SetOverBaseColor(Gfx::Color(0.0f, 0.0f, 0.0f, 0.0f)); // TODO: color ok?
|
||||
|
||||
|
|
@ -619,11 +522,6 @@ void CScreenSetupGraphics::ChangeSetupQuality(int quality)
|
|||
if ( quality > 0 ) value = 2.0f;
|
||||
m_engine->SetClippingDistance(value);
|
||||
|
||||
if ( quality < 0 ) value = 0.5f;
|
||||
if ( quality == 0 ) value = 1.0f;
|
||||
if ( quality > 0 ) value = 1.0f;
|
||||
m_engine->SetGadgetQuantity(value);
|
||||
|
||||
if ( quality < 0 ) m_engine->SetMultiSample(1);
|
||||
if ( quality == 0 ) m_engine->SetMultiSample(2);
|
||||
if ( quality > 0 ) m_engine->SetMultiSample(4);
|
||||
|
|
|
|||
Loading…
Reference in New Issue