From 18cce6377e3dd1a5bee3345a5bbcae47956a5574 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Tue, 29 Nov 2022 11:21:35 +0100 Subject: [PATCH] Fix for lonely pixel in Liquid Dirt. --- grafproc.asm | 4 ++++ scorch.asm | 2 +- scorch.bin | Bin 32768 -> 32768 bytes scorch.xex | Bin 49327 -> 49336 bytes weapons.asm | 5 +++-- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/grafproc.asm b/grafproc.asm index 21bf6d6..3165903 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1362,6 +1362,9 @@ NoClearTanks adw RangeLeft #mountaintable temp adw RangeLeft #mountaintable2 tempor2 + cpw xdraw RangeRight + jcs NothingToFall + NextColumn1 mwa #0 ydraw NextPoint1 @@ -1450,6 +1453,7 @@ ColumnIsReady jeq MainFallout2 ; now correct heights are in the mountaintable sta color ; Pozor! :) we know - now A=1 +NothingToFall mva #sfx_silencer sfx_effect jsr DrawTanks rts diff --git a/scorch.asm b/scorch.asm index fd06f7f..f17bd93 100644 --- a/scorch.asm +++ b/scorch.asm @@ -15,7 +15,7 @@ ;--------------------------------------------------- .macro build - dta d"1.20" ; number of this build (4 bytes) + dta d"1.21" ; number of this build (4 bytes) .endm .macro RMTSong diff --git a/scorch.bin b/scorch.bin index 26b1843ab8eabfdbfc92958bb23ddd075494f536..942ccbf6f97073393bb9934213a26548a50c5017 100644 GIT binary patch delta 3502 zcmZ`*3s_Xu7M?vb!0dT3kq)K zAq-Al4|(Wf=-79&oTN*TgNk!Y()>)W8WfQ^Wj^RDz3a>nmUemUwbxqzT6^tv*4lfQ zln6^ogxw>?$XYdOTw#RDNtOle7gL0%=ivRhI5-DS%jXgpIk$@0!BsN3oE4MD37CA2 zVs>Kl7jS$b&LkriG89Z!SuPZcn@EwR8`@5kma~GdH_)CjSfwBL@8blDy_Cln(jM6l z0t%mQ#MiT~`%!p(&5>+ycokpFU_a8i;3jg<@_TfM+_b7T-de~Zd`Oi;A!J%!#JSeZ z?7=arUD8kyicy`M79^2?RLEFC2)dabW)Ssc$SN171cbgLa_3w?jyum4qRXlo_%d>` zZNlP%c=OAz9;Mg5teK~^<$M`sa})-7FEMpXLD8xVw{Qej9q#i)))5`d3AL(&QGLsg zJJb>6Yp>T(q$+lHrchj7gfmsAy#sjXKlrqZEP8gbA8A9_4F3iAC~2O*5cQD3`Dgul zc80PiM{1dL_PsFylYx2u#K<-#l~nq3CX*c>ErjA)MsolbUet!llg9q55eULMx zCOF7NoX>}w6yyPHQIIQ)hk|Coct$@C2ie*DZVQop3uVHAwPfLX>-<9XJCuDUV$wMY zglklw%37F#&=vAo@G@b~PEr)&=E0`*UDAr#)V|N_MYMT7Sf@jNjS6(;N&%bRP|_f$ zw-7oc)5)kn>&zkWePyRoa9qx$AD4sc203Kz3i(gS33QxPgodJpL>;;roguRptwyEf zl|^S!qRRid6$rk*e6a{wZ7o!nQ%tQo$(DH=Hxg#aF62Sb(mAl7xl3PK*VWjOt*)lb zI@RwKMX5WBqGaM?s@SpEv)I2_QQTIXyxX?Kt7NQbtSF>3taN4RFJ+Q)x^zRStTeZ@ zwzR&iqwI9qXJyyQM$2ZD>&m_>noX`Q^_+LRoHJsSoHf%;!&D4YhbL1P!*mjWZxi1z z=V`ZUpwGgff4lL#M&20fp2)2@%PBdnBeh|k;(3h#crPpl-6G;}k2L>AFgMpPY7Wrb z<%1DYZ7n4CX4eFz6XEto83*g~q2Rl_L65~Hp=|1yo1qx~B)4Z%Gb5SQdZ@fV$w_Va zY{~D&kdbomfo}7_&%ce*Fqm;7+UxKAPWd8;D8rOiX{48cjxOVc5^f3U0>K zY}V9lsbRMGO~`57qkM`((+=DEs^Q>Zrjx6ih93P+#t%%O8(mdb^IlbC%Q@YW?wW4)>V3h0nc+PsGDD!(URT%t2G%&4UT)Og(5H*sS>v>1imT)vubpL4H_JkwQ$s#Mge~f@#UuwwU=(;) zJgd++KqL>y>gYT;OwL4aK@r6F`LEIY#F~By%^^ATZ1fFjp#zW;IY-ZRxt~wp{5#tN zHS{r)*7XyAMc#!g(xb&+gzx8*t8p$1fj(Vi|8$Y+OsZ;Kq;$z1NZn137O9AK-vfoo z6MjxI*7{23?9q7Yc;?{RAoLr#xHbv3lQ}VK(N82dCIrS~F=bHI0kO+WziCw4O96X{ z?20XdXeVMloge1Y5qs5-DJE4dmO_P}g9<+n6)s>tg1dilTp%EhIrCN#d*Kh{sZ1L8 zDco253*aHCiF5ar76amG4R6IEg}wB!m|xXsK>E-hoRBZ$+|fhwTioDWc;<}ez_F&3 z@#lk5P|POH=5d1@ zI=Kl~Hsh>Ip6BOLPO3sVCwLZoC0>I%GO_A$)N8%PAf+ESr_-N1M{d5_bYzvd4 zd`l>az9sYubr7^UolG?Gb7lzk!*fH)*+6w-!8X2mPsh^<#N>rQhbV*U@KY*|U&4`W zdEo$RBEp1Bw2o{^I0c{1YXgy-ZLDjhWcV`qctg19lBTFri<{uBM@$pFJvKKLH&M;n z=85LjEeBeno4U-#p;IO_R^9i!A00iV2a^qn8zAdliHR1A6f&IGj1M=%`;kbK=Al=8IeSQZW#9IJXa*$9baTX7$Gf1@vT=3pp0G-kvM!Eu}qvb!5+qhH9(P2S>ygTO{@ z@}**1?b)HsCy??@v#o1d`EZPwBk-nU`-kX2^5G^|*IP9m*)p@vfdTcy)+qIZ)+m{A zTS?p7ZCdyhDMSh_`E8Q}3L$nWTN7Q|;Fd4o^Nb+RRQEmX+SXs7{Q)YF7rKIQ?xc`2 zegbs)BT#KdMH^I8aPn1(oip!A%6obiAZa7kFWL(wZ7QD^ElhW3Zp*D`X#Q|`{8tGz zW6q-3q@8abIP>Y34~(a|FJGVX2H`#!95?e^y1B6B-A`_e&-4x2m|5O>eCW&JZ-1Wn z6`8n4$0eq`URB?G?BlZ+$4qU#R&U5Jsi>-LcyIWwUC{G?+q$dyQ15rs0;1x!wVnL; zjgd!|9ubPEpZ0e0uM9hKA;Xc3Wmu{1We7zlUOOg&VtV)W{gOnE`H6k#kVKx(b}-4} W6zz_uN>o|dd##PF1$M4n^#1^JHtx3o delta 3393 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 diff --git a/scorch.xex b/scorch.xex index fde3ec81e9ae53c03b46cf6ee5bd92c87dac194d..0fe8b1b0b146f851ca0f95363f84168698ff167f 100644 GIT binary patch delta 3431 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 bf&Rsp0{!0~3@o&9#`eIz>y}l=