This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit d63ed865f48f9fa8695af731f0f3a46e4fa1b259 Author: tomangelo2 <tomang...@wp.pl> Date: Sun Jun 11 17:50:21 2017 +0200 Added QuickSave/QuickLoad feature #929 Also rearranged a bit speed control buttons to make some space for it F5 - QuickSave F6 - lower speed (current/2) F7 - reset speed F8 - higher speed (current*2) F9 - QuickLoad --- po/colobot.pot | 16 +++---- po/de.po | 109 ++++++++++++++++++++++++++---------------------- po/fr.po | 69 ++++++++++++++++++++---------- po/pl.po | 36 +++++++--------- po/ru.po | 69 ++++++++++++++++++++---------- src/app/input.cpp | 24 +++++------ src/common/key.h | 12 +++--- src/common/restext.cpp | 12 +++--- src/level/robotmain.cpp | 50 ++++++++++++++-------- src/level/robotmain.h | 2 + 10 files changed, 229 insertions(+), 170 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 4aee2bc..bbcbe8b 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -516,25 +516,19 @@ msgstr "" msgid "Origin of last message\\Shows where the last message was sent from" msgstr "" -msgid "Speed 0.5x\\Half speed" +msgid "Lower speed\\Decrease speed by half" msgstr "" -msgid "Speed 1.0x\\Normal speed" +msgid "Standard speed\\Reset speed to normal" msgstr "" -msgid "Speed 1.5x\\1.5 times faster" +msgid "Higher speed\\Doubles speed" msgstr "" -msgid "Speed 2.0x\\Double speed" +msgid "Quick save\\Immediately save game" msgstr "" -msgid "Speed 3.0x\\Triple speed" -msgstr "" - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "" - -msgid "Speed 6.0x\\Sextuple speed" +msgid "Quick load\\Immediately load game" msgstr "" msgid "Pause\\Pause the game without opening menu" diff --git a/po/de.po b/po/de.po index 0227795..9c1fbef 100644 --- a/po/de.po +++ b/po/de.po @@ -100,9 +100,7 @@ msgid "Already carrying something" msgstr "Trägt schon etwas" msgid "Alternative camera mode\\Move sideways instead of rotating (in free camera)" -msgstr "" -"Alternativer Kameramodus\\Seitwärts bewegen statt rotieren (bei freier " -"Kamera)" +msgstr "Alternativer Kameramodus\\Seitwärts bewegen statt rotieren (bei freier Kamera)" msgid "Ambiguous call to overloaded function" msgstr "" @@ -144,14 +142,10 @@ msgid "Automatic indent\\When program editing" msgstr "Automatisches Einrücken\\Beim Bearbeiten der Programme" msgid "Autosave interval\\How often your game will autosave" -msgstr "" -"Auto-Speichern Zeitintervall\\Wie oft das Spiel automatisch abgespeichert " -"wird" +msgstr "Auto-Speichern Zeitintervall\\Wie oft das Spiel automatisch abgespeichert wird" msgid "Autosave slots\\How many autosave slots you'll have" -msgstr "" -"Auto-Speicherplätze\\Wie viele Plätze zum automatischen Speichern zur " -"Verfügung stehen" +msgstr "Auto-Speicherplätze\\Wie viele Plätze zum automatischen Speichern zur Verfügung stehen" msgid "Autosave\\Enables autosave" msgstr "Auto-Speichern\\Aktiviert die automatische Speicherung" @@ -316,9 +310,7 @@ msgid "Camera back\\Moves the camera backward" msgstr "Kamera weiter\\Bewegung der Kamera rückwärts" msgid "Camera border scrolling\\Scrolling when the mouse touches right or left border" -msgstr "" -"Kamerabewegung am Bildschirmrand\\Die Kamera dreht wenn die Maus den rechten " -"oder linken Rand erreicht" +msgstr "Kamerabewegung am Bildschirmrand\\Die Kamera dreht wenn die Maus den rechten oder linken Rand erreicht" msgid "Camera closer\\Moves the camera forward" msgstr "Kamera näher\\Bewegung der Kamera vorwärts" @@ -688,6 +680,10 @@ msgstr "Anweisungen über das ausgewählte Objekt" msgid "Help balloons\\Explain the function of the buttons" msgstr "Hilfeblasen\\Hilfeblasen" +#, fuzzy +msgid "Higher speed\\Doubles speed" +msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" + msgid "Highest\\Highest graphic quality (lowest frame rate)" msgstr "Max.\\Beste Qualität (niedriges Framerate)" @@ -838,6 +834,23 @@ msgstr "Lade Objekte" msgid "Loading terrain" msgstr "Lade Gelände" +# msgid "Speed 0.5x\\Half speed" +# msgstr "" +# msgid "Speed 1.0x\\Normal speed" +# msgstr "" +# msgid "Speed 1.5x\\1.5 times faster" +# msgstr "" +# msgid "Speed 2.0x\\Double speed" +# msgstr "" +# msgid "Speed 3.0x\\Triple speed" +# msgstr "" +# msgid "Speed 4.0x\\Quadruple speed" +# msgstr "" +# msgid "Speed 6.0x\\Sextuple speed" +# msgstr "" +msgid "Lower speed\\Decrease speed by half" +msgstr "" + msgid "Lowest\\Minimum graphic quality (highest frame rate)" msgstr "Min.\\Minimale Qualität (großes Framerate)" @@ -1064,9 +1077,7 @@ msgid "Pause blur\\Blur the background on the pause screen" msgstr "Pausen-Unschärfe\\Während der Pause den Hintergrund unscharf zeichnen" msgid "Pause in background\\Pause the game when the window is unfocused" -msgstr "" -"Pausieren im Hintergrund\\Spiel anhalten,enn das Spielfenster im Hintergrund " -"ist" +msgstr "Pausieren im Hintergrund\\Spiel anhalten,enn das Spielfenster im Hintergrund ist" msgid "Pause/continue" msgstr "Pause/Weitermachen" @@ -1194,6 +1205,12 @@ msgstr "Öffentlich\\Gemeinsamer Ordner für alle Spieler" msgid "Quake at explosions\\The screen shakes at explosions" msgstr "Beben bei Explosionen\\Die Kamera bebt bei Explosionen" +msgid "Quick load\\Immediately load game" +msgstr "" + +msgid "Quick save\\Immediately save game" +msgstr "" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Beenden\\Colobot: Gold Edition schließen" @@ -1404,27 +1421,6 @@ msgstr "Raumschiff" msgid "Spaceship ruin" msgstr "Raumschiffswrack" -msgid "Speed 0.5x\\Half speed" -msgstr "Geschwindigkeit 0.5x\\Halbe Spielgeschwindigkeit" - -msgid "Speed 1.0x\\Normal speed" -msgstr "Geschwindigkeit 1.0x\\Normale Spielgeschwindigkeit" - -msgid "Speed 1.5x\\1.5 times faster" -msgstr "Geschwindigkeit 1.5x\\Spielgeschwindigkeit anderthalb Mal schneller" - -msgid "Speed 2.0x\\Double speed" -msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" - -msgid "Speed 3.0x\\Triple speed" -msgstr "Geschwindigkeit 3.0x\\Dreifache Spielgeschwindigkeit" - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "Geschwindigkeit 4.0x\\Vierfache Spielgeschwindigkeit" - -msgid "Speed 6.0x\\Sextuple speed" -msgstr "Geschwindigkeit 6.0x\\Sechsfache Spielgeschwindigkeit" - msgid "Spider" msgstr "Spinne" @@ -1440,6 +1436,9 @@ msgstr "Standardhandlung\\Führt die Standardhandlung des Roboters aus" msgid "Standard controls\\Standard key functions" msgstr "Alles zurücksetzen\\Standarddefinition aller Tasten" +msgid "Standard speed\\Reset speed to normal" +msgstr "" + msgid "Standard\\Standard appearance settings" msgstr "Standard\\Standardfarben einsetzen" @@ -1525,9 +1524,7 @@ msgid "This label does not exist" msgstr "Dieses Label existiert nicht" msgid "This menu is for userlevels from mods, but you didn't install any" -msgstr "" -"Dieses Menü ist für nachinstallierte Benutzer-Level, aber Du hast keine " -"installiert" +msgstr "Dieses Menü ist für nachinstallierte Benutzer-Level, aber Du hast keine installiert" msgid "This object is currently busy" msgstr "" @@ -1740,22 +1737,14 @@ msgstr "Sie haben ein brauchbares Objekt gefunden" #, c-format msgid "You have to use \"%1$s\" at least once in this exercise (used: %2$d)" msgid_plural "You have to use \"%1$s\" at least %3$d times in this exercise (used: %2$d)" -msgstr[0] "" -"In dieser Übung \"%1$s\" muß mindestens einmal verwendet werden (benutzt: %" -"2$d)" -msgstr[1] "" -"In dieser Übung muß \"%1$s\" mindestes %3$d Mal verwendet werden (benutzt: %" -"2$d)" +msgstr[0] "In dieser Übung \"%1$s\" muß mindestens einmal verwendet werden (benutzt: %2$d)" +msgstr[1] "In dieser Übung muß \"%1$s\" mindestes %3$d Mal verwendet werden (benutzt: %2$d)" #, c-format msgid "You have to use \"%1$s\" at most once in this exercise (used: %2$d)" msgid_plural "You have to use \"%1$s\" at most %3$d times in this exercise (used: %2$d)" -msgstr[0] "" -"In dieser Übung darf \"%1$s\" höchstens einmal verwendet werden (benutzt: %" -"2$d)" -msgstr[1] "" -"In dieser Übung darf \"%1$s\" höchstens %3$d Mal verwendet werden (benutzt: %" -"2$d)" +msgstr[0] "In dieser Übung darf \"%1$s\" höchstens einmal verwendet werden (benutzt: %2$d)" +msgstr[1] "In dieser Übung darf \"%1$s\" höchstens %3$d Mal verwendet werden (benutzt: %2$d)" msgid "You must get on the spaceship to take off" msgstr "Begib Dich an Bord, bevor Du abhebst" @@ -1968,9 +1957,27 @@ msgstr "epsitec.com" #~ msgid "Sky\\Clouds and nebulae" #~ msgstr "Himmel\\Himmel und Wolken" +#~ msgid "Speed 0.5x\\Half speed" +#~ msgstr "Geschwindigkeit 0.5x\\Halbe Spielgeschwindigkeit" + +#~ msgid "Speed 1.0x\\Normal speed" +#~ msgstr "Geschwindigkeit 1.0x\\Normale Spielgeschwindigkeit" + +#~ msgid "Speed 1.5x\\1.5 times faster" +#~ msgstr "Geschwindigkeit 1.5x\\Spielgeschwindigkeit anderthalb Mal schneller" + #~ msgid "Speed 3.0x\\Three times faster" #~ msgstr "Geschwindigkeit 3.0x\\Spielgeschwindigkeit drei Mal schneller" +#~ msgid "Speed 3.0x\\Triple speed" +#~ msgstr "Geschwindigkeit 3.0x\\Dreifache Spielgeschwindigkeit" + +#~ msgid "Speed 4.0x\\Quadruple speed" +#~ msgstr "Geschwindigkeit 4.0x\\Vierfache Spielgeschwindigkeit" + +#~ msgid "Speed 6.0x\\Sextuple speed" +#~ msgstr "Geschwindigkeit 6.0x\\Sechsfache Spielgeschwindigkeit" + #~ msgid "Sunbeams\\Sunbeams in the sky" #~ msgstr "Sonnenstrahlen\\Sonnenstrahlen" diff --git a/po/fr.po b/po/fr.po index 2de5e5a..16e1546 100644 --- a/po/fr.po +++ b/po/fr.po @@ -677,6 +677,10 @@ msgstr "Instructions sur la sélection" msgid "Help balloons\\Explain the function of the buttons" msgstr "Bulles d'aide\\Bulles explicatives" +#, fuzzy +msgid "Higher speed\\Doubles speed" +msgstr "Vitesse 2.0x\\Deux fois plus rapide" + msgid "Highest\\Highest graphic quality (lowest frame rate)" msgstr "Maxi\\Haute qualité (+ lent)" @@ -827,6 +831,23 @@ msgstr "Chargement des objets" msgid "Loading terrain" msgstr "Chargement du terrain" +# msgid "Speed 0.5x\\Half speed" +# msgstr "" +# msgid "Speed 1.0x\\Normal speed" +# msgstr "" +# msgid "Speed 1.5x\\1.5 times faster" +# msgstr "" +# msgid "Speed 2.0x\\Double speed" +# msgstr "" +# msgid "Speed 3.0x\\Triple speed" +# msgstr "" +# msgid "Speed 4.0x\\Quadruple speed" +# msgstr "" +# msgid "Speed 6.0x\\Sextuple speed" +# msgstr "" +msgid "Lower speed\\Decrease speed by half" +msgstr "" + msgid "Lowest\\Minimum graphic quality (highest frame rate)" msgstr "Mini\\Qualité minimale (+ rapide)" @@ -1181,6 +1202,12 @@ msgstr "Public\\Dossier commun à tous les joueurs" msgid "Quake at explosions\\The screen shakes at explosions" msgstr "Secousses lors d'explosions\\L'écran vibre lors d'une explosion" +msgid "Quick load\\Immediately load game" +msgstr "" + +msgid "Quick save\\Immediately save game" +msgstr "" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Quitter\\Quitter Colobot : Édition Gold" @@ -1391,27 +1418,6 @@ msgstr "Vaisseau spatial" msgid "Spaceship ruin" msgstr "Epave de vaisseau spatial" -msgid "Speed 0.5x\\Half speed" -msgstr "Vitesse 0.5x\\Demi-vitesse" - -msgid "Speed 1.0x\\Normal speed" -msgstr "Vitesse 1.0x\\Vitesse normale" - -msgid "Speed 1.5x\\1.5 times faster" -msgstr "Vitesse 1.5x\\Une fois et demi plus rapide" - -msgid "Speed 2.0x\\Double speed" -msgstr "Vitesse 2.0x\\Deux fois plus rapide" - -msgid "Speed 3.0x\\Triple speed" -msgstr "Vitesse 3.0x\\Trois fois plus rapide " - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "Vitesse 4.0x\\Quatre fois plus rapide" - -msgid "Speed 6.0x\\Sextuple speed" -msgstr "Vitesse 6.0x\\Six fois plus rapide" - msgid "Spider" msgstr "Araignée" @@ -1427,6 +1433,9 @@ msgstr "Action standard\\Action du bouton avec le cadre rouge" msgid "Standard controls\\Standard key functions" msgstr "Tout réinitialiser\\Remet toutes les touches standards" +msgid "Standard speed\\Reset speed to normal" +msgstr "" + msgid "Standard\\Standard appearance settings" msgstr "Standard\\Remet les couleurs standards" @@ -1950,9 +1959,27 @@ msgstr "epsitec.com" #~ msgid "Sky\\Clouds and nebulae" #~ msgstr "Ciel\\Ciel et nuages" +#~ msgid "Speed 0.5x\\Half speed" +#~ msgstr "Vitesse 0.5x\\Demi-vitesse" + +#~ msgid "Speed 1.0x\\Normal speed" +#~ msgstr "Vitesse 1.0x\\Vitesse normale" + +#~ msgid "Speed 1.5x\\1.5 times faster" +#~ msgstr "Vitesse 1.5x\\Une fois et demi plus rapide" + #~ msgid "Speed 3.0x\\Three times faster" #~ msgstr "Vitesse 3.0x\\Trois fois plus rapide" +#~ msgid "Speed 3.0x\\Triple speed" +#~ msgstr "Vitesse 3.0x\\Trois fois plus rapide " + +#~ msgid "Speed 4.0x\\Quadruple speed" +#~ msgstr "Vitesse 4.0x\\Quatre fois plus rapide" + +#~ msgid "Speed 6.0x\\Sextuple speed" +#~ msgstr "Vitesse 6.0x\\Six fois plus rapide" + #~ msgid "Sunbeams\\Sunbeams in the sky" #~ msgstr "Rayons du soleil\\Rayons selon l'orientation" diff --git a/po/pl.po b/po/pl.po index 2995e51..9d531ed 100644 --- a/po/pl.po +++ b/po/pl.po @@ -678,6 +678,9 @@ msgstr "Pomoc na temat zaznaczonego obiektu" msgid "Help balloons\\Explain the function of the buttons" msgstr "Dymki pomocy\\Wyjaśnia funkcje przycisków" +msgid "Higher speed\\Doubles speed" +msgstr "Zwiększ prędkość\\Podwaja prędkość" + msgid "Highest\\Highest graphic quality (lowest frame rate)" msgstr "Najwyższa\\Maksymalna jakość grafiki (najniższa częstotliwość odświeżania)" @@ -828,6 +831,9 @@ msgstr "Wczytywanie obiektów" msgid "Loading terrain" msgstr "Wczytywanie terenu" +msgid "Lower speed\\Decrease speed by half" +msgstr "Zmniejsz prędkość\\Zmniejsza prędkość o połowę" + msgid "Lowest\\Minimum graphic quality (highest frame rate)" msgstr "Najniższa\\Minimalna jakość grafiki (najwyższa częstotliwość odświeżania)" @@ -1182,6 +1188,12 @@ msgstr "Publiczny\\Folder ogólnodostępny" msgid "Quake at explosions\\The screen shakes at explosions" msgstr "Wstrząsy przy wybuchach\\Ekran trzęsie się podczas wybuchów" +msgid "Quick load\\Immediately load game" +msgstr "Szybkie wczytywanie\\Natychmiastowo wczytuje zapisaną grę" + +msgid "Quick save\\Immediately save game" +msgstr "Szybki zapis\\Natychmiastowo zapisuje grę" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Wyjdź\\Kończy grę Colobot: Gold Edition" @@ -1392,27 +1404,6 @@ msgstr "Statek kosmiczny" msgid "Spaceship ruin" msgstr "Ruiny statku kosmicznego" -msgid "Speed 0.5x\\Half speed" -msgstr "Prędkość 0,5x\\Połowa prękości" - -msgid "Speed 1.0x\\Normal speed" -msgstr "Prędkość 1,0x\\Prędkość normalna" - -msgid "Speed 1.5x\\1.5 times faster" -msgstr "Prędkość 1,5x\\1,5 raza szybciej" - -msgid "Speed 2.0x\\Double speed" -msgstr "Prędkość 2,0x\\Dwa razy szybciej" - -msgid "Speed 3.0x\\Triple speed" -msgstr "Prędkość 3,0x\\Trzy razy szybciej" - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "Prędkość 4,0x\\Cztery razy szybciej" - -msgid "Speed 6.0x\\Sextuple speed" -msgstr "Prędkość 6,0x\\Sześć razy szybciej" - msgid "Spider" msgstr "Pająk" @@ -1428,6 +1419,9 @@ msgstr "Standardowa akcja\\Standardowa akcja robota (podnieś/upuść, strzelaj, msgid "Standard controls\\Standard key functions" msgstr "Standardowa kontrola\\Standardowe klawisze funkcyjne" +msgid "Standard speed\\Reset speed to normal" +msgstr "Standardowa prędkość\\Resetuje prędkość do wartości domyślnej" + msgid "Standard\\Standard appearance settings" msgstr "Standardowe\\Standardowe ustawienia wyglądu" diff --git a/po/ru.po b/po/ru.po index b460b77..fa1686d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -686,6 +686,10 @@ msgstr "Справка о выбранном объекте" msgid "Help balloons\\Explain the function of the buttons" msgstr "Подсказки\\Объяснение функций кнопок" +#, fuzzy +msgid "Higher speed\\Doubles speed" +msgstr "Скорость 2.0х\\В два раза быстрее" + msgid "Highest\\Highest graphic quality (lowest frame rate)" msgstr "Высок.\\Самые высокие настройки графики (лучшее качество)" @@ -836,6 +840,23 @@ msgstr "Загрузка объектов" msgid "Loading terrain" msgstr "Загрузка местности" +# msgid "Speed 0.5x\\Half speed" +# msgstr "" +# msgid "Speed 1.0x\\Normal speed" +# msgstr "" +# msgid "Speed 1.5x\\1.5 times faster" +# msgstr "" +# msgid "Speed 2.0x\\Double speed" +# msgstr "" +# msgid "Speed 3.0x\\Triple speed" +# msgstr "" +# msgid "Speed 4.0x\\Quadruple speed" +# msgstr "" +# msgid "Speed 6.0x\\Sextuple speed" +# msgstr "" +msgid "Lower speed\\Decrease speed by half" +msgstr "" + msgid "Lowest\\Minimum graphic quality (highest frame rate)" msgstr "Низкое\\Минимальное качество графики (быстро)" @@ -1193,6 +1214,12 @@ msgstr "Общее\\Общая папка" msgid "Quake at explosions\\The screen shakes at explosions" msgstr "Землетряс. при взрывах\\Тряска экрана при взрывах" +msgid "Quick load\\Immediately load game" +msgstr "" + +msgid "Quick save\\Immediately save game" +msgstr "" + msgid "Quit\\Quit Colobot: Gold Edition" msgstr "Выход\\Выйти из Colobot: Gold Edition" @@ -1406,27 +1433,6 @@ msgstr "Космический корабль" msgid "Spaceship ruin" msgstr "Обломки корабля" -msgid "Speed 0.5x\\Half speed" -msgstr "Скорость 0.5х\\В два раза медленнее" - -msgid "Speed 1.0x\\Normal speed" -msgstr "Скорость 1.0х\\Нормальная скорость" - -msgid "Speed 1.5x\\1.5 times faster" -msgstr "Скорость 1.5х\\В полтора раза быстрее" - -msgid "Speed 2.0x\\Double speed" -msgstr "Скорость 2.0х\\В два раза быстрее" - -msgid "Speed 3.0x\\Triple speed" -msgstr "Скорость 3.0х\\В три раза быстрее" - -msgid "Speed 4.0x\\Quadruple speed" -msgstr "Скорость 4.0х\\В четыре раза быстрее" - -msgid "Speed 6.0x\\Sextuple speed" -msgstr "Скорость 6.0х\\В шесть раз быстрее" - msgid "Spider" msgstr "Паук" @@ -1442,6 +1448,9 @@ msgstr "Стандартное действие\\Стандартное дейс msgid "Standard controls\\Standard key functions" msgstr "Стандартное управление\\Сделать управление по умолчанию" +msgid "Standard speed\\Reset speed to normal" +msgstr "" + msgid "Standard\\Standard appearance settings" msgstr "По умолчанию\\Настройки внешнего вида по умолчанию" @@ -1960,9 +1969,27 @@ msgstr "epsitec.com" #~ msgid "Sky\\Clouds and nebulae" #~ msgstr "Небо\\Облака и туманности" +#~ msgid "Speed 0.5x\\Half speed" +#~ msgstr "Скорость 0.5х\\В два раза медленнее" + +#~ msgid "Speed 1.0x\\Normal speed" +#~ msgstr "Скорость 1.0х\\Нормальная скорость" + +#~ msgid "Speed 1.5x\\1.5 times faster" +#~ msgstr "Скорость 1.5х\\В полтора раза быстрее" + #~ msgid "Speed 3.0x\\Three times faster" #~ msgstr "Скорость 3.0х\\В три раза быстрее" +#~ msgid "Speed 3.0x\\Triple speed" +#~ msgstr "Скорость 3.0х\\В три раза быстрее" + +#~ msgid "Speed 4.0x\\Quadruple speed" +#~ msgstr "Скорость 4.0х\\В четыре раза быстрее" + +#~ msgid "Speed 6.0x\\Sextuple speed" +#~ msgstr "Скорость 6.0х\\В шесть раз быстрее" + #~ msgid "Sunbeams\\Sunbeams in the sky" #~ msgstr "Солнечные лучи\\Солнечные лучи в небе" diff --git a/src/app/input.cpp b/src/app/input.cpp index 142a455..ebaf62e 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -59,13 +59,11 @@ CInput::CInput() { INPUT_SLOT_HELP, "help" }, { INPUT_SLOT_PROG, "prog" }, { INPUT_SLOT_VISIT, "visit" }, - { INPUT_SLOT_SPEED05, "speed05" }, - { INPUT_SLOT_SPEED10, "speed10" }, - { INPUT_SLOT_SPEED15, "speed15" }, - { INPUT_SLOT_SPEED20, "speed20" }, - { INPUT_SLOT_SPEED30, "speed30" }, - { INPUT_SLOT_SPEED40, "speed40" }, - { INPUT_SLOT_SPEED60, "speed60" }, + { INPUT_SLOT_SPEED_DEC, "speed_dec" }, + { INPUT_SLOT_SPEED_RESET,"speed_reset" }, + { INPUT_SLOT_SPEED_INC, "speed_inc" }, + { INPUT_SLOT_QUICKSAVE, "quicksave" }, + { INPUT_SLOT_QUICKLOAD, "quickload" }, { INPUT_SLOT_PAUSE, "pause" }, { INPUT_SLOT_CMDLINE, "cmdline" }, }; @@ -274,13 +272,11 @@ void CInput::SetDefaultInputBindings() m_inputBindings[INPUT_SLOT_HELP ].primary = KEY(F1); m_inputBindings[INPUT_SLOT_PROG ].primary = KEY(F2); m_inputBindings[INPUT_SLOT_VISIT ].primary = KEY(KP_PERIOD); - m_inputBindings[INPUT_SLOT_SPEED05].primary = KEY(F3); - m_inputBindings[INPUT_SLOT_SPEED10].primary = KEY(F4); - m_inputBindings[INPUT_SLOT_SPEED15].primary = KEY(F5); - m_inputBindings[INPUT_SLOT_SPEED20].primary = KEY(F6); - m_inputBindings[INPUT_SLOT_SPEED30].primary = KEY(F7); - m_inputBindings[INPUT_SLOT_SPEED40].primary = KEY(F8); - m_inputBindings[INPUT_SLOT_SPEED60].primary = KEY(F9); + m_inputBindings[INPUT_SLOT_QUICKSAVE].primary = KEY(F5); + m_inputBindings[INPUT_SLOT_SPEED_DEC].primary = KEY(F6); + m_inputBindings[INPUT_SLOT_SPEED_RESET].primary = KEY(F7); + m_inputBindings[INPUT_SLOT_SPEED_INC].primary = KEY(F8); + m_inputBindings[INPUT_SLOT_QUICKLOAD].primary = KEY(F9); m_inputBindings[INPUT_SLOT_PAUSE].primary = KEY(PAUSE); m_inputBindings[INPUT_SLOT_PAUSE].secondary = KEY(p); m_inputBindings[INPUT_SLOT_CMDLINE].primary = KEY(BACKQUOTE); diff --git a/src/common/key.h b/src/common/key.h index d249860..4341519 100644 --- a/src/common/key.h +++ b/src/common/key.h @@ -100,13 +100,11 @@ enum InputSlot INPUT_SLOT_HELP, INPUT_SLOT_PROG, INPUT_SLOT_VISIT, - INPUT_SLOT_SPEED05, - INPUT_SLOT_SPEED10, - INPUT_SLOT_SPEED15, - INPUT_SLOT_SPEED20, - INPUT_SLOT_SPEED30, - INPUT_SLOT_SPEED40, - INPUT_SLOT_SPEED60, + INPUT_SLOT_SPEED_DEC, + INPUT_SLOT_SPEED_RESET, + INPUT_SLOT_SPEED_INC, + INPUT_SLOT_QUICKSAVE, + INPUT_SLOT_QUICKLOAD, INPUT_SLOT_PAUSE, INPUT_SLOT_CMDLINE, diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 87812d6..5a91541 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -240,13 +240,11 @@ void InitializeRestext() stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_HELP] = TR("Instructions\\Shows the instructions for the current mission"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_PROG] = TR("Programming help\\Gives more detailed help with programming"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_VISIT] = TR("Origin of last message\\Shows where the last message was sent from"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED05] = TR("Speed 0.5x\\Half speed"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED10] = TR("Speed 1.0x\\Normal speed"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED15] = TR("Speed 1.5x\\1.5 times faster"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED20] = TR("Speed 2.0x\\Double speed"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED30] = TR("Speed 3.0x\\Triple speed"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED40] = TR("Speed 4.0x\\Quadruple speed"); - stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED60] = TR("Speed 6.0x\\Sextuple speed"); + stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED_DEC] = TR("Lower speed\\Decrease speed by half"); + stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED_RESET] = TR("Standard speed\\Reset speed to normal"); + stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_SPEED_INC] = TR("Higher speed\\Doubles speed"); + stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_QUICKSAVE] = TR("Quick save\\Immediately save game"); + stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_QUICKLOAD] = TR("Quick load\\Immediately load game"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_PAUSE] = TR("Pause\\Pause the game without opening menu"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_CMDLINE] = TR("Cheat console\\Show cheat console"); diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 6c8cb09..43801d8 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -968,33 +968,25 @@ bool CRobotMain::ProcessEvent(Event &event) { StartDisplayVisit(EVENT_NULL); } - if (data->slot == INPUT_SLOT_SPEED05) + if (data->slot == INPUT_SLOT_SPEED_DEC) { - SetSpeed(0.5f); + SetSpeed(GetSpeed()*0.5f); } - if (data->slot == INPUT_SLOT_SPEED10) + if (data->slot == INPUT_SLOT_SPEED_RESET) { SetSpeed(1.0f); } - if (data->slot == INPUT_SLOT_SPEED15) + if (data->slot == INPUT_SLOT_SPEED_INC) { - SetSpeed(1.5f); + SetSpeed(GetSpeed()*2.0f); } - if (data->slot == INPUT_SLOT_SPEED20) + if (data->slot == INPUT_SLOT_QUICKSAVE) { - SetSpeed(2.0f); + QuickSave(); } - if (data->slot == INPUT_SLOT_SPEED30) + if (data->slot == INPUT_SLOT_QUICKLOAD) { - SetSpeed(3.0f); - } - if (data->slot == INPUT_SLOT_SPEED40) - { - SetSpeed(4.0f); - } - if (data->slot == INPUT_SLOT_SPEED60) - { - SetSpeed(6.0f); + QuickLoad(); } if (data->key == KEY(c) && ((event.kmodState & KEY_MOD(CTRL)) != 0) && m_engine->GetShowStats()) { @@ -5565,6 +5557,30 @@ void CRobotMain::Autosave() m_playerProfile->SaveScene(dir, info); } +void CRobotMain::QuickSave() +{ + GetLogger()->Info("Quicksave!\n"); + + char infostr[100]; + time_t now = time(nullptr); + strftime(infostr, 99, "%y.%m.%d %H:%M", localtime(&now)); + std::string info = std::string("[QUICKSAVE]") + infostr; + std::string dir = m_playerProfile->GetSaveFile(std::string("quicksave")); + + m_playerProfile->SaveScene(dir, info); +} + +void CRobotMain::QuickLoad() +{ + std::string dir = m_playerProfile->GetSaveFile(std::string("quicksave")); + if(!CResourceManager::Exists(dir)) + { + GetLogger()->Debug("Quicksave slot not found\n"); + return; + } + m_playerProfile->LoadScene(dir); +} + void CRobotMain::SetExitAfterMission(bool exit) { m_exitAfterMission = exit; diff --git a/src/level/robotmain.h b/src/level/robotmain.h index fee753f..9b1511c 100644 --- a/src/level/robotmain.h +++ b/src/level/robotmain.h @@ -510,6 +510,8 @@ protected: void AutosaveRotate(); void Autosave(); + void QuickSave(); + void QuickLoad(); bool DestroySelectedObject(); void PushToSelectionHistory(CObject* obj); CObject* PopFromSelectionHistory(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits