Merged revision(s) 6894 from branches/ja2_source_official_2014:

Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-10 00:28:04 +00:00
parent 8d07ebccc0
commit cb3304e93f
17 changed files with 151 additions and 139 deletions
+3
View File
@@ -168,4 +168,7 @@ extern UINT8 gubDescBoxLine;
// Record how many lines there are for the current item in the Advanced tab.
extern UINT8 gubDescBoxTotalAdvLines;
// Jenilee: determine the cost of moving this item around in our inventory
UINT16 GetInvMovementCost(OBJECTTYPE* pObj, INT16 old_pos, INT16 new_pos);
#endif