wtf is that 8 doing?

diff --git a/.gitignore b/.gitignore
index 70ed7d7559f36ad034ae916e1aac57babd351473..1fa485c9e260e3b0bed3e62387da177bd244b257 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@
 *.[O]\r
 *.BCO\r
 *.*~\r
-FUCK\r
 *.err\r
 *.ERR\r
 *.lib\r
@@ -30,3 +29,5 @@ img
 #!foo.html\r
 # Ignore objects and archives.\r
 *.[oa]\r
+#*.16W\r
+#*.16B\r

diff --git a/ZCROLL.L16 b/ZCROLL.L16
index fd9bf43f0320cf1d07644b881d1d31dd50f11699..febfef5ebdc2a0c8626dfb2c15e3ea8b261c9ee7 100755 (executable)
--- a/ZCROLL.L16
+++ b/ZCROLL.L16
@@ -11,22 +11,22 @@ Object 4's name: 'stump'
                walkable: 0\r
 \r
 Project 16 zcroll.exe. This is just a test file!\r
-version Mar 13 2017 11:55:15\r
+version Mar 13 2017 12:20:24\r
 page[0]dxy: 16x16\r
 \r
 player vars:\r
-       xy: 160x128     txy: 16x8       triggxy: 17x8\r
-       hp: 4   q: 1    info.dir: 2     d: 2    dire: 21        pdir: 3\r
-       delay=1\r
+       xy: 160x128     txy: 10x8       triggxy: 10x9   value: 39\r
+       hp: 4   q: 1    info.dir: 2     d: 2    dire: 30        pdir: 0\r
+       delay=0\r
 \r
 VL_PrintmodexmemInfo:\r
   Virtual Screen: 352x272      Tile: 22x17=((Virtual Screen)/16)\r
          Screen: 320x240       Tile: 20x15=((Screen)/16)\r
   Free Video Memory: 767\r
-  page [0]=(a000:0018) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
-       [1]=(a000:5d98) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
-       [2]=(a000:bb18) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
-       [3]=(a000:dc18) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
+  page [0]=(a000:0000) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
+       [1]=(a000:5d80) size=23936      w=352  h=272 sw=320  sh=240 pi=1408\r
+       [2]=(a000:bb00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
+       [3]=(a000:dc00) size=8448       w=352  h=96  sw=352  sh=96  pi=1408\r
 gvar.video:\r
  r=0 bgps=1 \r
 \r

diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c
index b2a5dc8e0a76510db258d8733044eaafa1633d8b..efb62ba8fc4fd122a99683c7836ff00691c62b26 100755 (executable)
--- 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)\r
 {\r
        //memptr        big buffer;\r
-       static struct vrs_container vrs;        //vrs spritesheet\r
+       static struct vrs_container vrs;\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
        uint16_t far *vrl_id_iter;\r
        uint32_t far *vrl_headers_offsets;\r
@@ -56,7 +56,6 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia
 \r
        // Allocate memory for vrl line offsets table\r
        vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);\r
-//++++ MM_GetPtr((memptr)(vrl_line_offsets), sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar);\r
 \r
        vrl_headers_offsets = (uint32_t far *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);\r
        // Calculate line offsets for each vrl\r
@@ -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);\r
        }\r
        vrs.vrl_line_offsets = vrl_line_offsets;\r
-       free(vrl_line_offsets);\r
 \r
        enti->spri.spritesheet = &vrs;\r
        enti->spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));\r
-//++++ MM_GetPtr((memptr)(enti->spri.sprite_vrl_cont), sizeof(struct vrl_container), gvar);\r
 }\r
 \r
 // Seek and return a specified .vrl blob from .vrs blob in far memory\r

diff --git a/src/util/git/git_igno.re b/src/util/git/git_igno.re
index 70ed7d7559f36ad034ae916e1aac57babd351473..1fa485c9e260e3b0bed3e62387da177bd244b257 100755 (executable)
--- a/src/util/git/git_igno.re
+++ b/src/util/git/git_igno.re
@@ -8,7 +8,6 @@
 *.[O]\r
 *.BCO\r
 *.*~\r
-FUCK\r
 *.err\r
 *.ERR\r
 *.lib\r
@@ -30,3 +29,5 @@ img
 #!foo.html\r
 # Ignore objects and archives.\r
 *.[oa]\r
+#*.16W\r
+#*.16B\r