comparison NPC.h @ 252:e22e2357c8b3

Merge
author Gloval
date Mon, 18 Feb 2013 08:59:34 +0400
parents 48f21f569328 37dcbe8f3cca
children f1218b9d67f1
comparison
equal deleted inserted replaced
251:48f21f569328 252:e22e2357c8b3
15 15
16 /* 136 */ 16 /* 136 */
17 #pragma pack(push, 1) 17 #pragma pack(push, 1)
18 struct NPCData 18 struct NPCData
19 { 19 {
20 inline bool Hired() {return uFlags & 0x80;}
21
20 char *pName; 22 char *pName;
21 unsigned int uPortraitID; 23 unsigned int uPortraitID;
22 unsigned int uFlags; // & 0x80 no greeting on dialogue start 24 unsigned int uFlags; // & 0x80 no greeting on dialogue start; looks like hired
23 int fame; 25 int fame;
24 int rep; 26 int rep;
25 int house; 27 int house;
26 unsigned int uProfession; 28 unsigned int uProfession;
27 int greet; 29 int greet;