1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- reseted IMP activation text box after creating an IMP

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-11-06 21:09:37 +00:00
parent f839dcbe73
commit b53eec588d
5 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.614" };
INT16 zVersionLabel[256] = { L"Release v1.13.620" };
#endif
INT8 czVersionNumber[16] = { "Build 06.11.02" };
INT8 czVersionNumber[16] = { "Build 06.11.06" };
INT16 zTrackingNumber[16] = { L"Z" };
JA2.suo
BIN
View File
Binary file not shown.
JA2.vcproj
+2 -2
View File
@@ -43,7 +43,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_609.exe"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_620.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_614.exe"
OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_620.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
Laptop/IMP Confirm.cpp
+3
View File
@@ -811,6 +811,9 @@ BOOLEAN LoadImpCharacter( STR nickName )
}
else
{
// close file
FileClose(hFile);
// You cannot have more than 3 I.M.P characters with the same gender on your team.
DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 9 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
return FALSE;
Laptop/IMP HomePage.cpp
+21 -1
View File
@@ -48,6 +48,8 @@ INT32 GlowColorsList[][3] ={
// btn callbacks
void BtnIMPAboutUsCallback(GUI_BUTTON *btn,INT32 reason);
void ResetActivationStringTextBox(void);
// position defines
#define IMP_PLAYER_ACTIVATION_STRING_X LAPTOP_SCREEN_UL_X + 261
#define IMP_PLAYER_ACTIVATION_STRING_Y LAPTOP_SCREEN_WEB_UL_Y + 336
@@ -306,7 +308,6 @@ void HandleTextEvent( UINT32 uiKey )
{
// this function checks to see if a letter or a backspace was pressed, if so, either put char to screen
// or delete it
switch( uiKey )
{
case ( BACKSPACE ):
@@ -430,6 +431,9 @@ void ProcessPlayerInputActivationString( void )
{
if (LoadImpCharacter( IMP_MERC_FILENAME ) == TRUE)
{
// Reset activation text box
ResetActivationStringTextBox();
//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId );
}
@@ -453,6 +457,9 @@ void ProcessPlayerInputActivationString( void )
{
if (LoadImpCharacter( charPlayerActivationString ) == TRUE)
{
// Reset activation text box
ResetActivationStringTextBox();
//DoLapTopMessageBox( MSG_BOX_IMP_STYLE, pImpPopUpStrings[ 11 ], LAPTOP_SCREEN, MSG_BOX_FLAG_OK, NULL);
AddEmail(IMP_EMAIL_PROFILE_RESULTS, IMP_EMAIL_PROFILE_RESULTS_LENGTH, IMP_PROFILE_RESULTS, GetWorldTotalMin( ), PLAYER_GENERATED_CHARACTER_ID + LaptopSaveInfo.iVoiceId );
}
@@ -477,7 +484,20 @@ void ProcessPlayerInputActivationString( void )
return;
}
void ResetActivationStringTextBox(void)
{
// Reset activation text box
for (int i = 0; i < iStringPos; i++)
{
pPlayerActivationString[i] = 0;
}
iStringPos = 0;
uiCursorPosition = StringPixLength( pPlayerActivationString, FONT14ARIAL ) + IMP_PLAYER_ACTIVATION_STRING_X;
DisplayPlayerActivationString();
DisplayActivationStringCursor();
}
void CreateIMPHomePageButtons( void )
{