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

Added x6 speed option

master
krzys-h 2015-07-10 20:17:00 +02:00
parent 0dfbb00491
commit 24db675d3f
9 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
po/colobot.pot
View File

@ -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 ""

10
po/de.po
View File

@ -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"

10
po/fr.po
View File

@ -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"

9
po/pl.po
View File

@ -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"

10
po/ru.po
View File

@ -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-звук\\Стерео звук"

2
src/app/input.cpp
View File

@ -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<InputSlot, std::string> 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" },

53
src/common/key.h
View File

@ -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
};

1
src/common/restext.cpp
View File

@ -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");

4
src/object/robotmain.cpp
View File

@ -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();