Fixed a couple bugs, and added Change history and TODO stuff

[irc/gameservirc.git] / gameserv / gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 6ac8c76de279d6b90be0615088ff6ba541dccfa5..7237e0e8f0ae9ed08333153875f0ff7445498fe8 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -974,14 +974,14 @@ void do_fight(char *u)
        notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
        return;
     }
-    else if (!(battle = findbyrealnick(nick)))
+    else if (!is_playing(ni))
     {
-       notice(s_GameServ, u, "You can't attack %s while they aren't playing!", nick);
+       notice(s_GameServ, u, "You are not playing!");
        return;
     }
-    else if (!is_playing(ni))
+    else if (!(battle = findplayer(nick)))
     {
-       notice(s_GameServ, u, "You are not playing!");
+       notice(s_GameServ, u, "You can't attack %s while they aren't playing!", nick);
        return;
     }
 /*
@@ -1048,7 +1048,8 @@ void do_fight(char *u)
        // Initiate Battle sequence!
         notice(s_GameServ, u, "You challenge %s to an online duel!", battle->stats->name);
         notice(s_GameServ, battle->getNick(), "%s has challenged you to an online duel!", ni->stats->name);
-        notice(s_GameServ, battle->getNick(), "%s gets to go first because he initiated!", ni->stats->name);
+        notice(s_GameServ, battle->getNick(), "%s gets to go first "\
+                       "because they initiated!", ni->stats->name);
         notice(s_GameServ, battle->getNick(), "Please wait while %s decides what to do.", ni->stats->name);
         display_players(u);
     }