Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2008-03-08 15:15:25 +00:00
parent e16d166277
commit 43ca24dda8
649 changed files with 93359 additions and 82507 deletions
+5 -2
View File
@@ -74,6 +74,7 @@ enum
TBAR_MODE_ITEM_WEAPONS,
TBAR_MODE_ITEM_AMMO,
TBAR_MODE_ITEM_ARMOUR,
TBAR_MODE_ITEM_LBEGEAR,
TBAR_MODE_ITEM_EXPLOSIVES,
TBAR_MODE_ITEM_EQUIPMENT1,
TBAR_MODE_ITEM_EQUIPMENT2,
@@ -221,7 +222,7 @@ enum
DRAW_MODE_SELECT_BRUSH = 200,
DRAW_MODE_FILL_AREA,
DRAW_MODE_UNDO,
DRAW_MODE_ERASE = 1000
DRAW_MODE_ERASE = 1000
};
extern INT32 iEditorButton[NUMBER_EDITOR_BUTTONS];
@@ -244,7 +245,7 @@ extern BOOLEAN gfPendingBasement;
extern BOOLEAN gfPendingCaves;
//When in merc-inventory mode, this flag is set when the user wishes to get an item, which requires hooking
//into the item editing features. It is defined here, so editoritems can get access to this mode which makes
//into the item editing features. It is defined here, so editoritems can get access to this mode which makes
//certain special cases.
extern BOOLEAN gfMercGetItem;
@@ -262,3 +263,5 @@ extern BOOLEAN gfShowItemStatsPanel;