mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
*** Merged Code from Multiplayer Branch Revision 2960 ***
- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-) - Multiplayer Version 1.1 + some additional features and bugfixes * INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory * git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -487,8 +487,8 @@ void ExitFloristOrderForm()
|
||||
RemoveButton( guiFlowerOrderGalleryButton );
|
||||
|
||||
//Store the text fields
|
||||
Get16BitStringFromField( 1, gsSentimentTextField );
|
||||
Get16BitStringFromField( 2, gsNameTextField );
|
||||
Get16BitStringFromField( 1, gsSentimentTextField, 75 );
|
||||
Get16BitStringFromField( 2, gsNameTextField, 35 );
|
||||
gbCurrentlySelectedCard = -1;
|
||||
|
||||
|
||||
@@ -1039,12 +1039,12 @@ BOOLEAN CreateDestroyFlowerOrderDestDropDown( UINT8 ubDropDownMode )
|
||||
//if its the personel sentiment field
|
||||
if( ubTextFieldID == 1 )
|
||||
{
|
||||
Get16BitStringFromField( ubTextFieldID, gsSentimentTextField );
|
||||
Get16BitStringFromField( ubTextFieldID, gsSentimentTextField, 75 );
|
||||
}
|
||||
else if( ubTextFieldID == 2 )
|
||||
{
|
||||
//else its the name field
|
||||
Get16BitStringFromField( ubTextFieldID, gsNameTextField );
|
||||
Get16BitStringFromField( ubTextFieldID, gsNameTextField, 35 );
|
||||
}
|
||||
|
||||
SetActiveField(0);
|
||||
@@ -1074,7 +1074,7 @@ BOOLEAN CreateDestroyFlowerOrderDestDropDown( UINT8 ubDropDownMode )
|
||||
|
||||
//disable the text entry fields
|
||||
// DisableAllTextFields();
|
||||
Get16BitStringFromField( 1, gsSentimentTextField );
|
||||
Get16BitStringFromField( 1, gsSentimentTextField, 75 );
|
||||
KillTextInputMode();
|
||||
|
||||
//disable the clear order and accept order buttons, (their rendering interferes with the drop down graphics)
|
||||
@@ -1267,12 +1267,12 @@ void HandleFloristOrderKeyBoardInput()
|
||||
//if its the personel sentiment field
|
||||
if( ubTextFieldID == 1 )
|
||||
{
|
||||
Get16BitStringFromField( ubTextFieldID, gsSentimentTextField );
|
||||
Get16BitStringFromField( ubTextFieldID, gsSentimentTextField, 75 );
|
||||
}
|
||||
else if( ubTextFieldID == 2 )
|
||||
{
|
||||
//else its the name field
|
||||
Get16BitStringFromField( ubTextFieldID, gsNameTextField );
|
||||
Get16BitStringFromField( ubTextFieldID, gsNameTextField, 35 );
|
||||
}
|
||||
|
||||
SetActiveField(0);
|
||||
|
||||
Reference in New Issue
Block a user