--- deliantra/server/common/recipe.C	2008/05/06 16:55:25	1.26
+++ deliantra/server/common/recipe.C	2009/01/01 11:41:17	1.27
@@ -112,11 +112,11 @@
 
   for (i = 0; i < rp->arch_names; i++)
     {
-      if (archetype::find (rp->arch_name[i]) != NULL)
+      if (archetype::find (rp->arch_name[i]))
         {
           artifact *art = locate_recipe_artifact (rp, i);
 
-          if (!art && strcmp (rp->title, "NONE") != 0)
+          if (!art && rp->title != shstr_NONE)
             {
               LOG (llevError, "WARNING: Formula %s of %s has no artifact.\n", rp->arch_name[i], &rp->title);
               result = 0;
@@ -378,7 +378,7 @@
 
       /* find the first archetype matching the first part of the name */
       for_all_archetypes (at)
-        if (!strcasecmp (at->object::name, part1) && at->title == NULL)
+        if (at->object::name.eq_nc (part1) && !at->title)
           {
             /* find the first artifact derived from that archetype (same type) */
             for (al = first_artifactlist; al; al = al->next)
@@ -400,7 +400,7 @@
       strcpy (part2, cp + 3);
       /* examine all archetypes matching the first part of the name */
       for_all_archetypes (at)
-        if (!strcasecmp (at->object::name, part1) && at->title == NULL)
+        if (at->object::name.eq_nc (part1) && !at->title)
           {
             if (at->randomitems)
               {