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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.20 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC

     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The authors can be reached via e-mail at crossfire-devel@real-time.com
+    The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <cassert>
 #include <tr1/unordered_map>
   * Last, make a check on the full name.
   */
 int
 item_matched_string (object *pl, object *op, const char *name)
 {
-  char *
-    cp,
-    local_name[MAX_BUF];
+  char *cp, local_name[MAX_BUF];
-  int
+  int count, retval = 0;
-    count,
-    retval = 0;
   strcpy (local_name, name);    /* strtok is destructive to name */
   for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
     {
         retval = 15;
       else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
         retval = 14;
       else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
         retval = 14;
       /* Do substring checks, so things like 'Str+1' will match.
        * retval of these should perhaps be lower - they are lower
        * then the specific strcasecmp aboves, but still higher than
        * some other match criteria.
        */
         retval = 12;
       else if (strstr (query_base_name (op, 0), cp))
         retval = 12;
       else if (strstr (query_short_name (op), cp))
         retval = 12;
       /* Check against plural/non plural based on count. */
       else if (count > 1 && !strcasecmp (cp, op->name_pl))
-        {
-          retval = 6;
+        retval = 6;
-        }
       else if (count == 1 && !strcasecmp (op->name, cp))
-        {
-          retval = 6;
+        retval = 6;
-        }
       /* base name matched - not bad */
       else if (strcasecmp (cp, op->name) == 0 && !count)
         retval = 4;
       /* Check for partial custom name, but give a real low priority */
       else if (op->custom_name && strstr (op->custom_name, cp))
       if (retval)
         {
           if (pl->type == PLAYER)
             pl->contr->count = count;
           return retval;
         }
     }
   return 0;
 }
 /*
  * Initialises the internal linked list of archetypes (read from file).
  */
 void
 init_archetable (void)
 {
-  archetype *
+  archetype *at;
-    at;
   LOG (llevDebug, " Setting up archetable...\n");
   for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
     add_arch (at);
  */
 void
 dump_all_archetypes (void)
 {
-  archetype *
+  archetype *at;
-    at;
   for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
     {
       dump_arch (at);
       fprintf (logfile, "%s\n", errmsg);
 }
 void
 free_all_archs (void)
 {
-  archetype *
+  archetype *at, *next;
-  at, *
-    next;
-  int
-    i = 0, f = 0;
+  int i = 0, f = 0;
   for (at = first_archetype; at != NULL; at = next)
     {
       if (at->more)
         next = at->more;
  * of archetype-structures.
  */
 void
 first_arch_pass (object_thawer & fp)
 {
-  archetype *
-  at, *
-    head = NULL, *last_more = NULL;
+  archetype *at, *head = NULL, *last_more = NULL;
   at->clone.arch = first_archetype = at = new archetype;
   while (int i = load_object (fp, &at->clone, 0))
     {
  */
 void
 second_arch_pass (object_thawer & thawer)
 {
-  char
-  buf[MAX_BUF], *
-    variable = buf, *argument, *cp;
+  char buf[MAX_BUF], *variable = buf, *argument, *cp;
-  archetype *
-    at = NULL, *other;
+  archetype *at = NULL, *other;
   while (fgets (buf, MAX_BUF, thawer) != NULL)
     {
       if (*buf == '#')
         continue;
         }
       else if (!strcmp ("randomitems", variable))
         {
           if (at != NULL)
             {
-              treasurelist *
-                tl = find_treasurelist (argument);
+              treasurelist *tl = find_treasurelist (argument);
               if (tl == NULL)
                 LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
               else
                 at->clone.randomitems = tl;
 #ifdef DEBUG
 void
 check_generators (void)
 {
-  archetype *
+  archetype *at;
-    at;
   for (at = first_archetype; at != NULL; at = at->next)
     if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
       LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
 }
  */
 void
 load_archetypes (void)
 {
-  char
-    filename[MAX_BUF];
+  char filename[MAX_BUF];
 #if TIME_ARCH_LOAD
   struct timeval
     tv1,
     tv2;
  */
 object *
 arch_to_object (archetype *at)
 {
-  object *
+  object *op;
-    op;
   if (at == NULL)
     {
       if (warn_archetypes)
         LOG (llevError, "Couldn't find archetype.\n");
  */
 object *
 create_singularity (const char *name)
 {
-  object * op;
+  object *op;
   char buf[MAX_BUF];
   sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
   op = get_object ();
   op->name = op->name_pl = buf;

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.20 by root, Thu Sep 14 21:16:11 2006 UTC vs. Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.20 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC