diff options
author | James Haley | 2010-09-16 13:06:09 +0000 |
---|---|---|
committer | James Haley | 2010-09-16 13:06:09 +0000 |
commit | 8bc7af8cbbf6ef3c68880c05f37604a4a49db071 (patch) | |
tree | 0a172be5692ff8b8fce56ebcc490584d34090c9d /src/strife/p_dialog.h | |
parent | 050936093f9dfe6b835e2b815fb3974aa0699cc8 (diff) | |
download | chocolate-doom-8bc7af8cbbf6ef3c68880c05f37604a4a49db071.tar.gz chocolate-doom-8bc7af8cbbf6ef3c68880c05f37604a4a49db071.tar.bz2 chocolate-doom-8bc7af8cbbf6ef3c68880c05f37604a4a49db071.zip |
Had to majorly deconflict p_doors.c; kept my version of lock switch in
EV_VerticalDoor because it had all the types present and no errors such
as missing parentheses. Please tell me next time if you're going to
start working on the same thing I am doing, as I don't like wasting my
entire evening.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2093
Diffstat (limited to 'src/strife/p_dialog.h')
-rw-r--r-- | src/strife/p_dialog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/strife/p_dialog.h b/src/strife/p_dialog.h index 9b4829e7..91cc99a8 100644 --- a/src/strife/p_dialog.h +++ b/src/strife/p_dialog.h @@ -78,6 +78,7 @@ void P_DialogDoChoice(int choice); boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type);
void P_DialogStartP1(void);
mapdialog_t* P_DialogFind(mobjtype_t type, int jumptoconv);
+int P_PlayerHasItem(player_t *player, mobjtype_t type);
#endif
|