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 09e61b0cf..7260a739f 100644 Binary files a/JA2.suo and b/JA2.suo differ 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();