gameobj = src/game.obj src/util.obj src/gfxutil.obj src/dynarr.obj src/rbtree.obj
gfxobj = src/3dgfx/3dgfx.obj src/3dgfx/mesh.obj src/3dgfx/meshload.obj &
src/3dgfx/polyfill.obj src/3dgfx/polyclip.obj
+csprobj = cspr/dbgfont.obj
incpath = -Isrc -Isrc/dos -Ilibs/imago/src
libpath = libpath libs/imago
!else
-dosobj = src\dos\main.obj src\dos\gfx.obj src\dos\timer.obj src\dos\watdpmi.obj &
- src\dos\vbe.obj src\dos\vga.obj src\dos\keyb.obj src\dos\mouse.obj &
- src\dos\logger.obj
+dosobj = src\dos\main.obj src\dos\gfx.obj src\dos\timer.obj &
+ src\dos\watdpmi.obj src\dos\vbe.obj src\dos\vga.obj src\dos\keyb.obj &
+ src\dos\mouse.obj src\dos\logger.obj
scrobj = src\introscr.obj src\menuscr.obj
-gameobj = src\game.obj src\util.obj src\gfxutil.obj src\dynarr.obj src\rbtree.obj
+gameobj = src\game.obj src\util.obj src\gfxutil.obj src\dynarr.obj &
+ src\rbtree.obj
gfxobj = src\3dgfx\3dgfx.obj src\3dgfx\mesh.obj src\3dgfx\meshload.obj &
- src\3dgfx\polyfill.obj src\3dgfx\polyclip.obj
+ src\3dgfx\polyfill.obj src\3dgfx\polyclip.obj
+csprobj = cspr/dbgfont.obj
incpath = -Isrc -Isrc\dos -Ilibs\imago\src
libpath = libpath libs\imago
!endif
-obj = $(dosobj) $(gameobj) $(gfxobj) $(scrobj)
+obj = $(dosobj) $(gameobj) $(gfxobj) $(scrobj) $(csprobj)
bin = game.exe
def = -dM_PI=3.141592653589793
$(LD) debug all name $@ system dos4g file { @objects } @ldflags
.c: src;src/dos;src/3dgfx
-.asm: src;src/dos;src/3dgfx
+.asm: src;src/dos;src/3dgfx;cspr
cflags.occ: Makefile
%write $@ $(CFLAGS)
clean: .symbolic
del src\*.obj
del src\dos\*.obj
+ del cspr\*.obj
del *.lnk
del cflags.occ
del $(bin)
intro_cleanup();
menu_cleanup();
}
+
+void cs_puts_font(cs_font_func csfont, int sz, void *fb, int x, int y, const char *str)
+{
+ while(*str) {
+ int c = *str++;
+
+ if(c > ' ' && c < 128) {
+ csfont(fb, x, y, c - ' ');
+ }
+ x += sz;
+ }
+}
+
void game_quit(void);
+/* compiled sprites available */
+typedef void (*cs_font_func)(void *, int, int, int);
+void cs_dbgfont(void *fb, int x, int y, int idx);
+
+/* helper to print text with cs_font */
+void cs_puts_font(cs_font_func csfont, int sz, void *fb, int x, int y, const char *str);
+
+#define cs_dputs(fb, x, y, str) cs_puts_font(cs_dbgfont, 9, fb, x, y, str)
#endif /* GAME_H_ */
}
}
+ cs_dputs(fb_pixels, 10, 10, "foo");
+
blit_frame(fb_pixels, 1);
}
}
-#define BBW 512
-#define BBH 128
+#define BBW 256
+#define BBH 64
void menu_draw(void)
{
memcpy(fb_pixels, bgpix, fb_size);
tmp = fboffs;
- fboffs -= 16 * fb_width + 128;
- bboffs -= 16 * BBW + 128;
- blit_key(fb_pixels + fboffs, fb_width, blurbuf[0] + bboffs, ent->len + 256, ent->height + 32, BBW, 0);
+ fboffs -= 8 * fb_width + 32;
+ bboffs -= 8 * BBW + 32;
+ blit(fb_pixels + fboffs, fb_width, blurbuf[0] + bboffs, ent->len + 64, ent->height + 16, BBW);
fboffs = tmp;
- //blit_key(fb_pixels + fboffs, fb_width, bgpix + fboffs, ent->len, ent->height, bgwidth, 0);
+ blit_key(fb_pixels + fboffs, fb_width, bgpix + fboffs, ent->len, ent->height, bgwidth, 0);
blit_frame(fb_pixels, 0);
}
--- /dev/null
+#!/bin/sh
+
+mkwrong=$(find . -name makefile)
+
+for i in $mkwrong; do
+ mv $i `dirname $i`/Makefile
+done
+
+files=$(git ls-files -m)
+for i in $files; do
+ dropcr $i
+done