From 818c6c740d03393778fbabc2d790ca99c56b60bd Mon Sep 17 00:00:00 2001 From: sparky4 Date: Wed, 3 May 2017 16:13:05 -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] --- XCROLL.LOG | 38 +++----------------- data/G.PAL | Bin 768 -> 768 bytes data/chikyuu.pcx | Bin 5690 -> 5690 bytes data/me.pcx | Bin 4291 -> 4309 bytes data/mebak.pcx | Bin 0 -> 4291 bytes data/spri/CHUBFCW0.VRL | Bin 495 -> 471 bytes data/spri/MEBACW0.VRL | Bin 419 -> 333 bytes data/spri/MEBACW1.VRL | Bin 413 -> 331 bytes data/spri/MEBACW2.VRL | Bin 425 -> 341 bytes data/spri/MEBFCW0.VRL | Bin 435 -> 353 bytes data/spri/MEBFCW1.VRL | Bin 474 -> 378 bytes data/spri/MEBFCW2.VRL | Bin 435 -> 353 bytes data/spri/MEBLCW0.VRL | Bin 416 -> 332 bytes data/spri/MEBLCW1.VRL | Bin 413 -> 331 bytes data/spri/MEBLCW2.VRL | Bin 419 -> 333 bytes data/spri/MEBRCW0.VRL | Bin 435 -> 353 bytes data/spri/MEBRCW1.VRL | Bin 474 -> 378 bytes data/spri/MEBRCW2.VRL | Bin 435 -> 353 bytes data/spri/chikyuu.pal | Bin 768 -> 768 bytes data/spri/chistnd.vrs | Bin 596 -> 601 bytes data/spri/me.pal | Bin 768 -> 768 bytes data/spri/me.vrl | Bin 4257 -> 3345 bytes data/spri/me.vrs | Bin 5787 -> 4763 bytes src/0tesuto.c | 30 ++++++++++------ src/lib/16_spri.c | 2 +- src/lib/16_vl.c | 4 ++- src/lib/16_vrs.c | 74 +++++++++++++++------------------------ src/util/shbat/respri.sh | 5 +++ src/xcroll.c | 9 +++-- 29 files changed, 65 insertions(+), 97 deletions(-) create mode 100755 data/mebak.pcx create mode 100755 src/util/shbat/respri.sh diff --git a/XCROLL.LOG b/XCROLL.LOG index b1501b6a..c4fea944 100755 --- a/XCROLL.LOG +++ b/XCROLL.LOG @@ -9,42 +9,12 @@ Object 4's name: 'stump' "walkable":"0" } walkable: 0 -DrawVRL: -[00] 85 -[01] 00 -[02] 0b -[03] 86 -[04] 00 -[05] 02 -[06] 88 -[07] 01 -[08] 0b -[09] 88 -[10] 04 -[11] 0b -[12] ff -[13] 84 -[14] 00 -[15] 0b -[16] 06 -[17] 00 -[18] 02 -[19] 06 -[20] 04 -[21] 04 -[22] 03 -[23] 02 -[24] 87 -[25] 01 -[26] 0b -[27] 01 -[28] 02 -[29] 05 -[30] 02 -[31] 01 +VRS_OpenVRS + vrl_size=515 + Project 16 xcroll.exe. This is just a test file! -version May 3 2017 13:29:21 +version May 3 2017 15:15:20 page[0]dxy: 16x16 player vars: diff --git a/data/G.PAL b/data/G.PAL index bdc3b00c28e43da344b0076ca8feee03370f73ac..34da18d07d1b14cc3ff233f7e8b1a01281ffcc61 100755 GIT binary patch delta 18 ZcmZo*YhYuux3_0xWZbBDpJ`%(Gyo^71d;#% literal 768 zcmZQ%WVB}h0(%eyArJv#!2zobBZn#zx1NlwnykFNnwq}3nkW@SBo&V?>V4{%nJ%6w$f1ylmrCG*;x?xq+{9rMRa#87GWi;>Rf(Ph=E|4sNB1 z1gBWw2m(Q<^G}Q=GMwo$rG#x}Jc5BpzpL+6b^E_bO#*0vdJPi^|-r zT)2*Y1V}nxIz0O##SACLVBGncD={ICkwyj2TNeI+w`NI4TE>Tc>;dZ(QRlVuiHwRV z9kXJ5BHV)Y#2CkZ!9@HlouBV;r5TJMc}JAh{Z`p6(&*icJ=1*aEs4oVer073P6T~C*D)>tl0 zGxHd9>Ic)A#Ij&DW?5Q|FEBJ0_{GzoG&6^3Es{)HEExL24KHQ;lp6`9 z0P~3_TexRBtREw!E1(ci{43!KupfDWha9&6@Ox`Zr{Gw!!tJyfkY-APG>i)XJUU?% z3s{{ZO%TYC6=sDTuUJ4nkZ=uX%8{l84Iss}02+e3t+iB{X+*dcOBxkvR$TCKXL6ch zK`q!lTxrO&49v8nX-JR;C$a7_6_fR2K}ObV=Mlo0 ztynr*Q}~^(aI;uF(25qTPdI*|`Rd&_^^QZ@>`FR|RU^+A3$hU9I>5N?~m#dvChr(@)>8vQDq(bkTZLzp=fDYo;p%eFjiU+z3DL-eW)g~r6r)3kOjEhtKR8nl<@>A4jS zE9+A1Jnfak8nP~&S36H*L0($U&eP;chG(93XU$FPZtrNjYBeb!hmFXggS_vjQ_EQT;DYy?a`fSUXQPBrGkyD)wu52kD_K@D?p1Knaont1?t zH`dTR#1?I|hZ2=zj?EPi!V;w^!lx4Dor^*< zGSKFBpf{%=oi@KW7MspUNfov(p%DRdfW@IhU_qhmRw#^@XiKp7S$GU)Nm$Z!P&XPb zdtAk|&_oeavc#(pus9%lE7KljrN(B>P|b0@nfe+^xxMLS?zQ)|Gl|xDQZwY+zUI6} z1!-DrUuK2v&9r9Dbj1$4SfL1U^SVgQR-BwL5Y7JSsOw zRQ0HIesXfM|JN2jt0+?5P15aco2^Z)v8dL^cCBBwdsIHBa-B-{o{Wp_TCH!@Vw6n0 z?YO%coUgt5qF0@?%A;o4t5eseW}dImvlyLI$<21t+pJrQs4{)?Z*FS!MYT4zt6s@IC;cZk%TY)G1Nzh)ybbR>?$d`s%r(;<~!Eld-+&m)G5L)F@ro%16B?(!IagY&)AxV;$F` z$exVLgF&h9QLjhMCe@C*PtVCH-g=XDW3Z_9BioylyCZ7#sd-I}4%M1;JY3qS+ePBt zCf&iNe!VHTVroWI8&S=pMvv?!m5?4ZbY5N_`Eh~+Fq^PsZ#yr{4BPc+judUjJ-j>)AyR*b-mZI YJFRl-ywt2y)uva!|6?}&|Ml~~03H6+vj6}9 literal 4291 zcmd5KW0j@V_zXjHQD_|fsF^iPbE&gE8pR8AZ}8V|bgO%;RQVpIGs28Q z48T}O;?^?t{A=htP6`Z7DX|UeX?m;FAt@$3X@20#lC6)Z@2g-O3NJpBy(4NQmIBNb zt+eotby#;Jq$kdB2!`jv6W~73-i|41pM5~MCtc>+(xNtc6n@kMD8f8Nn5HF6gJDw& z`hI&-fG;g-CZ@P$19{JdXF^J@9INRyICZWZ!@3uwd@A9j&@9Po?PjcarF6L&36vaz8T`=$E;z1*xw zF)x40yp5r|S8_OU*04*(L3G^D$bhe@Rn4^fjeBaI)AjMALy zDDmq!Ho-#j*YeG4zK~>AwOnmjH54XeE-;8Uq#QD?8b*pZL_-0x7MZrNTBhd46&hzOh&d)mlq2r(z3#I{y;){{rQv#pg?h~Aa4(3sd-8FT}qu%RYxWl&w2r`J}v8WmeB z`_3f|*{AMzTPqVf*WFr~d{N<*m0jCQZeQ<=Y@03jMy3fh8}rDOyqb-b4eU%z<9ib; z6&yprRi_A$us+oTx2qB`n%^;bse3?myO)7qAQB~Tvw zJBWB>ViC$j5>PFxWbVNXhxj5zQ3k^y;vOMA>@jGi)Fb?C0_E%x;vHh97Gs2FL(*6+ zujG~IOu9X4 z1o|YlZbMq+SOW2PT)-3HY(QX+5GI)v%HUgcCCKt@N`m9qlDnu9O^>Y2;x?Kvuok!Y z1_Yc9$j-sEHQA+~**B=&sJble%)$)+qn#Z~v`)+U-|ftOiF%RSbi&iK1TWQmu zInAKqoG|@+w#rdOqMoKI8K_xHT{cwEDEf_chb3(`^;y5c`~x~u#gi)LDj%t*zRFta z$|+_}KC;#WD`___eCuHJjOo!|=9_+=x7V4UB+h(hjmM2qz=lKC=`jCb`0S~eW}9HX zZjaOEC~<q&h zi=tSs*GZC0r_&$^hQndE+wF8ZzVA1iO~*O-vam=hU#l!B=HtyY$Vc7mqMh{HvlD;Z zaRT4!H(BfX`lOruDoe-nSuh^;M?ojJXbt;LziV|*8l4tvI_$;o|5z>mZ*l(@cmUP< diff --git a/data/mebak.pcx b/data/mebak.pcx new file mode 100755 index 0000000000000000000000000000000000000000..6e78ab972cc4ad5394839cb30df62fd4e66e289f GIT binary patch literal 4291 zcmd5KW0j@V_zXjHQD_|fsF^iPbE&gE8pR8AZ}8V|bgO%;RQVpIGs28Q z48T}O;?^?t{A=htP6`Z7DX|UeX?m;FAt@$3X@20#lC6)Z@2g-O3NJpBy(4NQmIBNb zt+eotby#;Jq$kdB2!`jv6W~73-i|41pM5~MCtc>+(xNtc6n@kMD8f8Nn5HF6gJDw& z`hI&-fG;g-CZ@P$19{JdXF^J@9INRyICZWZ!@3uwd@A9j&@9Po?PjcarF6L&36vaz8T`=$E;z1*xw zF)x40yp5r|S8_OU*04*(L3G^D$bhe@Rn4^fjeBaI)AjMALy zDDmq!Ho-#j*YeG4zK~>AwOnmjH54XeE-;8Uq#QD?8b*pZL_-0x7MZrNTBhd46&hzOh&d)mlq2r(z3#I{y;){{rQv#pg?h~Aa4(3sd-8FT}qu%RYxWl&w2r`J}v8WmeB z`_3f|*{AMzTPqVf*WFr~d{N<*m0jCQZeQ<=Y@03jMy3fh8}rDOyqb-b4eU%z<9ib; z6&yprRi_A$us+oTx2qB`n%^;bse3?myO)7qAQB~Tvw zJBWB>ViC$j5>PFxWbVNXhxj5zQ3k^y;vOMA>@jGi)Fb?C0_E%x;vHh97Gs2FL(*6+ zujG~IOu9X4 z1o|YlZbMq+SOW2PT)-3HY(QX+5GI)v%HUgcCCKt@N`m9qlDnu9O^>Y2;x?Kvuok!Y z1_Yc9$j-sEHQA+~**B=&sJble%)$)+qn#Z~v`)+U-|ftOiF%RSbi&iK1TWQmu zInAKqoG|@+w#rdOqMoKI8K_xHT{cwEDEf_chb3(`^;y5c`~x~u#gi)LDj%t*zRFta z$|+_}KC;#WD`___eCuHJjOo!|=9_+=x7V4UB+h(hjmM2qz=lKC=`jCb`0S~eW}9HX zZjaOEC~<q&h zi=tSs*GZC0r_&$^hQndE+wF8ZzVA1iO~*O-vam=hU#l!B=HtyY$Vc7mqMh{HvlD;Z zaRT4!H(BfX`lOruDoe-nSuh^;M?ojJXbt;LziV|*8l4tvI_$;o|5z>mZ*l(@cmUP< literal 0 HcmV?d00001 diff --git a/data/spri/CHUBFCW0.VRL b/data/spri/CHUBFCW0.VRL index af1b4956a34a98069b8280b017a10db336d03294..75d5a6e46e90a41bbe26dff7c9165d175947ab34 100755 GIT binary patch literal 471 zcmYjOOHRcw4D>io+E=<@gZK$}SKtV&*sx;p#C@uV#DX)MnU)lyO0_-X@x(d3zdfH` zUp|g@W9vDl^=}!lT)@U0DqIJLSOZKmY{)BSQ8tA25=_QP$aQ!$7K%{SR~7)Pc~^+B z)~iLa2!c!AGm2;(?kGWwFc+@gok0CnVC(n1RQo?diL*sB=~wAL0EO6+D6~H?CZ~@;>nJZ9Fq}28Gp7>GUtR&yUyJ``gzGJyU&m z%AMrF`LH}T%7J7sQ~Bm(ap7oq9V4YA26876HZk>abmrJ44<^jiwDwd?ToXeVabLlL zbs&PpYydI#BTQp)SFku+BR*D=l}y1N#?#VbhVlXyhtTMXzW{6^@OLRu(YakHfW~qg zCAYA`BJ7w%>!4W5QDIy(^LRoYjBDQJxkI|=O7#bsC<}wk@h^2kiszE*s1tVjPR^60 z#0-YI@7Bo%Ey3XL_f2f1N?8R~dsQGv6!oE$xvqn=-C1@{ O@$+0e<&WkAxA_G%b|=^X diff --git a/data/spri/MEBACW0.VRL b/data/spri/MEBACW0.VRL index 88ff88ff4bd8ec16ef6d4e3cba660fcf9ee90e2b..9aa0ffbff242cb26eaf36a1afe72a78a8b6dc053 100755 GIT binary patch literal 333 zcmYk2F>b>!3`IrNah!k(AR|pPXvkoJbC1xeOQ#Njd!XJRFvSxTy+DyMfPpMNltQ^h zkq-@m9{Ksj9tM|5%fM-(Ip8&?Pgu-LVQ>}p{J*U`=(g1urFrpZ(pD%pX| zeTlV-Vho7B3p%XIPYV$qPJ?!9KdD;hI`>nUnre`N)fPoQdWzn~_FT|*POnIk)}(@d d!}~^`cu=n*PWoT7%%5wqItZYw<9R&?cRigDGMBxQTsjjC*S@41H#jR<^TWy diff --git a/data/spri/MEBACW1.VRL b/data/spri/MEBACW1.VRL index 314def27fa891349984b4aeafce619111b0ddaa2..4aea51d46292fc74bd23f0fbd43d0985d5cc149f 100755 GIT binary patch literal 331 zcmYk2J!%6n5QU}j&#r@HkO*-K6)sjxog<`5lPZP1_c6JF*_k;($OS^mz=E3`N*V3q z;Kvl=edsZ74sWkdhnMGmZywF0eK9u!t%!AKHl=NZS)6LI#*C&dcWYrH0r(kRW4AtF z4AsA1sedL(pC2%~-iP3QMhm}YS#~Q?#FDnYvSak#cPXVSQ*;?&La27=qW`MQ0`Fk{ z$|OXCWNX27F??5iTF8T;;XDwrMqthfF76sUFEo%wJ4VFhT+{|liBkgw!n!i|n5P1v ZQG*5zsv@52zHj8T6l?1-Zcp_8{sWF&Y=r;- literal 413 zcmZ8dyGjH>5bU`#k*R}O4?&zn*kN)%!N|nOV9)}wHQim+U0L@pNcmTjV9@9KCPs sP_y@E(O4DpBdeT#ELsFd7M5_axg%J9lX)UbN^hs_b3#pWKkWbYH)MZ*f&c&j diff --git a/data/spri/MEBACW2.VRL b/data/spri/MEBACW2.VRL index eddc1ee6efff8a2a41bb44b1e145a79e6054bbe1..d13f08d078c6ed64aea42bf9271297464ea5dfd6 100755 GIT binary patch literal 341 zcmY+=!Ab)`3sO4p!e zFp7$d%H&+%XI!MsLRH4YC=&BH_W?a!Xk8W=C5KYv5CD)u8M-O!XVIwl%!EhclUXKe ja!1A-l)qR3`M{=5Z>_$fqLBzNp9F7JP5bX&=iB`NP{3~1 literal 425 zcmZXRy-vh15QNu9MLdU`69r%jq*$ir5vXXcLL%@${8JvWx1>V60HQ>Sbj`g~m?U@N zZzapcH=5m@t@-LNPHm zYz(;J?yw=bW<8G4nx&1aK8ik^8QpVg=*%y}dWJ*K?op`FLI7p^j4{pUb-)bzU-+A2 Fd;vrgf)4-y diff --git a/data/spri/MEBFCW0.VRL b/data/spri/MEBFCW0.VRL index 8d93837bdf214d7ea1e6d18fcb6cc0cf6976d828..66b6f71fdb1de69143a6f1e917a9e1fbbcbd9d42 100755 GIT binary patch literal 353 zcmZvYF>b>!3`HqLa#BMMV8cl}aLC|5bC1v|OQ#NwbDp9%2t@HBMNZ(Qhf--JanYiJ zAP9Wm13&w>*XRE5GVI_9^4TT0U)?%{GQF3qz**zH84(^*y<(0r5)%dXjOaZqQ?ukq zAq0xd-pgC}Q+Zol%NbCNJoNS6iPt1+nduxpAgp2PIt|CF>YDoU1&gE%KPskh7Nzv^ zn5p3E^NQp459Ug`5ht@UWQ1n7%Wm-tZ4qp0|CEAc*5Z*f4iL!IKwHLN@sy6JOUjJ$>{iBww%>e`>9r3AhFu zdKjjvtGjEu$A{bQ{%(CEmomnuV3_8Ipcd!x#`kx@lb90+MhJE9@yciBxtOJt)KsGd z^F9PT6M7NM#gfJtHJOFLvso65_|*Z+sHSAAWwUVX#u&DO6Uyo?ZY9oStY5D>pq(}Q z?~$+(T#Lap?x;@<>ob82eEl-g5yM#9dS9AQ<5ZN4Nf&k^W1a~ZIOfHFV|sAFKMN`s nY!_5MEO_k8zN&gxb}vqz6(`|cT~!`5Ylzuymwlan!}R_GGg*$R diff --git a/data/spri/MEBFCW1.VRL b/data/spri/MEBFCW1.VRL index db868ea3feb327563e575ffb2ba29bd7ec6a5040..63f069e110ab032508511bf681cc3e6228de63ca 100755 GIT binary patch literal 378 zcmaKoJr2S!429kF2Z~apR{RYaI<(5n5tvw*7(zKu#SN-Bz6jz3T{u)oTLc5NmgT{p z{N(r4`LtKZLzTl0`pPZz%~qVl!iE{=9^(+(IwlWz6iCTfE8HTT5gB8U5H*z~L@8lz z*AW@iTB9LZN;gv_ITsMxZ8(sgp)pjcw9L}S69QZNArsG2YO{9&GR97cAi%w}$!tvYAhOME5qeTcsaq=1e0*6pd zDT#_it=0QF(BSqH96^)B7$s?_gU!_@f{2J7rz^!`70>3I*?bt4_ib}7c=O*q-WTyDfnF1W-qXwpe#H%74kg!D TDK-Q}kI~!M|FtRRv2c@a2(_~=C`~QY?F7?P4 n#E9Nw$ZB5jG8bk%R#1yzoxi_KM_Fw8}jEroxF~! diff --git a/data/spri/MEBLCW0.VRL b/data/spri/MEBLCW0.VRL index b9549159df245f5637e3c8d6ec337ba9104c16c9..3dfeb8095a9f15f9b8da78124689617a43fbdf1b 100755 GIT binary patch literal 332 zcmYk2u}%Xq42ENKy*nzWQVz9Z$j~8?S$PB|7AA(H?}PdVRTDn};sp>R(n($VP{BDW zR4YUDeey5c0yMAA`J%9_O?qNfmM1&yph(m{DnqOro{+(m9$ zC0X+jC)&LY<6vDFw67^u)h55Pf6iJP?Ds|K97+7=M^)B2Yoq_FYB`TCh(8l`u(FN^ d#|U$xE}OHE)=kTi0c!)^iU8GHT;J&b{|f?sYc2o) literal 416 zcmZ9Iy-Gwe5QQhZ2)a2dxnQBjLbxH;K7y5vmEhI)@n6ejlPRsl7Z6L~!Z!O-*OSeP zvI8lS@8q1B=`Jr$yYsV~W7(HdZ-Qa-ya?_^?*zA^V?o3tMNfilQO#+dvJ!8J^&#Sc zhyb4BASGl?G|MwrZ C+EaiVOb}5@BGfKY%EaPD;a19pjj1 zREaw?^s1jFHZ5UfOR1xwMfAmW~+JHfH2=Cn;&OQjq`1iy#1 zU?xNek-$q{#NaBn5}XulLu}XE9Aos>HdInIEcYH~lD5PXg&ITfW@lUP{RddXOn?k% z+7Qi2>7v1ojBOkDRw?xGLLk$@nBFeBNV#hpy#6DU4t|O~qhaq~liGn(CiO4Rg#hOO vPKny#XGJyUy|`~|w@Wn91w&De zIfWcYGq1Y^?q`78Kq4mvK6T%tY3d_9`2xn6kPLO+_x?+nZDePK&j5vmIj0nfLLXt; zs40eE>D)lDwC+ZI92GqP=~UeKiAC$E?=%SrlCZ?js}diGeA+5mPvOP6pMh3(<3sNL b(zmUYA_UDA_^7q|+^w(+(p}sy>A(I3+1YRP literal 419 zcmZ9Iy-veG5QO(Y6l5o0LjxQIl26z32vjsw6d?~p5`M}kcUw{+UI0-dSxS?aGIMbR z$Rk&8=?N%0v&TaC#MyG#LE_`8ffs@1CN4BF<4sC z%*j%UA$ZlQ@qI>#I1+x(3~;Vh2B>puZTzMmLExA`8Q{m*5`N^IHudl)llhPL0-#bw wINkZbJDPLftzwKS)_*&)okQ-JO(~X#k(73Jm!AdurO8*pp7eDNEB}A~0n(v?<^TWy diff --git a/data/spri/MEBRCW0.VRL b/data/spri/MEBRCW0.VRL index 45eaba804edc5944b268782341dd2b61cd980bb9..843dc3d85e87a1411a015b68ae97b64caef9aa96 100755 GIT binary patch literal 353 zcmZvYL2AP=5JkrmIZ4APAmO@Q%pwaJt$T#7y6LJ5C->7OZ)bE*ugW*XBXlBVnqy___>h+s8rsoiQyrdwMZ|0kPtfYirITu zMZ3z_0nYmI9t`Knl`@Ki`RX8LtX{}R^PIBSLV0mqgyri5Ql*4P29q<_0%)2gHeT VugfSUQ-KWYh>t{Ro9lMh$1m)JYcl`< literal 435 zcmZuuO-sW-5S=9#VP7G!2;z7UHtgM>(36**3P%5rpY63~Ge=L-KOi|40=f97;$*jI zunr6?^WM(9c~h;H*VWD9{)*0NjCaB?%{M|uma*3QhVVdQ$wI^XtY^GxS@V=c8fk)r zP>au)y~ndcFN8Ub^}aKm74Mnb(j`psixI1X@C=>3tBTtqccs;78p9*uk^&@bN5<|$ z8z=?HU6Hq6Ka55h^)`qx`@QLB$Q5w~K7SeVAA>nfc_OfiKOQoVI0lt@7G*XEnchd4 r4E=hvpewcUVZpz?w8r!{?Vg-GNlt=oW(-5k8tQ1bjlNFLFnxam0=#}e diff --git a/data/spri/MEBRCW1.VRL b/data/spri/MEBRCW1.VRL index ab88635c5d6dd853ac6de60e89080c04737e3b66..0039fd18cd9a42c851bb2031fd33b7b92f147361 100755 GIT binary patch literal 378 zcmaKoIS#@=3`HG7*yKT)5nJJcBBQA}0u>DvMaX@)0?NcEKwJP(B1KBWp@swy6fBnI z;y>B)|LJDENLR~j4l}sdJixtiL8mQ3L1<$oXj_VL~KM?CN3o>4w>ea#!}O>PMQ literal 474 zcmah`J!``-5IrTMUcl~Dd`rMWdwxQuE}aT>@_#~_WUXuY#!R7qpky={y!21Gr?deR zsB>^gdV2TyikIg_@w8me>5-xx3H{YS2vf2a2gTkA6TMH3vDoWdu?-2xLd|<)I=V+45QQhM0~FavwgP1_3l>4M?h(4`h82sD`}7JZ&YYm)0w_zQNZIsI?%3*& zkg&XZpZxsZYmSH4=KZbR!4~q_MfkmHZ45lek0lpi$`VbX5Ejubn0xL6htTn$)MN5_T;T~b%jt0>^B0t zb6}-zH#M!Sv)0z)3R)Pegh^NYcl`< literal 435 zcmZvZze)o^5XNV@CNLAYH3;HZ2p6W$Bc!si61@068vnI%_olQ8zJOdAIJm}_(%D^$ zBRa6K%s5QTzPp4oNc9f%Jv{-a0z`VY{wvTu=nRljF;>noJsB`~0;-*M zQDY3+J2#@xqani!Nd0ke1FAGjW^M{IewtY5l;K diff --git a/data/spri/chikyuu.pal b/data/spri/chikyuu.pal index 1fc14ee725663e77af99c1239d8ca9f9efdf30b4..d347e50a40ff00c73720fa2688f663d5087650ac 100755 GIT binary patch delta 15 WcmZo*YhYvh|NlP=3(H2fUrYcl<^|6H delta 15 WcmZo*YhYtzWMpJuVA#m^iwOV|)B?!> diff --git a/data/spri/chistnd.vrs b/data/spri/chistnd.vrs index 401ca63b4efd2c22b8655e45221dddcc5878fc96..48720e945f26e7d7acda160c074b1ad714da3782 100755 GIT binary patch delta 247 zcmXAjF;2r!5JY$8ufIPTiH0f?SfM}^R5VnSAZQ6vL@tqz6Ob4;6qY-<3df+K<0fXE z6i=F+-5t%3|9Z1pK3}hCb{pIUkHIon1uyK+FZ=tGhiqVSacAtH&NXgL*_hoE-yyIf z$}H4ao2Xb!w}jJERo4|zTB`qST!8xT4K!R~k)`q2G(6#~4tZqK@H*KC`Gt#xM9<0H rBdrwYl(tP3d}bKm;`a~pGKKC3aDKWkw*y;<)uB{t`bg@i;fBpW=aeT+ delta 282 zcmXYsF;2rk5Jl(zowYa4iiR316bOk5DvA_HAW8}df?IF^T4Kiyg_Q%qRj9ZCO-^I} z21feQXy^agH#`6F_UU1D@kp~v=}Nkh?xcHZ#qs!bygj_`483sx2FJ8ERL06Za07sm zNR7IwHV_)HGZIb@v92SKdSd)&U1p45FTnO3i!%id6mS(&)8w3+j5JpwmRO7ovdm2O zS1hXk_7f-6%QudmF*ka}P(WN1`xru8mwzz58Islq?n^ifF$SUL!m1-WurK(3@V((Z JU?8?jw!aAhB-H=_ diff --git a/data/spri/me.pal b/data/spri/me.pal index f67f2c3d4c7a384e12c0ea3ccdf5413ebb54ec77..ae38e163f8ff9437d91eb10b3f3d1d16275cdde8 100755 GIT binary patch delta 18 ZcmZo*YhYvkKj;61KxP&emW?4RnE*c_21)<` delta 19 YcmZo*Yhatm9LUVTz_2lVB@>7S04u%&s{jB1 diff --git a/data/spri/me.vrl b/data/spri/me.vrl index 6882abe57e06d2c0b5c7461316c2ef78410b87f8..f7bf346e7cac88cb0b5419d49917e5920d997b1b 100755 GIT binary patch literal 3345 zcmai1%Z}SN6eT(Gv(yAsY`F`fD+x@q%Q`@TuG&RcU3lET31G}06qfh}MSdWdWdH-- z=%d_oNlMl`#=v7xy!TR<=Nuj$|NiUK@sHn6U)Z0_eZJgT{U>%(i{GSXAMfX_HCUtHU4PnsF zio&e2v=X1ErO6HF6$f~J zTQ|`P@%<_{{5e)8QAShRbm`N�AQpjw+W@@3$EL7pZSoS(-fOT*zEk=}$Dhu=+W^ z%F|17OjP!mj`6Smq3$VGQpWj?3M>}ZBGD_mJTqGRKc|;C&Jy)jrRYy_L5-rs1C!-K z%Pi9s-xLQCUwvr(Vw7>#9R3Dx0|r6}a157zApp;G*<;w!tSj0mh7 zEtT@MN*`5FbH0lkdK1(75S5}9BG5@!D(7e~mRGR|#mcl-%u<-vI^DLTs6(`Lyw%$J zkX|K(gh$Qt&~7cILN;Hkh+I3+Lg`wFMWNPCV>8;#pf1H(jK*$U%X{tH>BF|uaAOQ2 zGQ26?Xg7ufok~JMlPFebPOiUIJ3`0BZ3FFsaWDw8J!WX5O|IfRd870VdVy8!G+z4H z0p+R&rQo_s2xK*a-Q>*dT2KdED7Oc2hh=YqC;*mq_#-MMTO{+79PbZrG|O z_(DrAv`~)9f!==XHL(JS2J69av6m9cAla`EwP<9c`2qd#vp(Jzi9}+#`0V~6?7SiA zSVB;+a*gC|MX86wI@so}R(OwEQgTR2(2wqWbR;EzqFKF`VD0;`;Q$j}9pBIs@ZR-4 zNJ`!3J@wx22c{aQD44pXZE|S7%4YwN`LG~xI2M*@td|rb{BDB>jiw-xlu2$5gs}!o zK~f&md*Cx%5T4FY_KA(i3c!3`*_5?(1!Qu>1)C0}9s^lHjC+6{1X=M+0!SVIM45^a zVIktK$^#xX#JyOjlTNAlvhZO;zJrG?VR?Z@Yesks%R zjnRS{(%0s>hWPG|HgTr$DD?wWjBGPDWeyl#XG*A;#}U{&f$348PJnt0|8$lQiPxjl z2)hDXrcfz^W^jyI%#*p}{@J9&okb>TclUtXqM z=k05)D2>}ifyTJBYFGYtR6g^XeR+{j$cC|P3yQ1f6_*xcLiY)y$--AypH4OA4tF-hjPWn#K`}nlo zZu_C{H-jCFv6g;Obi$weO}`y*?tR>#lh3jn3vTx+?0#3_j6vgvYtX5(*nPvdqXX2O zW3}IG_^`oR{8?XG`dQHj{2e-=Y53S$UG25Kp`X0Ku-{cX4FO}WyH*4qi@;D-uXmcx zsJ2aQjo0&yqK96OXzFpHtIN96Fy8ly-s80w(6!&`t?jzwqe^#>g)N;}KbSMx>8o{f z+0<%{HdwR7dYMc7{hV6@!hkgUC{T7S1 z?JA?&7FuEV3)K^gj%TkMqS}dK`GLYBgm5WVY|Uv^>9+Bj;b`0p@;ID-c$R2}YWn+z zV2ekx%qIkA>AIeDZ$-9eQ@*bDFeO~&WT6|j!j0MfqPo)+JcDbC@&j}~R!)A>J+Qnn zVrslP5@&nzyYOmQ1RgADW=X6*NiPjI8LexaJ8C}mR)fLM#NfCmG@l#q$k=9VP-+RT zz?;MsGiyT*v0+j-S!*HLvLW$1z?dJF0?TkBN$k8BeMmJ7*%?UUSSKYeWDi=2E0J z{%iKLq1;!s6Kud2$>uPKNes~uDB7EnD>n(wUXpXlGL7ybodZ;20gDXNb1`BQl-31V{EEb`A4i#jiOV%f--CHVwn2`p+o9prB3@RLP zPb`;LKW{lPE42F(=5Q>QgI%0UWFxR+&{ve&bb@VEraw^zH|3DfS>Wv)5)=z^NDInHXm#9@YIKnJM2z0_v` z=sAVZb?r!&FHsXyXh#qxPAcTeyot%6%&m{l)eIyIb%^o$$hsN;e~9+f*|*W;me zn&X&zJk~0$Y2Fr(ttpOn?dJ&NxWSawVq45S#GP4l#L}s)^_nkcO|g(zh=x$go9dIX zsfOmz%x5GHG|c*9%xR&S56_PJ;@Kbq<+Ewx*iRF97i>~0e}06?dgEz?5zPoI>407J znK0~!E@>fR3j68l4MSHxtDX8;O;o~KW6EUnq)VAJ0SYM-4V2{x6oqY;{L^Hdrt`6% zbuqOjU6~zc6t#a-Pr~sFEFS&Ob%nmp0os#`%8|y!7Y5 JyLWDo{|AL#-~|8x diff --git a/data/spri/me.vrs b/data/spri/me.vrs index ae522653b6ae6d31affd9c746e8b7c2c455e0432..ef3bdff93958f7fdacf93a3c19f2f8f5a6ee8aee 100755 GIT binary patch literal 4763 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 diff --git a/src/0tesuto.c b/src/0tesuto.c index fb3d0fc9..f8371585 100755 --- a/src/0tesuto.c +++ b/src/0tesuto.c @@ -29,9 +29,11 @@ //#define FILENAME_1 "data/aconita.vrl" //#define FILENAME_2 "data/aconita.pal" -#define FILENAME_1 "data/spri/chikyuu.vrl" +#define FILENAME_1 "data/spri/chistnd.vrl" #define FILENAME_2 "data/spri/chikyuu.pal" +//#define ZSP + #define INITTNUM 1 map_view_t mv[4]; @@ -41,7 +43,7 @@ int main(int argc,char **argv) { static global_game_variables_t gvar; struct vrl1_vgax_header *vrl_header; - vrl1_vgax_offset_t *vrl_lineoffs; + vrl1_vgax_offset_t *line_offsets; unsigned char *buffer; unsigned int bufsz; int fd; @@ -50,10 +52,10 @@ int main(int argc,char **argv) char bakapee1[64] = FILENAME_1; char bakapee2[64] = FILENAME_2; - boolean anim=1,noanim=0,zerostoppause=1; - -// bakapee1=mALLoc(64); -// bakapee2=mALLoc(64); + boolean anim=1,noanim=0; +#ifdef ZSP + boolean zerostoppause=1; +#endif if (argc >= 2) { /* if (argc < 2) { @@ -103,8 +105,8 @@ int main(int argc,char **argv) VL_LoadPalFile(bakapee2, &gvar.video.palette, &gvar); /* preprocess the sprite to generate line offsets */ - vrl_lineoffs = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); - if (vrl_lineoffs == NULL) return 1; + line_offsets = vrl1_vgax_genlineoffsets(vrl_header,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); + if (line_offsets == NULL) return 1; IN_Startup(&gvar); IN_Default(0,&gvar.player[0],ctrl_Keyboard1, &gvar); @@ -148,11 +150,17 @@ int main(int argc,char **argv) IN_ReadControl(&gvar.player[0], &gvar); if(gvar.in.inst->Keyboard[68]){ gvar.kurokku.fpscap=!gvar.kurokku.fpscap; IN_UserInput(1, &gvar); } //f10 TAIL_PANKEYFUN; - if(gvar.in.inst->Keyboard[sc_Space] || zerostoppause) //space + if(gvar.in.inst->Keyboard[sc_Space] +#ifdef ZSP + || zerostoppause +#endif +) //space { anim=!anim; DRAWCORNERBOXES; +#ifdef ZSP if(!zerostoppause) IN_UserInput(1, &gvar); else zerostoppause=0; +#endif } if(gvar.in.inst->Keyboard[sc_R]){ gvar.video.page[0].dx=gvar.video.page[0].dy=gvar.video.page[1].dx=gvar.video.page[1].dy=16; @@ -190,7 +198,7 @@ int main(int argc,char **argv) vga_state.vga_graphics_ram = omemptr + gvar.video.page[0].pagesize + gvar.video.page[1].pagesize; /* then the sprite. note modding ram ptr means we just draw to (x&3,0) */ -draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); +draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,line_offsets,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header)); //printf("x=%d y=%d rx=%d ry=%d\n", x, y, rx, ry); /* restore ptr */ @@ -308,7 +316,7 @@ if(!noanim) { } IN_Shutdown(&gvar); VGAmodeX(0, 1, &gvar); - free(vrl_lineoffs); + free(line_offsets); buffer = NULL; free(buffer); bufsz = 0; diff --git a/src/lib/16_spri.c b/src/lib/16_spri.c index c7c2b99d..502ed4a4 100755 --- a/src/lib/16_spri.c +++ b/src/lib/16_spri.c @@ -53,7 +53,7 @@ void DrawVRL (unsigned int x,unsigned int y,struct vrl1_vgax_header *hdr,vrl1_vg // if(*(s+a)<=13) // if (!(a%4) && a ) printf("\n"); // sprintf(outputvars[sx][by], "%02x", *(s+a)); - printf("[%02u] %02x\n", a, *(s+a)); + printf("[%02u] %u\n", a, *(s+a)); // by++; } diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c index dc53d947..77c5fad2 100755 --- a/src/lib/16_vl.c +++ b/src/lib/16_vl.c @@ -918,7 +918,9 @@ modexLoadPalFile(byte *filename, byte *palette) { void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar) { - VL_LoadPalFilewithoffset(filename, palette, 9, gvar); + VL_LoadPalFilewithoffset(filename, palette, + 0, gvar); + //9, gvar); // VL_LoadPalFileCore(palette); } diff --git a/src/lib/16_vrs.c b/src/lib/16_vrs.c index 834754dd..0edcf627 100755 --- a/src/lib/16_vrs.c +++ b/src/lib/16_vrs.c @@ -35,7 +35,6 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia struct vrl1_vgax_header far *curr_vrl; uint32_t vrl_size; int num_of_vrl,i; - int size=0; switch(rlsw) { @@ -49,7 +48,7 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia // Insert sanity cheks later enti->spri.spritesheet.buffer = gvar->ca.spribuff; - enti->spri.spritesheet.data_size = size - sizeof(struct vrl1_vgax_header); + enti->spri.spritesheet.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header); num_of_vrl = 0; vrl_id_iter = (uint16_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]); while(vrl_id_iter[num_of_vrl]){ @@ -60,8 +59,8 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia #ifndef VRS_USECAMMPM vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_ #else - MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar); - enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0]; + MM_GetPtr(MEMPTRCONV gvar->ca.grsegs, sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar); + enti->spri.spritesheet.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs; #endif vrl_headers_offsets = (uint32_t far *)(enti->spri.spritesheet.buffer + enti->spri.spritesheet.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]); @@ -86,20 +85,21 @@ void VRS_OpenVRS(char *filename, entity_t *enti, boolean rlsw, global_game_varia #ifndef VRS_USECAMMPM enti->spri.spritesheet.vrl_line_offsets = vrl_line_offsets; #endif +// printf("VRS_OpenVRS\n"); +// printf(" vrl_size=%lu\n\n",vrl_size); } +#if 0 +// void VRS_ReadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 1, gvar); } void VRS_LoadVRL(char *filename, entity_t *enti, global_game_variables_t *gvar){ VRS_OpenVRL(filename, enti, 0, gvar); } void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_variables_t *gvar) { - vrl1_vgax_offset_t *vrl_line_offsets; -// struct vrl1_vgax_header *vrl_header; -// uint16_t far *vrl_id_iter; +#ifndef VRL_USECAMMPM + vrl1_vgax_offset_t *line_offsets; +#endif // uint32_t far *vrl_headers_offsets; -// struct vrl1_vgax_header far *curr_vrl; - uint32_t vrl_size; -// int num_of_vrl,i; - int size=0; + struct vrl1_vgax_header far *curr_vrl; switch(rlsw) { @@ -113,50 +113,34 @@ void VRS_OpenVRL(char *filename, entity_t *enti, boolean rlsw, global_game_varia // Insert sanity cheks later enti->spri.sprite_vrl_cont.buffer = gvar->ca.spribuff; - enti->spri.sprite_vrl_cont.data_size = size - sizeof(struct vrl1_vgax_header); - - vrl_size = enti->spri.sprite_vrl_cont.buffer - enti->spri.sprite_vrl_cont.buffer - sizeof(struct vrl1_vgax_header); -// vrl_header = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.buffer); -#if 0 - num_of_vrl = 0; - while(vrl_id_iter[num_of_vrl]){ - num_of_vrl++; - } + enti->spri.sprite_vrl_cont.data_size = sizeof(enti->spri.spritesheet.buffer) - sizeof(struct vrl1_vgax_header); // Allocate memory for vrl line offsets table -//#ifndef VRS_USECAMMPM - vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);//TODO: USE MM_ CA_ AND PM_ -//#else - MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *)*num_of_vrl, gvar); - enti->spri.sprite_vrl_cont.vrl_line_offsets = (vrl1_vgax_offset_t **)gvar->ca.grsegs[0]; -//#endif +#ifndef VRL_USECAMMPM + line_offsets = malloc(sizeof(vrl1_vgax_offset_t *));//TODO: USE MM_ CA_ AND PM_ +#else + MM_GetPtr(MEMPTRCONV gvar->ca.grsegs[0], sizeof(vrl1_vgax_offset_t *), gvar); + enti->spri.sprite_vrl_cont.line_offsets = (vrl1_vgax_offset_t *)gvar->ca.grsegs[0]; +#endif - vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]); + //vrl_headers_offsets = (uint32_t far *)(enti->spri.sprite_vrl_cont.buffer + enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRL_HEADER_OFFSET_VRL_LIST]); // Calculate line offsets for each vrl - for(i = 0; i < num_of_vrl; i++){ - curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer + vrl_headers_offsets[i]); + curr_vrl = (struct vrl1_vgax_header far *)(enti->spri.sprite_vrl_cont.buffer);// + vrl_headers_offsets); - // Calc. vrl size as (next_offset - curr_offset) - if (i != num_of_vrl - 1){ - vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header); - } - // If it's the last vrl, size is (next_vrs_struct_offset - curr_offset) - else{ - vrl_size = enti->spri.sprite_vrl_cont.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header); - } -#ifndef VRS_USECAMMPM - vrl_line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size); +#ifndef VRL_USECAMMPM + line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer)); #else - enti->spri.sprite_vrl_cont.vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size); -#endif - } + enti->spri.sprite_vrl_cont.line_offsets = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), sizeof(enti->spri.spritesheet.buffer)); #endif - vrl_line_offsets = vrl1_vgax_genlineoffsets(enti->spri.sprite_vrl_cont.vrl_header, (byte *)enti->spri.sprite_vrl_cont.buffer + sizeof(struct vrl1_vgax_header), vrl_size); -#ifndef VRS_USECAMMPM - enti->spri.sprite_vrl_cont.vrl_line_offsets = vrl_line_offsets; +#ifndef VRL_USECAMMPM + enti->spri.sprite_vrl_cont.line_offsets = line_offsets; #endif + printf("VRS_OpenVRL\n"); + printf(" vrl_size=%lu\n\n",sizeof(enti->spri.spritesheet.buffer)); } +// +#endif // Seek and return a specified .vrl blob from .vrs blob in far memory int get_vrl_by_id(struct vrs_container far *vrs_cont, uint16_t id, struct vrl_container *vrl_cont){ diff --git a/src/util/shbat/respri.sh b/src/util/shbat/respri.sh new file mode 100755 index 00000000..79bc4f16 --- /dev/null +++ b/src/util/shbat/respri.sh @@ -0,0 +1,5 @@ +#! /bin/bash +rm data/spri/"$1".vr* +rm data/spri/"$1".pal +. ./spri.sh "$1" +. ./spri.sh "$1" diff --git a/src/xcroll.c b/src/xcroll.c index e31ff558..7e93de09 100755 --- a/src/xcroll.c +++ b/src/xcroll.c @@ -46,7 +46,7 @@ memptr pal; #define FILENAME_1P "data/spri/chikyuu.pal" #define FILENAME_2 "data/spri/me.vrs" #define FILENAME_2P "data/spri/me.pal" -#define FILENAME_3 "data/spri/chistnd.vrl" +//#define FILENAME_3 "data/spri/chistnd.vrl" void main(int argc, char *argv[]) { @@ -57,7 +57,7 @@ void main(int argc, char *argv[]) char bakapee[64] = FILENAME_1; char bakapeep[64] = FILENAME_1P; - char bakapee3[64] = FILENAME_3; +// char bakapee3[64] = FILENAME_3; Startup16(&gvar); @@ -86,7 +86,6 @@ void main(int argc, char *argv[]) #endif // data VRS_LoadVRS(bakapee, &gvar.player[0].enti, &gvar); -// VRS_LoadVRS(bakapee3, &enti, &gvar); // input! IN_Default(0, &gvar.player[0],ctrl_Keyboard1, &gvar); @@ -200,7 +199,7 @@ void main(int argc, char *argv[]) if(gvar.in.inst->Keyboard[sc_LBrkt]){ ShowPalVal (&gvar); IN_UserInput(1, &gvar); } //=============================================================================== - +#if 0 if(gvar.in.inst->Keyboard[sc_BackSlash]){ VRS_ReadVRL(bakapee3, &gvar.player[0].enti, &gvar); DrawVRL( @@ -213,7 +212,7 @@ void main(int argc, char *argv[]) ); while (!IN_CheckAck (&gvar)){} VRS_ReadVRS(bakapee, &gvar.player[0].enti, &gvar); IN_UserInput(1, &gvar); } - +#endif //=============================================================================== if(gvar.in.inst->Keyboard[sc_J] || gvar.in.inst->Keyboard[sc_K]) -- 2.39.2