From 918eb740a4005385ab076e45a5552cc28369c276 Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 3 Jan 2008 01:06:41 +0000 Subject: [PATCH] minor Xaw skin improvements; work around fteqcc bug as always git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3090 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/gfx/menu/xaw/background.tga | Bin 0 -> 262450 bytes data/gfx/menu/xaw/closebutton_c.tga | Bin 6403 -> 2232 bytes data/gfx/menu/xaw/closebutton_f.tga | Bin 6723 -> 8163 bytes data/gfx/menu/xaw/closebutton_n.tga | Bin 6783 -> 2612 bytes data/gfx/menu/xaw/skinvalues.txt | 2 +- data/qcsrc/menu-div0test/menu.qc | 3 +-- 6 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 data/gfx/menu/xaw/background.tga diff --git a/data/gfx/menu/xaw/background.tga b/data/gfx/menu/xaw/background.tga new file mode 100644 index 0000000000000000000000000000000000000000..e57e6f40daa04b7f25f791985dc6d6ef03f98eed GIT binary patch literal 262450 zcmeI%U20TO5Jlm0`zg-AN$4yhG>C#f!RaIuZw=d7tS=$txvK8kwWxEh59i#@$MgPk zJGZCz|BuJxTyMu;w+FALA12_s&cEO8*RS^1WBTo{pk2MMp8=E!U;y<5U;y)7I{1q^Odj2zj`WH~nKeaP}HvbHuJ^yntfch6;3%0)iH-It$44_Rv11QtK+I66v z0Sur_00U^#&j8BwGXT@~3eesF44^%K24Dy1Ksy860Lla~fHwUMpiKX2*MW8hFn}@v z44_Rv11Qta08HO2Kzjo)fcE?ufE}O%?F?`OC=OaKFD)6W3P^fLg{_X^P7 z01Ti#e+FO&=s-II+yKf1Fn~7w44_Q^YS)2w1~7m!0Sur`KLaS!&j3u{D?ob#Fo5>_ z8Gs$21MLiO11J-~0NV63fHM87T?g73zyQhwFn~7w44_Ou12BEB0PPLH0NV3s0Cs>5 zv@^gBpiBS*Xw%OC%Ji>x9cX6&11J-~0NV63fHM6I!1TQWv^M|)XwRPk*a14w&Hy)n zG64*rO+N!D)4$qvpq&8>piBS*Xw%OC%Jee;)AtI{-T(}sJ%0vZ2k1aM1Ka@01TcU$ z{S2T?|7zEPb_OtjG64*rO+N!D)6W1*-zz|S12BO0{2729pabm;a04h4zyR9xGk`Mv zt6c}$8NdL_1TcU${S2T?KLap*uK?{0zyR9wX8?A94zx4C4WLW_18CFF0Lt{Qb{%ME z00Sr!zyR9xGk`Mv48Zig0<<>(18C2m0oVaL(9QrifHDCLpiMsmDAT{%b)cOA44_N^ z18CFF0Lt_;0Mqvh(B1$Hpgn&EUOaKFD)6W3P^fLg{_X^P701Ti#e+FO&=s-II+yKf1Fn~7w44_Q^ zYS)2w1~7m!0Sur`KLaS!&j3u{D?ob#Fo5>_8Gs$21MLiO11J-~0NV63fHM87T?g73 zzyQhwFn~7w44_Ou12BEB0PPLH0NV3s0Cs>5v@^gBpiBS*Xw%OC%Ji>x9cX6&11J-~ z0NV63fHM6I!1TQWv^M|)XwRPk*a14w&Hy)nG64*rO+N!D)4$qvpq&8>piBS*Xw%OC z%Jee;)AtI{-T(}sJ%0vZ2k1aM1Ka@01TcU${S2T?|7zEPb_OtjG64*rO+N!D)6W1* z-zz|S12BO0{2729pabm;a04h4zyR9xGk`Mvt6c}$8NdL_1TcU${S2T?KLap*uK?{0 zzyR9wX8?A94zx4C4WLW_18CFF0Lt{Qb{%ME00Sr!zyR9xGk`Mv48Zig0<<>(18C2m z0oVaL(9QrifHDCLpiMsmDAT{%b)cOA44_N^18CFF0Lt_;0Mqvh(B1$Hpgn&EUOaKFD)6W3P^fLg{ z_X^P701Ti#e+FO&=s-II+yKf1Fn~7w44_Q^YS)2w1~7m!0Sur`KLaS!&j3u{D?ob# zFo5>_8Gs$21MLiO11J-~0NV63fHM87T?g73zyQhwFn~7w44_Ou12BEB0PPLH0NV3s z0Cs>5v@^gBpiBS*Xw%OC%Ji>x9cX6&11J-~0NV63fHM6I!1TQWv^M|)XwRPk*a14w z&Hy)nG64*rO+N!D)4$qvpq&8>piBS*Xw%OC%Jee;)AtI{-T(}sJ%0vZ2k1aM1Ka@0 k1TcU${S2T?|7t(~e}4V={rqzOdH??H)1NQ*ug{;)UkJ(%#sB~S literal 0 HcmV?d00001 diff --git a/data/gfx/menu/xaw/closebutton_c.tga b/data/gfx/menu/xaw/closebutton_c.tga index f6e28e364597fea102e18e0c146f9ceb5e92e655..d8bfea5adba70cf53445464a2d254f3d391acdf2 100644 GIT binary patch literal 2232 zcmb_eTPUS#82-Qg|6|7HLN1UCwxnD*U63SL&)8$i znOsOMhfW7jmzU-W~I0Xa*P&3~MXJ=>X=;$CT zUuna`!vqhNOFaM*5)x>0bCdXKZEYndCnx&AH(FU)8Cm&bv9Ym1@$vCy02`a>IXO9W zc6P>wR8>_)?-4yUHI_oDCNj7wYWn1i;G53dP06Q6m5x_4Az=85tpOZ*MaQOpU<6K$@7C z0LbX*DEayM5pomd<>hFtEMskL4FPbcGHK#?Mq*+jZEtS_q@|^WbX}MAij zBmjnnhRD~~m)M^>pw#fx0c5Qppt@H{NlCQ3y92rTTU%7iu^pO6Rw^3Y-ehKG(&gnP zl3Z9=fC8V+Pg+M_%25twNJt1&jTpwjz<@)%=jZ2?m6aujSGgg)aCLR1o}M0Ak#|1G)l16znomC(ujzNfHoL`fw(Z!R}+p7)yprT!NEb8Vvuys z@ZjJ8S=em07Xh@$$VjrX)J0oc8^+`#>)@xnygX3H^Y>C@8}IH zs;Dj(W!jAx!2xGQ#`Yp2D@&wI>~B?8rR$H>^z^i}OifM6473|}oREz;cF ztg_9`O*uV1mCMUZxxKxW)WgGrwA|m{%hlDDoSmHs8dzh2B_8mE49`R$5)p|^24q4; zWJZQ$O2%Xk0VELNOBo}^n9>4x@@A9!*+)i3{vYn3P`uJjLs`6pPNz&bO&c3sGaK(eYIl z_AV!SL0*kc*KMXDgV63JWiGMzzn>jSkGnR=&1BJU{~b0rH>Woazvz?Mn|D}kA!;n~ z;P>di!-z}<$O4J(>$7x(=9yh1N7E^5jg%QvBu zg`n-~#}nPgvq2M)$Yk(qU~4X{Y0MNjMO909L>@LWfB(4H|9w?HykUW51|RAzO%D=0 zA`f~~PYD}5|D}k zD@WGe-tNj+sqBe4_C7G2ST+^U6w|S!D7yKAzRI!;MU)Lh*r-C(jv~?=+l~hs;&{ML zWtqCVI*HfU*Goe~gHAB1diB)n09-yV8yg!1%`7&K$J*Lj*CQ)O<{7^b&ylUHthjn> zYiq7-YirAu9UUFHvc0`MS9Wo6;mVGWk6qc#&5bKNIXQ7<`en?Q>GMy$ySqDA@8ICT z)w{mFc4a#|JFe{f{M?m&`SQh;Vd3Pww6x^PR##VD8H3_fkg;*}%FD}L87q}#Dk>@@ zURhZwRaI3|Q&XeWrH*PGXF7RXP_*jmYC$uLjpLCabD|JWWm(2E$^_<5FD159lEbaz z!5i8aPnN?_&xN{dXMtM8I7aqag|8>n)GEU&ZvN3h zm*c6Har(iu4NdP5tl z4Cd-B&k<=G5GkdxZ(#)@yVy|!Izk`mue})QI=ZCK+%g>t3k$NozAoF_+p@pEFPuwG z)#2fx?C$Q$#>R#$FE6VPoprJ<7qrifJ^8!SwQj%ns;?9 zl(jR+YV%9PFkZ5>SiET8ON=ePQsDj>#!JO*og>qiZ? z_S0~yiop%G*v1tsZF9ts6*t9GUl7;dU26Dg$koLn`%kj}jpSi#&lP#V3P5SlrNI!} z`K5%PN?r3i)OMbO_l`&IK!>#$V9Y7rr$Z-y7n0E-3gvT*~^71%HPJM_-S( R{@VJsJASgUwf%KM{sXNTQQC4|O@=v`UAyT? zS;r5^O7v=@RT5SbwN4+DB-(^F`9Mm^wa<0kGuYkMr*Yr+|GKa1`v0!``TgrZlfJ~r z4IUu=ot&INW@aYvJP#Qe8E|}j3_sxp|M2htRaI4B#VtNJHx~qhJjC3Io3iEQWr&K3 z0*>RLwzd`?A0OdI+~J%~Cs=V=5*-~4D=RCw3f;Kk3=9n9I>ld{L!;4fv}VCw>Dbs9 z`1trxIGfD|y|~KH&dx$WKmZf-N~IEpho!^NDSRu}>bpp2u~+1{S2@ehq zASo${<-s*IHGxI=S*|saMs|OH50#abq%#_gu)4YmJ*0an8MEbca&q9};zHD}%5|o0 zJRv(eI)e1{bkb&JWx?s`DL6>m)6+vuq^kIsm>7!NCHy67t)yLAS^}L;N80-OdU$$z z0vl=P=H|fP-``cJTrP*f!9nO2J}QiQIw2h$9R;;oO=;#QHk;|ZpPwI0O-%t+&tvr!6%|ZFwqlJ|;X8$f>14OJw@_MIN?Mc21REP0KsLR4 z%cHkzYinQ=1{IoE>cG3h!$U|*OCw!gULKsConan;)xFy2uFfv}rqGzF?;Z;a3!v3% zN!ifQKu{(pC%fuuZf<5hW)S7)=er=v&dz2KIq@3Vz`y`_d3liw7zKS|ZlIHwmzQs& zl$Did^`c?{-2RN3{G*PlwU?P6fiV2gdK*(#YG4Y4<{vd`1$!6?7}ZfjhTq!cXxLoF)`8QTWf18<3@@!qwm9Zi!Iq8Lv4CQJu7F~j-voSZ z0Qc^+zHh{4(IwlZ{r&ym>FEg)i3Ixk z`k+e?R66z)a(26&-NPFU23TKTXOE$@t*wpj2@VdXQM3pvst^+mG+B+$0~-@Jmp@=P zW!Kl&P+VM0TC8DbXGeT`&sAC@eF6yBe-0^q06ez0w+RC53F;k{a8kYHFhxP&7w z&NA)O7e|KgeNa#k-PqF70)kc@62YTtYikRv$SPk`Q$u+7;j(mOWQ6*T<05=kM}FXN T*^V!(fWJEN7x!zU`VYn5gmAJ{ delta 242 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 Cdp}?R diff --git a/data/gfx/menu/xaw/skinvalues.txt b/data/gfx/menu/xaw/skinvalues.txt index ade55a79b..7618f8bc9 100644 --- a/data/gfx/menu/xaw/skinvalues.txt +++ b/data/gfx/menu/xaw/skinvalues.txt @@ -1,4 +1,4 @@ -ALPHAS_MAINMENU '0.6 0.8 0.9' +ALPHAS_MAINMENU '1 1 1' ALPHA_DISABLED 0.2 COLOR_BUTTON_C '1 1 1' COLOR_BUTTON_D '1 1 1' diff --git a/data/qcsrc/menu-div0test/menu.qc b/data/qcsrc/menu-div0test/menu.qc index c37d2d34d..71c7003a8 100644 --- a/data/qcsrc/menu-div0test/menu.qc +++ b/data/qcsrc/menu-div0test/menu.qc @@ -230,8 +230,7 @@ void() m_draw = if(frametime > 0) { vector dMouse; - dMouse = getmousepos(); - dMouse *= frametime / realFrametime; // for capturevideo + dMouse = getmousepos() * (frametime / realFrametime); // for capturevideo if(dMouse != '0 0 0') { dMouse = globalToBoxSize(dMouse, draw_scale); -- 2.39.2