--- deliantra/server/server/spell_attack.C	2009/10/12 14:00:59	1.88
+++ deliantra/server/server/spell_attack.C	2009/11/11 04:45:23	1.92
@@ -39,7 +39,7 @@
  * but moved here so it could be applied to bolts too
  * op is the spell object.
  */
-void
+static void
 check_spell_knockback (object *op)
 {
   int weight_move;
@@ -110,7 +110,7 @@
 /* Causes op to fork. op is the original bolt, tmp
  * is the first piece of the fork.
  */
-void
+static void
 forklightning (object *op, object *tmp)
 {
   int new_dir = 1;              /* direction or -1 for left, +1 for right 0 if no new bolt */
@@ -391,7 +391,7 @@
  * poison cloud ball, etc.  op is the object to
  * explode.
  */
-void
+static void
 explode_bullet (object *op)
 {
   object *tmp, *owner;
@@ -689,7 +689,7 @@
  *****************************************************************************/
 
 /* drops an object based on what is in the cone's "other_arch" */
-void
+static void
 cone_drop (object *op)
 {
   object *new_ob = arch_to_object (op->other_arch);
@@ -1049,7 +1049,7 @@
  * type is the type of spell - either SPELL_MANA or SPELL_GRACE.
  * this info is used for blocked magic/unholy spaces.
  */
-object *
+static object *
 get_pointed_target (object *op, int dir, int range, int type)
 {
   object *target;
@@ -1246,7 +1246,7 @@
  * make this work for non-living objects, we would have to 
  * give them the capability to have an inventory. b.t.
  */
-int
+static int
 make_object_glow (object *op, int radius, int time)
 {
   /* some things are unaffected... */
@@ -1327,7 +1327,6 @@
  * CURSE
  *
  ***************************************************************************/
-
 int
 cast_curse (object *op, object *caster, object *spell_ob, int dir)
 {
@@ -1415,8 +1414,8 @@
   change_abil (tmp, force);     /* Mostly to display any messages */
   insert_ob_in_ob (force, tmp);
   tmp->update_stats ();
-  return 1;
 
+  return 1;
 }
 
 /**********************************************************************
@@ -1527,7 +1526,7 @@
           if (head->level > level)
             continue;
 
-          if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + MIN (50, 2 * (level - head->level))))
+          if (random_roll (0, 100, caster, PREFER_LOW) >= (20 + min (50, 2 * (level - head->level))))
             /* Failed, no effect */
             continue;
         }
@@ -2034,7 +2033,7 @@
                     new_draw_info_format (NDI_UNIQUE, 0, op, "You inflict %s on %s!", &disease->name, &walk->name);
 
                     disease->destroy ();      /* don't need this one anymore */
-                    walk->map->insert (get_archetype ("detect_magic"), x, y, op);
+                    walk->map->insert (get_archetype (shstr_detect_magic), x, y, op);
                     return 1;
                   }