X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=game.c;h=36dccb41669cf628070979921560f8fdf93ec3d2;hb=0afebb148532e32e6b47194e08e908beec45087e;hp=cacaf6213412aca5862a489bb33f50c5cc9a2aa9;hpb=0aebaa861295894d8bfd51ee7d02da0d4b63e477;p=netwar.git

diff --git a/game.c b/game.c
index cacaf62..36dccb4 100644
--- a/game.c
+++ b/game.c
@@ -6,9 +6,12 @@
 
 #include "game.h"
 
-#define SPEED      0.00006
-#define ROTATE     0.00004
-#define BULL_SPEED 0.00800
+#define SPEED      (0.03 / TICK)
+#define ROTATE     (0.03 / TICK)
+#define BULL_SPEED (0.4  / TICK)
+
+#define MAX_SPEED  (0.3 / TICK)
+#define MAX_ROTATE (0.3 / TICK)
 
 Player g_player[MAX_PLAYERS];
 Bullet g_bullet[MAX_BULLETS];
@@ -53,10 +56,17 @@ static int freebullet() {
 static void moveplayer(int id, float speed) {
 	g_player[id].vx += speed * cos(g_player[id].r * 2 * M_PI);
 	g_player[id].vy += speed * sin(g_player[id].r * 2 * M_PI);
+
+	if(fabs(g_player[id].vx) > MAX_SPEED)
+		g_player[id].vx = copysignf(MAX_SPEED, g_player[id].vx);
+	if(fabs(g_player[id].vy) > MAX_SPEED)
+		g_player[id].vy = copysignf(MAX_SPEED, g_player[id].vy);
 }
 
 static void roteplayer(int id, float speed) {
 	g_player[id].vr += speed;
+	if(fabs(g_player[id].vr) > MAX_ROTATE)
+		g_player[id].vr = copysignf(MAX_ROTATE, g_player[id].vr);
 }
 
 static void fireplayer(int id) {