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
+2 -2
View File
@@ -26,9 +26,9 @@ struct history{
enum{
HISTORY_ENTERED_HISTORY_MODE=0,
HISTORY_HIRED_MERC_FROM_AIM,
HISTORY_HIRED_MERC_FROM_AIM,
HISTORY_HIRED_MERC_FROM_MERC,
HISTORY_MERC_KILLED,
HISTORY_MERC_KILLED,
HISTORY_SETTLED_ACCOUNTS_AT_MERC,
HISTORY_ACCEPTED_ASSIGNMENT_FROM_ENRICO,
HISTORY_CHARACTER_GENERATED,