Merged "Enhanced IMP Creation" (by Sandro)

- For code changes search for // SANDRO
- Tooltips can now be toggled on/off in the options screen instead of "Random IMP Personality" option
- Updated Version Number for new Release Build (2949)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-06-04 10:44:23 +00:00
parent e983a0ccc6
commit 7445ba2051
40 changed files with 3638 additions and 161 deletions
+71
View File
@@ -25,6 +25,11 @@
#include "IMP Confirm.h"
#include "messageboxscreen.h"
#include "LaptopSave.h"
// These 4 added - SANDRO
#include "IMP Character and Disability Entrance.h"
#include "IMP Character Trait.h"
#include "IMP Disability Trait.h"
#include "IMP Color Choosing.h"
#endif
@@ -250,6 +255,19 @@ void HandleCharProfile()
case( IMP_CONFIRM ):
HandleIMPConfirm( );
break;
// These 4 added - SANDRO
case( IMP_CHARACTER_AND_DISABILITY_ENTRANCE ):
HandleIMPCharacterAndDisabilityEntrance( );
break;
case( IMP_CHARACTER_PAGE ):
HandleIMPCharacterTrait( );
break;
case( IMP_DISABILITY_PAGE ):
HandleIMPDisabilityTrait( );
break;
case( IMP_COLOR_CHOICE_PAGE ):
HandleIMPColorChoice( );
break;
}
return;
@@ -310,6 +328,19 @@ void RenderCharProfile()
case( IMP_CONFIRM ):
RenderIMPConfirm( );
break;
// These 4 added - SANDRO
case( IMP_CHARACTER_AND_DISABILITY_ENTRANCE ):
RenderIMPCharacterAndDisabilityEntrance( );
break;
case( IMP_CHARACTER_PAGE ):
RenderIMPCharacterTrait( );
break;
case( IMP_DISABILITY_PAGE ):
RenderIMPDisabilityTrait( );
break;
case( IMP_COLOR_CHOICE_PAGE ):
RenderIMPColorChoice( );
break;
}
// render title bar
@@ -394,6 +425,23 @@ void ExitOldIMPMode( void )
case( IMP_CONFIRM ):
ExitIMPConfirm( );
break;
// These 4 added - SANDRO
case( IMP_CHARACTER_AND_DISABILITY_ENTRANCE ):
DestroyIMPButtons( );
ExitIMPCharacterAndDisabilityEntrance( );
break;
case( IMP_CHARACTER_PAGE ):
DestroyIMPButtons( );
ExitIMPCharacterTrait( );
break;
case( IMP_DISABILITY_PAGE ):
DestroyIMPButtons( );
ExitIMPDisabilityTrait( );
break;
case( IMP_COLOR_CHOICE_PAGE ):
DestroyIMPButtons( );
ExitIMPColorChoice( );
break;
}
return;
@@ -460,6 +508,23 @@ void EnterNewIMPMode( void )
case( IMP_CONFIRM ):
EnterIMPConfirm( );
break;
// These 4 added - SANDRO
case( IMP_CHARACTER_AND_DISABILITY_ENTRANCE ):
CreateIMPButtons( );
EnterIMPCharacterAndDisabilityEntrance( );
break;
case( IMP_CHARACTER_PAGE ):
CreateIMPButtons( );
EnterIMPCharacterTrait( );
break;
case( IMP_DISABILITY_PAGE ):
CreateIMPButtons( );
EnterIMPDisabilityTrait( );
break;
case( IMP_COLOR_CHOICE_PAGE ):
CreateIMPButtons( );
EnterIMPColorChoice( );
break;
}
@@ -549,6 +614,8 @@ void LoadImpGraphics( void )
LoadAvgMercIndentFrame( );
LoadAboutUsIndentFrame( );
LoadAttribStartingLevelFrame( ); // Added by SANDRO
LoadColorChoiceFrame( ); // Added by SANDRO
return;
@@ -599,6 +666,10 @@ void RemoveImpGraphics( void )
DeleteAttrib2IndentFrame( );
DeleteAvgMercIndentFrame( );
DeleteAboutUsIndentFrame( );
DeleteAttribStartingLevelFrame( ); // Added by SANDRO
DeleteColorChoiceFrame( ); // Added by SANDRO
return;
}