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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.84 by root, Thu Jan 8 04:35:05 2009 UTC vs.
Revision 1.85 by elmex, Mon Jan 12 00:17:23 2009 UTC

   op->remove ();
   for (i = 0; i < op->stats.food; i++)
     {
       object *tmp = arch_to_object (op->other_arch);
-      if (op->type == LAMP)
-        tmp->stats.food = op->stats.food - 1;
       tmp->stats.hp = op->stats.hp;     /* The only variable it keeps. */
       if (env)
         env->insert (tmp);
       else
 {
   op->set_speed (0);
   cfperl_mapscript_activate (op, true, op, 0);
 }
+void move_lamp (object *op)
+{
+  // if the lamp/torch is off, we should disable it.
+  if (!op->glow_radius)
+    {
+      op->set_speed (0);
+      return;
+    }
+  // lamps and torches auf maps don't use up their fuel
+  if (op->is_on_map ())
+    return;
+  if (op->stats.food > 0)
+    {
+      op->stats.food--;
+      return;
+    }
+  apply_lamp (op, false);
+}
 void
 process_object (object *op)
 {
   if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
     return;
         break;
       case MAPSCRIPT:
         move_mapscript (op);
         break;
-    }
-}
+      case LAMP:
+      case TORCH:
+        move_lamp (op);
+        break;
+    }
+}

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