Skip to content
Snippets Groups Projects
Commit 6b70240e authored by John Hodge's avatar John Hodge
Browse files

Merge branch 'master' of github.com:ucc/OpenDispense2

parents 73c92939 9848ce7d
No related merge requests found
...@@ -101,7 +101,7 @@ int Door_CanDispense(int User, int Item) ...@@ -101,7 +101,7 @@ int Door_CanDispense(int User, int Item)
// Sanity please // Sanity please
if( Item != 0 ) return -1; if( Item != 0 ) return -1;
if( !(Bank_GetFlags(User) & USER_FLAG_DOORGROUP) ) if( !(Bank_GetFlags(User) & (USER_FLAG_DOORGROUP|USER_FLAG_ADMIN)) )
{ {
#if DEBUG #if DEBUG
printf("Door_CanDispense: User %i not in door\n", User); printf("Door_CanDispense: User %i not in door\n", User);
...@@ -129,7 +129,7 @@ int Door_DoDispense(int User, int Item) ...@@ -129,7 +129,7 @@ int Door_DoDispense(int User, int Item)
if( Item != 0 ) return -1; if( Item != 0 ) return -1;
// Check if user is in door // Check if user is in door
if( !(Bank_GetFlags(User) & USER_FLAG_DOORGROUP) ) if( !(Bank_GetFlags(User) & (USER_FLAG_DOORGROUP|USER_FLAG_ADMIN)) )
{ {
#if DEBUG #if DEBUG
printf("Door_CanDispense: User %i not in door\n", User); printf("Door_CanDispense: User %i not in door\n", User);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment