From ad167659d2632401aabe0266016206076c5e7caa Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 15 May 2017 10:29:59 -0500 Subject: [PATCH] xcroll.exe needs through testing on real hardware./wbuild.sh; wmake www./wbuild.sh; wmake www 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? --- makefile | 3 ++- ps.exe | Bin 14774 -> 15350 bytes src/lib/16_dbg.h | 3 +++ src/lib/16_tdef.h | 2 +- src/lib/bakapee.c | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index c14d9353..36084f4a 100755 --- a/makefile +++ b/makefile @@ -119,7 +119,8 @@ UPXQ=-qqq # # compile flags # -S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#24576 +#-st +S_FLAGS=-sg -of+ -zu -zdf -zff -zgf -k24576#32768 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 diff --git a/ps.exe b/ps.exe index 46bd72cabcfb972b998fdd9a12be394245f0034d..dff9674475a42250c52df0afbfb27c74bb9f1405 100755 GIT binary patch delta 4664 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 b@E;1}_!@t3Fbnb%l<~8mF^-4um&X4BxEM2) delta 3983 zcmYk93wTqyJ zU&CS(*M#u}Rmr4TAT&JOFC{FS@G2EJC4Mw^iJKHkb}O5N@LD28gn*qm1dQ+g?^W7V z-}lp7516~Hw80dl*(D&Ifq>*euMF!Wv z7Bs#Bl9CAN2lJB&IXae*t6<(ZLRNwaRzf}j-vHZqLhc7!!C7Fop$-;+WneX^1p%-h zbb$B4H83lUkm9sP_yUF3z*TSqSSCO?5zk3jVJ0CXVBvJM%^;)*ECEw6$!TCM%6EZd zCLupW{Y5Y55ON66EJEDi z3Gi>=XCPxPA?=_F16G3`lmmGF%t=TtHogWB!q*BVji;sZvJfF9p=8p2%~EpGEm|Uj zQn2}ty3nhlr6BSV(WEZY-l306KZ;8?jD_@gTsoVyze?lM<8i6m2I=;=G?TPHH7zdP z9+zHEgY@UBbY@8?gS4lTxcKLBaY-S>D@jPVutXai)3ZdX`H#hl#?$)X@=_n`VQ1KY z>wL>!>vLFVpubh;yc$=XNK4T7qQ3c$(r|Z@e~s2Z8;y}a>(xaSdGpS#|1jhh1L0w5 zH`UcG-Mf#@lD5+Yl+-VJ&;APSF_>EoZnHl}Q);s8rpXHAiu4LC3+1SuBC5HKsyS)f znvv?tCztkV!{pG|_V!ok3AY$B6H8=uVleih=I3>~@q(h`n{^LQWF3zzWB*qYvO?ka zy5MqOMe}uCNm+Sm$j$q8YsR|8E$0GZr&2upVl64GD@1dtK1C=?;A`|*)+q^Fx?;am zZN{yXz)HW!-_k!VNM@dFxS!`s6+){C#Z2BVl?xWN*n}MU`?%`FKBIh>!NZ+KNv~FS z@GlHS{DQ%(S0`1>^NkM*vn0OWSSZ|;_%Wk1^M(|Zy~DEaHkMmcjpc6XX79`1ubhe{ z^50T0c1oQQ;%S{}6Ls@1O=(7tp`DWGO#@Fh&$hsE2&=8WQS8ih1ApB7D+B!B*?z2u zUo#gOzBX)qKYB*u&V&W%{nLcD#$!eAzADc8OLoW5f#!m{0;#iwBy-zcVXNhy(5B!) z#WqpgYSD}HzE~z-59!Tq22@RANFf*_*?s+pSL0u z#(?kSEG{o8+xnNlrzZ`@5MA&=h8&(;B@d1q{6z;3CR!2_j3)$gtnh=3lWzWIV!HWj zY5B1wA7qqZL(U{R5?zL1;8VFc(GqbR+C~zo@GlY{9WxsYUF$HuG2?$Zz4BS4UrTG4iau^du#&^RCm- ze$<9F`zml;{S7rgzcnt+)M#UORF~U$inWG@c&&9CJ;>>J$9#26H8c`Qpn9~|JEADD z0hHv$iRk>{_yvlBJ$puB-jV1}l+Zp8;=51HyQ6p09u?G-3O5({_~VnNAdS{d`h(gs zptiWu-$Bcb^fde%?T$oMGv6{nY;Yl%bL@pPN>bqPv>xv$QO)1RXoab0xq=oNtyI{V z*l+vFOUt1BYy09!Zt<`#FmUdoZ2w$fT~4LBE4k@P(u@IgE8+L-=@Zm(<=o$RT88}v zc|8qAIh79Pbv0BWlXg!YFBanYgURC`j;qwma1~D6&3&Xyq@~Rc!OUTyAfLy zeTw{(nQYBW+Cr^+gAN_ug7iRqkotY-$cFF=yAuyehI!=Y+QeFuyx5#CVbQ78RV(^n zQejt(wf$(YDjmw#yTbNo;Fq zta{cgxyO1DbkD_We;8!F%r}ax(!qb#*gRIJLwB}RLRwp2_w3!{Q5zpo$7ACX)m$HC z1+RPB_IUWE@pOMLyBS}Z!;!~&2p-sGeY9_tFpP%}l)XP(*RnW2gnQ2kF z@#wP5*C@Sw^w#v}1v>rcx>@7s7##5ZzQCu7_bbJ|od0rmErLy)GdFXOgt)B}qYd}o zs~&0fMz$C_+$$DU^8mlK2 zqSzfGZYXg0+n=#8>(Xp!jjDoTe?VksqFEPN2l?J-0_$yu6qzXJ?(wL8;+JerYe8i6 zv)E-E658RSZY1*Tb-p?)$GpH0+z}fr$J>hU$$9__crR;>TOA;tmAG@Lefls9F2#nT z)WAB*zMIQlpUA8}v8oTpK)IUn7#jKViEH9`)d1Tdu$8(N#qU8tw4AS71X)scp_YoQ zL5TgX91Sb7mtoAq*)t`z%U&P9lzsmM9HrHxfv|{V%Llb$`>4XgmdM+BZl7m&Ky!e3 zM`b%w=e$25?%PHkse2UF8W>$UF9Sw5&a*Au6bs>z;U{9>c|U@W10ij;WRG-SZyATLFaWd7JunYR?Dkual$Oai*`;p)b<`7?lmPpS9?r>Rc`$Z)3 zU|^u>i3G=Rae|@l8cM>7K7M813iTaUn6s1za*D7I(PuwJda-V8pw``oJxy1r6I-dD4*6R-GW0%}1^`FH0w_J8!W7d71*ku^7M0VqluIj_+#|l2k*trYeZdf>KPv8E& zTKe}`&9{CftS@5c4(pn`lg`E92(g_c!$*Psrh=QeZt;(ECpxtl#0hWxT!@)41vLls zM0J?9!q|27QWqEyrOyRRL{_SJMQ*zFf4&K_o0?ZOrBmPCby{;BS)~>1EbB#|O}&Ra zGdd5^Ma6-xilGBFHI?0^Wfc&dpw!h77&1y>gcP*C2-TdpjK92lJOt^(fr9r8|VKk<`qa^aFT?)_Vbk(O diff --git a/src/lib/16_dbg.h b/src/lib/16_dbg.h index 3322046c..3a2ce94c 100755 --- a/src/lib/16_dbg.h +++ b/src/lib/16_dbg.h @@ -7,6 +7,8 @@ #include "src/lib/16_tdef.h" #define __DEBUG__ + +#ifdef __DEBUG__ //#define __DEBUG_InputMgr__ #define __DEBUG_MAP__ //#define __DEBUG_2__ @@ -16,6 +18,7 @@ //#define __DEBUG_RF__ #define __DEBUG_SPRI__ #define __DEBUG_VL__ +#endif #ifdef __DEBUG__ diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h index 8cb5a708..709a871c 100755 --- a/src/lib/16_tdef.h +++ b/src/lib/16_tdef.h @@ -457,7 +457,7 @@ typedef struct word bordercolor; boolean fastpalette; byte far palette1[256][3],far palette2[256][3]; - pictabletype _seg *pictable; +//???? pictabletype _seg *pictable; //keen/cata vars // spritetabletype _seg *spritetable; // unsigned *shifttabletable[8]; diff --git a/src/lib/bakapee.c b/src/lib/bakapee.c index 52786282..ac7978e9 100755 --- a/src/lib/bakapee.c +++ b/src/lib/bakapee.c @@ -23,8 +23,8 @@ #include "src/lib/bakapee.h" //static word far* clockw= (word far*) 0x046C; /* 18.2hz clock */ -char global_temp_status_text[512]; -char global_temp_status_text2[512]; +//char global_temp_status_text[512]; +//char global_temp_status_text2[512]; //========================================================================== -- 2.39.2