5 files changed, 15 insertions, 16 deletions

diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index 5957312a..1732b02b 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -8,7 +8,7 @@
 
 #include <engine/e_system.h>
 #include <engine/e_engine.h>
-#include <engine/e_interface.h>
+#include <engine/e_client_interface.h>
 
 #include <engine/e_protocol.h>
 #include <engine/e_snapshot.h>
@@ -65,7 +65,7 @@ static float ticktime = 0;
 
 /* predicted time */
 static int current_predtick = 0;
-static float intrapredtick = 0;
+static float predintratick = 0;
 
 static struct /* TODO: handle input better */
 {
@@ -237,7 +237,7 @@ int snap_num_items(int snapid)
 
 /* ------ time functions ------ */
 float client_intratick() { return intratick; }
-float client_intrapredtick() { return intrapredtick; }
+float client_predintratick() { return predintratick; }
 float client_ticktime() { return ticktime; }
 int client_tick() { return current_tick; }
 int client_predtick() { return current_predtick; }
@@ -924,7 +924,7 @@ static void client_update()
 			/*tg_add(&predicted_time_graph, pred_now, 0); */
 			int prev_pred_tick = (int)(pred_now*50/time_freq());
 			int new_pred_tick = prev_pred_tick+1;
-			static float last_intrapred = 0;
+			static float last_predintra = 0;
 
 			intratick = (now - prevtick_start) / (float)(curtick_start-prevtick_start);
 			ticktime = (now - curtick_start) / (freq/(float)SERVER_TICK_SPEED);
@@ -933,12 +933,11 @@ static void client_update()
 
 			curtick_start = new_pred_tick*time_freq()/50;
 			prevtick_start = prev_pred_tick*time_freq()/50;
-			intrapredtick = (pred_now - prevtick_start) / (float)(curtick_start-prevtick_start);
-			
+			predintratick = (pred_now - prevtick_start) / (float)(curtick_start-prevtick_start);
 			
 			if(new_pred_tick > current_predtick)
 			{
-				last_intrapred = intrapredtick;
+				last_predintra = predintratick;
 				current_predtick = new_pred_tick;
 				repredict = 1;
 				
@@ -946,9 +945,9 @@ static void client_update()
 				client_send_input();
 			}
 			
-			if(intrapredtick < last_intrapred)
+			if(predintratick < last_predintra)
 				dbg_msg("client", "prediction time goes backwards, that can't be good");
-			last_intrapred = intrapredtick;
+			last_predintra = predintratick;
 		}
 
 		/* only do sane predictions */
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c
index b71cb186..505c42f7 100644
--- a/src/engine/client/ec_gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -3,7 +3,7 @@
 #include <engine/external/pnglite/pnglite.h>
 
 #include <engine/e_system.h>
-#include <engine/e_interface.h>
+#include <engine/e_client_interface.h>
 #include <engine/e_engine.h>
 #include <engine/e_config.h>
 #include <engine/e_keys.h>
diff --git a/src/engine/client/ec_inp.c b/src/engine/client/ec_inp.c
index 57216ac4..41689d8a 100644
--- a/src/engine/client/ec_inp.c
+++ b/src/engine/client/ec_inp.c
@@ -3,7 +3,7 @@
 #include <engine/external/glfw/include/GL/glfw.h>
 
 #include <engine/e_system.h>
-#include <engine/e_interface.h>
+#include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 
 static int keyboard_state[2][1024]; /* TODO: fix this!! */
@@ -53,7 +53,7 @@ enum
 	INPUT_BUFFER_SIZE=32
 };
 
-static INPUTEVENT input_events[INPUT_BUFFER_SIZE];
+static INPUT_EVENT input_events[INPUT_BUFFER_SIZE];
 static int num_events = 0;
 
 static void add_event(char c, int key)
@@ -76,11 +76,11 @@ void inp_clear_events()
 	num_events = 0;
 }
 
-INPUTEVENT inp_get_event(int index)
+INPUT_EVENT inp_get_event(int index)
 {
 	if(index < 0 || index >= num_events)
 	{
-		INPUTEVENT e = {0,0};
+		INPUT_EVENT e = {0,0};
 		return e;
 	}
 	
diff --git a/src/engine/client/ec_snd.c b/src/engine/client/ec_snd.c
index 49f050c9..6bcb242b 100644
--- a/src/engine/client/ec_snd.c
+++ b/src/engine/client/ec_snd.c
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_system.h>
-#include <engine/e_interface.h>
+#include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 
 #include <engine/external/portaudio/portaudio.h>
diff --git a/src/engine/client/ec_srvbrowse.c b/src/engine/client/ec_srvbrowse.c
index 3a07d86a..7459657f 100644
--- a/src/engine/client/ec_srvbrowse.c
+++ b/src/engine/client/ec_srvbrowse.c
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_system.h>
 #include <engine/e_network.h>
-#include <engine/e_interface.h>
+#include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 #include <engine/e_memheap.h>