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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.13 by pippijn, Fri Sep 1 14:12:04 2006 UTC vs.
Revision 1.14 by root, Sun Sep 3 00:18:42 2006 UTC

 /*
  * static char *rcsid_player_c =
- *   "$Id: player.C,v 1.13 2006/09/01 14:12:04 pippijn Exp $";
+ *   "$Id: player.C,v 1.14 2006/09/03 00:18:42 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 static player* get_player(player *p) {
     object *op=arch_to_object(get_player_archetype(NULL));
     int i;
     if (!p) {
-        p = (player *) malloc(sizeof(player));
+        p = new player;
-        if(p==NULL)
-            fatal(OUT_OF_MEMORY);
         /* This adds the player in the linked list.  There is extra
          * complexity here because we want to add the new player at the
          * end of the list - there is in fact no compelling reason that
          * that needs to be done except for things like output of
     /* There are some elements we want initialized to non zero value -
      * we deal with that below this point.
      */
     p->party=NULL;
     p->outputs_sync=16;		/* Every 2 seconds */
-    p->outputs_count=1;		/* Keeps present behaviour */
+    p->outputs_count=8;		/* Keeps present behaviour */
     p->unapply = unapply_nochoice;
     p->Swap_First = -1;
 #ifdef AUTOSAVE
     p->last_save_tick = 9999999;
     p->explore=0;
         p->no_shout=0;			/* default can shout */
     strncpy(p->title, op->arch->clone.name, sizeof(p->title)-1);
     p->title[sizeof(p->title)-1] = '\0';
-    op->race = add_string (op->arch->clone.race);
+    op->race = op->arch->clone.race;
     CLEAR_FLAG(op,FLAG_READY_SKILL);
     /* we need to clear these to -1 and not zero - otherwise,
      * if a player quits and starts a new character, we wont
                 lastdist=rv.distance;
             }
         }
     }
 #if 0
-    LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?op->name:"(null)");
+    LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?&op->name:"(null)");
 #endif
     return op;
 }
 /* I believe this can safely go to 2, 3 is questionable, 4 will likely
             if (tmp) {
                 remove_ob(op);
                 free_object(op);
                 LOG(llevError,"give_initial_items: Removing duplicate object %s\n",
-                    tmp->name);
+                    &tmp->name);
                 continue;
             }
             if (op->nrof > 1) op->nrof = 1;
         }
         leave(op->contr,0); /* ericserver will draw the message */
         return 2;
     }
     else if(key=='a'||key=='A') {
         player *pl = op->contr;
-        const char *name = op->name;
+        shstr name = op->name;
-        add_refcount(name);
         remove_friendly_object(op);
         free_object(op);
         pl = get_player(pl);
         op = pl->ob;
         add_friendly_object(op);
         op->contr->password[0]='~';
-        FREE_AND_CLEAR_STR(op->name);
+        op->name = op->name_pl = 0;
-        FREE_AND_CLEAR_STR(op->name_pl);
         /* Lets put a space in here */
         new_draw_info(NDI_UNIQUE, 0, op, "\n");
         get_name(op);
-        op->name = name;		/* Alrady added a refcount above */
+        op->name = op->name_pl = name;
-        op->name_pl = add_string(name);
         set_first_map(op);
     } else {
         /* user pressed something else so just ask again... */
         play_again(op);
     }
     send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
 }
 void get_party_password(object *op, partylist *party) {
     if (party == NULL) {
-        LOG(llevError, "get_party_password(): tried to make player %s join a NULL party", op->name);
+        LOG(llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
         return;
     }
     op->contr->write_buf[0]='\0';
     op->contr->state=ST_GET_PARTY_PASSWORD;
     op->contr->party_to_join = party;
         INVOKE_PLAYER (BIRTH, op->contr);
         INVOKE_PLAYER (LOGIN, op->contr);
         op->contr->state=ST_PLAYING;
-        if (op->msg) {
+        if (op->msg)
-            free_string(op->msg);
-            op->msg=NULL;
+          op->msg=NULL;
-        }
         /* We create this now because some of the unique maps will need it
          * to save here.
          */
-        sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,op->name);
+        sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,&op->name);
         make_path_to_file(buf);
 #ifdef AUTOSAVE
         op->contr->last_save_tick = pticks;
 #endif
         if(*first_map_ext_path) {
             object *tmp;
             mapstruct *oldmap = op->map;
             char mapname[MAX_BUF];
             snprintf(mapname, MAX_BUF-1, "%s/%s",
-                     first_map_ext_path, op->arch->name);
+                     first_map_ext_path, &op->arch->name);
             tmp=get_object();
-            EXIT_PATH(tmp) = add_string(mapname);
+            EXIT_PATH(tmp) = mapname;
             EXIT_X(tmp) = op->x;
             EXIT_Y(tmp) = op->y;
             enter_exit(op,tmp); /* we don't really care if it succeeded;
                                  * if the map isn't there, then stay on the
                                  * default initial map */
      * if we don't match with one of the options above.
      */
     tmp_loop = 0;
     while(!tmp_loop) {
-        const char *name = add_string (op->name);
+        shstr name = op->name;
         int x = op->x, y = op->y;
         remove_statbonus(op);
         remove_ob (op);
         op->arch = get_player_archetype(op->arch);
         copy_object (&op->arch->clone, op);
         op->instantiate ();
         op->stats = op->contr->orig_stats;
-        free_string (op->name);
-        op->name = name;
+        op->name = op->name_pl = name;
-        free_string(op->name_pl);
-        op->name_pl = add_string(name);
         op->x = x;
         op->y = y;
         SET_ANIMATION(op, 2);    /* So player faces south */
         insert_ob_in_map (op, op->map, op,0);
         strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1);
     terminate_all_pets(op);
     leave_map(op);
     op->direction=0;
     new_draw_info_format(NDI_UNIQUE | NDI_ALL, 5, NULL,
-        "%s quits the game.",op->name);
+        "%s quits the game.", &op->name);
     strcpy(op->contr->killer,"quit");
     check_score(op);
     op->contr->party=NULL;
     if (settings.set_title == TRUE)
         /* We need to hunt for any per player unique maps in memory and
          * get rid of them.  The trailing slash in the path is intentional,
          * so that players named 'Ab' won't match against players 'Abe' pathname
          */
-        sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, op->name);
+        sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
         for (mp=first_map; mp!=NULL; mp=next) {
             next = mp->next;
             if (!strncmp(mp->path, buf, strlen(buf)))
                 delete_map(mp);
         }
       if(op->contr->mode & PU_DEBUG)
       {
         /* some debugging code to figure out item information */
         if(tmp->name!=NULL)
           sprintf(putstring,"item name: %s    item type: %d    weight/value: %d",
-              tmp->name, tmp->type,
+              &tmp->name, tmp->type,
               (int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
         else
           sprintf(putstring,"item name: %s    item type: %d    weight/value: %d",
-              tmp->arch->name, tmp->type,
+              &tmp->arch->name, tmp->type,
               (int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
         new_draw_info(NDI_UNIQUE, 0,op,putstring);
         sprintf(putstring,"...flags: ");
         for(k=0;k<4;k++)
              */
             if(bow->type==BOW)
                 break;
         if (!bow) {
-            LOG (llevError, "Range: bow without activated bow (%s).\n", op->name);
+            LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
             return 0;
         }
     }
     if( !bow->race || !bow->skill) {
-        new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", bow->name);
+        new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
         return 0;
     }
     bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
     if (arrow == NULL) {
         if ((arrow=find_arrow(op, bow->race)) == NULL) {
             if (op->type == PLAYER)
                 new_draw_info_format(NDI_UNIQUE, 0, op,
-                    "You have no %s left.", bow->race);
+                    "You have no %s left.", &bow->race);
      /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
             else
                 CLEAR_FLAG(op, FLAG_READY_BOW);
             return 0;
         }
     left = arrow; /* these are arrows left to the player */
     left_tag = left->count;
     arrow = get_split_ob(arrow, 1);
     if (arrow == NULL) {
-        new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.",
+        new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
-             bow->race);
         return 0;
     }
     set_owner(arrow, op);
-    if (arrow->skill) free_string(arrow->skill);
-    arrow->skill = add_refcount(bow->skill);
+    arrow->skill = bow->skill;
     arrow->direction=dir;
     arrow->x = sx;
     arrow->y = sy;
         arrow->level = op->level;
     }
     if (arrow->attacktype == AT_PHYSICAL)
         arrow->attacktype |= bow->attacktype;
     if (bow->slaying != NULL)
-        arrow->slaying = add_string(bow->slaying);
+        arrow->slaying = bow->slaying;
     arrow->map = m;
     arrow->move_type = MOVE_FLY_LOW;
     arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
         return;
     }
     item = op->contr->ranges[range_misc];
     if (!item->inv) {
-        LOG(llevError,"Object %s lacks a spell\n", item->name);
+        LOG(llevError,"Object %s lacks a spell\n", &item->name);
         return;
     }
     if (item->type == WAND) {
         if(item->stats.food<=0) {
             play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0);
     char buf[MAX_BUF];
     time_t now = time (NULL);
     strcpy (buf2, "                 R.I.P.\n\n");
     if (op->type == PLAYER)
-        sprintf (buf, "%s the %s\n", op->name, op->contr->title);
+        sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
     else
-        sprintf (buf, "%s\n", op->name);
+        sprintf (buf, "%s\n", &op->name);
     strncat (buf2, "                    ",  20 - strlen (buf) / 2);
     strcat (buf2, buf);
     if (op->type == PLAYER)
         sprintf (buf, "who was in level %d when killed\n", op->level);
     else
         /* create a bodypart-trophy to make the winner happy */
         tmp=arch_to_object(find_archetype("finger"));
         if (tmp != NULL)
         {
-            sprintf(buf,"%s's finger",op->name);
+            sprintf(buf,"%s's finger", &op->name);
-            tmp->name = add_string(buf);
+            tmp->name = buf;
             sprintf(buf,"  This finger has been cut off %s\n"
                     "  the %s, when he was defeated at\n  level %d by %s.\n",
-                op->name, op->contr->title, (int)(op->level),
+                &op->name, op->contr->title, (int)(op->level),
                 op->contr->killer);
-            tmp->msg=add_string(buf);
+            tmp->msg=buf;
             tmp->value=0, tmp->material=0, tmp->type=0;
             tmp->materialname = NULL;
             tmp->x = op->x, tmp->y = op->y;
             insert_ob_in_map(tmp,op->map,op,0);
         }
             new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are");
             new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
             op->stats.food=999;
             return;
         }
-        sprintf(buf,"%s starved to death.",op->name);
+        sprintf(buf,"%s starved to death.",&op->name);
         strcpy(op->contr->killer,"starvation");
     }
     else {
         if (op->contr->explore) {
             new_draw_info(NDI_UNIQUE, 0,op,"You would have died, but you are");
             new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so...");
             op->stats.hp=op->stats.maxhp;
             return;
         }
-        sprintf(buf,"%s died.",op->name);
+        sprintf(buf,"%s died.", &op->name);
     }
     play_sound_player_only(op->contr, SOUND_PLAYER_DIES,0,0);
     /*  save the map location for corpse, gravestone*/
     x=op->x;y=op->y;map=op->map;
         /* Put a gravestone up where the character 'almost' died.  List the
          * exp loss on the stone.
          */
         tmp=arch_to_object(find_archetype("gravestone"));
-        sprintf(buf,"%s's gravestone",op->name);
+        sprintf(buf,"%s's gravestone",&op->name);  tmp->name    = buf;
-        FREE_AND_COPY(tmp->name, buf);
-        sprintf(buf,"%s's gravestones",op->name);
+        sprintf(buf,"%s's gravestones",&op->name); tmp->name_pl = buf;
-        FREE_AND_COPY(tmp->name_pl, buf);
         sprintf(buf,"RIP\nHere rests the hero %s the %s,\n"
                 "who was killed\n"
                 "by %s.\n",
-                op->name, op->contr->title,
+                &op->name, op->contr->title,
                 op->contr->killer);
-        tmp->msg = add_string(buf);
+        tmp->msg = buf;
         tmp->x=op->x,tmp->y=op->y;
         insert_ob_in_map (tmp, op->map, NULL,0);
         /**************************************/
         /*                                    */
         }
         play_again(op);
         /*  peterm:  added to create a corpse at deathsite.  */
         tmp=arch_to_object(find_archetype("corpse_pl"));
-        sprintf(buf,"%s", op->name);
+        sprintf(buf,"%s", &op->name);
-        FREE_AND_COPY(tmp->name, buf);
+        tmp->name = tmp->name_pl = buf;
-        FREE_AND_COPY(tmp->name_pl, buf);
         tmp->level=op->level;
         tmp->x=x;tmp->y=y;
-        if (tmp->msg)
-            free_string(tmp->msg);
-        tmp->msg = add_string (gravestone_text(op));
+        tmp->msg = gravestone_text(op);
         SET_FLAG (tmp, FLAG_UNIQUE);
         insert_ob_in_map (tmp, map, NULL,0);
     }
 }
     int old = pl->ob->carrying, sum = sum_weight(pl->ob);
     if(old == sum)
       continue;
     fix_player(pl->ob);
     LOG(llevDebug,"Fixed inventory in %s (%d -> %d)\n",
-        pl->ob->name, old, sum);
+        &pl->ob->name, old, sum);
   }
 }
 void fix_luck(void) {
   player *pl;
   /* casting POTION 'dusts' is really a use_magic_item skill */
   if (op->type == PLAYER && throw_ob->type == POTION && !skop)
     {
       LOG (llevError, "Player %s lacks critical skill use_magic_item!\n",
-           op->name);
+           &op->name);
       return;
     }
   spob = throw_ob->inv;
   // not pass NULL to cast_spell (which did indeed check itself, but
   // errors should be reported as early as possible IMHO)
   if (!spob)
     {
       LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!",
-           throw_ob->name, op->name);
+           &throw_ob->name, &op->name);
       return;
     }
   if (op->type == PLAYER)
-    new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", spob->name);
+    new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
   cast_spell (op, throw_ob, dir, spob, NULL);
   if (!QUERY_FLAG (throw_ob, FLAG_REMOVED))
     remove_ob (throw_ob);
 void make_visible (object *op) {
     op->hide = 0;
     op->invisible = 0;
     if(op->type==PLAYER) {
         op->contr->tmp_invis = 0;
-        if (op->contr->invis_race) FREE_AND_CLEAR_STR(op->contr->invis_race);
+        op->contr->invis_race = 0;
     }
     update_object(op,UP_OBJ_FACE);
 }
 int is_true_undead(object *op) {
     if (item->type == SPELL) {
         if (check_spell_known (who, item->name))
             return;
-        new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->name);
+        new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", &item->name);
         do_learn_spell (who, item, 0);
         return;
     }
     /* grant direct spell */
     if (item->type == SPELLBOOK) {
         if (!item->inv) {
-            LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n",
+            LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n", &item->name);
-                item->name);
             return;
         }
         if (check_spell_known (who, item->inv->name))
             return;
         if (item->invisible) {
-            new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->inv->name);
+            new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", &item->inv->name);
             do_learn_spell (who, item->inv, 0);
             return;
         }
     }
     else if (item->type == SKILL_TOOL && item->invisible) {

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.13 by pippijn, Fri Sep 1 14:12:04 2006 UTC vs. Revision 1.14 by root, Sun Sep 3 00:18:42 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.13 by pippijn, Fri Sep 1 14:12:04 2006 UTC vs.
Revision 1.14 by root, Sun Sep 3 00:18:42 2006 UTC