more minor updates

1 files changed, 9 insertions, 20 deletions

diff --git a/src/client/input.cc b/src/client/input.cc
index 7193c0e..5dda3fb 100644
--- a/src/client/input.cc
+++ b/src/client/input.cc
@@ -24,17 +24,6 @@ float local_turn;
 // local thrust setting
 float local_thrust;
 
-core::Player *localplayer() {
-	return core::game()->localplayer();
-}
-
-core::EntityControlable *localcontrol() {
-	if (core::game()->localplayer())
-		return core::game()->localplayer()->control;
-	else
-		return 0;
-}
-
 void init()
 {
 	con_print << "Initializing input..." << std::endl;
@@ -89,8 +78,8 @@ void keypressed(const SDL_keysym &keysym)
 		case SDLK_KP4:
 			// TODO set core entity params
 			local_turn += 5;
-			if (math::degrees180f(local_turn - localcontrol()->direction()) > 90)
-				local_turn = localcontrol()->direction() + 90;
+			if (math::degrees180f(local_turn - core::localcontrol()->direction()) > 90)
+				local_turn = core::localcontrol()->direction() + 90;
 			if (local_turn > 360)
 				local_turn -= 360;
 			
@@ -98,8 +87,8 @@ void keypressed(const SDL_keysym &keysym)
 		case SDLK_KP6:
 			// TODO set core entity params
 			local_turn -= 5;
-			if (math::degrees180f(local_turn - localcontrol()->direction()) < -90)
-				local_turn = localcontrol()->direction() - 90;
+			if (math::degrees180f(local_turn - core::localcontrol()->direction()) < -90)
+				local_turn = core::localcontrol()->direction() - 90;
 			if (local_turn < 0)
 				local_turn += 360;
 			break;
@@ -117,7 +106,7 @@ void frame(float seconds)
 	
 		switch (event.type) {
 			case SDL_KEYUP:
-				if (!console::visible() && core::application()->connected() && localcontrol())
+				if (!console::visible() && core::application()->connected() && core::localcontrol())
 					// send key events to the game world
 					keyreleased(event.key.keysym);
 				break;
@@ -127,7 +116,7 @@ void frame(float seconds)
 				} else if (console::visible()) {
 					// send key events to the console
 					console::keypressed(event.key.keysym);
-				} else if (core::application()->connected() && localcontrol()) {
+				} else if (core::application()->connected() && core::localcontrol()) {
 					// send key events to the game world
 					keypressed(event.key.keysym);
 				}
@@ -139,9 +128,9 @@ void frame(float seconds)
 		
 	}
 	
-	if (!console::visible() && core::application()->connected() && localcontrol()) {
-		localcontrol()->set_thrust(local_thrust);
-		localcontrol()->set_direction(local_turn);
+	if (!console::visible() && core::application()->connected() && core::localcontrol()) {
+		core::localcontrol()->set_thrust(local_thrust);
+		core::localcontrol()->set_direction(local_turn);
 	}
 }