From 0c925b2b0d1719a71b7688b13839d41470a59872 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 4 Dec 2014 21:47:26 -0600 Subject: [PATCH] modified: Project 16.bfproject modified: scroll.exe modified: src/scroll.c --- Project 16.bfproject | 4 ++-- scroll.exe | Bin 49084 -> 49200 bytes src/scroll.c | 47 +++++++++++++++++++++++++++---------------- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Project 16.bfproject b/Project 16.bfproject index 63c9bd70..ebde19af 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -2,7 +2,7 @@ c2e.convert_special: 0 e2c.convert_num: 0 openfiles: /dos/z/16/doc/project.txt:60:0:0: openfiles: /dos/z/16/16.c:0:0:0: -openfiles: /dos/z/16/src/scroll.c:4649:3633:1: +openfiles: /dos/z/16/src/scroll.c:17044:16836:1: openfiles: /dos/z/16/src/lib/scroll.c:1666:0:0: openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0: openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0: @@ -18,7 +18,7 @@ openfiles: /dos/z/16/src/test2.c:18:0:0: openfiles: /dos/z/16/src/lib/bitmap.c:59:0:0: openfiles: /dos/z/16/src/lib/bitmap.h:125:0:0: openfiles: /dos/z/16/src/lib/lib_head.cpp:0:0:0: -openfiles: /dos/z/16/src/lib/types.h:98:0:0: +openfiles: /dos/z/16/src/lib/types.h:242:0:0: openfiles: /dos/z/16/makefile:22:0:0: openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0: openfiles: /dos/z/16/16/dos_gfx.h:175:233:0: diff --git a/scroll.exe b/scroll.exe index 3f4a3c79d24cf05efb943519b7292d0560447867..6126c4e25675e11d73c6eb28f51befb5cab0ea0f 100644 GIT binary patch delta 12808 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 delta 12793 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 Cs5(Ue diff --git a/src/scroll.c b/src/scroll.c index bf910772..530f305f 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -40,8 +40,8 @@ struct { int ty; //player tile position on the viewable map int triggerx; //player's trigger box tile position on the viewable map int triggery; //player's trigger box tile position on the viewable map - sword q; //loop variable - sword d; //direction + word q; //loop variable + word d; //direction int hp; //hitpoints of the player } player; @@ -56,7 +56,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); -sword dpad(sword keypressed); +void dpad(sword k); 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); #define TILEWH 16 @@ -79,8 +79,7 @@ void main() { map_view_t mv, mv2, mv3; map_view_t *bg, *spri, *mask;//, *tmp; byte *pal; - byte *ptr; - sword keypressed = 0; + byte *ptr; player.q=1; player.d=0; @@ -150,9 +149,7 @@ void main() { //TODO: make this better like rpg maker 2000 better if(player.q == 1) { - dpad(keypressed); - if(keypressed>1){ dpad(keypressed); } - keypressed = 0; + dpad(0/*, 0*/); } #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; @@ -581,15 +578,31 @@ mapDrawCol(map_view_t *mv, int tx, int ty, word x) { } } -sword -dpad(sword keypressed) -{ - if(keypressed>1) keypressed=0; - if(keyp(75) && !keyp(77)){ player.d = 4; keypressed++; } - if(keyp(80) && !keyp(72)){ player.d = 3; keypressed++; } - if(keyp(77) && !keyp(75)){ player.d = 2; keypressed++; } - if(keyp(72) && !keyp(80)){ player.d = 1; keypressed++; } - return keypressed; +//sword +void +dpad(sword k/*, sword q*/) +{ + //printf("p1: %d\n", k); + //keypressed=0; + //if(q>1){ q=0; return q; } + //if(keypressed>1){ keypressed=0; return keypressed; } + if(k==0) + { + if(keyp(75) && !keyp(77)){ player.d = 4; k--; } + if(keyp(80) && !keyp(72)){ player.d = 3; k--; } + if(keyp(77) && !keyp(75)){ player.d = 2; k++; } + if(keyp(72) && !keyp(80)){ player.d = 1; k++; } + } + else + { + if(keyp(72) && !keyp(80)){ player.d = 1; k++; } + if(keyp(77) && !keyp(75)){ player.d = 2; k++; } + if(keyp(80) && !keyp(72)){ player.d = 3; k--; } + if(keyp(75) && !keyp(77)){ player.d = 4; k--; } + } + //printf("p2: %d\n", k); + //if(k>1 || k<-1){ dpad(0); } + //return keypressed=0; } void -- 2.39.5