From 780f4842b07d97c8f4a5b336fd36c20575c31cb1 Mon Sep 17 00:00:00 2001 From: elasota Date: Tue, 13 Oct 2020 10:02:17 -0400 Subject: [PATCH] Increase touchscreen control size --- ApplicationResourcePatches/PICT/1973.bmp | Bin 1138 -> 4210 bytes ApplicationResourcePatches/PICT/1974.bmp | Bin 1134 -> 4206 bytes ApplicationResourcePatches/PICT/1975.bmp | Bin 1134 -> 4206 bytes ApplicationResourcePatches/PICT/1976.bmp | Bin 1086 -> 4158 bytes ApplicationResourcePatches/PICT/1977.bmp | Bin 1086 -> 4158 bytes ApplicationResourcePatches/PICT/1978.bmp | Bin 1110 -> 4182 bytes ApplicationResourcePatches/PICT/1979.bmp | Bin 1110 -> 4182 bytes ApplicationResourcePatches/PICT/1980.bmp | Bin 1110 -> 4182 bytes ApplicationResourcePatches/PICT/1981.bmp | Bin 1114 -> 4186 bytes ApplicationResourcePatches/PICT/1982.bmp | Bin 1150 -> 4222 bytes ApplicationResourcePatches/PICT/1983.bmp | Bin 1154 -> 4226 bytes ApplicationResourcePatches/PICT/1984.bmp | Bin 1154 -> 4226 bytes ApplicationResourcePatches/PICT/1985.bmp | Bin 1154 -> 4226 bytes ApplicationResourcePatches/PICT/1986.bmp | Bin 1154 -> 4226 bytes ApplicationResourcePatches/PICT/1987.bmp | Bin 1154 -> 4226 bytes GpApp/Play.cpp | 150 +++++++++++------------ 16 files changed, 75 insertions(+), 75 deletions(-) diff --git a/ApplicationResourcePatches/PICT/1973.bmp b/ApplicationResourcePatches/PICT/1973.bmp index 8ca08e988609aa2edcba5729dcdde131f6dd1c70..4093f47616f628c1e9acfb50c3d1197207c5c081 100644 GIT binary patch literal 4210 zcmc(h+fl3i`!`QAH3=)ZOVTsUz%ID z_FwwPWABHW>PG)iR`Kw$r&F9x`7 z7SYH)pEvIU8SMR+^V~nDugo^9GLv2NinI53Dc`<-o1H3BuL?A0^{Wca59e+DHj^}K zH>-U%iN;#yaus z|6hp2L!=(s>en0`KIIsk9G!PhIRsOtGq=Bj2=SpyMAI|^>-%1GDP>to*L6ZYNmW&HsegnnwX|(3 zB(=~l34Loc8b_A!o)ht&B}BVa+Qk9}ZV;BB?>dF1_Xz@{z5@BKaX{0H_A5cw?B diff --git a/ApplicationResourcePatches/PICT/1974.bmp b/ApplicationResourcePatches/PICT/1974.bmp index 94c10d552b47bd963ee84882a14ea6e4cdb12f63..5939a7cb07ecc2d999a0a7e781fe4e17338093d7 100644 GIT binary patch literal 4206 zcmeH}%W=Xm5QZ0H%*)P%E^?=VOonTYX@Mhkqy<`_g%yxe? zUDp}f?#=0RGGz9Ke#p?5E#J00+$IWx^9p?OjKc7!CY`NsTIek5! z6GKd2&zHT`HBnuoNhC%3O;eVbkL&As#2}inng|}G^|d@AKzuQ69%~wCjKzN|FaAru z#UJUTh6gEqEiZc5Cp5$)meSYpvio=)*B|F(MU2mQ{ipZmS1aU>O}q?inJ>%rI{g0J zkB92wY-m@Ndx{5_^szdhm+vQ7?7&ue#v^=6>HO<>pXRv56VAhIMg$L1`Z^w3E_&#r zS5^EZn)L<`;`$oikCT&*5ikAyEpV&C`{!na$>I4w93pi4_-%}G^cZ#j_%QDGe8z8I z%VV80Q5@Do#jxjS=W#AyB#ie775(^GJ%Jb3@L=UF4{OX_&OeckFN(3Ra8X=}U(5Ta hmu?R;KJ29_H!~z$FTaI7^C?F>`N!wa-HS)G{s5Z{J8}R3 literal 1134 zcmb`G&2@t?5QGO=U^~Hij}CIooeuK2`j{3tx{kEq7HA>Yv_T8Bu$f&UkPSE&kM(DL zyMrXe=lSAcy0HCVeIILv14lu>Z-7=7tL&t{id0o4ecuZPNYgY@w^td4K~T5Sb)7(3 z!4CvqtlzBvDSIg3AU;vt95jEMd=7v3Ll82wbCWv}^m@y7dQ tR0C!$xJ$Imch1gaY@ECEclSr^7XEP!u}{~x`H?*1``9!mh>O|m{{VVDC*J@7 diff --git a/ApplicationResourcePatches/PICT/1975.bmp b/ApplicationResourcePatches/PICT/1975.bmp index a836c7e6058e18de6134aeb6ccfc9aadf8c388b0..d5309f704d2977ef1b02b35113168442b1078280 100644 GIT binary patch literal 4206 zcmeH~&2fV;5QP_GjDH{#caggr$YgxYF)eU(9cdvgxP@HP1})HnqQ`nin2`XnOmguX z3xVL%+g$;J-`+3J)aqilFSfnjT0&d9$NG69LbJcN+0HagW1!>lXzIE))Q~x!&*oHp z89G(wdc7Jlm7#Ak^kLhlZU3%BAq20$6XsVll|1;i{xi$Ba`nSH#A>xDpCs!D?RG@> z{(3$pf1kge&sr4)QBh!*NSYj%WtQQ*-(Sxo2l4dvM2H~lujP>e^7DD~SXshjEdRN@ z#4q)hc;py8A_)0wdGW(MeIX}N$Y00H?Bl)Pf1Hyme0;>?zh0i-?@>FJMA`4#yUxH0Ldma2+-qB191K*YWUj z*~1@4dCps+O)Es;_t)^6E{{3*1%x`_G*bCWhxP2xREy>F#5cv&X1>Z@BM= zrFiGwbrff*f7pK+J`HH9e*jOX@L=UB@Ao)2Tz?`RpQdAP;WQmue=UE%exakO>mSR@ cyi@!B{XdnH>mEE-NdNzF{tTfzPX|0-InsiUse=}1!7Xs54Y%MHmf4kME3uMrVB(cz zeY+D$QQqE91xzQluZ)*D9QGUq{X7F2d@R_>G)*Uyf368xC!yu4e z@D0HS9zNZ{U0@s!aXI$%7 z%FzL5TEzz@7qXdo*F;dcO13 zt4(y`)Z$MbFl$XUDkdbH<_c3x9uk#D3!+*AV-3eLBu5u0O|g?l1h#|1&P|b-U3t8F-p~`dQ5|{hvNE;zkd5&FT&FN39-O1}Re6L^o z3Hj;9TEO*KwGdj%##+F6?E7a?r|UWN>_v^vGQEgHkB02Ebq6tM$kqXqrKT$e4H*Ts za`mW=(PRDbOwX>*_sSTr`C~`RKF;6H$*O#Q=4koh|Ns58C$wIT^LzdCvuF6cH~~Pu B6Se>V literal 1086 zcmdT=ITFJl3>29Zsq%)D?$cAG_XG1E{|oCrJT|>GBUrS{BJ^AP6F54q3+6|&!3&YZ z_6DGQ;E@tzeE(wzoUCmc08_f%kA#f9fk%O(Oe2W{kGSDL6o|<9sH#9sgr}OD zGPH{E&LR+LV$$WLQy;nz=BK;~iY)o_r>alw&%ezM#MzU!yF!8W5j^{s4oGw0?V9hE R_p*b+do{rQd71X*x&w$K3J?GQ diff --git a/ApplicationResourcePatches/PICT/1977.bmp b/ApplicationResourcePatches/PICT/1977.bmp index 13154a6bba2e052200ea9f32141d2a5cff3cd50f..7023eb19fa6b164346d97ee7ee3ee72050ec0f06 100644 GIT binary patch literal 4158 zcmeH{OK!t33`Fg&x(afPo+2o^&#ikNUm+2rJ`AOj&c_IX03x7pIGhn}+0M`Lu%9k* zD8FB2egCa_`Yfo%?{1oGeU#ExiPN$yrwU*BJ8uZP?hW>N_{aH;_viWvWN*o>-_JIG zJ|*w?d&*ULM}E_6x&C|oRnJUSFuJli{Qr`}l&Ws=do^=B*Y6S4=pAr7MUBofy@*4PhU~R<2Qg^K)&Y~HrYi;w83na+ z^{9@~bN%s5&#uq+${4TtV@JzA&)?3;s(gOtX!+s)|NXQlv|f$#d;jyZXZX4}12uOP AwEzGB literal 1086 zcmdT=xeQH+DhMvWuCE@q0Qw&WoTC}pYwdb1>-*bh;Mj59Fjvh6A4C%W z1%PtGBPGVsdp`sY);0`)A>H1{=P%v#UrOb`qrg$7k;H*V+;AWYL}YwaRiGxqQ_W2o zTE%#05r{M~>2lJk4_yfJTiygkmi+ls)u;C7-)0Bm>`B{Qp}_hGp8ZP)q`B~R&G*WC Q*+JpG8sPoBO#5*?0f;CI4*&oF diff --git a/ApplicationResourcePatches/PICT/1978.bmp b/ApplicationResourcePatches/PICT/1978.bmp index 20a84065f8857267351219d0495806bac46ba206..1557f9cec542ec85f769cce36b0a873eaa119d27 100644 GIT binary patch literal 4182 zcmeH}Jr08~3`P@3NT;eJN9f)QRNcFBx15EwBWK|XE-A1?act=ukSZ*NpNQw@ghcRq z4>$9RVL9HH_S~8^m*r}W&()aJQqR^)k4O|kpuX>Eo@bh-iNoV|ul=ohff%l`lb0NqT@P3@{I=OybX-t)+iqDAXy~hv&mQpb1j436IF=9J!cQ%IsaLDGD-dhU2Kh4{! zX$_pd0(0wC1NVz+;OeW(@p3&W%mBTx*CkNb5<@`x@6&s anV-(>tJr4td|P?VsINtm{NHzf>={0?=NmTw diff --git a/ApplicationResourcePatches/PICT/1979.bmp b/ApplicationResourcePatches/PICT/1979.bmp index d3809103869a2a570fba073efa7be37a7a4841db..c144a5f3605cddbf42d0717b69f3921926353d40 100644 GIT binary patch literal 4182 zcmeH~yA6Xd5Qc5QI8~IA5i&-UJ}tX33vEhfVFky>qvIaok3%1_Vd-= z+!Sqo-gA2_&AUtfn&W+SjvDnWy=ffBL=j_5P1B@d7*gN&sq4D5a>u=$s$9Rp_{0Lu`Ri&SR`2COadhJvl??-uk?6UvlEi=HcpM{pz|2uyF4e}TF JPs(vzd;m=}G${Z8 literal 1110 zcmciBF%H8Z3w@$gu?4Rjr6Oj zKA*K8YdgBtx1~OJqSkF@o#j#rw+bO}jFEHBJkK+yl=#1Hb9B2!|42B&ZO{c0ON9f)QRNcFBx15EwBWK|XZrl(7Es?wP&c^C$E&T-du9J%A}1~91_z)j|J z|F+G~dY`t>55}i-Qt{t!O07%9mpswwgw&7mL{)|8W4zGT>h&>RXha|51FhG`_(*H@ zF@B>Mjz*=3_5+Bj~TT3I3F`0|6iFS zJs&DKl9vjq3fq4%-k72&%jKCMylp!_;Jowz(Z~5Ub;-J3*ZS)JXy$YOWCo7250Ew} A{{R30 literal 1110 zcmc)Ju@b@{3Bcch|lf&%)}+v+xQr0leZ}`5nt0EtfBl($eQ^aa7x) z*Sq#x?@SjRwf4ReS+_`!$|H(|5X5^gIcF)QNQ_ZZO7fjIy)$e?ka-s$o@uN87#qiZ zCv=AM$w4RQk&}b2jNBM_<+(QoezN7~&Que?{%Qj7x&m@bfNlxs{jw%tXL9iSG9QlX Wncg@bTH=qdywCansXzU(8+-tl!5c6D diff --git a/ApplicationResourcePatches/PICT/1981.bmp b/ApplicationResourcePatches/PICT/1981.bmp index b527b679010a93fdc94810e63e80b331deb332b8..e43efe8b13f86c9cd961a20fc7f00bfe4c09ee88 100644 GIT binary patch literal 4186 zcmeH~K?;K~5Je|Z8@nl8dW0UMbl(ejGtc6-OV8p3Tuk##Lj_lzUl7582@1aa$xle) zNb6jU(yzRo_8*JZ}T6gGQ)en?7=esERXe*$6(QCdF=MN0*n4X z_*{WipXYNA%>Ij6wDYNgEqPQ>RowZ@@!l6jSu*zzmWKz7KF_b!{jTn>NBwID^8MZZ P2Z?*Nolg4bW4m|*B7iv; literal 1114 zcmc)JF%p9y5CzcBMuKTlTc*r8(t81K=2>V{auzN?v0*V|CEq49*_mZz-U6cVnwJ4B zmfAjRKECNN)~7Arcfj&iyOuRH=d2dfG-(JyQ%bt7tHv0$l%iW1X&nu~2?_TX$Nol# z>w`P4)ZwYa2j=k9D-$1$i8t>1#>AaX-*-VP=s8*&k37r*Px|xtIV$ zO4LvC7nS7wpC>c;Oa&z7hXS4&AJNZ zDFm0hkmq?gm1S_H3q?_cs;Yu3TqxPg8qC9GH1a-GX+9MT4!lp6(dZs{`bZV(_r<5y zW@-cf{_m&n{QBaD`RfM8WAEEk@pF6r{@bwZT@%AIKTaJE*Hu|mK^gV^?}N8o>$Ufr zjrY6VU(4QNVP~lF^kj-3^H0Z%|9)@P+pKu6R^Csi)&V`m{M&G_VgEn8Md^RLwGOcI z$$*kU)#;df5PxFnc(P3<_8&+V*0T606QCl~&>mIAzYpHHajVKKt1hr~Ky`lah@bOM z$CFL{D~l{KeDPl{y`Rl&5^em2lkI}Hx82qOS)`nTGu7vFyEDz7SUR2_;i6t;RT)bh zr2`Zn(fs@1EfX2w(59-!Nqnti{^@x5#+g+iwszw3Q~dkjFSB;tiTQWM#ODkz{&A$M pAM@{uiO+$L*SGlt|9jluF#p?LU3~gJ@1F^zsm(tPOHJ^Pm2UxhO(*~W literal 1150 zcmds0&3S_`43%)8p#_q5f*yPC2EBKUj*&AfumUS^?a?cE1y)d>Bqxx3{m4DiC;z?o zY|DbL@6(RVPG~<6?>U(E7`gp+L>h0HYV>_CYV$k`rb06!k$nCPm?w#Y2#qA;ILZ*C zP$ZeANm5Ee6G_yy9-4br@Rk$tmK8+B7S0c%54`v~U&}x6>y-yEl&)s^H{9|eN6WRr z6<45S{SojIs(s-S1k(p@xC5cH_JEPY1qi0!p@K~gtz`|MwW+=Q{QAiixB^#5^Ng8giijgl?R0oE zOE$ZC`$7!s$LDrU2W;i}D&ze)BAUxgvCoJwUc|)^@Y{}=8sesDm}>FAcD$=9CaSr@ zUPVj=aZwapmL=zT&QucDbiN80Z5kT%E=+VTV>NoYz^%eL}-w)p9H2Uj< zc-uYAZAVySu(k`k?uA7~hx;mc>f^NWeD5CxnV@ZTzF6Qbq2Z3O9D*Ise-=PrZQC<_ z=hAd0*le8By0`V)3_C^b5T7WHy?+uwU#)pq$+ETlOGACRgnp8wsb--1x8WxOFHno8 zAZTZedC$EjE~-q zV~q{x;0%NIKQe&+eBSN9-{7D7{w~o!$43SFU|*Tu0l`z>?w>w(90vwwfZc#U=ZDSC r!=k(Pmi+GN!z*q5;plF}#1FmDt;>J8W~)H0xhg(C3sJqdFR}o_eR>) z?5?DF|F~I1+_=7yFEa}q7$tmpKzU`VB;>6V!33G6Nf4NScG8Wb06|98MhJRH-}f>M zgS2fc7$6}8K?@mK%MRB6g5n{7hjQ^h^p%AxL-hZ^DMz$KJG3zBu4%ka?vJ{Z;fKGggS#XSyF1I%zprP`ZH3=M CSUdgz diff --git a/ApplicationResourcePatches/PICT/1984.bmp b/ApplicationResourcePatches/PICT/1984.bmp index 524da04d18c818f0bbbdd4afb3d43d5c3198ebeb..5c9638c860a45bc517a7c3a67eb360fe84b39bc3 100644 GIT binary patch literal 4226 zcmeHK%W=Xm5M5#9AP5d2P2`>iGP$RX6vD|Z(1Kg=HAlDL7Tm&SAB)EF7y)B5frH$ zG4>DE;xuCO>+avvTzD_@F=`V<8v`{!BeweRMd^nZMj03f^!d&`3o=1ywZ2?}0iHcV zV}$zS`L6=#s|{OT-`X^t3$|NpF{7@2$na6rUg8raiE}Rk=&SWDc(QCGIfVLZ1$|@E z6f^Mpx8dU*a{{&DtCnR;fwfqT^;&!S`pO&1$FFMPqj-B+|2BNht})(XM)SFISV7JI zli*bTRp0Zxy^fE)og_N8je{5-y8kf)=r0!i{r4aIbLa0G{d0U|AO=0{xHC`#`uE2; zei&O7!mq0JzyADbPsr%j`%Lw8`LR)P|HMb0ALadyuT!jNTEA)iZt?#SFUK%+@2PvV F{s6FWUGe|` literal 1154 zcmd^6yLH1b3_Mz-Whn}6Ckv!ZpAFJyjSS*SD`*9+pw=Z<;0js+If#-U{Y{_Tdk2Cz z5RW{5ejO|(92nopx0wbTW(h|RC||i%5;BgXC@?}0As^qJbRh^3C3LI@)_X|b_c9EF zv~4RGATdTk3kmGy3HJX2^ALbpJ%ITi`k95f9n<@PT@HX9dV)*RtETZjk+B9Oa+$wEku*DFx?fpt=KI~!&)NOum9bS$RV_Ya_jH7xX1Y^|8-3SK%r#)CH%hY*O#C2 z|G)q3*XOUD|M8dz;J+e#uf@K9xA3{9tva3B6E~TB@4}y*I{$KhX#e~D`yKezF_!qx z@wsN_AI#Z|D5j9}FXN~Dqq^S#?=|ON!snWue|&MF;O|0zcFw@X;`bum1?Pz z=}NUK-`2K5w59wCnX*96MUb;Xq{zjQ@Fju=CgG3pzGqsnh%d3l3wC(LJt5%_INZWV zQ~{6I{}28R=9%>!921_l{!`Dt#B%aL$^EZ+u+^C2Z#cPs&-;Y%01x~Mn{kF2elsS_ z@D;=U8=B$EWO}6UKRsZwf19|XTOBOgzYUdGL_r|oeZrl!{sV7Au}%0mXl?Sj-;?|w F_6wIOG~@sP diff --git a/ApplicationResourcePatches/PICT/1986.bmp b/ApplicationResourcePatches/PICT/1986.bmp index 1d9926e2b70aef98114eda1ec97e25b8a82c8370..ce94fc36cce2e8175e7805588c41fa4772313431 100644 GIT binary patch literal 4226 zcmeH}O>ToQ5QT>%CWNHnCpTc#eJ)US-z8VzAX#yRoP}+dxzlteLntB!#hFN`m7nx1 zF#bIDU>iQaPAObm(K>*Lu0-E^0QP}y*(5xk@v5e2u&!&&vJ8u&z_Kin9+N8s zY6BN?MLx1Gb{v#*EyOpoPH#{(n-rKvHtShl)=-s%8P zT=_WOZsT~jdn4^hN!!CP17q<${~z*~_arOG?fv)g{289k^j7&SykGx*|Ic&&h2eS~ zhH~cjza@|Ezt`~_((ee|<7@dS(#6;CJa*<;k^{H-GpFIBPS3^f@GggLY>T(O?O|@PQNlc*`UVg7)w4n`ZNT boXvRnNu6U@JEglUzrNRd#YLZWbWGt1<0m$7 diff --git a/ApplicationResourcePatches/PICT/1987.bmp b/ApplicationResourcePatches/PICT/1987.bmp index cfcd74ebbccd740039137ef143fe703d5e1ad7f2..0027e0cd05e101e9c7f3f3569307069b94d7116f 100644 GIT binary patch literal 4226 zcmeH~O>%-j5QT@)L4rnpasyV`=K`thv*ZdK#1&WYENrv%EL@?}ofZO9P{OoTBo?pg zfunwOPt%O!$LA?lKRV&@75#p-rviM%`Z_8_e!(Fb1$A8msj4a{%My|#fh@})&vU?! z(FLe8o-gPE{YJi^&uDr>L4oGWEqU|=qPzvT$Gmow_ptnMKiFj&pTCS(DzX&E#?UqU z8H~l3^I^E(hvDJyj5?yCh%=ZPf8`&cerZQ8_rHUuEQYwkAFYN-3P9^3!Pd7dZjH#eK@*4}qERTz(dAHJDK6VE>1iZAEwi2d>H Z`2FwOqrbwt|AVBybf5JeXhB`RR>0uGhEH?X(l3LJ!rD|i-KOU}X-*1rKpR1&q~&wN7ilD{Fq zQo{v<+OqXK@4H zU>P7T;4aQ_^_(K|e22V$_-GSD(tKY z-oLZ{YQ4hAcbYn1!<8}t<8 diff --git a/GpApp/Play.cpp b/GpApp/Play.cpp index e07322d..9dada6c 100644 --- a/GpApp/Play.cpp +++ b/GpApp/Play.cpp @@ -82,7 +82,7 @@ void NewGame (short mode) Rect tempRect; PLError_t theErr; Boolean wasPlayMusicPref; - + gameOver = false; theMode = kPlayMode; if (isPlayMusicGame) @@ -112,7 +112,7 @@ void NewGame (short mode) SetHouseToFirstRoom(); DetermineRoomOpenings(); NilSavedMaps(); - + gameFrame = 0L; numBands = 0; demoIndex = 0; @@ -120,7 +120,7 @@ void NewGame (short mode) otherPlayerEscaped = kNoOneEscaped; onePlayerLeft = false; playerSuicide = false; - + if (twoPlayerGame) // initialize glider(s) { InitGlider(&theGlider, kNewGameMode); @@ -134,7 +134,7 @@ void NewGame (short mode) LoadGraphic(glidSrcMap, kGliderPictID); LoadGraphic(glid2SrcMap, kGliderFoilPictID); } - + #if !BUILD_ARCADE_VERSION // HideMenuBarOld(); // TEMP #endif @@ -146,7 +146,7 @@ void NewGame (short mode) tempRect = thisMac.constrainedScreen; tempRect.top = tempRect.bottom - 20; // thisMac.menuHigh mainWindowSurface->FillRect(tempRect, blackColorMain); - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie)) { @@ -160,9 +160,9 @@ void NewGame (short mode) // DissBitsChunky(&workSrcRect); // else // DissBits(&workSrcRect); - + // DebugStr("\pIf screen isn't black, exit to shell."); // TEMP TEMP TEMP - + ResetLocale(false); RefreshScoreboard(kNormalTitleMode); // if (quickerTransitions) @@ -183,7 +183,7 @@ void NewGame (short mode) { DumpScreenOn(&justRoomsRect, false); } - + InitGarbageRects(); StartGliderFadingIn(&theGlider); if (twoPlayerGame) @@ -194,11 +194,11 @@ void NewGame (short mode) } InitTelephone(); wasPlayMusicPref = isPlayMusicGame; - + #ifdef CREATEDEMODATA SysBeep(1); #endif - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie) && (tvInRoom)) { @@ -210,17 +210,17 @@ void NewGame (short mode) } } #endif - + playing = true; // everything before this line is game set-up PlayGame(); // everything following is after a game has ended - + #ifdef CREATEDEMODATA DumpToResEditFile((Ptr)demoData, sizeof(demoType) * (long)demoIndex); #endif - + isPlayMusicGame = wasPlayMusicPref; ZeroMirrorRegion(); - + #ifdef COMPILEQT if ((thisMac.hasQT) && (hasMovie) && (tvInRoom)) { @@ -228,7 +228,7 @@ void NewGame (short mode) theMovie.m_playing = false; } #endif - + twoPlayerGame = false; theMode = kSplashMode; InitCursor(); @@ -253,7 +253,7 @@ void NewGame (short mode) NilSavedMaps(); UpdateMenus(false); - + if (!gameOver) { RedrawSplashScreen(); @@ -269,7 +269,7 @@ void DoDemoGame (void) { short wasHouseIndex; Boolean whoCares; - + wasHouseIndex = thisHouseIndex; whoCares = CloseHouse(); thisHouseIndex = demoHouseIndex; @@ -291,14 +291,14 @@ void DoDemoGame (void) //-------------------------------------------------------------- InitGlider void InitGlider (gliderPtr thisGlider, short mode) -{ +{ WhereDoesGliderBegin(&thisGlider->dest, mode); - + if (mode == kResumeGameMode) numStarsRemaining = smallGame.wasStarsLeft; else if (mode == kNewGameMode) numStarsRemaining = CountStarsInHouse(); - + if (mode == kResumeGameMode) { theScore = smallGame.score; @@ -309,13 +309,13 @@ void InitGlider (gliderPtr thisGlider, short mode) thisGlider->mode = smallGame.gliderState; thisGlider->facing = smallGame.facing; showFoil = smallGame.showFoil; - + switch (thisGlider->mode) { case kGliderBurning: FlagGliderBurning(thisGlider); break; - + default: FlagGliderNormal(thisGlider); break; @@ -336,16 +336,16 @@ void InitGlider (gliderPtr thisGlider, short mode) thisGlider->mask = gliderSrc[0]; showFoil = false; } - + QSetRect(&thisGlider->destShadow, 0, 0, kGliderWide, kShadowHigh); QOffsetRect(&thisGlider->destShadow, thisGlider->dest.left, kShadowTop); thisGlider->wholeShadow = thisGlider->destShadow; - + thisGlider->hVel = 0; thisGlider->vVel = 0; thisGlider->hDesiredVel = 0; thisGlider->vDesiredVel = 0; - + thisGlider->tipped = false; thisGlider->sliding = false; thisGlider->dontDraw = false; @@ -356,7 +356,7 @@ void InitGlider (gliderPtr thisGlider, short mode) void SetHouseToFirstRoom (void) { short firstRoom; - + firstRoom = GetFirstRoomNumber(); ForceThisRoom(firstRoom); } @@ -514,7 +514,7 @@ void HandleInGameEvents(void) //-------------------------------------------------------------- ResetTouchScreenControlBounds -static int16_t touchScreenControlSize = 32; +static int16_t touchScreenControlSize = 64; void ResetTouchScreenControlBounds (void) { @@ -601,14 +601,14 @@ void PlayGame (void) gameFrame++; evenFrame = !evenFrame; - + if (doBackground) { Delay(2, nil); } - + HandleTelephone(); - + if (twoPlayerGame) { HandleDynamics(); @@ -660,7 +660,7 @@ void PlayGame (void) HandleDynamicScoreboard(); } } - + if (gameOver) { countDown--; @@ -668,22 +668,22 @@ void PlayGame (void) { HideGlider(&theGlider); RefreshScoreboard(kNormalTitleMode); - + #if BUILD_ARCADE_VERSION // Need to paint over the scoreboard black. - + boardSrcMap->SetForeColor(StdColors::Black()); boardSrcMap->FillRect(boardSrcRect); - - CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), + + CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), &boardSrcRect, &boardDestRect, srcCopy); - + { Rect bounds; THandle thePicture; SInt16 hOffset; - + if (boardSrcRect.right >= 640) hOffset = (RectWide(&boardSrcRect) - kMaxViewWidth) / 2; else @@ -700,7 +700,7 @@ void PlayGame (void) #else // ShowMenuBarOld(); // TEMP #endif - + if (mortals < 0) DoDiedGameOver(); else @@ -708,21 +708,21 @@ void PlayGame (void) } } } - + #if BUILD_ARCADE_VERSION { DrawSurface *wasCPort = GetGraphicsPort(); - + boardSrcMap->SetForeColor(StdColors::Black()); boardSrcMap->FillRect(boardSrcRect); - - CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), - GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), + + CopyBits((BitMap *)*GetGWorldPixMap(boardSrcMap), + GetPortBitMapForCopyBits(GetWindowPort(boardWindow)), &boardSrcRect, &boardDestRect, srcCopy); - + SetGraphicsPort(wasCPort); } - + { Rect bounds; THandle thePicture; @@ -741,11 +741,11 @@ void PlayGame (void) boardSrcMap->DrawPicture(thePicture, bounds); thePicture.Dispose(); } - + #else - + // ShowMenuBarOld(); // TEMP - + #endif } @@ -758,11 +758,11 @@ void SetObjectsToDefaults (void) short r, i; char wasState; Boolean initState; - + thisHousePtr = *thisHouse; - + numRooms = thisHousePtr->nRooms; - + for (r = 0; r < numRooms; r++) { thisHousePtr->rooms[r].visited = false; @@ -781,10 +781,10 @@ void SetObjectsToDefaults (void) case kGrecoVent: case kSewerBlower: case kLiftArea: - thisHousePtr->rooms[r].objects[i].data.a.state = + thisHousePtr->rooms[r].objects[i].data.a.state = thisHousePtr->rooms[r].objects[i].data.a.initial; break; - + case kRedClock: case kBlueClock: case kYellowClock: @@ -799,16 +799,16 @@ void SetObjectsToDefaults (void) case kStar: case kSparkle: case kHelium: - thisHousePtr->rooms[r].objects[i].data.c.state = + thisHousePtr->rooms[r].objects[i].data.c.state = thisHousePtr->rooms[r].objects[i].data.c.initial; break; - + case kDeluxeTrans: initState = (thisHousePtr->rooms[r].objects[i].data.d.wide & 0xF0) >> 4; thisHousePtr->rooms[r].objects[i].data.d.wide &= 0xF0; thisHousePtr->rooms[r].objects[i].data.d.wide += initState; break; - + case kCeilingLight: case kLightBulb: case kTableLamp: @@ -817,14 +817,14 @@ void SetObjectsToDefaults (void) case kFlourescent: case kTrackLight: case kInvisLight: - thisHousePtr->rooms[r].objects[i].data.f.state = + thisHousePtr->rooms[r].objects[i].data.f.state = thisHousePtr->rooms[r].objects[i].data.f.initial; break; - + case kStereo: thisHousePtr->rooms[r].objects[i].data.g.state = isPlayMusicGame; break; - + case kShredder: case kToaster: case kMacPlus: @@ -834,10 +834,10 @@ void SetObjectsToDefaults (void) case kOutlet: case kVCR: case kMicrowave: - thisHousePtr->rooms[r].objects[i].data.g.state = + thisHousePtr->rooms[r].objects[i].data.g.state = thisHousePtr->rooms[r].objects[i].data.g.initial; break; - + case kBalloon: case kCopterLf: case kCopterRt: @@ -846,10 +846,10 @@ void SetObjectsToDefaults (void) case kBall: case kDrip: case kFish: - thisHousePtr->rooms[r].objects[i].data.h.state = + thisHousePtr->rooms[r].objects[i].data.h.state = thisHousePtr->rooms[r].objects[i].data.h.initial; break; - + } } } @@ -860,17 +860,17 @@ void SetObjectsToDefaults (void) void HideGlider (gliderPtr thisGlider) { Rect tempRect; - + tempRect = thisGlider->whole; QOffsetRect(&tempRect, playOriginH, playOriginV); CopyRectWorkToMain(&tempRect); - + if (hasMirror) { QOffsetRect(&tempRect, -20, -16); CopyRectWorkToMain(&tempRect); } - + tempRect = thisGlider->wholeShadow; QOffsetRect(&tempRect, playOriginH, playOriginV); CopyRectWorkToMain(&tempRect); @@ -883,7 +883,7 @@ void InitTelephone (void) thePhone.nextRing = RandomInt(kRingSpread) + kRingBaseDelay; thePhone.rings = RandomInt(3) + 3; thePhone.delay = kRingDelay; - + theChimes.nextRing = RandomInt(kChimeDelay) + 1; } @@ -892,7 +892,7 @@ void InitTelephone (void) void HandleTelephone (void) { short delayTime; - + if (!phoneBitSet) { if (thePhone.nextRing == 0) @@ -915,7 +915,7 @@ void HandleTelephone (void) thePhone.nextRing--; } // handle also the wind chimes (if they are present) - + if (numChimes > 0) { if (theChimes.nextRing == 0) @@ -924,11 +924,11 @@ void HandleTelephone (void) PlayPrioritySound(kChime1Sound, kChime1Priority); else PlayPrioritySound(kChime2Sound, kChime2Priority); - + delayTime = kChimeDelay / numChimes; if (delayTime < 2) delayTime = 2; - + theChimes.nextRing = RandomInt(delayTime) + 1; } else @@ -948,19 +948,19 @@ void StrikeChime (void) void RestoreEntireGameScreen (void) { Rect tempRect; - + HideCursor(); - + #if !BUILD_ARCADE_VERSION // HideMenuBarOld(); // TEMP #endif - + DrawSurface *surface = mainWindow->GetDrawSurface(); tempRect = thisMac.constrainedScreen; PortabilityLayer::ResolveCachingColor blackColor = StdColors::Black(); surface->FillRect(tempRect, blackColor); - + ResetLocale(false); RefreshScoreboard(kNormalTitleMode); // if (quickerTransitions)