From 335b42284dedf3017d0ff30cd743ff7750c25e36 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 4 Dec 2014 17:13:58 -0600 Subject: [PATCH] modified: Project 16.bfproject modified: scroll.exe modified: src/scroll.c --- Project 16.bfproject | 26 +++++++++++++------------- scroll.exe | Bin 48811 -> 48811 bytes src/scroll.c | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Project 16.bfproject b/Project 16.bfproject index e260eb4d..d88f2d07 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -2,17 +2,17 @@ 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:2242:1394:0: +openfiles: /dos/z/16/src/scroll.c:4410:3763: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/lib/modex16.c:13778:13598:0: +openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0: openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0: openfiles: /dos/z/16/src/pcxtest.c:68:0:0: openfiles: /dos/z/16/src/lib/dos_kb.c:107:0:0: openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0: openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0: openfiles: /dos/z/16/src/palettec.c:176:0:0: -openfiles: /dos/z/16/src/test.c:415:52:1: +openfiles: /dos/z/16/src/test.c:415:629:0: 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: @@ -20,7 +20,7 @@ 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/makefile:22:0:0: openfiles: /dos/z/16/16/dos_gfx.cpp:6388:0:0: -openfiles: /dos/z/16/16/dos_gfx.h:175:597:0: +openfiles: /dos/z/16/16/dos_gfx.h:175:233:0: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -96,23 +96,23 @@ recent_files: file:///dos/z/keen-src/id_rf.h recent_files: file:///dos/z/keen-src/id_rf_a.asm recent_files: file:///dos/z/keen-src/id_rf.c recent_files: file:///dos/z/16/gfx.pal -recent_files: file:///dos/z/16/src/scroll.c +recent_files: file:///dos/z/16/src/test.c recent_files: file:///dos/z/16/doc/project.txt recent_files: file:///dos/z/16/src/lib/modex16.h +recent_files: file:///dos/z/16/src/lib/modex16.c recent_files: file:///dos/z/16/src/lib/scroll.h recent_files: file:///dos/z/16/src/lib/scroll.c -recent_files: file:///dos/z/16/src/pcxtest.c -recent_files: file:///dos/z/16/src/lib/modex16.c -recent_files: file:///dos/z/16/16.c recent_files: file:///dos/z/16/src/lib/dos_kb.c recent_files: file:///dos/z/16/src/lib/dos_kb.h -recent_files: file:///dos/z/16/src/palettec.c -recent_files: file:///dos/z/16/src/test2.c recent_files: file:///dos/z/16/src/lib/lib_head.h -recent_files: file:///dos/z/16/src/test.c +recent_files: file:///dos/z/16/src/pcxtest.c +recent_files: file:///dos/z/16/16.c +recent_files: file:///dos/z/16/src/scroll.c +recent_files: file:///dos/z/16/src/test2.c +recent_files: file:///dos/z/16/src/lib/lib_head.cpp recent_files: file:///dos/z/16/src/lib/bitmap.c +recent_files: file:///dos/z/16/src/palettec.c recent_files: file:///dos/z/16/src/lib/bitmap.h -recent_files: file:///dos/z/16/src/lib/lib_head.cpp recent_files: file:///dos/z/16/src/lib/types.h recent_files: file:///dos/z/16/makefile recent_files: file:///dos/z/16/16/dos_gfx.h @@ -139,7 +139,7 @@ searchlist: void modexPalBlack(); searchlist: oid modexPalBlack( searchlist: id modexPalBlack( searchlist: d modexPalBlack( -searchlist: modexPalBlack( +searchlist: modexPalBlack( searchlist: fadePalette( searchlist: modexPalBlack( searchlist: modexPalUpdate diff --git a/scroll.exe b/scroll.exe index 776f5aeaf0631e6b2ecf27d06eec3f017a43cf8e..6ec502479cc9f2a469f13fcc47cd6d83443ff52c 100644 GIT binary patch delta 82 zcmZ4emudB1rVT5Z_%l#ylfM<#VX W4~7?^5QzYW7v5kA#?98u1-k(?g&n{E delta 82 zcmZ4emudB1rVT5Z_&gY19FcE5P{Oq%fZ@fi$&Ab*f{YA1d>LNMhlqMJyqF3SWn`NC Ykx88o$PI-^0F`)yC0I6FGZ*Xz05v2XzyJUM diff --git a/src/scroll.c b/src/scroll.c index 21fd76d5..76bc9f1f 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -147,10 +147,10 @@ void main() { //TODO: make this better - if(keyp(72) && !keyp(80) && player.q == 1) player.d = 1; if(keyp(77) && !keyp(75) && player.q == 1) player.d = 2; - if(keyp(80) && !keyp(72) && player.q == 1) player.d = 3; if(keyp(75) && !keyp(77) && player.q == 1) player.d = 4; + if(keyp(80) && !keyp(72) && player.q == 1) player.d = 3; + if(keyp(72) && !keyp(80) && player.q == 1) player.d = 1; //if(player.d>0) player.q=1; #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; -- 2.39.2