From 417cb6eac7932db6e16decc754dc1ed0b5720f3b Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 15 May 2017 09:14:06 -0500 Subject: [PATCH] 16_ca needs huge amounts of work and I should remember what needs to be done soon[going to port rest of code to borland c some time so we can use the core components of id engine here ][going to add 16_us.c eventually but the debug system and CA_ PM_ and MM_ usage is priority now]older zcroll renamed to xcroll][zcroll is now the pre menu game loop system with PROPER data usage with CAMMPM] added 1st scroll back [i work on CA] palette debug show values added wwww and i need to know how to see vrs/vrl imaage data palette index numbers [i am trying to find out how the hell you get the index number values of VRL/VRS] boom has been fixed ^^[CA_CacheMap added seems to be used in start a new game] what is mapsegs? testing xcroll.exe working but not really --- makefile | 6 +++--- src/lib/16_tdef.h | 10 +++++----- src/lib/doslib | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index 5c21b2ad..1d8d592f 100755 --- a/makefile +++ b/makefile @@ -119,8 +119,8 @@ UPXQ=-qqq # # compile flags # -S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576 -Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei +S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k45056#32768#24576 +Z_FLAGS=-zk0 -zc -zm -zp4 -ei O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536 @@ -139,7 +139,7 @@ LIBFLAGS=$(WLIBQ) -b -n # VGMSNDOBJ = vgmSnd.$(OBJ) OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ) -GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) +GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_sd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) !ifeq DEBUGSERIAL 1 diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index a1a29392..ce68bda5 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -366,7 +366,7 @@ typedef struct //===================================// #define PALSIZE 768 //vga #define NUMCHUNKS 416 //keen -#define MAXSCANLINES 240 // size of ylookup table +//#define MAXSCANLINES 240 // size of ylookup table #define MAXSHIFTS 4 #define STARTSPRITES 0 //temp @@ -400,7 +400,7 @@ typedef struct word quadwh; //preproccessed quad size of tilewidth and tileheight } tile_dimention_t; -#define MAXSCROLLEDGES 6 +#define MAXSCROLLEDGES 2 typedef struct { unsigned panx,pany; // panning adjustments inside port in pixels @@ -497,7 +497,7 @@ typedef struct //from 16_mm //========================================================================== -#define MAXBLOCKS 800//kd=1300 wolf3d=700 cata=600 +#define MAXBLOCKS 256//800 //kd=1300 wolf3d=700 cata=600 typedef struct mmblockstruct { @@ -756,13 +756,13 @@ typedef struct //TODO: USE THIS!!!! #ifdef GRHEADERLINKED huffnode *grhuffman; #else - huffnode grhuffman[255]; + huffnode grhuffman[63]; #endif #ifdef AUDIOHEADERLINKED huffnode *audiohuffman; #else - huffnode audiohuffman[255]; +// huffnode audiohuffman[63]; #endif CASVT chunkcomplen,chunkexplen;//long diff --git a/src/lib/doslib b/src/lib/doslib index dac2cfe2..da8765d3 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit dac2cfe205617d6edcb6d483c23bc3d4254977d1 +Subproject commit da8765d3e9a400fd02106d23b05462fdf38b777b -- 2.39.2