From a9b21bda2177190eb7d0c358dd93665685946c02 Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 22 Oct 2006 19:59:46 +0000 Subject: [PATCH] - updated language defines (thx to Sergeant_Kolja) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@603 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Intro.cpp | 17 +++++++++++++++++ JA2.suo | Bin 197632 -> 197632 bytes Language Defines.h | 46 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/Intro.cpp b/Intro.cpp index 24964e78f..ad49ebf7c 100644 --- a/Intro.cpp +++ b/Intro.cpp @@ -504,9 +504,26 @@ void DisplaySirtechSplashScreen() // FilenameForBPP("INTERFACE\\TShold.sti", VObjectDesc.ImageFile); if( !AddVideoObject(&VObjectDesc, &uiLogoID) ) { + FilenameForBPP("GERMAN\\SPLASH_GERMAN.sti", VObjectDesc.ImageFile); + if( !AddVideoObject(&VObjectDesc, &uiLogoID) ) + { + /* + * This is the place, where most non english coders stranding. + * Don't hesitate, don't give up! + * I'll now tell You what You made wrong + * (2006-10-10, Sergeant_Kolja) + */ + #ifdef _DEBUG + # if defined(ENGLISH) + AssertMsg( 0, String( "Wheter English nor German works. May be You built English - but have only German or other foreign Disk?" ) ); + # elif defined(GERMAN) + AssertMsg( 0, String( "Weder Englisch noch Deutsch geht. Deutsche Version kompiliert und mit englischer CDs gestartet? Das geht nicht!" ) ); + # endif + #endif AssertMsg( 0, String( "Failed to load %s", VObjectDesc.ImageFile ) ); return; } + } GetVideoObject(&hPixHandle, uiLogoID); BltVideoObject(FRAME_BUFFER, hPixHandle, 0,(SCREEN_WIDTH-640)/2, (SCREEN_HEIGHT-480)/2, VO_BLT_SRCTRANSPARENCY,NULL); diff --git a/JA2.suo b/JA2.suo index e9b33e8dd43050adfad35f7fc45691f6d3a33bf8..2d5c7a9c5df3fc1d12e229d81b6c6c7461f507bb 100644 GIT binary patch delta 1071 zcmZXTZ%9*76u{4UzD?hJzD+ls&VN%&#iFA8pf$?;lORb&_9a9bIxMzKO#>(Rr=lb% zlpEflKg>yJNsvvQpGs@mmjvr$kw|^7K2(TN>)dG>`QZ1?pLgzg=iYN}PoLV;r#>#1 zlr#YN6%L0jtXj&{8OTZxv`9ZtGi|SFvwWY&C~`qxz$?$AoF)MT%Jma^so5J?Rbwz# z21F46U}SNcRZ)dT9A@#FnU!cAvN;KW^|D0vMk}zmHSrCc&&0 z;u&{$px>tX3ljYK68mCP1FFNLNe2C}x5~@+4`C_RGMuYqp^)vbmW06Gg)Xty#Uj@A zQ)A2aj6lQuonlru=jV$9n9Uz7pfjQxq&6g+0b5f?8pUBt-ITdAN6Es3Qb*vFwV25)4X&T)oE9A@9 zrAVqgk&3r`z_YyHiG^`*BSQut1F`2?Q7YtC!PmSUNzvsj)y!bVq5>yY1%#~fvl zlKY5sG2g{z+D#$x=Uf)X3KKp*eYCU}YN3kuzni2T4n>CA6&dTb(mkT<{M8Do+$Uo; z{%1can8B$VcroKZ;==j_B nB5}dM2FK|dwbMnar(Ut~uNC}m5FI0U4fR)X0)sdqg^&COrwRh6 delta 530 zcmXX@O=uHA6n@`i(&lHK)@Ex68L6zA~qzHh$w-n=*NqUA1HYa=Y4 zBBE9phW+v^+Y?P|mhf+~KM=&ee1G?&iHMeH!LRTpxH0-8ZO_}-<}H8AiXlk^7z0sK z?hrk36GaWkogyVqiaGA@(qut)%TMC4ofP_Nl=4)hGTqQ<@;WIe5DiSsCZTUFx3tpe_ zhMDJdt>AmFl?f=lpi{v8KQZ+TzvF^_%((`5|CRK1E~u<;B-OocXPgK`}reL{~* zdU$hs=xgK^5=3EmkkS87ptW&_ZCrGi;q7Lp#Hbfl%F;19Me=Clxaptp9H{jxsNJir KBB-sh(%3(;dzVE3 diff --git a/Language Defines.h b/Language Defines.h index 5c95c2406..438577df7 100644 --- a/Language Defines.h +++ b/Language Defines.h @@ -1,18 +1,58 @@ #ifndef __LANGUAGE_DEFINES_H #define __LANGUAGE_DEFINES_H -//ONLY ONE OF THESE CAN BE DEFINED AT A TIME! +#pragma once +/* ============================================================================ + * ONLY ONE OF THESE LANGUAGES CAN BE DEFINED AT A TIME! + * BUT now You can define it _here_ by uncommenting one _or_ (better): + * You can comment them all out and then set it _global_ in "Preprocessor + * options" (do it for ALL projects in the workspace and both debug & release) + * _or_ + * give it do Your MAKEFILE, f.i. make ENGLISH, but keep in mind that some + * weird make tools will require 'make ENGLISH=1' instead + * + * using one of the two later methods will keep this SVN file unchanged for the + * future, only Your private project files (workspace/solution) will differ + * from the SVN stuff. + * (2006-10-10, Sergeant_Kolja) + */ + +#if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) +/* please set one manually here (by uncommenting) if not willingly to set Workspace wide */ #define ENGLISH //#define GERMAN //#define RUSSIAN //#define DUTCH //#define POLISH +#endif + + + +/* ==================================================================== + * Regardless of if we did it Workspace wide or by uncommenting above, + * HERE we must see, what languaga was selected. If one, we + */ +#if defined(ENGLISH) +# pragma message(" (Language set to ENGLISH, You'll need english CDs)") +#elif defined(GERMAN) +# pragma message(" (Language set to GERMAN, You'll need Topware/german CDs)") +#elif defined(RUSSIAN) +# pragma message(" (Language set to RUSSIAN, You'll need russian CDs)") +#elif defined(DUTCH) +# pragma message(" (Language set to DUTCH, You'll need dutch CDs)") +#elif defined(POLISH) +# pragma message(" (Language set to POLISH, You'll need polish CDs)") +#else +# error "At least You have to specify a Language somewhere. See comments above." +#endif + + + + #define BLOOD_N_GORE_ENABLED - - //if the language represents words as single chars #ifdef TAIWAN #define SINGLE_CHAR_WORDS