Various bugfixes

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

diff --git a/gameserv/Makefile.in b/gameserv/Makefile.in
index 43b88b5c41801aa6a37ffa05479ac6b815c490ed..87df5198977fdb68a14d35d5cb88b8a8c2ac1cf6 100644 (file)
--- a/gameserv/Makefile.in
+++ b/gameserv/Makefile.in
@@ -12,7 +12,7 @@ libdir = $(prefix)/lib/gnudl
 mandir = $(prefix)/man/man1
 
 CC = @CXX@
-CPPFLAGS = -Wno-deprecated @CPPFLAGS@
+CPPFLAGS = -Wno-deprecated -Wall -O2 @CPPFLAGS@
 CFLAGS = $(CPPFLAGS) @CFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@

diff --git a/gameserv/c_forest.cpp b/gameserv/c_forest.cpp
index 430f0751eaae5f71ab90120122cf030bb86a9e7a..87e20d03db09dbe647d13322d45e4a5ee48d1bab 100644 (file)
--- a/gameserv/c_forest.cpp
+++ b/gameserv/c_forest.cpp
@@ -34,7 +34,6 @@ source--;
 void do_forest(char *u)
 {
     aClient *source;
-    char *cmd;
 
     int num = rand() % 12;
 

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 54d39bac6f520815d4ab495b728c4539e5a12f2f..f60c794eaf8e595199dc717d36a4f3c476a4793f 100644 (file)
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -114,7 +114,7 @@ int defbonus[11] = {2, 3, 5, 10, 15, 22, 35, 60, 80, 120, 150};
 
 void gameserv(char *source, char *buf)
 {
-    char *cmd, input[1024];
+    char *cmd;
     cmd = strtok(buf, " ");
 
     source++; // Get rid of that : at the beginning of a :Nick privmsg Gameserv :text
@@ -408,7 +408,7 @@ void do_register(char *u)
     {
        notice(s_GameServ, u, "SYNTAX: /msg %S REGISTER PASSWORD");
     }
-    else if (user = find(u))
+    else if ((user = find(u)))
     {
         if (!user->stats)
         {
@@ -442,7 +442,7 @@ void do_identify(char *u)
     {
            notice(s_GameServ, u, "Password incorrect");
     }
-    else if (user = find(u))
+    else if ((user = find(u)))
     {
         if (!user->stats)
         {
@@ -1925,7 +1925,7 @@ void do_fight(char *u)
 void do_run(char *u)
 {
     aClient *user;
-    Player *p, *p2;
+    Player *p, *p2 = NULL;
 
     if (!(user = find(u)))
     {
@@ -2366,7 +2366,7 @@ void do_heal(char *u)
 
 int isstringnum(char *num)
 {
-    int x;
+    unsigned int x;
     for (x = 0; x < strlen(num); x++)
     {
         if ((int)num[x] < 48 || (int)num[x] > 57)
@@ -2440,6 +2440,7 @@ int save_gs_dbase()
        ptr = ptr->Next();
     }
 outfile.close();
+return 1;
 }
 
 int load_gs_dbase()
@@ -2502,6 +2503,8 @@ int load_gs_dbase()
        cout << "Deleted" << endl;
     }
 delete [] buf;
+infile.close();
+return 1;
 }
 
 bool passcmp(char *encrypted, char *plaintext)

diff --git a/gameserv/player.cpp b/gameserv/player.cpp
index d513c2df2ebc7dab9754d374c931ebbfead16b05..8c26d60eef15580572b9ffff9076e9c029cc2bec 100644 (file)
--- a/gameserv/player.cpp
+++ b/gameserv/player.cpp
@@ -98,7 +98,7 @@ void Player::setData(Player *right)
         reset();
 
        int num = rand() % 32767;
-       sprintf(name, "Player%d\0", num);
+       sprintf(name, "Player%d", num);
     }
 
     cout << "Setting Player data for " << name << endl;

diff --git a/gameserv/sockhelp.cpp b/gameserv/sockhelp.cpp
index c68dd8e1f7d12df47e08425afa5bfdd1a0c2a73a..25cfcb5a21ea279334cd1c9864aa67fc42519377 100644 (file)
--- a/gameserv/sockhelp.cpp
+++ b/gameserv/sockhelp.cpp
@@ -47,7 +47,7 @@ struct in_addr *atoaddr(char *address)
 
   /* First try it as aaa.bbb.ccc.ddd. */
   saddr.s_addr = inet_addr(address);
-  if (saddr.s_addr != -1) {
+  if (saddr.s_addr != 0) {
     return &saddr;
   }
   host = gethostbyname(address);
@@ -242,7 +242,7 @@ int sock_read(int sockfd, char *buf, size_t count)
 int sock_gets(int sockfd, char *str, size_t count)
 {
   int bytes_read;
-  int total_count = 0;
+  unsigned int total_count = 0;
   char *current_position;
   char last_read = 0;
 

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 1ef3832f989333b761eed7cb1d3dca532ab36108..17375aee8d38e4a76ed3ccdd254cfbafcfa31adf 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -29,7 +29,7 @@ List<aClient> clients;
 
 int main(int argc, char *argv[])
 {
-  char buffer[1024], buf[1024], input[1024], uplink[80], kb[1024];
+  char buffer[1024], buf[1024];
   int connected = 1;
   char *cmd, *source = NULL;
   srand(time(NULL));
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
            if (buffer[0] == ':')
            {
                aClient *tempPtr;
-               if (tempPtr = find((source + 1)))
+               if ((tempPtr = find((source + 1))))
                {
                    char *nick;
                    nick = strtok(NULL, " ");
@@ -115,9 +115,9 @@ int main(int argc, char *argv[])
            }
        } else if (stricmp(cmd, "QUIT") == 0) {
            aClient *quitter;
-           if (quitter = find(source + 1))
+           if ((quitter = find(source + 1)))
                clients.remove(quitter);
-           if (quitter = findplayer(source + 1))
+           if ((quitter = findplayer(source + 1)))
                players.remove(quitter);
 
        } else if (stricmp(cmd, "PRIVMSG") == 0) {