This is a major bugfix for several mistakes made in coding that were

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

diff --git a/gameserv/tcpclient.cpp b/gameserv/tcpclient.cpp
index 26963dc98bd1121d6e0dec85a86a2506697ed4f4..4e939d569017f8fbe4153dfb50e9e0e617817f32 100644 (file)
--- a/gameserv/tcpclient.cpp
+++ b/gameserv/tcpclient.cpp
@@ -103,10 +103,15 @@ int main(int argc, char *argv[])
         exit(3);
     }
 
-  init_masters();
   load_gs_dbase();
   loadNews(newsdata, todaysnews);
 
+  if (load_masters() == false)
+  {
+       log("Error loading masters");
+       goto end;
+  }
+
   if (load_monsters() == false)
   {
        log("Error loading monsters");
@@ -131,16 +136,16 @@ int main(int argc, char *argv[])
        currentserver = strtok(NULL, " ");
     }
 
-  strcpy(boss.name, "Red Dragon");
-  strcpy(boss.weapon, "Breath of Unholy Fire");
+  boss.name = "Red Dragon";
+  boss.weapon = "Breath of Unholy Fire";
   boss.strength = 2500;
   boss.gold = 2000000000;
   boss.exp = 2000000000;
   boss.maxhp = 6667;
   boss.hp = 6667;
-  strcpy(boss.death, "You finally snuff out the deadly murderous "\
+  boss.death = "You finally snuff out the deadly murderous "\
     "dragon's dark flames. You have freed the land of its terror "\
-    "filled reign from above!");
+    "filled reign from above!";
 
 
  // This loop will retry the connection 3 times
@@ -295,10 +300,11 @@ int main(int argc, char *argv[])
 
            save_gs_dbase();
            saveNews(newsdata, todaysnews);
-
-           // Send notice to the channel of the update
            if (isSavedNotice())
+           {
+               // Send notice to the channel of the update
                notice(s_GameServ, c_Forest, "%S player data saved");
+           }
        }
 
 
@@ -534,7 +540,7 @@ int main(int argc, char *argv[])
            {
                #ifdef DEBUGMODE
                    log("Player %s (IRC: %s) joined %s", 
-                       joiner->stats->name, 
+                       joiner->stats->name.c_str(), 
                        #ifdef P10
                            joiner->getRealNick(),
                        #else
@@ -588,7 +594,6 @@ int main(int argc, char *argv[])
   saveNews(newsdata, todaysnews);
 
   delete_monsters();
-  delete_masters();
 
   #ifdef DEBUGMODE
       log("<CLOSED>");
@@ -677,7 +682,7 @@ aClient *findIRCplayer(const char *nick)
     if (!is_playing(p))
        return NULL;
 
-    unsigned long hv = iHASH((unsigned char *) p->stats->name);
+    unsigned long hv = iHASH((unsigned char *) p->stats->name.c_str());
 
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
@@ -701,7 +706,7 @@ aClient *findplayer(const char *name)
     for (newPtr = players[hv].First(); newPtr; newPtr = newPtr->Next())
     {
        p = newPtr->getData()->stats;
-       if (stricmp(p->name, name) == 0)
+       if (stricmp(p->name.c_str(), name) == 0)
            return newPtr->getData();
        p = NULL;
     }