[ViewVC] Diff of: cvs/deliantra/server/server/login.C

Comparing deliantra/server/server/login.C (file contents):
Revision 1.7 by root, Wed Aug 30 06:06:27 2006 UTC vs.
Revision 1.11 by root, Sun Sep 3 22:45:57 2006 UTC

 /*
  * static char *rcsid_login_c =
- *   "$Id: login.C,v 1.7 2006/08/30 06:06:27 root Exp $";
+ *   "$Id: login.C,v 1.11 2006/09/03 22:45:57 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 void delete_character(const char *name, int newchar) {
     char buf[MAX_BUF];
     sprintf(buf,"%s/%s/%s.pl",settings.localdir,settings.playerdir,name);
     if(unlink(buf)== -1)
-        LOG(llevDebug, "Cannot delete character file %s: %s\n", buf, strerror_local(errno));
+        LOG(llevDebug, "Cannot delete character file %s: %s\n", buf, strerror(errno));
     if (newchar) {
         sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,name);
         /* this effectively does an rm -rf on the directory */
         remove_directory(buf);
     }
   } else {
     stat(savedir, buf);
     if (!S_ISDIR(buf->st_mode))
       if (mkdir(savedir, SAVE_DIR_MODE))
         {
-        LOG(llevError, "Unable to create player savedir %s: %s\n", savedir, strerror_local(errno));
+        LOG(llevError, "Unable to create player savedir %s: %s\n", savedir, strerror(errno));
         return 0;
       }
     free(buf);
   }
  return 1;
  * will be saved at the emergency save location.
  * Returns non zero if successful.
  */
 int save_player(object *op, int flag) {
-  char filename[MAX_BUF];
   object *tmp, *container=NULL;
   player *pl = op->contr;
   int i,wiz=QUERY_FLAG(op,FLAG_WIZ);
   long checksum;
 #ifdef BACKUP_SAVE_AT_HOME
      * mostly exited.
      */
     if (pl->state != ST_PLAYING && pl->state != ST_GET_PARTY_PASSWORD)
         return 0;
-  INVOKE_PLAYER (SAVE, op->contr, ARG_STRING (filename));
+  INVOKE_PLAYER (SAVE, op->contr);
   if (flag == 0)
     terminate_all_pets(op);
-  sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,op->name,op->name);
-  make_path_to_file(filename);
-  object_freezer fp (filename);
+  object_freezer freezer;
-  if (!fp)
+  /* Eneq(@csd.uu.se): If we have an open container hide it. */
+  if (op->container)
     {
-      new_draw_info(NDI_UNIQUE, 0,op, "Can't open file for save.");
-      return 0;
-    }
-/* Eneq(@csd.uu.se): If we have an open container hide it. */
-   if (op->container)
-     {
-       container = op->container;
+      container = op->container;
-       op->container = NULL;
+      op->container = NULL;
-     }
+    }
-  fprintf(fp,"password %s\n",pl->password);
+  fprintf(freezer,"password %s\n",pl->password);
   if (settings.set_title == TRUE)
       if(pl->own_title[0]!='\0')
-          fprintf(fp,"title %s\n",pl->own_title);
+          fprintf(freezer,"title %s\n",pl->own_title);
-  fprintf(fp,"explore %d\n",pl->explore);
+  fprintf(freezer,"explore %d\n",pl->explore);
-  fprintf(fp,"gen_hp %d\n",pl->gen_hp);
+  fprintf(freezer,"gen_hp %d\n",pl->gen_hp);
-  fprintf(fp,"gen_sp %d\n",pl->gen_sp);
+  fprintf(freezer,"gen_sp %d\n",pl->gen_sp);
-  fprintf(fp,"gen_grace %d\n",pl->gen_grace);
+  fprintf(freezer,"gen_grace %d\n",pl->gen_grace);
-  fprintf(fp,"listening %d\n",pl->listening);
+  fprintf(freezer,"listening %d\n",pl->listening);
-  fprintf(fp,"shoottype %d\n",pl->shoottype);
+  fprintf(freezer,"shoottype %d\n",pl->shoottype);
-  fprintf(fp,"bowtype %d\n",pl->bowtype);
+  fprintf(freezer,"bowtype %d\n",pl->bowtype);
-  fprintf(fp,"petmode %d\n",pl->petmode);
+  fprintf(freezer,"petmode %d\n",pl->petmode);
-  fprintf(fp,"peaceful %d\n",pl->peaceful);
+  fprintf(freezer,"peaceful %d\n",pl->peaceful);
-  fprintf(fp,"no_shout %d\n",pl->no_shout);
+  fprintf(freezer,"no_shout %d\n",pl->no_shout);
-  fprintf(fp,"digestion %d\n",pl->digestion);
+  fprintf(freezer,"digestion %d\n",pl->digestion);
-  fprintf(fp,"pickup %d\n", pl->mode);
+  fprintf(freezer,"pickup %d\n", pl->mode);
-  fprintf(fp,"outputs_sync %d\n", pl->outputs_sync);
+  fprintf(freezer,"outputs_sync %d\n", pl->outputs_sync);
-  fprintf(fp,"outputs_count %d\n", pl->outputs_count);
+  fprintf(freezer,"outputs_count %d\n", pl->outputs_count);
   /* Match the enumerations but in string form */
-  fprintf(fp,"usekeys %s\n", pl->usekeys==key_inventory?"key_inventory":
+  fprintf(freezer,"usekeys %s\n", pl->usekeys==key_inventory?"key_inventory":
           (pl->usekeys==keyrings?"keyrings":"containers"));
   /* Match the enumerations but in string form */
-  fprintf(fp,"unapply %s\n", pl->unapply==unapply_nochoice?"unapply_nochoice":
+  fprintf(freezer,"unapply %s\n", pl->unapply==unapply_nochoice?"unapply_nochoice":
           (pl->unapply==unapply_never?"unapply_never":"unapply_always"));
 #ifdef BACKUP_SAVE_AT_HOME
   if (op->map!=NULL && flag==0)
 #else
   if (op->map!=NULL)
 #endif
-    fprintf(fp,"map %s\n",op->map->path);
+    fprintf(freezer,"map %s\n",op->map->path);
   else
-    fprintf(fp,"map %s\n",settings.emergency_mapname);
+    fprintf(freezer,"map %s\n",settings.emergency_mapname);
-  fprintf(fp,"savebed_map %s\n", pl->savebed_map);
+  fprintf(freezer,"savebed_map %s\n", pl->savebed_map);
-  fprintf(fp,"bed_x %d\nbed_y %d\n", pl->bed_x, pl->bed_y);
+  fprintf(freezer,"bed_x %d\nbed_y %d\n", pl->bed_x, pl->bed_y);
-  fprintf(fp,"weapon_sp %f\n",pl->weapon_sp);
+  fprintf(freezer,"weapon_sp %f\n",pl->weapon_sp);
-  fprintf(fp,"Str %d\n",pl->orig_stats.Str);
+  fprintf(freezer,"Str %d\n",pl->orig_stats.Str);
-  fprintf(fp,"Dex %d\n",pl->orig_stats.Dex);
+  fprintf(freezer,"Dex %d\n",pl->orig_stats.Dex);
-  fprintf(fp,"Con %d\n",pl->orig_stats.Con);
+  fprintf(freezer,"Con %d\n",pl->orig_stats.Con);
-  fprintf(fp,"Int %d\n",pl->orig_stats.Int);
+  fprintf(freezer,"Int %d\n",pl->orig_stats.Int);
-  fprintf(fp,"Pow %d\n",pl->orig_stats.Pow);
+  fprintf(freezer,"Pow %d\n",pl->orig_stats.Pow);
-  fprintf(fp,"Wis %d\n",pl->orig_stats.Wis);
+  fprintf(freezer,"Wis %d\n",pl->orig_stats.Wis);
-  fprintf(fp,"Cha %d\n",pl->orig_stats.Cha);
+  fprintf(freezer,"Cha %d\n",pl->orig_stats.Cha);
-  fprintf(fp,"lev_array %d\n",op->level>10?10:op->level);
+  fprintf(freezer,"lev_array %d\n",op->level>10?10:op->level);
   for(i=1;i<=pl->last_level&&i<=10;i++) {
-    fprintf(fp,"%d\n",pl->levhp[i]);
+    fprintf(freezer,"%d\n",pl->levhp[i]);
-    fprintf(fp,"%d\n",pl->levsp[i]);
+    fprintf(freezer,"%d\n",pl->levsp[i]);
-         fprintf(fp,"%d\n",pl->levgrace[i]);
+         fprintf(freezer,"%d\n",pl->levgrace[i]);
   }
-  fp.put (op->contr);
+  freezer.put (op->contr);
-  fprintf(fp,"endplst\n");
+  fprintf(freezer,"endplst\n");
   SET_FLAG(op, FLAG_NO_FIX_PLAYER);
   CLEAR_FLAG(op, FLAG_WIZ);
 #ifdef BACKUP_SAVE_AT_HOME
   if (flag) {
     op->y = -1;
   }
   /* Save objects, but not unpaid objects.  Don't remove objects from
    * inventory.
    */
-  save_object(fp, op, 2);
+  save_object(freezer, op, 2);
   if (flag) {
     op->x = backup_x;
     op->y = backup_y;
   }
 #else
-  save_object(fp, op, 3); /* don't check and don't remove */
+  save_object(freezer, op, 3); /* don't check and don't remove */
 #endif
+  char filename[MAX_BUF];
+  sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,&op->name,&op->name);
+  make_path_to_file(filename);
+  freezer.save (filename);
   CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER);
   if(!flag)
       while ((tmp = op->inv))
           destroy_object (tmp);
   /* Eneq(@csd.uu.se): Reveal the container if we have one. */
-  if (flag&&container!=NULL)
+  if (flag && container!=NULL)
     op->container = container;
-  if (wiz) SET_FLAG(op,FLAG_WIZ);
+  if (wiz) SET_FLAG (op, FLAG_WIZ);
   if(!flag)
         esrv_send_inventory(op, op);
   return 1;
     long checksum = 0;
     player *pl = op->contr;
     int correct = 0;
     strcpy (pl->maplevel,first_map_path);
-    sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,op->name,op->name);
+    sprintf(filename,"%s/%s/%s/%s.pl",settings.localdir,settings.playerdir,&op->name,&op->name);
     object_thawer thawer (filename);
     /* If no file, must be a new player, so lets get confirmation of
      * the password.  Return control to the higher level dispatch,
      * since the rest of this just deals with loading of the file.
     }
     if (!correct) {
         new_draw_info(NDI_UNIQUE, 0,op," ");
         new_draw_info(NDI_UNIQUE, 0,op,"Wrong Password!");
         new_draw_info(NDI_UNIQUE, 0,op," ");
-        FREE_AND_COPY(op->name, "noname");
+        op->name =
-        FREE_AND_COPY(op->name_pl, "noname");
+        op->name_pl = "noname";
         op->contr->socket.password_fails++;
         if (op->contr->socket.password_fails >= MAX_PASSWORD_FAILURES) {
             new_draw_info(NDI_UNIQUE, 0,op,
                 "You gave an incorrect password too many times, you will now be dropped from the server.");
             LOG(llevInfo, "A player connecting from %s has been dropped for password failure\n",
             else if (!strcmp(bufall+8,"unapply_always\n"))
                 pl->unapply=unapply_always;
             else LOG(llevDebug,"load_player: got unknown unapply type: %s\n", bufall+8);
         }
         else if (!strcmp(buf,"lev_array")){
-            for(i=1;i<=value;i++) {
+            for(i=1;i<=value;i++)
-                int j;
+              {
-                fscanf(thawer,"%d\n",&j);
+                char line[128];
-                pl->levhp[i]=j;
+                fgets (line, 128, thawer); pl->levhp[i]    = atoi (line);
-                fscanf(thawer,"%d\n",&j);
+                fgets (line, 128, thawer); pl->levsp[i]    = atoi (line);
-                pl->levsp[i]=j;
+                fgets (line, 128, thawer); pl->levgrace[i] = atoi (line);
-                fscanf(thawer,"%d\n",&j);
-                pl->levgrace[i]=j;
-            }
+              }
         /* spell_array code removed - don't know when that was last used.
          * Even the load code below will someday be replaced by spells being
          * objects.
          */
         } else if (!strcmp(buf,"known_spell")) {
     reset_object(op);
     op->contr = pl;
     pl->ob = op;
     /* this loads the standard objects values. */
-    load_object(thawer, op, LO_NEWFILE,0);
+    load_object (thawer, op, 0);
     CLEAR_FLAG(op, FLAG_NO_FIX_PLAYER);
     strncpy(pl->title, op->arch->clone.name, sizeof(pl->title)-1);
     pl->title[sizeof(pl->title)-1] = '\0';
         set_dragon_name(op, abil, skin);
     }
     new_draw_info(NDI_UNIQUE, 0,op,"Welcome Back!");
     new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL,
-             "%s has entered the game.",pl->ob->name);
+             "%s has entered the game.", &pl->ob->name);
     INVOKE_PLAYER (LOAD,  pl, ARG_STRING (filename));
     INVOKE_PLAYER (LOGIN, pl);
     op->contr->socket.update_look=1;
     if (op->stats.hp<0) {
         new_draw_info(NDI_UNIQUE, 0,op,"Your character was dead last your played.");
         kill_player(op);
         if (pl->state != ST_PLAYING) return;
     }
-    LOG(llevInfo,"LOGIN: Player named %s from ip %s\n", op->name,
+    LOG(llevInfo,"LOGIN: Player named %s from ip %s\n", &op->name, op->contr->socket.host);
-        op->contr->socket.host);
     /* Do this after checking for death - no reason sucking up bandwidth if
      * the data isn't needed.
      */
     esrv_new_player(op->contr,op->weight+op->carrying);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/login.C (file contents): Revision 1.7 by root, Wed Aug 30 06:06:27 2006 UTC vs. Revision 1.11 by root, Sun Sep 3 22:45:57 2006 UTC

Diff Legend

Comparing deliantra/server/server/login.C (file contents):
Revision 1.7 by root, Wed Aug 30 06:06:27 2006 UTC vs.
Revision 1.11 by root, Sun Sep 3 22:45:57 2006 UTC