From: sparky4 Date: Sun, 7 Dec 2014 21:03:21 +0000 (-0600) Subject: Controls are PERFECT! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=5ac0fc9f64b9c05179bc9b501e0391dc32f73c82;p=16.git Controls are PERFECT! I made it so that the controls are good and the collision detection code is just a simple place holder for 1 tile wwww modified: Project 16.bfproject modified: scroll.exe modified: src/scroll.c --- diff --git a/Project 16.bfproject b/Project 16.bfproject index 663f35e0..a453f15d 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -1,28 +1,6 @@ -<<<<<<< HEAD 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:17553:16983:1: -openfiles: /dos/z/16/src/lib/scroll.c:359: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: -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:3352:2801: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: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: -openfiles: /dos/z/16/src/lib/lib_head.cpp:0: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: +openfiles: /dos/z/16/src/scroll.c:0:378:1: snr_recursion_level: 0 convertcolumn_horizontally: 0 adv_open_matchname: 0 @@ -34,33 +12,18 @@ view_left_panel: 0 default_mime_type: text/plain e2c.convert_xml: 1 c2e.convert_iso: 0 -opendir: file:///dos/z/16/src/v2/source/ENGINE +opendir: file:///dos/z/16/src wrap_text_default: 0 bookmarks_filename_mode: 1 -ssearch_text: UnPress( -snr_casesens: 1 +snr_casesens: 0 view_blocks: 1 -name: project 16 -replacelist: dest -replacelist: animatePlayer(bg, spri, -replacelist: qi=1 -replacelist: qi<=( -replacelist: \t\t\t\t -replacelist: animatePlayer(bg, spri, mask, 1 -replacelist: animatePlayer(bg, spri, mask, 0 -replacelist: modexShowPage(mask-> -replacelist: modexShowPage(spri -replacelist: player.tx == player.ty -replacelist: TRIGGY -replacelist: TRIGGX -replacelist: $(SRCLIB) -replacelist: $(SRC) -replacelist: play-> +name: Project 16 fb_show_hidden_f: 0 editor_tab_width: 4 -show_visible_spacing: 1 +template: /usr/share/bluefish/templates/C_header_GPL +show_visible_spacing: 0 view_statusbar: 1 -display_right_margin: 0 +display_right_margin: 1 c2e.IE_apos_workaround: 0 outputb_scroll_mode: 0 leftpanel_active_tab: 0 @@ -69,125 +32,36 @@ ssearch_regex: 0 e2c.convert_iso: 0 ssearch_casesens: 0 charmap_block: 1 -======= -view_main_toolbar: 1 -bmarksearchmode: 0 -snr_scope: 0 -snr_type: 0 -view_cline: 0 -editor_indent_wspaces: 0 -c2e.convert_xml: 1 -snr_dotmatchall: 0 -c2e.convert_symbol: 0 -filegloblist: *.txt -filegloblist: *.shtml -filegloblist: *.py -filegloblist: *.pl -filegloblist: *.php -filegloblist: *.js -filegloblist: *.java -filegloblist: *.htm -filegloblist: *.html -filegloblist: *.h -filegloblist: *.css -filegloblist: *.cpp -filegloblist: *.cgi -filegloblist: *.c -filegloblist: * -fb_focus_follow: 1 +snr_replacetype: 0 +savedir: file:///dos/z/16/src +spell_check_default: 1 +spell_insert_entities: 0 +last_filefilter: +htmlbar_notebooktab: 0 +view_blockstack: 1 +snr_escape_chars: 0 +htmlbar_view: 1 +spell_lang: en +ssearch_dotmatchall: 0 +autocomplete: 1 +outputb_show_all_output: 0 +bookmarks_show_mode: 0 +snippets_show_as_menu: 1 adv_open_recursive: 0 -recent_dirs: file:///dos/z/16/16 -encoding: UTF-8 -autoindent: 1 +encoding: SHIFT_JIS e2c.convert_special: 0 +autoindent: 1 fb_viewmode: 0 -htmlbar_view: 0 -snippets_show_as_menu: 1 -bookmarks_show_mode: 0 -outputb_show_all_output: 0 -autocomplete: 1 -searchlist: mapDrawTile -searchlist: dxThresh -searchlist: PalFile -searchlist: src\\lib\\ -searchlist: player. -searchlist: src\\ -searchlist: void modexPalBlack(); -searchlist: oid modexPalBlack( -searchlist: id modexPalBlack( -searchlist: d modexPalBlack( -spell_lang: en -snr_escape_chars: 0 -view_blockstack: 1 -htmlbar_notebooktab: 0 -last_filefilter: -spell_insert_entities: 0 -spell_check_default: 1 -savedir: file:///dos/z/16/src -snr_replacetype: 0 ->>>>>>> 3a2e65f55f3d4f720e9076f68f6292f702369391 -recent_files: file:///dos/z/16/16/modex16/scroll.c -recent_files: file:///dos/z/16/16/modex16/dos_kb.c -recent_files: file:///dos/z/16/16/modex16/makefile -recent_files: file:///dos/z/16/16/dos_kb.c -recent_files: file:///dos/z/16/16/TEST.C -recent_files: file:///dos/z/16/16/dos_kb.h -recent_files: file:///dos/z/16/16/lib/lib_com.cpp -recent_files: file:///dos/z/16/16/lib/lib_com.h -recent_files: file:///dos/z/16/16/16.txt -recent_files: file:///dos/z/16/16/lib/x/MODEX.H -recent_files: file:///dos/z/16/16/modex16/dos_kb.h -recent_files: file:///dos/z/16/doc/16.16 -recent_files: file:///dos/z/16/doc/16story.txt -recent_files: file:///dos/z/16/README -recent_files: file:///dos/z/16/scroll.c -recent_files: file:///dos/z/16/dos_kb.h -recent_files: file:///dos/z/16/dos_kb.c -recent_files: file:///dos/z/16/lib/lib_head.h -recent_files: file:///dos/z/16/modex16.c -recent_files: file:///dos/z/16/modex16.h -recent_files: file:///dos/z/16/types.h -recent_files: file:///dos/z/16/pcxtest.c -recent_files: file:///dos/z/keen-src/id_mm.h -recent_files: file:///dos/z/keen-src/id_mm.c -recent_files: file:///dos/z/keen-src/id_rf.h -charmap_block: 1 -e2c.convert_iso: 0 -enable_syntax_scan: 1 -outputb_scroll_mode: 0 -leftpanel_active_tab: 0 -c2e.IE_apos_workaround: 0 -display_right_margin: 0 -replacelist: dest -replacelist: animatePlayer(bg, spri, -replacelist: qi=1 -replacelist: qi<=( -replacelist: \t\t\t\t -replacelist: animatePlayer(bg, spri, mask, 1 -replacelist: animatePlayer(bg, spri, mask, 0 -replacelist: modexShowPage(mask-> -replacelist: modexShowPage(spri -replacelist: player.tx == player.ty -editor_tab_width: 4 -view_statusbar: 1 -fb_show_hidden_f: 0 -name: project 16 -view_blocks: 1 -snr_casesens: 1 -c2e.convert_iso: 0 -bookmarks_filename_mode: 1 -wrap_text_default: 0 -opendir: file:///dos/z/16/src/v2/source/ENGINE -e2c.convert_xml: 1 -default_mime_type: text/plain -view_left_panel: 0 -htmlbar_thumbnailwidth: 300 -fb_show_backup_f: 0 -view_line_numbers: 1 -show_mbhl: 1 -adv_open_matchname: 0 -convertcolumn_horizontally: 0 -snr_recursion_level: 0 +recent_dirs: file:///dos/z/16/src +fb_focus_follow: 1 +ssearch_unescape: 0 +c2e.convert_symbol: 0 +snr_dotmatchall: 0 +c2e.convert_xml: 1 +editor_indent_wspaces: 0 +view_cline: 0 +snr_type: 0 +snr_scope: 2 +bmarksearchmode: 0 +view_main_toolbar: 1 e2c.convert_symbol: 0 -e2c.convert_num: 0 -c2e.convert_special: 0 diff --git a/scroll.exe b/scroll.exe index 6d3572cb..8734952f 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/scroll.c b/src/scroll.c index 21647006..bcb089da 100644 --- a/src/scroll.c +++ b/src/scroll.c @@ -143,7 +143,8 @@ void main() { //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction //when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1; - + + //right movement if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2) { if(player.d == 0){ player.d = 2; } @@ -153,7 +154,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollRight(bg, SPEED); mapScrollRight(spri, SPEED); //mapScrollRight(mask, SPEED); @@ -168,7 +169,7 @@ void main() { INC_PER_FRAME; player.x+=SPEED; //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx++; } @@ -182,8 +183,9 @@ void main() { } player.triggerx = player.tx+1; player.triggery = player.ty; - } + } + //left movement if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4) { if(player.d == 0){ player.d = 4; } @@ -193,7 +195,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 3, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollLeft(bg, SPEED); mapScrollLeft(spri, SPEED); //mapScrollLeft(mask, SPEED); @@ -208,7 +210,7 @@ void main() { INC_PER_FRAME; player.x-=SPEED; //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.tx--; } @@ -222,8 +224,9 @@ void main() { } player.triggerx = player.tx-1; player.triggery = player.ty; - } + } + //down movement if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3) { if(player.d == 0){ player.d = 3; } @@ -233,7 +236,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 2, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollDown(bg, SPEED); mapScrollDown(spri, SPEED); //mapScrollDown(mask, SPEED); @@ -248,7 +251,7 @@ void main() { INC_PER_FRAME; player.y+=SPEED; //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); modexShowPage(spri->page); player.q++; } else { player.q = 1; player.d = 0; player.ty++; } @@ -263,7 +266,8 @@ void main() { player.triggerx = player.tx; player.triggery = player.ty+1; } - + + //up movement if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1) { if(player.d == 0){ player.d = 1; } @@ -273,7 +277,7 @@ void main() { { INC_PER_FRAME; //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp); - animatePlayer(bg, spri, 0, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp); mapScrollUp(bg, SPEED); mapScrollUp(spri, SPEED); //mapScrollUp(mask, SPEED); @@ -289,7 +293,7 @@ void main() { player.y-=SPEED; //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp); modexShowPage(spri->page); - animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); + animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp); player.q++; } else { player.q = 1; player.d = 0; player.ty--; } }