Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-17 17:19:03 +0000
committerStijn Buys <ingar@osirion.org>2010-10-17 17:19:03 +0000
commitd6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b (patch)
tree63744dff093a8b23f65d9c68b922b678805647d9 /src/client/keyboard.cc
parentea6e6bb769d713ac55114c1940626f13e384ebed (diff)
core bullet physics support,
initial vstrafe support
Diffstat (limited to 'src/client/keyboard.cc')
-rw-r--r--src/client/keyboard.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/client/keyboard.cc b/src/client/keyboard.cc
index e617c59..176e310 100644
--- a/src/client/keyboard.cc
+++ b/src/client/keyboard.cc
@@ -54,6 +54,8 @@ Keyboard::Keyboard()
add_action("+strafeleft", Action::StrafeLeft, "strafe left");
add_action("+straferight", Action::StrafeRight, "strafe right");
+ add_action("+strafeup", Action::StrafeUp, "strafe up");
+ add_action("+strafedown", Action::StrafeDown, "strafe down");
add_action("+afterburner", Action::Afterburner, "afterburner");
add_action("+reverse", Action::Reverse, "reverse engine");
@@ -112,11 +114,11 @@ Keyboard::Keyboard()
add_key("`", SDLK_BACKQUOTE, '`', "+console");
add_key("a", SDLK_a, 'a', "+strafeleft");
- add_key("b", SDLK_b, 'b');
+ add_key("b", SDLK_b, 'b', "beam");
add_key("c", SDLK_c, 'c');
add_key("d", SDLK_d, 'd', "+straferight");
add_key("e", SDLK_e, 'e', "+rollright");
- add_key("f", SDLK_f, 'f');
+ add_key("f", SDLK_f, 'f', "+strafedown");
add_key("g", SDLK_g, 'g');
add_key("h", SDLK_h, 'h');
add_key("i", SDLK_i, 'i');
@@ -130,7 +132,7 @@ Keyboard::Keyboard()
add_key("o", SDLK_o, 'o');
add_key("p", SDLK_p, 'p');
add_key("q", SDLK_q, 'q', "+rollleft");
- add_key("r", SDLK_r, 'r');
+ add_key("r", SDLK_r, 'r', "+strafeup");
add_key("s", SDLK_s, 's', "+reverse");
add_key("t", SDLK_t, 't', "ui_chatbar");
add_key("u", SDLK_u, 'u');
@@ -280,16 +282,16 @@ void Keyboard::save_binds()
for (it = begin(); it != end(); it++) {
Key *key = (*it).second;
if (key->bind(Key::None).size()) {
- ofs << "bind " << key->name() << " " << key->bind(Key::None) << std::endl;
+ ofs << "bind " << key->name() << " \"" << key->bind(Key::None) << '\"' << std::endl;
}
if (key->bind(Key::Shift).size()) {
- ofs << "bind shift+" << key->name() << " " << key->bind(Key::Shift) << std::endl;
+ ofs << "bind shift+" << key->name() << " \"" << key->bind(Key::Shift) << '\"' << std::endl;
}
if (key->bind(Key::Ctrl).size()) {
- ofs << "bind ctrl+" << key->name() << " " << key->bind(Key::Ctrl) << std::endl;
+ ofs << "bind ctrl+" << key->name() << " \"" << key->bind(Key::Ctrl) << '\"' << std::endl;
}
if (key->bind(Key::Alt).size()) {
- ofs << "bind alt+" << key->name() << " " << key->bind(Key::Alt) << std::endl;
+ ofs << "bind alt+" << key->name() << " \"" << key->bind(Key::Alt) << '\"' << std::endl;
}
/*
} else {