- Improved compatibility with different russian JA2 distribs' resources

- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521

TacticalAI/DecideAction.cpp

@@ -34,6 +34,8 @@
 #include "Dialogue Control.h"
 #endif
 
+#include "Text.h"
+
 extern BOOLEAN gfHiddenInterrupt;
 extern BOOLEAN gfUseAlternateQueenPosition;
 
@@ -2334,7 +2336,7 @@ INT8 DecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK)
 				pSoldier->bAimTime			= 0;
 				pSoldier->bDoBurst			= 1;
 
-				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Suppression Fire!" );
+				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[ MSG113_SUPPRESSIONFIRE ] );
 				Menptr[BestShot.ubOpponent].ubSuppressionPoints += pSoldier->bDoAutofire;
 				Menptr[BestShot.ubOpponent].ubSuppressorID = pSoldier->ubID;
 				return( AI_ACTION_FIRE_GUN );
@@ -4976,7 +4978,7 @@ INT8 DecideAction(SOLDIERTYPE *pSoldier)
 	{
 		if ( !sniperwarning && pSoldier->bOrders == SNIPER )
 		{
-			ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Watch out for snipers..." );
+			ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, New113Message[MSG113_WATHCHOUTFORSNIPERS] );
 			sniperwarning = TRUE;
 		}
 

TacticalAI/NPC.cpp

@@ -176,7 +176,16 @@ NPCQuoteInfo * LoadQuoteFile( UINT8 ubNPC )
 	}
 	
 	FileClose( hFile );
-
+//<SB> check for Russian script & make a runtime conversion of it to International :D
+// just offset ptr 4 bytes backward
+	if( *(DWORD*)pFileData == 0x00350039 )
+	{
+		NPCQuoteInfo * pEnglishScript = (NPCQuoteInfo *) MemAlloc( uiFileSize );
+		memcpy( pEnglishScript, ((char*)pFileData)+4, uiFileSize-4 );
+		MemFree( pFileData );
+		return( pEnglishScript );
+	}
+//</SB>
 	return( pFileData );
 }
 

TacticalAI/NPC.h

@@ -35,10 +35,10 @@
 
 typedef struct
 {
-
-#if defined( CRIPPLED_VERSION ) || defined( RUSSIAN )
-	UINT8		ubIdentifier[4];
-#endif
+//SB: unify structure for all versions
+// #if defined( CRIPPLED_VERSION ) || defined( RUSSIAN )
+// 	UINT8		ubIdentifier[4];
+// #endif
 
 	UINT16	fFlags;
 
@@ -71,9 +71,10 @@ typedef struct
 	UINT16	usGoToGridno;
 	INT16		sActionData;		// special action value	
 
-#if !defined( CRIPPLED_VERSION ) && !defined( RUSSIAN )
+//SB: unify structure for all versions
+//#if !defined( CRIPPLED_VERSION ) && !defined( RUSSIAN )
 	UINT8		ubUnused[4];
-#endif
+//#endif
 
 } NPCQuoteInfo;																									// 32 bytes