From: sparky4 <sparky4@cock.li>
Date: Tue, 25 Nov 2014 02:54:43 +0000 (-0600)
Subject: 	modified:   Project 16.bfproject
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3454d21970e021a02e54f7df0d7eb9d2e3a691d6;hp=9f5c3b2b489235a37567ec4cc750979204424203;p=16.git

	modified:   Project 16.bfproject
	modified:   scroll.c
	modified:   scroll.exe
---

diff --git a/Project 16.bfproject b/Project 16.bfproject
index d086847f..1e580216 100644
--- a/Project 16.bfproject	
+++ b/Project 16.bfproject	
@@ -1,7 +1,7 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
-openfiles: /dos/z/16/scroll.c:390:375:1:
+openfiles: /dos/z/16/scroll.c:9765:9708:0:
 openfiles: /dos/z/16/modex16.c:6319:6141:0:
 openfiles: /dos/z/16/modex16.h:1057:344:0:
 openfiles: /dos/z/16/pcxtest.c:795:442:0:
@@ -12,7 +12,7 @@ openfiles: /dos/z/16/README:744:0:0:
 openfiles: /dos/z/16/makefile:181:0:0:
 openfiles: /dos/z/keen-src/id_mm.c:1835:1591:0:
 openfiles: /dos/z/keen-src/id_mm.h:0:0:0:
-openfiles: /dos/z/keen-src/id_rf.c:50912:46219:0:
+openfiles: /dos/z/keen-src/id_rf.c:46629:47612:1:
 openfiles: /dos/z/keen-src/id_rf.h:0:0:0:
 openfiles: /dos/z/keen-src/id_rf_a.asm:1555:3465:0:
 snr_recursion_level: 0
@@ -33,8 +33,6 @@ ssearch_text: cols
 snr_casesens: 1
 view_blocks: 1
 name: project 16
-replacelist: mv->page, src->page,
-replacelist: modexShowPage(draw
 replacelist: wPage(spri
 replacelist: 34);
 replacelist: bg
@@ -48,6 +46,8 @@ replacelist: animatePlayer(bg, spri, mask, 0
 replacelist: modexShowPage(mask->
 replacelist: modexShowPage(spri
 replacelist: player.tx == player.ty
+replacelist: TRIGGY
+replacelist: TRIGGX
 fb_show_hidden_f: 0
 editor_tab_width: 4
 show_visible_spacing: 1
@@ -122,8 +122,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: draw
-searchlist: modexDrawBmp
 searchlist: mapDrawTile
 searchlist: draw
 searchlist: return
@@ -137,6 +135,8 @@ searchlist: dyThresh
 searchlist: screen.width
 searchlist: width
 searchlist: cols
+searchlist: MAPY/2
+searchlist: MAPX/2
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/scroll.c b/scroll.c
index 218d0097..e5121790 100644
--- a/scroll.c
+++ b/scroll.c
@@ -52,7 +52,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty);
 void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
 void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);
+void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */word d1, word d2, int x, int y, word ls, word lp, bitmap_t *bmp);
 
 #define TILEWH 16
 #define QUADWH (TILEWH/4)
@@ -66,7 +66,7 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short
 //#define SWAP(a, b) tmp=a; a=b; b=tmp;
 void main() {
 	bitmap_t ptmp; // player sprite
-	int q=1;
+	word q=1;
 	static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
 	page_t screen, screen2, screen3;
 	map_t map;
@@ -550,10 +550,10 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
 }
 
 void
-animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp)
+animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */word d1, word d2, int x, int y, word ls, word lp, bitmap_t *bmp)
 {
-	short dire=32*d1;
-	short qq;
+	word dire=32*d1;
+	word qq;
 
 	if(d2==0) qq = 0;
 	else qq = ((lp)*SPEED);
diff --git a/scroll.exe b/scroll.exe
index 892a73f4..b62c90b1 100644
Binary files a/scroll.exe and b/scroll.exe differ