sfan5
/
BlockPlanet-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the keymap to resemble minecraft's keymap

master
Joel Leclerc 2012-04-30 21:31:43 -06:00
parent 62ca46cece
commit 0d37fe3f4c
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/defaultsettings.cpp
View File

@ -38,14 +38,14 @@ void set_default_settings(Settings *settings)
settings->setDefault("keymap_jump", "KEY_SPACE");
settings->setDefault("keymap_sneak", "KEY_LSHIFT");
settings->setDefault("keymap_drop", "KEY_KEY_Q");
settings->setDefault("keymap_inventory", "KEY_KEY_R");
settings->setDefault("keymap_special1", "KEY_KEY_E");
settings->setDefault("keymap_inventory", "KEY_KEY_E");
//settings->setDefault("keymap_special1", "KEY_KEY_E");
settings->setDefault("keymap_chat", "KEY_KEY_T");
settings->setDefault("keymap_cmd", "/");
settings->setDefault("keymap_console", "KEY_F10");
settings->setDefault("keymap_rangeselect", "KEY_F3");
settings->setDefault("keymap_freemove", "KEY_KEY_C");
settings->setDefault("keymap_fastmove", "KEY_KEY_X");
//settings->setDefault("keymap_freemove", "KEY_KEY_C");
//settings->setDefault("keymap_fastmove", "KEY_KEY_X");
settings->setDefault("keymap_screenshot", "KEY_F12");
settings->setDefault("keymap_toggle_hud", "KEY_F1");
settings->setDefault("keymap_toggle_chat", "KEY_F2");

6
src/game.cpp
View File

@ -1767,7 +1767,7 @@ void the_game(
statustext += L" (note: no 'fly' privilege)";
}
}*/
if(input->wasKeyDown(getKeySetting("keymap_fastmove")))
/*if(input->wasKeyDown(getKeySetting("keymap_fastmove")))
{
if(g_settings->getBool("fast_move"))
{
@ -1783,7 +1783,7 @@ void the_game(
if(!client.checkPrivilege("fast"))
statustext += L" (note: no 'fast' privilege)";
}
}
}*/
if(input->wasKeyDown(getKeySetting("keymap_screenshot")))
{
irr::video::IImage* const image = driver->createScreenShot();
@ -2073,7 +2073,7 @@ void the_game(
input->isKeyDown(getKeySetting("keymap_left")),
input->isKeyDown(getKeySetting("keymap_right")),
input->isKeyDown(getKeySetting("keymap_jump")),
input->isKeyDown(getKeySetting("keymap_special1")),
//input->isKeyDown(getKeySetting("keymap_special1")),
input->isKeyDown(getKeySetting("keymap_sneak")),
camera_pitch,
camera_yaw

12
src/guiKeyChangeMenu.cpp
View File

@ -408,9 +408,9 @@ bool GUIKeyChangeMenu::acceptInput()
g_settings->set("keymap_cmd", key_cmd.sym());
g_settings->set("keymap_console", key_console.sym());
g_settings->set("keymap_rangeselect", key_range.sym());
g_settings->set("keymap_freemove", key_fly.sym());
g_settings->set("keymap_fastmove", key_fast.sym());
g_settings->set("keymap_special1", key_use.sym());
//g_settings->set("keymap_freemove", key_fly.sym());
//g_settings->set("keymap_fastmove", key_fast.sym());
//g_settings->set("keymap_special1", key_use.sym());
g_settings->set("keymap_print_debug_stacks", key_dump.sym());
clearKeyCache();
return true;
@ -429,9 +429,9 @@ void GUIKeyChangeMenu::init_keys()
key_cmd = getKeySetting("keymap_cmd");
key_console = getKeySetting("keymap_console");
key_range = getKeySetting("keymap_rangeselect");
key_fly = getKeySetting("keymap_freemove");
key_fast = getKeySetting("keymap_fastmove");
key_use = getKeySetting("keymap_special1");
//key_fly = getKeySetting("keymap_freemove");
//key_fast = getKeySetting("keymap_fastmove");
//key_use = getKeySetting("keymap_special1");
key_dump = getKeySetting("keymap_print_debug_stacks");
}

2
src/input.cpp
View File

@ -229,6 +229,7 @@ void RandomInputHandler::step(float dtime)
keydown.toggle(getKeySetting("keymap_jump"));
}
}
#if 0
{
static float counter1 = 0;
counter1 -= dtime;
@ -238,6 +239,7 @@ void RandomInputHandler::step(float dtime)
keydown.toggle(getKeySetting("keymap_special1"));
}
}
#endif
{
static float counter1 = 0;
counter1 -= dtime;

8
src/localplayer.h
View File

@ -31,7 +31,7 @@ struct PlayerControl
left = false;
right = false;
jump = false;
aux1 = false;
//aux1 = false;
sneak = false;
pitch = 0;
yaw = 0;
@ -42,7 +42,7 @@ struct PlayerControl
bool a_left,
bool a_right,
bool a_jump,
bool a_aux1,
//bool a_aux1,
bool a_sneak,
float a_pitch,
float a_yaw
@ -53,7 +53,7 @@ struct PlayerControl
left = a_left;
right = a_right;
jump = a_jump;
aux1 = a_aux1;
//aux1 = a_aux1;
sneak = a_sneak;
pitch = a_pitch;
yaw = a_yaw;
@ -63,7 +63,7 @@ struct PlayerControl
bool left;
bool right;
bool jump;
bool aux1;
//bool aux1;
bool sneak;
float pitch;
float yaw;