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

diff --git a/game.c b/game.c
index 9b7f239..36dccb4 100644
--- a/game.c
+++ b/game.c
@@ -6,14 +6,19 @@
 
 #include "game.h"
 
-#define SPEED  0.00006
-#define ROTATE 0.00004
-#define BULL_SPEED 0.008
+#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];
 
-void g_player_set(unsigned int id, bool live, float x, float y, float r, float vx, float vy, float vr) {
+static bool svmode;
+
+void g_player_set(unsigned int id, bool live, float x, float y, float r, float vx, float vy, float vr, int shoot) {
 	assert(id < MAX_PLAYERS);
 	g_player[id] = (Player) {
 		.updated = true,
@@ -51,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) {
@@ -62,9 +74,16 @@ static void fireplayer(int id) {
 	if(j < 0)
 		return;
 
-	float vx = BULL_SPEED * cos(g_player[id].r * 2 * M_PI);
-	float vy = BULL_SPEED * sin(g_player[id].r * 2 * M_PI);
-	g_bullet_set(j, id, true, g_player[id].x, g_player[id].y, vx, vy, 0);
+	if(g_player[id].shoot < PLAYER_SHOOT)
+		return;
+
+	g_player[id].shoot = 0;
+
+	if(svmode) {
+		float vx = BULL_SPEED * cos(g_player[id].r * 2 * M_PI);
+		float vy = BULL_SPEED * sin(g_player[id].r * 2 * M_PI);
+		g_bullet_set(j, id, true, g_player[id].x, g_player[id].y, vx, vy, 0);
+	}
 }
 
 static void checkspacebound(float * a) {
@@ -105,6 +124,10 @@ void g_update() {
 			g_player[i].r += g_player[i].vr;
 			checkspacebound(&g_player[i].x);
 			checkspacebound(&g_player[i].y);
+
+			++g_player[i].shoot;
+			if(g_player[i].shoot > PLAYER_SHOOT)
+				g_player[i].shoot = PLAYER_SHOOT;
 		}
 	}
 
@@ -129,3 +152,8 @@ void g_update() {
 		}
 	}
 }
+
+void g_init(bool server_mode) {
+	svmode = server_mode;
+	// TODO memset & co
+}