final push commit #1: lots of stuff all at once

Author: jtsiomb

Makefile

@@ -6,7 +6,7 @@ appobj = src/app.obj src/options.obj src/treestor.obj src/ts_text.obj &
 	src/dynarr.obj src/util.obj src/scr_menu.obj src/scr_game.obj src/lut.obj &
 	src/xmath.obj src/xmath_s.obj src/image.obj src/tiles.obj src/level.obj &
 	src/rend.obj src/json.obj src/tiledfmt.obj src/mob.obj src/sprite.obj &
-	src/psys.obj src/audio.obj src/aufile.obj src/auwav.obj
+	src/psys.obj src/audio.obj src/aufile.obj src/auwav.obj src/ai.obj
 g3dobj = src/g3d/g3d.obj src/g3d/polyfill.obj
 
 incpath = -Isrc -Isrc/dos -Ilibs -Ilibs/imago/src
@@ -18,7 +18,7 @@ appobj = src\app.obj src\options.obj src\treestor.obj src\ts_text.obj &
 	src\dynarr.obj src\util.obj src\scr_menu.obj src\scr_game.obj src\lut.obj &
 	src\xmath.obj src\xmath_s.obj src\image.obj src\tiles.obj src\level.obj &
 	src\rend.obj src\json.obj src\tiledfmt.obj src\mob.obj src\sprite.obj &
-	src\psys.obj src\audio.obj src\aufile.obj src\auwav.obj
+	src\psys.obj src\audio.obj src\aufile.obj src\auwav.obj src\ai.obj
 g3dobj = src\g3d\g3d.obj src\g3d\polyfill.obj
 
 incpath = -Isrc -Isrc\dos -Ilibs -Ilibs\imago\src

src/ai.c

@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include "ai.h"
+#include "app.h"
+#include "util.h"
+#include "psys.h"
+
+#define GUARD_DMG	16
+#define GUARD_FIRE_DELAY	800
+
+static void spawn_bullet_psys(struct level_cell *cell, int32_t x, int32_t y, int32_t dx, int32_t dy);
+
+void ai_guard(struct mob *mob, int32_t dt)
+{
+	int32_t tx, ty, dx, dy;
+	struct mob *hitmob;
+
+	mob->state_t += dt;
+	if(mob->spr.frm < mob->spr.nfrm) {
+		mob->spr.frm++;
+	}
+
+	if(mob->state == MOB_DEAD) return;
+
+	if(player.state == MOB_DEAD) return;
+
+	if(mob->fire_cooldown) {
+		mob->fire_cooldown -= dt;
+		if(mob->fire_cooldown < 0) mob->fire_cooldown = 0;
+	}
+
+	tx = player.x;
+	ty = player.y;
+
+	dx = tx - mob->x;
+	dy = ty - mob->y;
+
+	if((hitmob = raycast(mob->lvl, mob->x, mob->y, dx, dy, mob)) == &player) {
+		mob_lookat(mob, tx, ty);
+
+		if(!mob->fire_cooldown) {
+			mob_state(mob, MOB_FIRE);
+			player.dmg += GUARD_DMG;
+			mob->fire_cooldown = GUARD_FIRE_DELAY;
+
+			spawn_bullet_psys(player.cell, player.x, player.y, -dx, -dy);
+		}
+	}
+}
+
+static void spawn_bullet_psys(struct level_cell *cell, int32_t x, int32_t y, int32_t dx, int32_t dy)
+{
+	struct psys *ps;
+
+	ps = malloc_nf(sizeof *ps);
+	*ps = psys_gunhit;
+	ps->x = x;
+	ps->y = y;
+
+	/* poor man's normalize */
+	if(dx > 0) {
+		dx = 0x100;
+	} else if(dx < 0) {
+		dx = -0x100;
+	}
+	if(dy > 0) {
+		dy = 0x100;
+	} else if(dy < 0) {
+		dy = -0x100;
+	}
+	ps->dirx = dx;
+	ps->diry = dy;
+
+	psys_add_emitter(&cell->psys, ps);
+}

src/ai.h

@@ -0,0 +1,8 @@
+#ifndef AI_H_
+#define AI_H_
+
+#include "mob.h"
+
+void ai_guard(struct mob *mob, int32_t dt);
+
+#endif	/* AI_H_ */

src/app.c

@@ -7,6 +7,7 @@
 #include "g3d/g3d.h"
 #include "timer.h"
 #include "options.h"
+#include "psys.h"
 
 #ifndef NO_SOUND
 #include "audio.h"
@@ -23,6 +24,8 @@ struct app_screen *cur_scr;
 struct tileimg *tile_inval;
 int cur_bpl;
 
+int showdbg;
+
 /* available screens */
 #define MAX_SCREENS	8
 static struct app_screen *screens[MAX_SCREENS];
@@ -41,6 +44,8 @@ int app_init(void)
 	g3d_init();
 	g3d_framebuffer(FB_WIDTH, FB_HEIGHT, 0);
 
+	psys_init_prefabs();
+
 	/* initialize screens */
 	screens[num_screens++] = &scr_menu;
 	screens[num_screens++] = &scr_game;
@@ -109,6 +114,10 @@ void app_keyboard(int key, int press)
 		case 27:
 			app_quit();
 			break;
+
+		case KEY_F3:
+			showdbg ^= 1;
+			break;
 		}
 	}
 

src/app.h

@@ -2,6 +2,7 @@
 #define APP_H_
 
 #include "szint.h"
+#include "mob.h"
 
 #define FB_WIDTH	320
 #define FB_HEIGHT	240
@@ -65,6 +66,10 @@ extern struct tileimg *tile_inval;	/* invalid tile */
 /* current bitplane, to avoid passing it to EVERY drawing function */
 extern int cur_bpl;
 
+extern struct mob player;
+
+extern int showdbg;
+
 
 int app_init(void);
 void app_shutdown(void);

src/crossgl/fakevga.c

@@ -138,6 +138,16 @@ void vga_rect_outline(uint8_t *vmem, int x, int y, int w, int h, uint8_t color)
 	vga_hline(vmem, x + 1, y + h - 1, w - 2, color);
 }
 
+void vga_fillrect(uint8_t *vmem, int x, int y, int w, int h, uint8_t color)
+{
+	vmem += y * SCANLEN + x;
+
+	while(h-- > 0) {
+		memset(vmem, color, w);
+		vmem += SCANLEN;
+	}
+}
+
 static uint32_t *convbuf;
 static int convbuf_size;
 

src/g3d/g3d.c

@@ -6,10 +6,6 @@
 #include "util.h"
 #include "xmath.h"
 
-struct rect {
-	int x0, y0, x1, y1;
-};
-
 static int32_t mvmat[16];
 static int32_t pmat[16];
 static int32_t mvpmat[16];

src/level.c

@@ -1,10 +1,12 @@
 #include <stdio.h>
+#include <limits.h>
 #include <assert.h>
 #include "level.h"
 #include "tiles.h"
 #include "util.h"
 #include "dynarr.h"
 #include "mob.h"
+#include "app.h"
 #include "psys.h"
 
 struct tileset tileset;
@@ -221,3 +223,82 @@ int cell_remove_psys(struct level_cell *cell, struct psys *ps)
 	}
 	return 0;
 }
+
+
+struct mob *raycast(struct level *lvl, int32_t x, int32_t y, int32_t dx, int32_t dy, struct mob *ignmob)
+{
+	int i, cx, cy, exit_dir;
+	int32_t hslope, vslope, nx, ny, rdx, rdy, hitx, hity;
+	struct level_cell *cell;
+	struct mob *cellmob, *hitmob;
+	int32_t hit_dist, t;
+
+	grid_to_cell(x, y, &cx, &cy);
+	if(!(cell = get_level_cell(lvl, cx, cy))) {
+		return 0;
+	}
+
+	hslope = dx ? (dy << 8) / dx : 256;
+	vslope = dy ? (dx << 8) / dy : 256;
+
+	for(i=0; i<MAX_BEAM_SEG; i++) {
+		exit_dir = ray_step(lvl, x, y, dx, dy, hslope, vslope, &nx, &ny);
+
+		rdx = nx - x;
+		rdy = ny - y;
+
+		hitmob = 0;
+		hit_dist = INT_MAX;
+
+		if(ignmob != &player) {
+			if((t = mob_rayhit(&player, x, y, rdx, rdy, &hitx, &hity)) >= 0) {
+				hitmob = &player;
+				hit_dist = t;
+			}
+		}
+
+		cellmob = cell->mobs;
+		while(cellmob) {
+			if(cellmob != ignmob) {
+				if((t = mob_rayhit(cellmob, x, y, rdx, rdy, &hitx, &hity)) >= 0 && t < hit_dist) {
+					hitmob = cellmob;
+					hit_dist = t;
+				}
+			}
+			cellmob = cellmob->next;
+		}
+
+		if(hitmob) {
+			return hitmob;
+		}
+
+		if(!(cell->flags & CELL_EXIT(exit_dir))) {
+			break;
+		}
+
+		switch(exit_dir) {
+		case DIR_E:
+			if(cell->cx >= lvl->size - 1) goto break_loop;
+			cell++;
+			break;
+		case DIR_W:
+			if(cell->cx <= 0) goto break_loop;
+			cell--;
+			break;
+		case DIR_S:
+			if(cell->cy >= lvl->size - 1) goto break_loop;
+			cell += lvl->size;
+			break;
+		case DIR_N:
+			if(cell->cy <= 0) goto break_loop;
+			cell -= lvl->size;
+			break;
+		}
+
+		x = nx;
+		y = ny;
+	}
+break_loop:
+	return 0;
+}
+

src/level.h

@@ -13,10 +13,6 @@
 #define CELL_XSZ	(TILE_XSZ << 1)
 #define CELL_YSZ	(TILE_YSZ << 1)
 
-struct rect {
-	int x, y, w, h;
-};
-
 enum { DIR_N, DIR_W, DIR_S, DIR_E };
 enum { DIR8_N, DIR8_NW, DIR8_W, DIR8_SW, DIR8_S, DIR8_SE, DIR8_E, DIR8_NE };
 
@@ -91,6 +87,8 @@ int cell_remove_beamseg(struct level_cell *cell, struct beamseg *bs);
 void cell_add_psys(struct level_cell *cell, struct psys *ps);
 int cell_remove_psys(struct level_cell *cell, struct psys *ps);
 
+struct mob *raycast(struct level *lvl, int32_t x, int32_t y, int32_t dx, int32_t dy, struct mob *ignmob);
+
 /* implicit in these conversions is the tile size: 64x32 */
 static INLINE void vscr_to_grid(int sx, int sy, int32_t *gridx, int32_t *gridy)
 {
@@ -127,4 +125,37 @@ static INLINE void grid_to_cell(int32_t gx, int32_t gy, int *cx, int *cy)
 	*cy = (gy + 0x80) >> 8;
 }
 
+static INLINE int ray_step(struct level *lvl, int32_t x, int32_t y, int32_t dx,
+		int32_t dy, int32_t hslope, int32_t vslope,	int32_t *nx, int32_t *ny)
+{
+	int32_t x1, y1, offs;
+
+	/* convert to origin at upper-left, rather than center of cells, to make
+	 * stepping simpler
+	 */
+	x += 128;
+	y += 128;
+
+	/* find next boundaries when stepping horizontally or vertically */
+	x1 = (dx > 0 ? x + 256 : x - 1) & ~0xff;
+	/*hslope = (dy << 8) / dx;*/
+	y1 = y + ((hslope * (x1 - x)) >> 8);
+	offs = y1 - (y & ~0xff);
+
+	if(offs < 256 && offs >= 0) {
+		*nx = x1 - 128;
+		*ny = y1 - 128;
+		return dx > 0 ? DIR_E : DIR_W;
+	}
+
+	y1 = (dy > 0 ? y + 256 : y - 1) & ~0xff;
+	/*vslope = (dx << 8) / dy;*/
+	x1 = x + ((vslope * (y1 - y)) >> 8);
+
+	*nx = x1 - 128;
+	*ny = y1 - 128;
+	return dy > 0 ? DIR_S : DIR_N;
+}
+
+
 #endif	/* LEVEL_H_ */

src/mob.c

@@ -101,38 +101,6 @@ void mob_state(struct mob *mob, int st)
 	mob->spr.frm = 0;
 }
 
-static INLINE int ray_step(struct level *lvl, int32_t x, int32_t y, int32_t dx,
-		int32_t dy, int32_t hslope, int32_t vslope,	int32_t *nx, int32_t *ny)
-{
-	int32_t x1, y1, offs;
-
-	/* convert to origin at upper-left, rather than center of cells, to make
-	 * stepping simpler
-	 */
-	x += 128;
-	y += 128;
-
-	/* find next boundaries when stepping horizontally or vertically */
-	x1 = (dx > 0 ? x + 256 : x - 1) & ~0xff;
-	/*hslope = (dy << 8) / dx;*/
-	y1 = y + ((hslope * (x1 - x)) >> 8);
-	offs = y1 - (y & ~0xff);
-
-	if(offs < 256 && offs >= 0) {
-		*nx = x1 - 128;
-		*ny = y1 - 128;
-		return dx > 0 ? DIR_E : DIR_W;
-	}
-
-	y1 = (dy > 0 ? y + 256 : y - 1) & ~0xff;
-	/*vslope = (dx << 8) / dy;*/
-	x1 = x + ((vslope * (y1 - y)) >> 8);
-
-	*nx = x1 - 128;
-	*ny = y1 - 128;
-	return dy > 0 ? DIR_S : DIR_N;
-}
-
 void mob_beam(struct mob *mob, int32_t tx, int32_t ty, int dmg)
 {
 	int i, exit_dir;