From 24db675d3f20bbb6c7f7693ba6851e04aa0b4f03 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Fri, 10 Jul 2015 20:17:00 +0200 Subject: [PATCH] Added x6 speed option --- po/colobot.pot | 6 ++--- po/de.po | 10 +++++--- po/fr.po | 10 +++++--- po/pl.po | 9 +++---- po/ru.po | 10 +++++--- src/app/input.cpp | 2 ++ src/common/key.h | 53 ++++++++++++++++++++-------------------- src/common/restext.cpp | 1 + src/object/robotmain.cpp | 4 +++ 9 files changed, 61 insertions(+), 44 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index 55cfc672..c7639f72 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -249,9 +249,6 @@ msgstr "" msgid "www.colobot.info" msgstr "" -msgid " " -msgstr "" - msgid "Recorder" msgstr "" @@ -496,6 +493,9 @@ msgstr "" msgid "Speed 4.0x\\Quadruple speed" msgstr "" +msgid "Speed 6.0x\\Sextuple speed" +msgstr "" + msgid "Camera up\\Increase camera angle while visiting message origin" msgstr "" diff --git a/po/de.po b/po/de.po index 262e8238..dc41575c 100644 --- a/po/de.po +++ b/po/de.po @@ -20,9 +20,6 @@ msgstr "" "X-Source-Language: en_US\n" "X-POOTLE-MTIME: 1406536037.000000\n" -msgid " " -msgstr " " - msgid " Challenges in the chapter:" msgstr " Liste der Challenges des Kapitels:" @@ -1402,6 +1399,10 @@ msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" msgid "Speed 4.0x\\Quadruple speed" msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" +#, fuzzy +msgid "Speed 6.0x\\Sextuple speed" +msgstr "Geschwindigkeit 2.0x\\Spielgeschwindigkeit doppelt so schnell" + msgid "Spider" msgstr "Spinne" @@ -1822,6 +1823,9 @@ msgstr "" msgid "www.epsitec.com" msgstr "www.epsitec.com" +#~ msgid " " +#~ msgstr " " + #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "3D-Geräusche\\Orten der Geräusche im Raum" diff --git a/po/fr.po b/po/fr.po index fa3085bf..c632eaea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16,9 +16,6 @@ msgstr "" "X-Language: fr_FR\n" "X-Source-Language: en_US\n" -msgid " " -msgstr " " - msgid " Challenges in the chapter:" msgstr " Liste des défis du chapitre :" @@ -1398,6 +1395,10 @@ msgstr "Vitesse 2.0x\\Deux fois plus rapide" msgid "Speed 4.0x\\Quadruple speed" msgstr "Vitesse 2.0x\\Deux fois plus rapide" +#, fuzzy +msgid "Speed 6.0x\\Sextuple speed" +msgstr "Vitesse 2.0x\\Deux fois plus rapide" + msgid "Spider" msgstr "Araignée" @@ -1818,6 +1819,9 @@ msgstr "" msgid "www.epsitec.com" msgstr "www.epsitec.com" +#~ msgid " " +#~ msgstr " " + #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "Bruitages 3D\\Positionnement sonore dans l'espace" diff --git a/po/pl.po b/po/pl.po index b3d46a51..a36a63d2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,9 +21,6 @@ msgstr "" "X-Source-Language: en_US\n" "X-POOTLE-MTIME: 1405002617.000000\n" -msgid " " -msgstr " " - msgid " Challenges in the chapter:" msgstr " Wyzwania w tym rozdziale:" @@ -1398,6 +1395,9 @@ 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" @@ -1829,6 +1829,3 @@ msgstr "www.epsitec.com" #~ msgid "Mouse shadow\\Gives the mouse a shadow" #~ msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy" - -#~ msgid "Speed 3.0x\\Three times faster" -#~ msgstr "Prędkość 3,0x\\Trzy razy szybciej" diff --git a/po/ru.po b/po/ru.po index c584444e..02e77892 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,9 +18,6 @@ msgstr "" "X-Language: ru_RU\n" "X-Source-Language: en_US\n" -msgid " " -msgstr " " - msgid " Challenges in the chapter:" msgstr " Задачи к главе:" @@ -1396,6 +1393,10 @@ msgstr "Скорость 2.0х\\В два раза скорость" msgid "Speed 4.0x\\Quadruple speed" msgstr "Скорость 2.0х\\В два раза скорость" +#, fuzzy +msgid "Speed 6.0x\\Sextuple speed" +msgstr "Скорость 2.0х\\В два раза скорость" + msgid "Spider" msgstr "Маук" @@ -1818,6 +1819,9 @@ msgstr "" msgid "www.epsitec.com" msgstr "www.epsitec.com" +#~ msgid " " +#~ msgstr " " + #~ msgid "3D sound\\3D positioning of the sound" #~ msgstr "3D-звук\\Стерео звук" diff --git a/src/app/input.cpp b/src/app/input.cpp index 084299c4..73a742d6 100644 --- a/src/app/input.cpp +++ b/src/app/input.cpp @@ -215,6 +215,7 @@ void CInput::SetDefaultInputBindings() 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_CAMERA_UP].primary = KEY(PAGEUP); m_inputBindings[INPUT_SLOT_CAMERA_DOWN].primary = KEY(PAGEDOWN); m_inputBindings[INPUT_SLOT_PAUSE].primary = KEY(PAUSE); @@ -296,6 +297,7 @@ static std::map keyTable = { INPUT_SLOT_SPEED20, "speed20" }, { INPUT_SLOT_SPEED30, "speed30" }, { INPUT_SLOT_SPEED40, "speed40" }, + { INPUT_SLOT_SPEED60, "speed60" }, { INPUT_SLOT_CAMERA_UP, "camup" }, { INPUT_SLOT_CAMERA_DOWN, "camdown" }, { INPUT_SLOT_PAUSE, "pause" }, diff --git a/src/common/key.h b/src/common/key.h index ec6a2251..9ee59c49 100644 --- a/src/common/key.h +++ b/src/common/key.h @@ -75,32 +75,33 @@ const unsigned int KEY_INVALID = SDLK_LAST + 1000; */ enum InputSlot { - INPUT_SLOT_LEFT = 0, - INPUT_SLOT_RIGHT = 1, - INPUT_SLOT_UP = 2, - INPUT_SLOT_DOWN = 3, - INPUT_SLOT_GUP = 4, - INPUT_SLOT_GDOWN = 5, - INPUT_SLOT_CAMERA = 6, - INPUT_SLOT_DESEL = 7, - INPUT_SLOT_ACTION = 8, - INPUT_SLOT_NEAR = 9, - INPUT_SLOT_AWAY = 10, - INPUT_SLOT_NEXT = 11, - INPUT_SLOT_HUMAN = 12, - INPUT_SLOT_QUIT = 13, - INPUT_SLOT_HELP = 14, - INPUT_SLOT_PROG = 15, - INPUT_SLOT_VISIT = 16, - INPUT_SLOT_SPEED05 = 17, - INPUT_SLOT_SPEED10 = 18, - INPUT_SLOT_SPEED15 = 19, - INPUT_SLOT_SPEED20 = 20, - INPUT_SLOT_SPEED30 = 21, - INPUT_SLOT_SPEED40 = 22, - INPUT_SLOT_CAMERA_UP = 23, - INPUT_SLOT_CAMERA_DOWN = 24, - INPUT_SLOT_PAUSE = 25, + INPUT_SLOT_LEFT, + INPUT_SLOT_RIGHT, + INPUT_SLOT_UP, + INPUT_SLOT_DOWN, + INPUT_SLOT_GUP, + INPUT_SLOT_GDOWN, + INPUT_SLOT_CAMERA, + INPUT_SLOT_DESEL, + INPUT_SLOT_ACTION, + INPUT_SLOT_NEAR, + INPUT_SLOT_AWAY, + INPUT_SLOT_NEXT, + INPUT_SLOT_HUMAN, + INPUT_SLOT_QUIT, + 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_CAMERA_UP, + INPUT_SLOT_CAMERA_DOWN, + INPUT_SLOT_PAUSE, INPUT_SLOT_MAX }; diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 44373144..1adfee6e 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -239,6 +239,7 @@ void InitializeRestext() 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_CAMERA_UP] = TR("Camera up\\Increase camera angle while visiting message origin"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_CAMERA_DOWN] = TR("Camera down\\Decrease camera angle while visiting message origin"); stringsEvent[EVENT_INTERFACE_KEY+INPUT_SLOT_PAUSE] = TR("Pause\\Pause the game without opening menu"); diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 97dfe226..5facfc02 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -903,6 +903,10 @@ bool CRobotMain::ProcessEvent(Event &event) { SetSpeed(4.0f); } + if (event.key.slot == INPUT_SLOT_SPEED60) + { + SetSpeed(6.0f); + } if (event.key.key == KEY(c) && ((event.kmodState & KEY_MOD(CTRL)) != 0) && m_engine->GetShowStats()) { CObject* obj = GetSelect();