Fix several crucial bits of data not being loaded

- Creature save data
- Outdoor wandering encounters
- Fix crash when entering outdoor combat after loading
- Stop using char types in cItemRec
- Move all pending attributes from cMonster to cCreature
This commit is contained in:
2014-04-21 21:35:26 -04:00
parent e8022df514
commit 434d4c522f
10 changed files with 85 additions and 57 deletions

View File

@@ -21,24 +21,24 @@ class cItemRec {
public:
eItemType variety;
short item_level;
char awkward;
char bonus;
char protection;
char charges;
int awkward;
int bonus;
int protection;
int charges;
eWeapType type;
char magic_use_type;
int magic_use_type;
unsigned short graphic_num;
eItemAbil ability;
unsigned char ability_strength;
unsigned int ability_strength;
unsigned short type_flag;
unsigned char is_special;
unsigned int is_special;
short value;
unsigned char weight;
unsigned char special_class;
unsigned int weight;
unsigned int special_class;
location item_loc;
std::string full_name;
std::string name;
unsigned char treas_class;
unsigned int treas_class;
//unsigned char item_properties;
bool ident : 1;
bool property : 1;
@@ -49,8 +49,8 @@ public:
bool enchanted : 1;
bool unsellable : 1;
private:
unsigned char reserved1;
unsigned char reserved2;
unsigned int reserved1;
unsigned int reserved2;
public:
//string desc; // for future use
unsigned char rec_treas_class() const;