From 3c6b8e4d8885d88d85577e48e0081411fac26cc5 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 13 Mar 2017 12:21:22 -0500 Subject: [PATCH] wtf is that 8 doing? --- .gitignore | 3 ++- ZCROLL.L16 | 16 ++++++++-------- src/lib/16_vrs.c | 5 +---- src/util/git/git_igno.re | 3 ++- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 70ed7d75..1fa485c9 100755 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ *.[O] *.BCO *.*~ -FUCK *.err *.ERR *.lib @@ -30,3 +29,5 @@ img #!foo.html # Ignore objects and archives. *.[oa] +#*.16W +#*.16B diff --git a/ZCROLL.L16 b/ZCROLL.L16 index fd9bf43f..febfef5e 100755 --- a/ZCROLL.L16 +++ b/ZCROLL.L16 @@ -11,22 +11,22 @@ Object 4's name: 'stump' walkable: 0 Project 16 zcroll.exe. This is just a test file! -version Mar 13 2017 11:55:15 +version Mar 13 2017 12:20:24 page[0]dxy: 16x16 player vars: - xy: 160x128 txy: 16x8 triggxy: 17x8 - hp: 4 q: 1 info.dir: 2 d: 2 dire: 21 pdir: 3 - delay=1 + xy: 160x128 txy: 10x8 triggxy: 10x9 value: 39 + hp: 4 q: 1 info.dir: 2 d: 2 dire: 30 pdir: 0 + delay=0 VL_PrintmodexmemInfo: Virtual Screen: 352x272 Tile: 22x17=((Virtual Screen)/16) Screen: 320x240 Tile: 20x15=((Screen)/16) Free Video Memory: 767 - page [0]=(a000:0018) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 - [1]=(a000:5d98) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 - [2]=(a000:bb18) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 - [3]=(a000:dc18) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 + page [0]=(a000:0000) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 + [1]=(a000:5d80) size=23936 w=352 h=272 sw=320 sh=240 pi=1408 + [2]=(a000:bb00) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 + [3]=(a000:dc00) size=8448 w=352 h=96 sw=352 sh=96 pi=1408 gvar.video: r=0 bgps=1 diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c index b2a5dc8e..efb62ba8 100755 --- a/src/lib/16_vrs.c +++ b/src/lib/16_vrs.c @@ -26,7 +26,7 @@ void VRS_LoadVRS(char *filename, entity_t *enti, global_game_variables_t *gvar){ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar) { //memptr big buffer; - static struct vrs_container vrs; //vrs spritesheet + static struct vrs_container vrs; vrl1_vgax_offset_t **vrl_line_offsets; uint16_t far *vrl_id_iter; uint32_t far *vrl_headers_offsets; @@ -56,7 +56,6 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia // Allocate memory for vrl line offsets table vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl); -//++++ MM_GetPtr((memptr)(vrl_line_offsets), sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar); vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]); // Calculate line offsets for each vrl @@ -74,11 +73,9 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size); } vrs.vrl_line_offsets = vrl_line_offsets; - free(vrl_line_offsets); enti->spri.spritesheet = &vrs; enti->spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container)); -//++++ MM_GetPtr((memptr)(enti->spri.sprite_vrl_cont), sizeof(struct vrl_container), gvar); } // Seek and return a specified .vrl blob from .vrs blob in far memory diff --git a/src/util/git/git_igno.re b/src/util/git/git_igno.re index 70ed7d75..1fa485c9 100755 --- a/src/util/git/git_igno.re +++ b/src/util/git/git_igno.re @@ -8,7 +8,6 @@ *.[O] *.BCO *.*~ -FUCK *.err *.ERR *.lib @@ -30,3 +29,5 @@ img #!foo.html # Ignore objects and archives. *.[oa] +#*.16W +#*.16B -- 2.39.2