1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Shortened some German option-texts in the preference screen

Browse Source 
- 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
This commit is contained in:
Wanne
2006-07-02 16:53:06 +00:00
parent f9ed02ede2
commit 8f8ae869c7
9 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -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" };
JA2 Splash.cpp
+2 -2
View File
@@ -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
JA2.suo
BIN
View File
Binary file not shown.
JA2.vcproj
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.316_2006_06_30.exe"
OutputFile="C:\games\Jagged Alliance 2 DE\ja2_debug_v1.13.321_2006_07_02.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.316_2006_06_30.exe"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.321_2006_07_02.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Strategic/Strategic AI.cpp
+5 -2
View File
@@ -3947,6 +3947,9 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
SECTORINFO *pSector;
UINT8 ubSectorID;
UINT8 ubNumSoldiers;
UINT8 ubSourceSectorID;
UINT8 ubTargetSectorID;
switch( usActionCode )
{
case STRATEGIC_AI_ACTION_WAKE_QUEEN:
@@ -4016,8 +4019,8 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
if ( !gGameExternalOptions.gfSendTroopsToDrassen )
break;
UINT8 ubSourceSectorID = SEC_H13;
UINT8 ubTargetSectorID = SEC_D13;
ubSourceSectorID = SEC_H13;
ubTargetSectorID = SEC_D13;
if ( !(SectorInfo[ ubSourceSectorID ].ubNumTroops > 0) )
{
Utils/_EnglishText.cpp
+1 -1
View File
@@ -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",
};
Utils/_GermanText.cpp
+4 -4
View File
@@ -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",
};
Utils/_RussianText.cpp
+1 -1
View File
@@ -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",
};
jascreens.cpp
+7 -7
View File
@@ -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();