fixed line drawing in mode-x

Author: jtsiomb

src/mob.c

@@ -7,6 +7,7 @@
 #include "level.h"
 #include "util.h"
 #include "xmath.h"
+#include "app.h"
 
 void init_mob(struct mob *mob)
 {
@@ -88,6 +89,7 @@ void mob_state(struct mob *mob, int st)
 	if(mob->state == st) return;
 
 	mob->state = st;
+	mob->state_t = 0;
 
 	if(mob->spr.anim[st].seq[0]) {
 		mob->spr.cur = mob->spr.anim + st;
@@ -142,11 +144,7 @@ void mob_beam(struct mob *mob, int32_t tx, int32_t ty, int dmg)
 	int32_t hit_dist, t;
 
 	/* first delete the previous beam if it's still active */
-	for(i=0; i<mob->beam.nseg; i++) {
-		seg = mob->beam.seg + i;
-		cell_remove_beamseg(seg->cell, seg);
-	}
-	mob->beam.nseg = 0;
+	mob_beamstop(mob);
 
 	x = mob->beam.x0 = mob->x;
 	y = mob->beam.y0 = mob->y;
@@ -225,6 +223,18 @@ void mob_beam(struct mob *mob, int32_t tx, int32_t ty, int dmg)
 	mob->beam.y1 = ny;
 }
 
+void mob_beamstop(struct mob *mob)
+{
+	int i;
+	struct beamseg *seg;
+
+	for(i=0; i<mob->beam.nseg; i++) {
+		seg = mob->beam.seg + i;
+		cell_remove_beamseg(seg->cell, seg);
+	}
+	mob->beam.nseg = 0;
+}
+
 /*
 static int32_t ray_pt_sqdist(int32_t ox, int32_t oy, int32_t dx, int32_t dy, int32_t px, int32_t py)
 {

src/mob.h

@@ -38,6 +38,7 @@ struct mob {
 	struct sprite spr;
 	int hp, dmg;	/* hit points, and damage accumulator since last update */
 	int32_t hitx, hity;	/* position of last hit */
+	long state_t;
 	struct level *lvl;
 	struct level_cell *cell;
 	struct beam beam;
@@ -61,6 +62,7 @@ void mob_state(struct mob *mob, int st);
  * it into beam segments, one per cell to be able to draw it correctly
  */
 void mob_beam(struct mob *mob, int32_t tx, int32_t ty, int dmg);
+void mob_beamstop(struct mob *mob);
 
 int32_t mob_rayhit(struct mob *mob, int32_t ox, int32_t oy, int32_t dx, int32_t dy,
 		int32_t *hitx, int32_t *hity);

src/rend.c

@@ -124,9 +124,12 @@ void draw_line(int x0, int y0, int x1, int y1, uint8_t color)
 
 #ifdef VGA_LFB
 	if(cur_bpl) return;
-#endif
 
 	vmem = vga_backbuf + y0 * SCANLEN + x0;
+#else
+	vmem = vga_backbuf + y0 * SCANLEN + (x0 >> 2);
+#endif
+
 	dx = x1 - x0;
 	dy = y1 - y0;
 
@@ -149,22 +152,48 @@ void draw_line(int x0, int y0, int x1, int y1, uint8_t color)
 		/* x-major */
 		err = dy2 - dx;
 		for(i=0; i<=dx; i++) {
+#ifdef VGA_LFB
 			*vmem = color;
+#else
+			if((x0 & 3) == cur_bpl) {
+				*vmem = color;
+			}
+#endif
 			if(err >= 0) {
 				err -= dx2;
 				vmem += yinc;
 			}
 			err += dy2;
+#ifdef VGA_LFB
 			vmem += xinc;
+#else
+			if((x0 & 3) == 3) {
+				vmem += xinc;
+			}
+			x0 += xinc;
+#endif
 		}
 	} else {
 		/* y-major */
 		err = dx2 - dy;
 		for(i=0; i<=dy; i++) {
+#ifdef VGA_LFB
 			*vmem = color;
+#else
+			if((x0 & 3) == cur_bpl) {
+				*vmem = color;
+			}
+#endif
 			if(err >= 0) {
 				err -= dy2;
+#ifdef VGA_LFB
 				vmem += xinc;
+#else
+				if((x0 & 3) == 3) {
+					vmem += xinc;
+				}
+				x0 += xinc;
+#endif
 			}
 			err += dx2;
 			vmem += yinc;

src/scr_game.c

@@ -14,6 +14,7 @@
 #define BEAM_DMG	8
 #define BEAM_COL	253
 #define BEAM_HEIGHT	16
+#define BEAM_DUR	100
 
 #ifndef NO_SOUND
 #include "audio.h"
@@ -192,6 +193,7 @@ static void update(void)
 	static long prev_upd;
 	long dt;
 	int i, j, x, y, dx, dy;
+	int32_t gx, gy;
 	struct level_cell *cell;
 
 	dt = time_msec - prev_upd;
@@ -213,14 +215,29 @@ static void update(void)
 		dx += SCROLL_SPEED * dt >> 2;
 	}
 
-	if(mob_move(&player, dx, dy)) {
-		scrollto(player.x, player.y);
-	}
-
 	if(player.state == MOB_FIRE) {
-		/* TODO */
+		if(player.state_t == 0) {
+			vscr_to_grid(mouse_x + xscroll, mouse_y + yscroll, &gx, &gy);
+			gx -= 128;
+			gy -= 128;
+			mob_lookat(&player, gx, gy);
+			mob_beam(&player, gx, gy, BEAM_DMG);
+
+		} else if(player.state_t >= BEAM_DUR) {
+
+			/* fire duration ended, change state and remove beam */
+			mob_state(&player, MOB_IDLE);
+			mob_beamstop(&player);
+		}
+
+	} else {
+		if(mob_move(&player, dx, dy)) {
+			scrollto(player.x, player.y);
+		}
 	}
 
+	player.state_t += dt;
+
 	/* compute the list of visible cells */
 	num_vis = 0;
 	cell = lvl.cells;
@@ -278,10 +295,9 @@ static void scrgame_display(void)
 
 static void draw_bitplane(int bpl)
 {
-	int i, j, x, y, x1, y1, mouse_cx, mouse_cy, mouse_gx, mouse_gy, player_cx, player_cy;
+	int i, j, x, y, x1, y1, player_cx, player_cy;
+	int32_t mouse_gx, mouse_gy;
 	struct level_cell *cell;
-	struct tileimg *tile;
-	struct tileseq *seq;
 	struct beamseg *bseg;
 	struct mob *mob;
 
@@ -320,7 +336,6 @@ static void draw_bitplane(int bpl)
 						draw_line(x + 1, y, x1 + 1, y1, BEAM_COL);
 					}
 
-					/*tiles_blit_rle(balltile, x1, y1, bpl);*/
 					bseg = bseg->next;
 				}
 
@@ -336,37 +351,25 @@ static void draw_bitplane(int bpl)
 					tiles_blit_rle(seltile, cell->x, cell->y, bpl);
 
 					spr_draw(&player.spr, x - xscroll, y - yscroll, player.dir);
-
-					if(player.beam.nseg) {
-						grid_to_vscr(player.beam.x1, player.beam.y1, &x, &y);
-						tiles_blit_rle(balltile, x - xscroll, y - yscroll, bpl);
-					}
 				}
 			}
 		}
 	}
 
-	/* mouseover highlight */
-	/*vscr_to_cell(mouse_x + xscroll, mouse_y + yscroll, &mouse_cx, &mouse_cy);
-	if(BOUNDCHK(mouse_cx, lvl.size) && BOUNDCHK(mouse_cy, lvl.size)) {
-		cell_to_vscr(mouse_cx, mouse_cy, &x, &y);
-		x -= xscroll;
-		y -= yscroll;
-		tiles_blit_rle(seltile, x, y, bpl);
-	}
-	*/
+	/*for(i=0; i<4; i++) {
+		int yoffs = i * 8;
+		draw_line(100 + i, 100 + yoffs, 140 + i, 180 + yoffs, 0xff);
+	}*/
+
 	vscr_to_grid(mouse_x + xscroll, mouse_y + yscroll, &mouse_gx, &mouse_gy);
 	mouse_gx -= 128;
 	mouse_gy -= 128;
 
 	tiles_blit_rle(cursors[mouse_mode], mouse_x, mouse_y, bpl);
 
 	gprintf(0, 0, fps_text);
-	/*gprintf(0, 8, "vsync: %s", vsync ? "on" : "off");*/
 	gprintf(90, 0, "vis:%d", num_vis);
 	gprintf(160, 0, "cell:%d,%d %s", player_cx, player_cy, strcellflags(player.cell->flags));
-	/*gprintf(0, 8, "player: %s,%s\n", fixpstr(player.x, 8), fixpstr(player.y, 8));
-	gprintf(180, 8, "mouse: %s,%s\n", fixpstr(mouse_gx, 8), fixpstr(mouse_gy, 8));*/
 }
 
 static void scrgame_keyb(int key, int press)
@@ -393,34 +396,18 @@ static void scrgame_keyb(int key, int press)
 
 static void scrgame_mouse(int bn, int press, int x, int y)
 {
-	int cx, cy, gx, gy;
-
 	prev_mx = x;
 	prev_my = y;
 
-
-	if(press) {
-		if(bn == 0) {
-			vscr_to_cell(mouse_x + xscroll, mouse_y + yscroll, &cx, &cy);
-
-			vscr_to_grid(mouse_x + xscroll, mouse_y + yscroll, &gx, &gy);
-			gx -= 128;
-			gy -= 128;
-			mob_lookat(&player, gx, gy);
-			mob_state(&player, MOB_FIRE);
-
-			mob_beam(&player, gx, gy, BEAM_DMG);
-		}
-	} else {
-		if(bn == 0) {
-			mob_state(&player, MOB_IDLE);
-		}
+	if(bn == 0 && press) {
+		mob_state(&player, MOB_FIRE);
 	}
 }
 
 static void scrgame_motion(int x, int y)
 {
-	int dx, dy, gx, gy;
+	int dx, dy;
+	int32_t gx, gy;
 
 	dx = mouse_x - prev_mx;
 	dy = mouse_y - prev_my;