Fixed a logic error allowing players to bank during a fight

git-svn-id: https://svn.code.sf.net/p/gameservirc/code/trunk@196 bc333340-6410-0410-a689-9d09f3c113fa

diff --git a/gameserv/Changes b/gameserv/Changes
index c0f6ded0cb8a374692dc3485e9e09b09c2d34e49..002858b5e3a7dbf39f539ee25564b172562c6c32 100644 (file)
--- a/gameserv/Changes
+++ b/gameserv/Changes
@@ -1,5 +1,7 @@
 Version 1.2.3
+* Fixed a logic error allowing players to bank during a fight - kain
 * Added more gold per monster above level 4 - kain
+
 Version 1.2.2
 * Fixed a logical error causing the ListenOnCF flag to only work in P10 
     servers - kain

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index d2e37a4f4931f048de5b0cc9154efa6b04a64eb8..fae663584a45344aacaa9636ee128c73c502241d 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -2563,7 +2563,11 @@ void do_bank(char *u)
        notice(s_GameServ, u, "You must be playing to use the bank!");
        return;
     }
-
+    else if (is_fighting(user))
+    {
+       notice(s_GameServ, u, "You can't go to the bank during a fight!");
+       return;
+    }
     updateTS(user->stats);
     if (stricmp(cmd, "BALANCE") == 0)
     {