1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Manual unrolling preprocessor stuff and added function

Browse Source 
This function is just for GERMAN but it has a unique name so it's no
problem.

Had to slightly change how MercID gets populated
This commit is contained in:
Marco Antonio J. Costa
2024-12-31 16:28:44 -03:00
parent 5fb989a1fc
commit cf0b4dfc40
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ja2/jascreens.cpp
-2
View File
@@ -959,7 +959,6 @@ void DoneFadeOutForDemoExitScreen( void )
// unused // unused
//extern INT8 gbFadeSpeed; //extern INT8 gbFadeSpeed;
#ifdef GERMAN
void DisplayTopwareGermanyAddress() void DisplayTopwareGermanyAddress()
{ {
VOBJECT_DESC vo_desc; VOBJECT_DESC vo_desc;
@@ -994,7 +993,6 @@ void DisplayTopwareGermanyAddress()
ExecuteBaseDirtyRectQueue(); ExecuteBaseDirtyRectQueue();
EndFrameBufferRender(); EndFrameBufferRender();
} }
#endif
UINT32 DemoExitScreenHandle(void) UINT32 DemoExitScreenHandle(void)
{ {
Laptop/AimMembers.cpp
+11 -5
View File
@@ -5367,11 +5367,17 @@ BOOLEAN DisplayShadedStretchedMercFace( UINT8 ubMercID, UINT16 usPosX, UINT16 us
void DemoHiringOfMercs( ) void DemoHiringOfMercs( )
{ {
INT16 i; INT16 i;
#ifdef GERMAN UINT8 MercID[5];
UINT8 MercID[]={ 7, 10, 4, 14, 50 }; MercID[0] = 7;
#else MercID[1] = 10;
UINT8 MercID[]={ 7, 10, 4, 42, 33 }; MercID[2] = 4;
#endif if( g_lang == i18n::Lang::de ) {
MercID[3] = 14;
MercID[4] = 50;
} else {
MercID[3] = 42;
MercID[4] = 33;
}
MERC_HIRE_STRUCT HireMercStruct; MERC_HIRE_STRUCT HireMercStruct;
static BOOLEAN fHaveCalledBefore=FALSE; static BOOLEAN fHaveCalledBefore=FALSE;