From 033bd59cfc2dff93529ad448459ad6348ea29c8d Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 3 Sep 2008 19:43:31 +0000
Subject: only one key repeat per frame

---
 doc/manual.html        | 38 +++++++++++++++++++++++---------------
 osirion.kdevelop       |  2 +-
 src/client/input.cc    |  7 ++-----
 src/client/keyboard.cc |  5 +++--
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/doc/manual.html b/doc/manual.html
index e6ee5e5..b788485 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -51,7 +51,7 @@ bind p screenshot
 </pre>
 <p>
 	You can use the <i>list_binds</i> command to get a list of currently
-	bound keys. Use the 'list_keys' command to get a list of all
+	bound keys. Use the <i>list_keys</i> command to get a list of all
 	available key names.
 <p>
 	The default configuration:
@@ -67,27 +67,27 @@ bind p screenshot
 	<tr><td>shift+v
 	</td><td>previous camera view
 	</td></tr>
-	
-	<tr><td>space bar
-	</td><td>toggle mouse control on or off
-	</td></tr>
-	
-	<tr><td>arrow left right up down 
+
+	<tr><td>left right up down 
 	</td><td>rotate camera in free view
-	</td></tr>
+	</td></tr>	
 
-	<tr><td>keypad left right up down
-	</td><td>steer the ship left/right/up/down
+	<tr><td>keypad left right
+	</td><td>direction
 	</td></tr>
 
-	<tr><td>keypad / *
-	</td><td>roll left/right
+	<tr><td>keypad up down
+	</td><td>pitch
 	</td></tr>
 
 	<tr><td>keypad + -
 	</td><td>increase/decrease forward thruster
 	</td></tr>
 
+	<tr><td>space bar
+	</td><td>toggle mouse control on or off
+	</td></tr>
+
 	<tr><td>tab
 	</td><td>kinetic impulse drive control
 	</td></tr>
@@ -96,20 +96,28 @@ bind p screenshot
 	</td><td>strafe left/right
 	</td></tr>
 
+	<tr><td>q / e
+	</td><td>roll left/right
+	</td></tr>
+
 	<tr><td>w s
 	</td><td>afterburner/reverse
 	</td></tr>
 
 	<tr><td>n
-	</td><td>Select next target
+	</td><td>select next target
 	</td></tr>
 
 	<tr><td>shift+n
-	</td><td>Select previous target
+	</td><td>select previous target
+	</td></tr>
+
+	<tr><td>ctrl+n
+	</td><td>deselect current target
 	</td></tr>
 
 	<tr><td>t
-	</td><td>Open the chat window
+	</td><td>chat window
 	</td></tr>
 
 	<tr><td>print screen
diff --git a/osirion.kdevelop b/osirion.kdevelop
index 0a41004..c94d33e 100644
--- a/osirion.kdevelop
+++ b/osirion.kdevelop
@@ -21,7 +21,7 @@
   </general>
   <kdevautoproject>
     <general>
-      <activetarget>src/render/librender.la</activetarget>
+      <activetarget>src/server/libserver.la</activetarget>
       <useconfiguration>debug</useconfiguration>
     </general>
     <run>
diff --git a/src/client/input.cc b/src/client/input.cc
index 75fa0f3..5cbb17c 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -786,11 +786,8 @@ void frame(float seconds)
 	for (Keyboard::iterator it = keyboard->begin(); it != keyboard->end(); it++) {
 		key = (*it).second;
 		if (key && key->pressed()) {
-			while ((key->pressed()+delay < core::application()->time()) && (key->lastpressed()+repeat < core::application()->time())) {
-				if (key->lastpressed() > key->pressed())
-					key->key_lastpressed += repeat;
-				else
-					key->key_lastpressed += delay;
+			if ((key->pressed()+delay < core::application()->time()) && (key->lastpressed()+repeat < core::application()->time())) {
+				key->key_lastpressed = core::application()->time();
 				key_pressed(key);
 			}
 		}
diff --git a/src/client/keyboard.cc b/src/client/keyboard.cc
index ae21eb1..b420fb8 100644
--- a/src/client/keyboard.cc
+++ b/src/client/keyboard.cc
@@ -112,7 +112,7 @@ Keyboard::Keyboard()
 	add_key("b", SDLK_b, 'b');
 	add_key("c", SDLK_c, 'c');
 	add_key("d", SDLK_d, 'd', "+straferight");
-	add_key("e", SDLK_e, 'e');
+	add_key("e", SDLK_e, 'e', "+rollright");
 	add_key("f", SDLK_f, 'f');
 	add_key("g", SDLK_g, 'g');
 	add_key("h", SDLK_h, 'h');
@@ -123,9 +123,10 @@ Keyboard::Keyboard()
 	add_key("m", SDLK_m, 'm');
 	key = add_key("n", SDLK_n, 'n', "target_next");
 	key->assign(Key::Shift, "target_prev");
+	key->assign(Key::Ctrl, "target_none");
 	add_key("o", SDLK_o, 'o');
 	add_key("p", SDLK_p, 'p');
-	add_key("q", SDLK_q, 'q');
+	add_key("q", SDLK_q, 'q', "+rollleft");
 	add_key("r", SDLK_r, 'r');
 	add_key("s", SDLK_s, 's', "+reverse");
 	add_key("t", SDLK_t, 't', "ui_chat");
-- 
cgit v1.2.3