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
+30 -9
View File
@@ -325,7 +325,7 @@ enum
STR_SURRENDER,
STR_REFUSE_FIRSTAID,
STR_REFUSE_FIRSTAID_FOR_CREATURE,
STR_HOW_TO_USE_SKYRIDDER,
STR_HOW_TO_USE_SKYRIDDER,
STR_RELOAD_ONLY_ONE_GUN,
STR_BLOODCATS_TURN,
STR_AUTOFIRE,
@@ -547,9 +547,10 @@ enum
LOCK_HAS_BEEN_HIT,
LOCK_HAS_BEEN_DESTROYED,
DOOR_IS_BUSY,
VEHICLE_VITAL_STATS_POPUPTEXT,
NO_LOS_TO_TALK_TARGET,
VEHICLE_VITAL_STATS_POPUPTEXT,
NO_LOS_TO_TALK_TARGET,
ATTACHMENT_REMOVED,
VEHICLE_CAN_NOT_BE_ADDED,
};
enum{
@@ -820,6 +821,7 @@ enum
// Used
BOBBYR_FILTER_USED_GUNS,
BOBBYR_FILTER_USED_ARMOR,
BOBBYR_FILTER_USED_LBEGEAR,
BOBBYR_FILTER_USED_MISC,
// Armour
BOBBYR_FILTER_ARMOUR_HELM,
@@ -835,6 +837,7 @@ enum
BOBBYR_FILTER_MISC_MEDKIT,
BOBBYR_FILTER_MISC_KIT,
BOBBYR_FILTER_MISC_FACE,
BOBBYR_FILTER_MISC_LBEGEAR,
BOBBYR_FILTER_MISC_MISC,
};
@@ -1112,11 +1115,11 @@ extern STR16 zMarksMapScreenText[];
//Weapon Name and Description size
#define ITEMSTRINGFILENAME "BINARYDATA\\ITEMDESC.EDT"
#define SIZE_ITEM_NAME 160
#define SIZE_SHORT_ITEM_NAME 160
#define SIZE_ITEM_INFO 480
#define SIZE_ITEM_PROS 160
#define SIZE_ITEM_CONS 160
#define SIZE_ITEM_NAME 160
#define SIZE_SHORT_ITEM_NAME 160
#define SIZE_ITEM_INFO 480
#define SIZE_ITEM_PROS 160
#define SIZE_ITEM_CONS 160
BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString );
extern void LoadAllExternalText( void );
@@ -1325,6 +1328,8 @@ enum
SLG_BR_GREAT_TEXT,
SLG_BR_EXCELLENT_TEXT,
SLG_BR_AWESOME_TEXT,
SLG_INV_RES_ERROR,
};
extern STR16 zSaveLoadText[];
@@ -1406,6 +1411,10 @@ enum
GIO_BR_GREAT_TEXT,
GIO_BR_EXCELLENT_TEXT,
GIO_BR_AWESOME_TEXT,
GIO_INV_TEXT,
GIO_INV_OLD_TEXT,
GIO_INV_NEW_TEXT,
};
extern STR16 gzGIOScreenText[];
@@ -1547,4 +1556,16 @@ enum
MSG113_ARRIVINGREROUTED,
};
#endif
//CHRISL: NewInv messages
extern STR16 NewInvMessage[];
enum
{
NIV_CAN_NOT_PICKUP,
NIV_NO_DROP,
NIV_NO_PACK,
NIV_ZIPPER_COMBAT,
NIV_ZIPPER_NO_MOVE,
};
#endif