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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.17 by elmex, Wed Aug 30 11:58:43 2006 UTC vs.
Revision 1.18 by root, Sun Sep 3 00:18:42 2006 UTC

 /*
  * static char *rcsid_apply_c =
- *   "$Id: apply.C,v 1.17 2006/08/30 11:58:43 elmex Exp $";
+ *   "$Id: apply.C,v 1.18 2006/09/03 00:18:42 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
     Copyright (C) 2001 Mark Wedel & Crossfire Development Team
     if (improver->slaying!=NULL) {
         count = check_item(op,improver->slaying);
         if (count<1) {
             char buf[200];
-            sprintf(buf,"The gods want more %ss",improver->slaying);
+            sprintf(buf,"The gods want more %ss", &improver->slaying);
             new_draw_info(NDI_UNIQUE,0,op,buf);
             return 0;
         }
     }
     else
     weapon->level=isqrt(sacrifice_count);
     new_draw_info(NDI_UNIQUE,0,op,"Your sacrifice was accepted.");
     eat_item(op, improver->slaying, sacrifice_count);
     new_draw_info_format(NDI_UNIQUE, 0, op,"Your *%s may be improved %d times.",
-            weapon->name,weapon->level);
+            &weapon->name,weapon->level);
-    sprintf(buf,"%s's %s",op->name,weapon->name);
+    sprintf(buf,"%s's %s",&op->name,&weapon->name);
-    FREE_AND_COPY(weapon->name, buf);
+    weapon->name = weapon->name_pl = buf;
-    FREE_AND_COPY(weapon->name_pl, buf);
     weapon->nrof=0;  /*  prevents preparing n weapons in the same
                          slot at once! */
     decrease_ob(improver);
     weapon->last_eat=0;
     return 1;
   sacrifice_needed *=2;
   sacrifice_count = check_sacrifice(op,improver);
   if (sacrifice_count < sacrifice_needed) {
         new_draw_info_format(NDI_UNIQUE, 0, op,
-            "You need at least %d %s", sacrifice_needed, improver->slaying);
+            "You need at least %d %s", sacrifice_needed, &improver->slaying);
         return 0;
   }
   eat_item(op,improver->slaying, sacrifice_needed);
   weapon->item_power++;
         item = object_create_clone(ob_to_copy);
         CLEAR_FLAG(item, FLAG_IS_A_TEMPLATE);
         unflag_inv(item, FLAG_IS_A_TEMPLATE);
     } else {
         if (converter->other_arch == NULL) {
-            LOG(llevError,"move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n", converter->name ? converter->name : "(null)", converter->map->path, converter->x, converter->y);
+            LOG(llevError,"move_creator: Converter doesn't have other arch set: %s (%s, %d, %d)\n",
+                &converter->name, converter->map->path, converter->x, converter->y);
             return -1;
         }
         item = object_create_arch(converter->other_arch);
         fix_generated_item(item, converter, 0, 0, GT_MINIMAL);
         item->nrof*=nr;
     if(is_in_shop (converter))
         SET_FLAG(item,FLAG_UNPAID);
     else if(price_in < item->nrof*item->value) {
         LOG(llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
-            converter->name, converter->map->path, converter->x, converter->y, price_in,
+            &converter->name, converter->map->path, converter->x, converter->y, price_in,
-            item->nrof*item->value, item->name);
+            item->nrof*item->value, &item->name);
         /**
          * elmex: we are going to let the game continue, as the mapcreator
          * propably had something in mind when doing this
          */
     }
     if(op->type!=PLAYER)
         return 0; /* This might change */
     if (sack==NULL || sack->type != CONTAINER) {
-        LOG (llevError, "apply_container: %s is not container!\n",sack?sack->name:"NULL");
+        LOG (llevError, "apply_container: %s is not container!\n", &sack->name);
         return 0;
     }
     op->contr->last_used = NULL;
     op->contr->last_used_id = 0;
     object *tmp=op->container;
     if(op->type!=PLAYER)
         return 0; /* This might change */
     if (sack==NULL || sack->type != CONTAINER) {
-        LOG (llevError,
-             "esrv_apply_container: %s is not container!\n",sack?sack->name:"NULL");
+        LOG (llevError, "esrv_apply_container: %s is not container!\n", &sack->name);
         return 0;
     }
     /* If we have a currently open container, then it needs to be closed in all cases
      * if we are opening this one up.  We then fall through if appropriate for
         /* Simple check.  Unfortunately, it means you can't cast magic bullet
          * with an altar.  We call it a Potion - altars are stationary - it
          * is up to map designers to use them properly.
          */
         if (altar->inv && altar->inv->type==SPELL) {
-            new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.",
+            new_draw_info_format (NDI_BLACK, 0, originator, "The altar casts %s.", &altar->inv->name);
-                                  altar->inv->name);
             cast_spell (originator, altar, 0, altar->inv, NULL);
             /* If it is connected, push the button.  Fixes some problems with
              * old maps.
              */
 /*	    push_button (altar);*/
         new_draw_info (NDI_UNIQUE, 0, op,
                        "You are unable to read while blind.");
         return;
     }
     msgType=get_readable_message_type(sign);
-    snprintf(newbuf,sizeof(newbuf),"%hhu %s", autoapply?1:0,sign->msg);
+    snprintf(newbuf,sizeof(newbuf),"%hhu %s", autoapply?1:0, &sign->msg);
-    draw_ext_info(NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, sign->msg);
+    draw_ext_info(NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, newbuf, &sign->msg);
 }
 /**
  * 'victim' moves onto 'trap'
  * 'victim' leaves 'trap'
  * effect is determined by move_on/move_off of trap and move_type of victime.
    * proper.  This code was causing needless crashes.
    */
     if (recursion_depth >= 500) {
         LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
              "[trap arch %s, name %s; victim arch %s, name %s]\n",
-             trap->arch->name, trap->name, victim->arch->name, victim->name);
+             &trap->arch->name, &trap->name, &victim->arch->name, &victim->name);
         return;
     }
     recursion_depth++;
     if (trap->head) trap=trap->head;
             }
             goto leave;
         default:
             LOG (llevDebug, "name %s, arch %s, type %d with fly/walk on/off not "
-                 "handled in move_apply()\n", trap->name, trap->arch->name,
+                 "handled in move_apply()\n", &trap->name, &trap->arch->name,
                  trap->type);
             goto leave;
     }
     leave:
       new_draw_info(NDI_UNIQUE, 0,op,"You are unable to read while blind.");
       return;
     }
     if(tmp->msg==NULL) {
       new_draw_info_format(NDI_UNIQUE, 0, op,
-        "You open the %s and find it empty.", tmp->name);
+        "You open the %s and find it empty.", &tmp->name);
       return;
     }
     /* need a literacy skill to read stuff! */
     skill_ob = find_skill_by_name(op, tmp->skill);
     readable_message_type* msgType = get_readable_message_type(tmp);
     draw_ext_info_format(NDI_UNIQUE | NDI_NAVY, 0, op,
             msgType->message_type, msgType->message_subtype,
             "You open the %s and start reading.\n%s",
             "%s\n%s",
-            long_desc(tmp,op), tmp->msg);
+            long_desc(tmp,op), &tmp->msg);
     /* gain xp from reading */
     if(!QUERY_FLAG(tmp,FLAG_NO_SKILL_IDENT)) { /* only if not read before */
         int exp_gain=calc_skill_exp(op,tmp, skill_ob);
       if(!QUERY_FLAG(tmp,FLAG_IDENTIFIED)) {
             new_draw_info(NDI_UNIQUE, 0,op,"You already possess the knowledge ");
             new_draw_info_format(NDI_UNIQUE, 0,op,"held within the %s.\n",query_name(tmp));
             return;
         case 1:
-            new_draw_info_format(NDI_UNIQUE, 0,op,"You succeed in learning %s",
+            new_draw_info_format(NDI_UNIQUE, 0,op,"You succeed in learning %s", &tmp->skill);
-                         tmp->skill);
-            new_draw_info_format(NDI_UNIQUE, 0, op,
-                         "Type 'bind ready_skill %s",tmp->skill);
-            new_draw_info(NDI_UNIQUE, 0,op,"to store the skill in a key.");
             decrease_ob(tmp);
             return;
         default:
             new_draw_info_format(NDI_UNIQUE,0,op,
     if (special_prayer) {
         SET_FLAG(tmp, FLAG_STARTEQUIP);
     }
-    new_draw_info_format (NDI_UNIQUE, 0, op,
-            "Type 'bind cast %s", spell->name);
-    new_draw_info (NDI_UNIQUE, 0, op, "to store the spell in a key.");
     esrv_add_spells(op->contr, tmp);
 }
 /**
  * Erases spell from player's inventory.
     if(tmp->slaying != NULL) {
         spell=arch_to_object(find_archetype_by_object_name(tmp->slaying));
         if (!spell) {
             new_draw_info_format(NDI_UNIQUE, 0, op,
-                "The book's formula for %s is incomplete", tmp->slaying);
+                "The book's formula for %s is incomplete", &tmp->slaying);
             return;
         }
         else
             insert_ob_in_ob(spell, tmp);
-        free_string(tmp->slaying);
         tmp->slaying=NULL;
     }
     skop = find_skill_by_name(op, tmp->skill);
         return;
     }
     spell = tmp->inv;
     if (!spell) {
-        LOG(llevError,"apply_spellbook: Book %s has no spell in it!\n", tmp->name);
+        LOG(llevError,"apply_spellbook: Book %s has no spell in it!\n", &tmp->name);
         new_draw_info(NDI_UNIQUE, 0,op,"The spellbook symbols make no sense.");
     return;
     }
     if (spell->level > (skop->level+10)) {
         new_draw_info(NDI_UNIQUE, 0,op,"You are unable to decipher the strange symbols.");
         return;
     }
     new_draw_info_format(NDI_UNIQUE, 0, op,
         "The spellbook contains the %s level spell %s.",
-            get_levelnumber(spell->level), spell->name);
+            get_levelnumber(spell->level), &spell->name);
     if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED)) {
         identify(tmp);
         if (tmp->env)
             esrv_update_item(UPD_FLAGS|UPD_NAME,op,tmp);
     if (spell->skill) {
         spell_skill = find_skill_by_name(op, spell->skill);
         if (!spell_skill) {
             new_draw_info_format(NDI_UNIQUE, 0, op,
                                  "You lack the skill %s to use this spell",
-                                 spell->skill);
+                                 &spell->skill);
             return;
         }
         if (spell_skill->level < spell->level) {
             new_draw_info_format(NDI_UNIQUE, 0, op,
                                  "You need to be level %d in %s to learn this spell.",
-                                 spell->level, spell->skill);
+                                 spell->level, &spell->skill);
             return;
         }
     }
     /* Logic as follows
     if (!QUERY_FLAG(tmp, FLAG_IDENTIFIED))
         identify(tmp);
     new_draw_info_format(NDI_BLACK, 0, op,
-                     "The scroll of %s turns to dust.", tmp->inv->name);
+                     "The scroll of %s turns to dust.", &tmp->inv->name);
     cast_spell(op,tmp,dir,tmp->inv, NULL);
     decrease_ob(tmp);
 }
           char buf[MAX_BUF];
           if (!is_dragon_pl(op)) {
             /* eating message for normal players*/
             if(tmp->type==DRINK)
-              sprintf(buf,"Ahhh...that %s tasted good.",tmp->name);
+              sprintf(buf,"Ahhh...that %s tasted good.",&tmp->name);
             else
-              sprintf(buf,"The %s tasted %s",tmp->name,
+              sprintf(buf,"The %s tasted %s",&tmp->name,
                       tmp->type==FLESH?"terrible!":"good.");
           }
           else {
             /* eating message for dragon players*/
-            sprintf(buf,"The %s tasted terrible!",tmp->name);
+            sprintf(buf,"The %s tasted terrible!",&tmp->name);
           }
           new_draw_info(NDI_UNIQUE, 0,op,buf);
           capacity_remaining = 999 - op->stats.food;
           op->stats.food+=tmp->stats.food;
   /* inverse totalchance as until now we have the failure-chance   */
   totalchance = 100 - totalchance*100;
   /* print message according to totalchance */
   if (totalchance > 50.)
-    sprintf(buf, "Hmm! The %s tasted delicious!", meal->name);
+    sprintf(buf, "Hmm! The %s tasted delicious!", &meal->name);
   else if (totalchance > 10.)
-    sprintf(buf, "The %s tasted very good.", meal->name);
+    sprintf(buf, "The %s tasted very good.", &meal->name);
   else if (totalchance > 1.)
-    sprintf(buf, "The %s tasted good.", meal->name);
+    sprintf(buf, "The %s tasted good.", &meal->name);
   else if (totalchance > 0.1)
-    sprintf(buf, "The %s tasted bland.", meal->name);
+    sprintf(buf, "The %s tasted bland.", &meal->name);
   else if (totalchance >= 0.01)
-    sprintf(buf, "The %s had a boring taste.", meal->name);
+    sprintf(buf, "The %s had a boring taste.", &meal->name);
   else if (meal->last_eat > 0 && atnr_is_dragon_enabled(meal->last_eat))
-    sprintf(buf, "The %s tasted strange.", meal->name);
+    sprintf(buf, "The %s tasted strange.", &meal->name);
   else
-    sprintf(buf, "The %s had no taste.", meal->name);
+    sprintf(buf, "The %s had no taste.", &meal->name);
   new_draw_info(NDI_UNIQUE, 0, op, buf);
   /* now choose a winner if we have any */
   i = -1;
   if (winners>0)
     /* Need to call terminate_all_pets()  before we remove the player ob */
     terminate_all_pets(pl);
     remove_ob(pl);
     pl->direction=0;
     new_draw_info_format(NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl,
-        "%s leaves the game.",pl->name);
+        "%s leaves the game.", &pl->name);
     /* update respawn position */
     strcpy(pl->contr->savebed_map, pl->map->path);
     pl->contr->bed_x = pl->x;
     pl->contr->bed_y = pl->y;
                     new_draw_info_format (NDI_UNIQUE, 0, who,
                                     "You stop using the %s.", query_name(op));
                 } else {
                     new_draw_info_format (NDI_UNIQUE, 0, who,
                                     "You can no longer use the skill: %s.",
-                                    op->skill);
+                                    &op->skill);
                 }
             }
             (void) change_abil (who, op);
             who->chosen_skill = NULL;
             CLEAR_FLAG (who, FLAG_READY_SKILL);
             new_draw_info_format(NDI_UNIQUE, 0, who, "You unwear %s.",query_name(op));
             (void) change_abil (who,op);
             break;
         case LAMP:
             new_draw_info_format(NDI_UNIQUE, 0, who, "You turn off your %s.",
-                                 op->name);
+                                 &op->name);
             tmp2 = arch_to_object(op->other_arch);
             tmp2->x = op->x;
             tmp2->y = op->y;
             tmp2->map = op->map;
             tmp2->below = op->below;
         }
     }
     if (op->skill && op->type != SKILL && op->type != SKILL_TOOL) {
         skop=find_skill_by_name(who, op->skill);
         if (!skop) {
-            new_draw_info_format(NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", op->skill);
+            new_draw_info_format(NDI_UNIQUE, 0, who, "You need the %s skill to use this item!", &op->skill);
             return 1;
         } else {
             /* While experience will be credited properly, we want to change the
              * skill so that the dam and wc get updated
              */
             (void) change_abil (who,op);
             break;
         case LAMP:
             if (op->stats.food < 1) {
                 new_draw_info_format(NDI_UNIQUE, 0, who, "Your %s is out of"
-                                     " fuel!", op->name);
+                                     " fuel!", &op->name);
                 return 1;
             }
             new_draw_info_format(NDI_UNIQUE, 0, who, "You turn on your %s.",
-                                 op->name);
+                                 &op->name);
             tmp2 = arch_to_object(op->other_arch);
             tmp2->stats.food = op->stats.food;
             SET_FLAG(tmp2, FLAG_APPLIED);
             if (QUERY_FLAG(op, FLAG_INV_LOCKED))
                 SET_FLAG(tmp2, FLAG_INV_LOCKED);
                 if ( ! op->invisible) {
                     new_draw_info_format (NDI_UNIQUE, 0, who, "You ready %s.",
                                   query_name (op));
                     new_draw_info_format (NDI_UNIQUE, 0, who,
                               "You can now use the skill: %s.",
-                                op->skill);
+                                &op->skill);
                 } else {
                     new_draw_info_format (NDI_UNIQUE, 0, who, "Readied skill: %s.",
-                                      op->skill? op->skill:op->name);
+                                      op->skill ? &op->skill : &op->name);
                 }
             }
             SET_FLAG (op, FLAG_APPLIED);
             (void) change_abil (who, op);
             who->chosen_skill = op;
             if(who->type==PLAYER) {
                 if (op->type == BOW) {
                     (void)change_abil(who, op);
                     new_draw_info_format (NDI_UNIQUE, 0, who,
                               "You will now fire %s with %s.",
-                              op->race ? op->race : "nothing", query_name(op));
+                              op->race ? &op->race : "nothing", query_name(op));
                     who->contr->shoottype = range_bow;
                 } else {
                     who->contr->shoottype = range_misc;
                 }
             } else {
           }
         } else if(lighter->last_eat) { /* no charges left in lighter */
              new_draw_info_format(NDI_UNIQUE, 0,who,
                                   "You attempt to light the %s with a used up %s.",
-                                  item->name, lighter->name);
+                                  &item->name, &lighter->name);
              return;
         }
         /* Perhaps we should split what we are trying to light on fire?
          * I can't see many times when you would want to light multiple
          * objects at once.
         /* Change to check count and not freed, since the object pointer
          * may have gotten recycled
          */
         if ((nrof != item->nrof ) || (count != item->count)) {
             new_draw_info_format(NDI_UNIQUE, 0,who,
-                 "You light the %s with the %s.",item_name,lighter->name);
+                 "You light the %s with the %s.", &item_name, &lighter->name);
             /* Need to update the player so that the players glow radius
              * gets changed.
              */
             if (is_player_env) fix_player(who);
         } else {
             new_draw_info_format(NDI_UNIQUE, 0,who,
-                 "You attempt to light the %s with the %s and fail.",item->name,lighter->name);
+                 "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
         }
    } else /* nothing to light */
         new_draw_info(NDI_UNIQUE, 0,who,"You need to mark a lightable object.");
         {
         new_draw_info_format( NDI_UNIQUE, 0, pl, "This %s is strange, better to not use it.", query_base_name( marked, 0 ) );
         return;
         }
     new_item->nrof = yield;
-    new_draw_info_format( NDI_UNIQUE, 0, pl, "You %s the %s.", transformer->slaying, query_base_name( marked, 0 ) );
+    new_draw_info_format( NDI_UNIQUE, 0, pl, "You %s the %s.", &transformer->slaying, query_base_name( marked, 0 ) );
     insert_ob_in_ob( new_item, pl );
     esrv_send_inventory( pl, pl );
     /* Eat up one item */
     decrease_ob_nr( marked, 1 );
     /* Eat one transformer if needed */

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.17 by elmex, Wed Aug 30 11:58:43 2006 UTC vs. Revision 1.18 by root, Sun Sep 3 00:18:42 2006 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.17 by elmex, Wed Aug 30 11:58:43 2006 UTC vs.
Revision 1.18 by root, Sun Sep 3 00:18:42 2006 UTC