From 8e5f803fc43e5fc26d83223e54d8e1475e18f70c Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 25 Feb 2007 13:41:15 +0000 Subject: [PATCH] - updated credits screen to the 1.13 Credits - translated "low cpu usage" option text for german version - improved existing "escorting kulbas" bugfix git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@741 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Credits.cpp | 183 +++++++++++++++++++++++++++++--- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Interface Dialogue.cpp | 4 +- Utils/Text.h | 1 + Utils/_DutchText.cpp | 13 ++- Utils/_EnglishText.cpp | 15 ++- Utils/_FrenchText.cpp | 15 ++- Utils/_GermanText.cpp | 15 ++- Utils/_ItalianText.cpp | 15 ++- Utils/_PolishText.cpp | 15 ++- Utils/_RussianText.cpp | 15 ++- 11 files changed, 263 insertions(+), 28 deletions(-) diff --git a/Credits.cpp b/Credits.cpp index c5d854f38..0631a0f7c 100644 --- a/Credits.cpp +++ b/Credits.cpp @@ -3,9 +3,13 @@ #include "JA2 All.h" #include "Credits.h" #include "Encrypted File.h" + //#include "Utils All.h" + #include "Language Defines.h" #else #include "Types.h" #include "Credits.h" + //#include "Utils All.h" + #include "Language Defines.h" #endif @@ -530,7 +534,7 @@ BOOLEAN EnterCreditsScreen() giCurrentlySelectedFace = -1; gfPauseCreditScreen = FALSE; - InitCreditEyeBlinking(); + //InitCreditEyeBlinking(); return( TRUE ); @@ -584,7 +588,7 @@ void HandleCreditScreen() HandleCreditNodes(); //Handle the blinkng eyes - HandleCreditEyeBlinking(); + //HandleCreditEyeBlinking(); //is it time to get a new node @@ -655,7 +659,7 @@ void GetCreditScreenUserInput() SetCreditsExitScreen( MAINMENU_SCREEN ); break; -#ifdef JA2TESTVERSION +//#ifdef JA2TESTVERSION case 'r': gubCreditScreenRenderFlags = CRDT_RENDER_ALL; break; @@ -679,7 +683,7 @@ void GetCreditScreenUserInput() else gfPauseCreditScreen = TRUE; break; -#endif +//#endif } } } @@ -1095,7 +1099,7 @@ BOOLEAN GetNextCreditFromTextFile() break; case 1: - wcscpy(zOriginalString, L"@T,{;JA2: Whitehat Project Team"); + wcscpy(zOriginalString, pCreditsJA2113[0]); break; case 2: @@ -1103,36 +1107,185 @@ BOOLEAN GetNextCreditFromTextFile() break; case 3: - wcscpy(zOriginalString, L"@T,C163,{;Programming"); + wcscpy(zOriginalString, pCreditsJA2113[1]); break; case 4: - wcscpy(zOriginalString, L"Alex \"Digicrab\" Vostrov"); + wcscpy(zOriginalString, L"Kaiden"); break; case 5: - wcscpy(zOriginalString, L"Michal \"Joker\" Laskowski"); + wcscpy(zOriginalString, L"Lesh"); break; case 6: - wcscpy(zOriginalString, L"@};Jackaians"); + wcscpy(zOriginalString, L"Little Alien"); break; case 7: - wcscpy(zOriginalString, L"@T,{;Project Organization"); + wcscpy(zOriginalString, L"Madd Mugsy"); break; case 8: - wcscpy(zOriginalString, L"Shanga"); + wcscpy(zOriginalString, L"@};Roman"); break; case 9: - wcscpy(zOriginalString, L"@};Keith \"Mouse Master\" Scroggins"); + wcscpy(zOriginalString, pCreditsJA2113[2]); break; + case 10: + wcscpy(zOriginalString, L"BulletSix"); + break; + + case 11: + wcscpy(zOriginalString, L"Corpse"); + break; + + case 12: + wcscpy(zOriginalString, L"John Wright"); + break; + + case 13: + wcscpy(zOriginalString, L"Khor"); + break; + + case 14: + wcscpy(zOriginalString, L"Lisac"); + break; + + case 15: + wcscpy(zOriginalString, L"Madd Mugsy"); + break; + + case 16: + wcscpy(zOriginalString, L"Marlboro Man"); + break; + + case 17: + wcscpy(zOriginalString, L"Scorpion"); + break; + + case 18: + wcscpy(zOriginalString, L"Starwalker"); + break; + + case 19: + wcscpy(zOriginalString, L"Tbird94lx"); + break; + + case 20: + wcscpy(zOriginalString, L"Terry Thorne"); + break; + + case 21: + wcscpy(zOriginalString, pCreditsJA2113[3]); + break; + + case 22: + wcscpy(zOriginalString, pCreditsJA2113[4]); + break; + + case 23: + wcscpy(zOriginalString, L"Madd Mugsy"); + break; + + case 24: + wcscpy(zOriginalString, L"Starwalker"); + break; + + case 25: + wcscpy(zOriginalString, L"@};Lisac"); + break; + + case 26: + wcscpy(zOriginalString, pCreditsJA2113[5]); + break; + + case 27: + wcscpy(zOriginalString, L"BearPit"); + break; + + case 28: + wcscpy(zOriginalString, L"Bugmonster"); + break; + + case 29: + wcscpy(zOriginalString, L"Captain J"); + break; + + case 30: + wcscpy(zOriginalString, L"DeFrog"); + break; + + case 31: + wcscpy(zOriginalString, L"Farmer Toby"); + break; + + case 32: + wcscpy(zOriginalString, L"Headrock"); + break; + + case 33: + wcscpy(zOriginalString, L"Jones"); + break; + + case 34: + wcscpy(zOriginalString, L"Judge"); + break; + + case 35: + wcscpy(zOriginalString, L"Nitrat"); + break; + + case 36: + wcscpy(zOriginalString, L"Pulmu"); + break; + + case 37: + wcscpy(zOriginalString, L"Realist"); + break; + + case 38: + wcscpy(zOriginalString, L"Scorpion"); + break; + + case 39: + wcscpy(zOriginalString, L"Sergeant Kolja"); + break; + + case 40: + wcscpy(zOriginalString, L"ShadoWarrior"); + break; + + case 41: + wcscpy(zOriginalString, L"Snap"); + break; + + case 42: + wcscpy(zOriginalString, L"TheDrill"); + break; + + case 43: + wcscpy(zOriginalString, L"Wil473"); + break; + + case 44: + wcscpy(zOriginalString, pCreditsJA2113[6]); + break; + + // Additonal lines for free space + case 45: + wcscpy(zOriginalString, L"@T,B40,C208,{; "); + break; + + case 46: + wcscpy(zOriginalString, L"@}; "); + break; + default: //Get the current Credit record - uiStartLoc = CREDITS_LINESIZE * (guiCurrentCreditRecord-10); + uiStartLoc = CREDITS_LINESIZE * (guiCurrentCreditRecord-47); if( !LoadEncryptedDataFromFile( CRDT_NAME_OF_CREDIT_FILE, zOriginalString, uiStartLoc, CREDITS_LINESIZE ) ) { //there are no more credits @@ -1465,7 +1618,9 @@ void HandleCreditEyeBlinking() { if( ( GetJA2Clock() - gCreditFaces[ubCnt].uiLastBlinkTime ) > (UINT32)gCreditFaces[ubCnt].sBlinkFreq ) { - BltVideoObject( FRAME_BUFFER, hPixHandle, (UINT8)(ubCnt*3), gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, VO_BLT_SRCTRANSPARENCY, NULL); + // EXCEPTION IS THROWN HERE! + BltVideoObject( FRAME_BUFFER, hPixHandle, (UINT8)(ubCnt*3), gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, VO_BLT_SRCTRANSPARENCY, NULL); + InvalidateRegion( gCreditFaces[ubCnt].sEyeX, gCreditFaces[ubCnt].sEyeY, gCreditFaces[ubCnt].sEyeX + CRDT_EYE_WIDTH, gCreditFaces[ubCnt].sEyeY + CRDT_EYE_HEIGHT ); gCreditFaces[ubCnt].uiLastBlinkTime = GetJA2Clock(); diff --git a/JA2.suo b/JA2.suo index e171899aebac66e0e6a0f744dfd15f6573cd1a91..7ccb30ec9f7f44f515181d156a49cf8bba3b9fa4 100644 GIT binary patch delta 15124 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 LcIHp|P4@o>S^lEZ delta 13674 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 diff --git a/Tactical/Interface Dialogue.cpp b/Tactical/Interface Dialogue.cpp index e0e7fcabc..b6c327bc1 100644 --- a/Tactical/Interface Dialogue.cpp +++ b/Tactical/Interface Dialogue.cpp @@ -4361,7 +4361,9 @@ BOOLEAN PlayerTeamHasTwoSpotsLeft( ) // WANNE //if ( uiCount <= (UINT32) (gTacticalStatus.Team[ gbPlayerNum ].bLastID - 2) - 2 ) - if ( uiCount <= (18 - 2) ) + //if ( uiCount <= (18 - 2) ) + + if ( uiCount <= (UINT32) (gTacticalStatus.Team[ gbPlayerNum].bLastID - 2) - 1 ) { return( TRUE ); } diff --git a/Utils/Text.h b/Utils/Text.h index c7449990d..7d4c269e5 100644 --- a/Utils/Text.h +++ b/Utils/Text.h @@ -7,6 +7,7 @@ #define STRING_LENGTH 255 +extern STR16 pCreditsJA2113[]; extern UINT16 ShortItemNames[MAXITEMS][80]; extern UINT16 ItemNames[MAXITEMS][80]; extern UINT16 AmmoCaliber[MAXITEMS][20]; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index af3014065..5c98fcd06 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -101,6 +101,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3561,7 +3572,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index b83ff55d0..958f23c5e 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -107,6 +107,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3483,7 +3494,7 @@ STR16 zOptionsToggleText[] = L"Random I.M.P personality", L"Auto save", L"Silent Skyrider", - L"Low CPU Usage", + L"Low CPU usage", }; //This is the help text associated with the above toggles. @@ -3563,7 +3574,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 15e928873..d3399db38 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -106,6 +106,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3470,7 +3481,7 @@ STR16 zOptionsToggleText[] = L"Random I.M.P personality", L"Auto save", L"Silent Skyrider", - L"Low CPU Usage", + L"Low CPU usage", }; //This is the help text associated with the above toggles. @@ -3550,7 +3561,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 903cdb4f6..d013c9966 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -107,6 +107,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Entwicklungsteam", + L"@T,C144,R134,{;Programmierung", + L"@T,C144,R134,{;Grafiken und Sounds", + L"@};(Verschiedene weiter Mods!)", + L"@T,C144,R134,{;Gegenstände", + L"@T,C144,R134,{;Weitere Mitwirkende", + L"@};(Alle weiteren Community Mitglieder die Ideen und Feedback eingebracht haben!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3289,7 +3300,7 @@ STR16 zOptionsToggleText[] = L"Zufällige B.S.E Personalität", L"Automatisch speichern", L"Stummer Skyrider", - L"Low CPU Usage", + L"Niedrige CPU Belastung", }; //This is the help text associated with the above toggles. @@ -3369,7 +3380,7 @@ STR16 zOptionsScreenHelpText[] = L"Wenn diese Funktion aktiviert ist, erhalten B.S.E Charaktere zufällige Persönlichkeit und Gesinnung.", L"Wenn diese Funktion aktiviert ist, wird nach jeder Runde automatisch gespeichert.", L"Wenn diese Funktion aktiviert ist, wird Skyrider nichts mehr sprechen.", - L"Low CPU Usage", + L"Wenn diese Funktion aktiviert ist, wird das Spiel mit viel geringerer CPU Belastung laufen.", }; STR16 gzGIOScreenText[] = diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index b9f43592b..e8c41c2ed 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -99,6 +99,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3463,7 +3474,7 @@ STR16 zOptionsToggleText[] = L"Random I.M.P personality", L"Auto save", L"Silent Skyrider", - L"Low CPU Usage", + L"Low CPU usage", }; //This is the help text associated with the above toggles. @@ -3543,7 +3554,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 7a2cd9649..b1beb615a 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -100,6 +100,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"", @@ -3463,7 +3474,7 @@ STR16 zOptionsToggleText[] = L"Random I.M.P personality", L"Auto save", L"Silent Skyrider", - L"Low CPU Usage", + L"Low CPU usage", }; //This is the help text associated with the above toggles. @@ -3543,7 +3554,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 83704f38a..25850d07d 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -99,6 +99,17 @@ FAST HELP TEXT -- Explains how the syntax of fast help text works. */ +STR16 pCreditsJA2113[] = +{ + L"@T,{;JA2 v1.13 Development Team", + L"@T,C144,R134,{;Coding", + L"@T,C144,R134,{;Graphics and Sounds", + L"@};(Various other mods!)", + L"@T,C144,R134,{;Items", + L"@T,C144,R134,{;Other Contributors", + L"@};(All other community members who contributed input and feedback!)", +}; + UINT16 ItemNames[MAXITEMS][80] = { L"" @@ -3474,7 +3485,7 @@ STR16 zOptionsToggleText[] = L"Random I.M.P personality", L"Auto save", L"Silent Skyrider", - L"Low CPU Usage", + L"Low CPU usage", }; //This is the help text associated with the above toggles. @@ -3554,7 +3565,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, I.M.P characters will get random personality and attitude.", L"When ON, game will be saved in tactical after each players turn.", L"When ON, Skyrider will not talk anymore.", - L"Low CPU Usage", + L"When ON, game will run with much lower CPU usage.", };