From a1a3487b2b92632db987c4b9e68f7ebbbcd4ad48 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sat, 28 Apr 2007 19:44:03 +0000 Subject: [PATCH] - bugfix: Text placement in insurance laptop pages in higher resolutions git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@863 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Laptop/insurance Contract.cpp | 6 +++--- Laptop/insurance Info.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/JA2.suo b/JA2.suo index 1f0f069c57497bf20122f5df599fce35539d7819..94e507bfdca651f317609b658d1d71335ca72ee0 100644 GIT binary patch delta 1429 zcmaKse{54#6vyv*yB&qTb#2$u!r0ayV{T(B1G+hkBvnLU5ZQF{kHR)rFvx&1N+Mg7 zC;Y*TWP#kw8~=bT5(p7zChw2>hZ#%A)Hq>72_X=0`WHAN{Lv-G==6IZ=`s+!&F9^7 z&$;KE`%ce&Mvrdv=z|+MaS`Gr&SP6fLKi;#mU0+l!@Xt~Zy-G%av}H!Lp0e-h2h}h z58FDvQe(_~Dfeq~y=FLG4xPBW?$gN=`%kv^hGkP8)tGTR=Xx*Oe*!K==W6LpjEB!B@_%L-l zvEB%MlBL)lJfRYy{J`_wI>gtZ+`&57KBe~H(Ttt#ma-jEhf=EmYghvNRDe#UG86eN zIbwDHGBe}hq@A;iKMNXkRRIUg*-F@4SbQ!HcsJ;CA*p;>lgM~CDSwgjHR_9CD4At6 zGrqV+)5qH)2mPpF04x9tK_OTKia;?a0YMM~VGseOU@<5I&wz4J0V=@~Pz9<%6f6Zb zU>R5rR)83&1$7$puxBCEgK3=nIW>RT=BM)u->uO;%Qd?i5?vxbGAsxCDB2gLnCKj@ z7w`Y=6cfQ>Gx5ztj#U%)talTs@0;y;vlSUAREcLwlNxQb+*I|lN;5O6$KgiR!l^bU59l(FXF}f#xpw4NQW20L9%T=>b*A z-Iu9Uy2dD(9_G|D$6f?$HfuVi(@}?XEuq$QYbEuQH2lQVJV1ZBWur&qvTQAFmd05s zPamqHX+s)gWSseeg7V6*6p$y!sgy{p8d)swj8i9d^zEg!vgQhv$=?UaBVHNt5|b|! zQ%D@!$XWL}*CbfiX>r^ZsA9@%I4f1#_d4Gzo+19}6ZJC&&opRMxnpZL7fp&V_ zL!C04y}`;J`A>EhWUFyycHy@Tp;K(1I!}AW%v+&FpB`6Z592=JtuFLap`84QHdjCL zV(9j#hhywT>zE6kbjV$x99(2My;6gMl(63`)6vFE!Szj`V?71 zeX`~{aBb9`jasYIFnk5vY85yR=@iI%Tsjx?+#edaEhny%_k3lXM5t)JeD4O`J5qa# L(zUm=(XxL5l9YH; delta 919 zcmY*XYe-a45T3bvb=UUp!@I88X6qwMEfJNBQiv@d#VV+1L12aMN>s**ZI)897Ligv ztmAr!9`q;cmsmHry)b{cB}y5hAY^C}6ht6l5Jp>bEgxO@&Yk&Y&dhh_oItx2XqWm* zMRc+xF~Qt9Isdr-+)LB}z`zBiMRcQ-K=xX~Z~9n;A%z8uBKr}sM+_686h=NnYwF2| z-naSrMeURKhFWj>e)0+vW+^U%C`#skJC}C*r2t-1zDp*w03ZVRs96ia$fC`*s3giy zCxGTLm$_Lq#*)*<>^1<*eUJGgkioi?RT7gE5QoNQ!IuooTTdTEr0A)@VQP2aMx49(~ z1&k|#5ms_U)*Ms93gs*|7gNRx;!Gb zVFfqd#RrblS;8%Y(&F~EU^T*xYcHA@aY#NVybGgr&fF+3GD>WXH*Jn8c1&{~T;D()adDZH35j*sT zs1@B*zl4{KJr0!lhu2uF7RTWezT(zgI!MO^ u?h|si^4UAMpJ$JuOaE8Gf(HJrSBO`q9Oy-L;1dS*7lYHN2B(E%DSrTzqZ&Q{ diff --git a/Laptop/insurance Contract.cpp b/Laptop/insurance Contract.cpp index 59fdd1b4..dd7659c2 100644 --- a/Laptop/insurance Contract.cpp +++ b/Laptop/insurance Contract.cpp @@ -31,8 +31,8 @@ #define INS_CTRCT_ORDER_GRID_OFFSET_X INS_CTRCT_ORDER_GRID_WIDTH + 2 -#define INS_CTRCT_ORDER_GRID1_X 76 + LAPTOP_SCREEN_UL_X -#define INS_CTRCT_ORDER_GRID1_Y 126 + LAPTOP_SCREEN_WEB_UL_Y +#define INS_CTRCT_ORDER_GRID1_X (76 + LAPTOP_SCREEN_UL_X) +#define INS_CTRCT_ORDER_GRID1_Y (126 + LAPTOP_SCREEN_WEB_UL_Y) #define INS_CTRCT_ORDER_GRID2_X INS_CTRCT_ORDER_GRID1_X + INS_CTRCT_ORDER_GRID_OFFSET_X @@ -361,7 +361,7 @@ void RenderInsuranceContract() //Display the title slogan GetInsuranceText( INS_SNGL_ENTERING_REVIEWING_CLAIM, sText ); - DrawTextToScreen( sText, LAPTOP_SCREEN_UL_X, INS_CTRCT_TITLE_Y, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, INS_FONT_BIG, INS_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); + DrawTextToScreen( sText, LAPTOP_SCREEN_UL_X, INS_CTRCT_TITLE_Y, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X-iScreenWidthOffset, INS_FONT_BIG, INS_FONT_COLOR, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED ); //Get and display the insurance bullet diff --git a/Laptop/insurance Info.cpp b/Laptop/insurance Info.cpp index 26ee1e4d..1f61393e 100644 --- a/Laptop/insurance Info.cpp +++ b/Laptop/insurance Info.cpp @@ -28,7 +28,7 @@ #define INS_INFO_SPACE_BN_PARAGRAPHS 12 -#define INS_INFO_INFO_TOC_TITLE_X 170 +#define INS_INFO_INFO_TOC_TITLE_X (iScreenWidthOffset + 170) // ROMAN #define INS_INFO_INFO_TOC_TITLE_Y 54 + LAPTOP_SCREEN_WEB_UL_Y #define INS_INFO_TOC_SUBTITLE_X INS_INFO_SUBTITLE_X @@ -39,7 +39,7 @@ #define INS_INFO_LINK_TO_CONTRACT_WIDTH 97//107 #define INS_INFO_LINK_START_OFFSET 20//14 -#define INS_INFO_LINK_START_X 262 + INS_INFO_LINK_START_OFFSET +#define INS_INFO_LINK_START_X 262 + INS_INFO_LINK_START_OFFSET + iScreenWidthOffset // ROMAN #define INS_INFO_LINK_START_Y 392 + LAPTOP_SCREEN_WEB_UL_Y #define INS_INFO_LINK_TO_CONTRACT_TEXT_Y 355 + LAPTOP_SCREEN_WEB_UL_Y