From 8f8ae869c73d3301ef1b056c85b96a9bb9e32286 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 2 Jul 2006 16:53:06 +0000 Subject: [PATCH] - Shortened some German option-texts in the preference screen - Centered the "Topware" splash-screen in the German version git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@322 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 4 ++-- JA2 Splash.cpp | 4 ++-- JA2.suo | Bin 70144 -> 70144 bytes JA2.vcproj | 4 ++-- Strategic/Strategic AI.cpp | 7 +++++-- Utils/_EnglishText.cpp | 2 +- Utils/_GermanText.cpp | 8 ++++---- Utils/_RussianText.cpp | 2 +- jascreens.cpp | 14 +++++++------- 9 files changed, 24 insertions(+), 21 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 34640a387..3a5ed2198 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.315" }; + INT16 zVersionLabel[256] = { L"Release v1.13.321" }; #endif -INT8 czVersionNumber[16] = { "Build 06.06.30" }; +INT8 czVersionNumber[16] = { "Build 06.07.02" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2 Splash.cpp b/JA2 Splash.cpp index 85d1a2644..6aec90d30 100644 --- a/JA2 Splash.cpp +++ b/JA2 Splash.cpp @@ -23,7 +23,7 @@ void InitJA2SplashScreen() sprintf( VSurfaceDesc.ImageFile, "LOADSCREENS\\Notification.sti" ); if( !AddVideoSurface( &VSurfaceDesc, &uiLogoID ) ) { - AssertMsg( 0, String( "Failed to load %s", VSurfaceDesc.ImageFile ) ); + //AssertMsg( 0, String( "Failed to load %s", VSurfaceDesc.ImageFile ) ); return; } GetVideoSurface(&hVSurface, uiLogoID ); @@ -59,7 +59,7 @@ void InitJA2SplashScreen() } GetVideoSurface( &hVSurface, uiLogoID ); - BltVideoSurfaceToVideoSurface( ghFrameBuffer, hVSurface, 0, 0, 0, 0, NULL ); + BltVideoSurfaceToVideoSurface( ghFrameBuffer, hVSurface, 0, iScreenWidthOffset, iScreenHeightOffset, 0, NULL ); DeleteVideoSurfaceFromIndex( uiLogoID ); } #endif diff --git a/JA2.suo b/JA2.suo index 09e61b0cfad31f000de0e80f2d9a62a9e0d8753c..7260a739fd112d8c8d5be6e092ef6e092e0153fa 100644 GIT binary patch delta 1091 zcmb7DUr1A76hG(g?rzSzJLjg(fwt*ff3abqf&I~fObHTG67s?6mj70cIZ7pT6@*V= zeU0xSk_7Q33F{(7L}>nbmL4NWsNQ>uQgoefMv48Q&gFN{`Of`)=X~Ee=O!lP#DqK@ zk+n~1L&4|!OK1Rq#7%ureuMa4Z&G@tN|{_mgbrwgdN=_Q=z=ITKp5H~4yCkegkJIh z__wq4lzG5_&)9%EEWJ?lRn?3(07L+v1P~zjnO$>aoX-Ua6F{t3mA1^hwtTBfjwVXc zMJfCAa@$K;ancqOuvNzp%51$;u`;2pg$XN+6f)Jc5gm zFZ_>#_wb239#B5eQOqWNuucoA8)OUiN7C%>!)AwxsO#UIDbgST8=uS9T~qyesOY!n z_v4+#=TxzlWDskTK6In7yezhShz+f4Y{gTkhnBunuo16Qk8X@&@;ds7m&>OV^jY0- zii#M75WQpkj1hBYTCp6HN3jU6QlOGa2_;^yU=d$I^srlTGdIhaohJ12ISp%hA``Rt zWf^_A&EXL_{Crl!IziIdXpd}ap;iTagwbxvd;5xP+9 zx-zMv!~${_o1RxOl+L@i4yvIHJaCpWMbc;J+>-ggW(W|vLd57{tqU?5`8x|9;|T>5 zyvl-ZK5D}~)KSlG#)0j#T7D)hE;yO~6~c7EP5E_ztUxCT(bprQK*?*k^S@6iM_w)4 i+3bSLYn9Sf7P&?$*D@X)Uds@5F^T_@q#Ie`+nR6p4DkN| delta 991 zcmb7DO-NKx6h7z8dvD&@_?|P4I%?LWLx?fz`2V-iY!Y2aq=J=;CTEChazqVMCubHx ztwOuyB`Giv3zCu^5xB|Fq*b_fWn`N+wFyel>D(~_p+&vR_uf6ASBkTuczBd=%G-TAOge8ZWNde z#*(alBGV_xwlgQt!$w_kjF>-Nhb@YgTxqPpU8L+LlSwBFx^o+-#hh9xL!NM; zyO{1kM^ex2Mw@lE$z~O@Rpd@amvJ2Gp%wycd3A~R$ykVe?9ECM8(Obp6FWNF^c*rn zYd>n))13@U3k1yQ?iAjauwgm_y{{5jC%O?MlQv!`qi0@1Nx4WB>E~Y!%;GT_6Dha+ zp@Jd)MM0f+s_6Q|b@1mZo}N~*nL8D%5>g$H7}y=(YaxJ}61@f&pp)KLp_|$or8P*c z{`Z!PLHJKU-rw%Ultih)A-YtUg714+i@)G?!itNSHlyunW;A|B#{phypmX{FX7dFN zC(+BNbiA^UyqTVwCbAM=k2ugcZ%2tOuE_jD8fyH!hF+r@TEIsrhe`;5kNMx_^9=(_ z6cMhSpEIyl)HYSeCO&E4h$=Kyz>aJNFvdPU$l}W?dNIadXxJ_aoXt;CAL1T3MfVEQ z-x8+6hGBq4*#m7f((O=6>>#Zet#LR((F5S8EUKXuYAB!Mlub2Fj*kKb2!7ht6I(+k heWa_TozPd%Y9+L!b~h+7e??`LND$aj*>$&M`4?%q+@}Bl diff --git a/JA2.vcproj b/JA2.vcproj index 3fc74829f..cecd52252 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -43,7 +43,7 @@ 0) ) { diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 6caad0341..257232062 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -3417,7 +3417,7 @@ STR16 zOptionsToggleText[] = L"Enemies Drop all Items", L"High angle Grenade launching", L"Restrict extra Aim Levels", - L"Space selects next Squad", + L"Select next Squad", L"Show Item Shadow", L"Show Weapon Ranges in Tiles", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index aa462e5cc..0735da47b 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3219,11 +3219,11 @@ STR16 zOptionsToggleText[] = L"Drahtgitter zeigen", L"3D Cursor zeigen", L"Trefferchance anzeigen", - L"GL Burst verwendet Burst Cursor", + L"GL Burst mit Burst Cursor", L"Gegner lassen alles fallen", - L"Granatwerfer feuern in hohem Winkel", - L"Extra Zielgenauigkeit bei Gewehren", - L"Space selektiert die nächste Gruppe", + L"Granatwerferflugbahn erhöhen", + L"Extra Zielgenauigkeit", + L"Nächste Gruppe selektieren", L"Gegenständen mit Schatten", L"Waffenreichweite in Felder", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 787812c57..c9660af9e 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3406,7 +3406,7 @@ STR16 zOptionsToggleText[] = L"Enemies Drop all Items", L"High angle Grenade launching", L"Restrict extra Aim Levels", - L"Space selects next Squad", + L"Select next Squad", L"Show Item Shadow", L"Show Weapon Ranges in Tiles", }; diff --git a/jascreens.cpp b/jascreens.cpp index b87447485..ca84d3fd4 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -972,18 +972,18 @@ void DisplayTopwareGermanyAddress() } //Shade out a background piece to emphasize the German address. - ClipRect.iLeft = 208; - ClipRect.iRight = 431; - ClipRect.iTop = 390; - ClipRect.iBottom = 475; + ClipRect.iLeft = iScreenWidthOffset + 208; + ClipRect.iRight = iScreenWidthOffset + 431; + ClipRect.iTop = iScreenHeightOffset + 390; + ClipRect.iBottom = iScreenHeightOffset + 475; pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); Blt16BPPBufferShadowRect( (UINT16*)pDestBuf, uiDestPitchBYTES, &ClipRect ); UnLockVideoSurface( FRAME_BUFFER ); //Draw the anti-aliased address now. - BltVideoObjectFromIndex( FRAME_BUFFER, uiTempID, 0, 218, 400, VO_BLT_SRCTRANSPARENCY, NULL ); - BltVideoObjectFromIndex( FRAME_BUFFER, uiTempID, 0, 218, 400, VO_BLT_SRCTRANSPARENCY, NULL ); - InvalidateRegion( 208, 390, 431, 475 ); + BltVideoObjectFromIndex( FRAME_BUFFER, uiTempID, 0, iScreenWidthOffset + 218, iScreenHeightOffset + 400, VO_BLT_SRCTRANSPARENCY, NULL ); + BltVideoObjectFromIndex( FRAME_BUFFER, uiTempID, 0, iScreenWidthOffset + 218, iScreenHeightOffset + 400, VO_BLT_SRCTRANSPARENCY, NULL ); + InvalidateRegion( iScreenWidthOffset + 208, iScreenHeightOffset + 390, iScreenWidthOffset + 431, iScreenHeightOffset + 475 ); DeleteVideoObjectFromIndex( uiTempID ); ExecuteBaseDirtyRectQueue(); EndFrameBufferRender();