X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fplayer.c;h=24c5851570d996fd64a1e7e6942052eb897a7b69;hb=60a62013e45b8dd307494b792c48b5fde17d2fdc;hp=0e683939f4ba80b5f369bbf9bff499e571e41839;hpb=3c7da38bbf5936211348c5b6c31874364060dca8;p=vrlugburz

diff --git a/src/player.c b/src/player.c
index 0e68393..24c5851 100644
--- a/src/player.c
+++ b/src/player.c
@@ -10,17 +10,39 @@ void init_player(struct player *p)
 	p->mp = p->mp_max = 10;
 }
 
+void move_player(struct player *p, int right, int fwd)
+{
+	static const int step[][2] = {{0, 1}, {1, 0}, {0, -1}, {-1, 0}};
+	int rdir = (p->dir + 1) & 3;
+	p->cx += step[p->dir][0] * fwd + step[rdir][0] * right;
+	p->cy += step[p->dir][1] * fwd + step[rdir][1] * right;
+}
+
+void turn_player(struct player *p, int turn)
+{
+	if(!turn) return;
+	turn = turn > 0 ? 1 : 3;
+	p->dir = (p->dir + turn) & 3;
+}
+
 void upd_player_xform(struct player *p)
 {
 	cgm_vec3 pos;
 	float celld = p->lvl ? p->lvl->cell_size : DEF_CELL_SIZE;
 
-	cgm_vcons(&pos, p->cx * celld, p->height, p->cy * celld);
+	cgm_vcons(&pos, p->cx * celld, p->height, -p->cy * celld);
 	cgm_vadd(&pos, &p->cpos);
 
 	cgm_midentity(p->view_xform);
 	cgm_mprerotate_x(p->view_xform, -p->phi);
-	cgm_mprerotate_y(p->view_xform, -p->theta);
+	cgm_mprerotate_y(p->view_xform, p->dir * M_PI / 2.0f);
 	cgm_mrotate_quat(p->view_xform, &p->vrot);
 	cgm_mpretranslate(p->view_xform, -pos.x, -pos.y, -pos.z);
 }
+
+void upd_player_vis(struct player *p)
+{
+	p->vis = 0;
+
+
+}