diff options
| author | James Haley | 2010-09-09 02:08:43 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-09 02:08:43 +0000 |
| commit | 95482c25b1e0ec85c90a9150c6c1da4a6aff1046 (patch) | |
| tree | e201f372602290b4d2396d4519dc7ed11dc6d571 /src/strife/p_mobj.h | |
| parent | 4c569339b73b05a6bb3a0420ee88c06b30c726ad (diff) | |
| download | chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.tar.gz chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.tar.bz2 chocolate-doom-95482c25b1e0ec85c90a9150c6c1da4a6aff1046.zip | |
Changed mobj_t::allegiance to mobj_t::miscdata due to the fact it has
two completely different uses. Finished P_DialogDoChoice; dialog is now
virtually 100% functional (just needs finished inventory to really do
much beyond initial dialogs or getting "no" messages from everybody).
Subversion-branch: /branches/strife-branch
Subversion-revision: 2048
Diffstat (limited to 'src/strife/p_mobj.h')
| -rw-r--r-- | src/strife/p_mobj.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/strife/p_mobj.h b/src/strife/p_mobj.h index 09013395..b7865ff0 100644 --- a/src/strife/p_mobj.h +++ b/src/strife/p_mobj.h @@ -325,8 +325,10 @@ typedef struct mobj_s // Thing being chased/attacked for tracers. struct mobj_s* tracer; - // [STRIFE] haleyjd 09/05/10: allegiance, for friends and teleport beacons - byte allegiance; + // [STRIFE] haleyjd 09/05/10: + // * In multiplayer this stores allegiance, for friends and teleport beacons + // * In single-player this tracks dialog state. + byte miscdata; } mobj_t; |