From: sparky4 <sparky4@cock.li>
Date: Fri, 12 Jun 2015 21:06:09 +0000 (-0500)
Subject: help.... ><
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=f02096268cea5a79cc6a32d2f67831ec50aabdbd;p=16.git

help.... ><
	modified:   Project 16.bfproject
	modified:   maptest.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   src/lib/modex16.c
	modified:   src/lib/modex16.h
	modified:   src/scroll.c
	modified:   test.exe
	modified:   test2.exe
---

diff --git a/Project 16.bfproject b/Project 16.bfproject
index b96899a9..d992d194 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -3,7 +3,7 @@ e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:138:0:0:
 openfiles: /dos/z/16/src/palettec.c:179:0:0:
 openfiles: /dos/z/16/src/pcxtest.c:1431:1432:0:
-openfiles: /dos/z/16/src/scroll.c:19850:19233:0:
+openfiles: /dos/z/16/src/scroll.c:19798:19084:0:
 openfiles: /dos/z/16/src/fmemtest.c:116:0:0:
 openfiles: /dos/z/16/src/emmtest.c:732:0:0:
 openfiles: /dos/z/16/src/emsdump.c:456:0:0:
@@ -13,11 +13,11 @@ openfiles: /dos/z/16/src/test.c:0:0:0:
 openfiles: /dos/z/16/src/test2.c:0:0:0:
 openfiles: /dos/z/16/src/lib/planar.h:602:0:0:
 openfiles: /dos/z/16/src/lib/PLANAR.C:0:0:0:
-openfiles: /dos/z/16/src/lib/bitmap.c:0:0:0:
+openfiles: /dos/z/16/src/lib/bitmap.c:294:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.h:257:0:0:
-openfiles: /dos/z/16/src/lib/modex16.c:22970:22527:0:
-openfiles: /dos/z/16/src/lib/modex16.h:2168:1159:0:
-openfiles: /dos/z/16/src/lib/dos_kb.c:3264:2408:1:
+openfiles: /dos/z/16/src/lib/modex16.c:23968:23029:1:
+openfiles: /dos/z/16/src/lib/modex16.h:2566:1791:0:
+openfiles: /dos/z/16/src/lib/dos_kb.c:3264:2598:0:
 openfiles: /dos/z/16/src/lib/dos_kb.h:0:0:0:
 openfiles: /dos/z/16/src/lib/mapread.c:2265:1988:0:
 openfiles: /dos/z/16/src/lib/mapread.h:584:0:0:
@@ -30,9 +30,9 @@ openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.c:7182:6673:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0:
 openfiles: /dos/z/16/src/lib/lib_head.c:0:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:2424:2067:0:
+openfiles: /dos/z/16/src/lib/lib_head.h:2786:2219:0:
 openfiles: /dos/z/16/makefile:2533:2535:0:
-openfiles: /dos/z/16/src/lib/types.h:165:0:0:
+openfiles: /dos/z/16/src/lib/types.h:274:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -47,7 +47,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/src/lib
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: reg
+ssearch_text: memset
 snr_casesens: 0
 view_blocks: 1
 name: Project 16
@@ -121,13 +121,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: 44
-searchlist: page, x, y, w.width, w.height, &w);
-searchlist: bmp(
-searchlist: modexDrawBmp
-searchlist: CopyPageRegion
-searchlist: vga
-searchlist: VGA
 searchlist: =VGA
 searchlist: = VGA
 searchlist: FARPTR
@@ -136,6 +129,13 @@ searchlist: atoi
 searchlist: (*bmp)=bitmapLoadPcx("data/font.pcx");(*bmp)=bitmapLoadPcx("data/font.pcx");
 searchlist: modexDraws
 searchlist: reg
+searchlist: animate
+searchlist: SelectPlane
+searchlist: modexClearRegion(page_t *page, int x, int y, int w, int h, byte  color) {
+searchlist: cla
+searchlist: clear
+searchlist: trigg
+searchlist: memset
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/maptest.exe b/maptest.exe
index 932d217d..75de896a 100644
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index e2d598ae..a6bd559d 100644
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/scroll.exe b/scroll.exe
index 42d6ff05..aa6367d6 100644
Binary files a/scroll.exe and b/scroll.exe differ
diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index 1ff10a1e..9b954529 100644
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -901,7 +901,7 @@ byte far *bios_8x8_font(void)
 	regs_t regs;
 
 /* use BIOS INT 10h AX=1130h to find font #3 (8x8) in ROM */
-	//memset(&regs, 0, sizeof(regs)); /* for Watcom C */
+	memset(&regs, 0, sizeof(regs)); /* for Watcom C */
 	regs.w.ax = 0x1130;
 	regs.w.bx = 0x0300;
 	intr(0x10, &regs);
@@ -911,22 +911,18 @@ byte far *bios_8x8_font(void)
 
 /*****************************************************************************
 *****************************************************************************/
-void bputs(page_t *page, bitmap_t *bmp, int x, int y, const char *s)
+void bputs(page_t *pee, int x, int y, const char *s)
 {
 	byte far *font;
-	//byte far *fontoffset;
-	//bitmap_t w;	//font bitmap wwww
+	byte far *fontoffset;
 
 	font = bios_8x8_font();
 	//printf("font=%Fp\n", font);
 	for(; *s != '\0'; s++)
-	{
-//++++		(*bmp)=bitmapLoadPcx("data/font.pcx");
+	{
 		//src.raster = font + 8 * (*s);
-		//bmp->width=8;
-		//w.height=8;
 		//BLOODY!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!111111111111!!!11!!11!111!11!!1111!!111!11!!1!!!11!11!!1!!111!11!!
-//++++		(*(bmp->data)) = (*(font + 8 * (*s)));
+//		(*(bmp->data)) = (*(font + 8 * (*s)));
 
 		//printf("fontoffset=%Fp\n", font + 8 * (*s));
 		//printf("*fontoffset=%s\n", *(font + 8 * (*s)));
@@ -934,8 +930,12 @@ void bputs(page_t *page, bitmap_t *bmp, int x, int y, const char *s)
 		//printf("*w.data=%s\n", *(w.data));
 		//blit1(&src, bmp, x, y);
 //		modexDrawSprite(page, x, y, bmp);
-		modexDrawBmp(page, x, y, bmp);
+//		modexDrawBmp(page, x, y, bmp);
+//		printf("%x\n", (*(font + 8 * (*s))));
+		//_fmemset(VGA, *(font + 8 * (*s)), _msize(font));
+		//draw text?!?! wwww
+		modexClearRegion(pee, x, y, 8, 8, 4);
 		x += 8;
 	}
-	//printf("\n");
+//	printf("\n");
 }
diff --git a/src/lib/modex16.h b/src/lib/modex16.h
index f3e5e421..b81fb36c 100644
--- a/src/lib/modex16.h
+++ b/src/lib/modex16.h
@@ -70,7 +70,7 @@ void modexPalUpdate0(byte *p);
 void chkcolor(bitmap_t *bmp, word *q, word *a, word *aa, word *z, word *i/*, word *offset*/);
 void modexWaitBorder();
 byte far *bios_8x8_font(void);
-void bputs(page_t *page, bitmap_t *bmp, int x, int y, const char *s);
+void bputs(page_t *pee, int x, int y, const char *s);
 
 /* -======================= Constants & Vars ==========================- */
 extern byte far*  VGA;  /* The VGA Memory */
diff --git a/src/scroll.c b/src/scroll.c
index 174b7bab..8134a31c 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -75,7 +75,7 @@ void main() {
 	byte *ptr;
 	byte *mappalptr;
 	actor_t player;
-	bitmap_t font;
+//	bitmap_t font;
 	//actor_t npc0;
 
 //	atexit(qclean());
@@ -123,7 +123,7 @@ void main() {
 	/* data */
 //0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
 	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
-	//font = bitmapLoadPcx("data/font.pcx");
+//	font = bitmapLoadPcx("data/font.pcx");
 	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
 
 	/* create the planar buffer */
@@ -589,7 +589,7 @@ void main() {
 	}
 	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
 	//if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
-	if(keyp(0x44))	bputs(bg->page, &font, player.triggerx, player.triggery, "wwww");	//f10
+	if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); }	//f10
 	if(keyp(25)){ pdump(bg); pdump(spri); }
 	if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }
 	if(keyp(22)){
diff --git a/test.exe b/test.exe
index f5790cd8..ec3ea875 100644
Binary files a/test.exe and b/test.exe differ
diff --git a/test2.exe b/test2.exe
index 30b9c1cd..92bb6efb 100644
Binary files a/test2.exe and b/test2.exe differ