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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC vs.
Revision 1.153 by root, Sun Apr 11 00:34:05 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
  * Free Software Foundation, either version 3 of the License, or (at your
  * option) any later version.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
-#include <loader.h>
 #include <sproto.h>
 /////////////////////////////////////////////////////////////////////////////
 extern archetype *loading_arch;
   /* objects now have a materialname.  try to patch it in */
   if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
     select_material (this, map ? map->difficulty : 5);
+  if (speed < 0.)
+    {
+      flag [FLAG_RANDOM_SPEED] = true;
+      speed = -speed;
+      // speed_left will be randomised in instantiate () and copy_to ()
+    }
   /* only do these when program is first run - a bit
    * excessive to do this at every run - most of this is
    * really just to catch any errors - program will still run, but
    * not in the ideal fashion.
    */
       randomitems = 0;   /* So another spell isn't created for this object */
       /* without this, value is all screwed up */
       value = arch->value * inv->value;
     }
-  if (QUERY_FLAG (this, FLAG_MONSTER))
+  if (this->flag [FLAG_MONSTER])
     {
       if (stats.hp > stats.maxhp)
         {
           LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
           stats.maxhp = stats.hp;
       /* The archs just need to be updated for this */
       if (move_type == 0)
         move_type = MOVE_WALK;
     }
-  if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
+  if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
     /* Object will duplicate it's content as part of the
      * generation process. To do this, we must flag inventory
      * so it remains unevaluated concerning the randomitems and
      * the living (a demonlord shouldn't cast from inside generator!)
      */
                 // was: insert_ob_in_ob (tmp, op);
                 // but manually adding it can improve map loading times a lot
                 // also, appending instead of prepending keeps the
                 // save ordering the same between repeated load/saves.
                 // and finally we do not want any funny effects
-                CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
+                tmp->clr_flag (FLAG_OBJ_ORIGINAL);
-                CLEAR_FLAG (tmp, FLAG_REMOVED);
+                tmp->clr_flag (FLAG_REMOVED);
                 if (!op_inv)
                   {
                     inv = tmp;
                     tmp->above = 0;
             f.delayed_deref (this, owner, f.get_str ());
             break;
           case KW_animation:
             {
-              CLEAR_FLAG (this, FLAG_ANIMATE);
+              this->clr_flag (FLAG_ANIMATE);
               animation_id = 0;
               if (f.has_value () && (animation_id = find_animation (f.get_str ())))
-                SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
+                this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
             }
             break;
           case KW_last_heal:  f.get (last_heal);  break;
           case KW_last_sp:    f.get (last_sp);    break;
           case KW_last_grace: f.get (last_grace); break;
           case KW_last_eat:   f.get (last_eat);   break;
+          case KW_sl:
           case KW_speed_left: f.get (speed_left); break;
           case KW_speed:
             f.get (speed);
           case KW_identified:
             GET_FLAG (this, FLAG_IDENTIFIED);
             //TODO: move to check_object or so
-            if (QUERY_FLAG (this, FLAG_IDENTIFIED))
+            if (this->flag [FLAG_IDENTIFIED])
-              CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
+              this->clr_flag (FLAG_KNOWN_MAGICAL);
             break;
           case KW_friendly:
             if (f.get_bool ())
           case KW_berserk:              GET_FLAG (this, FLAG_BERSERK); break;
           case KW_is_buildable:         GET_FLAG (this, FLAG_IS_BUILDABLE); break;
           case KW_destroy_on_death:     GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
           case KW_treasure_env:         GET_FLAG (this, FLAG_TREASURE_ENV); break;
           case KW_precious:             GET_FLAG (this, FLAG_PRECIOUS); break;
+          case KW_random_speed:         GET_FLAG (this, FLAG_RANDOM_SPEED); break;
           case KW_armour:               f.get (resist[ATNR_PHYSICAL]); break;
           case KW_resist_physical:      f.get (resist[ATNR_PHYSICAL]); break;
           case KW_resist_magic:         f.get (resist[ATNR_MAGIC]); break;
           case KW_resist_fire:          f.get (resist[ATNR_FIRE]); break;
     /* 100 */
     KW_neutral,
     KW_no_attack,
     KW_no_damage,
     KW_obj_original,
-    KW_NULL,
+    KW_random_speed,
     KW_activate_on_push,
     KW_activate_on_release,
     KW_is_water,
     KW_use_content_on_gen,
     KW_NULL,
   CMP_OUT (subtype);
   CMP_OUT (direction);
   CMP_OUT (name);
   CMP_OUT (name_pl);
   CMP_OUT (speed);
   // speed_left is a major time-burner, and has good locality, so
   // we use a simple lookup-cache to avoid the very slow printf.
   if (op->speed_left != arch->speed_left)
     {
       static double last_speed_left = 0.;
-      static char   last_speed_left_str [256] = "speed_left 0\n";
+      static char   last_speed_left_str [256] = "sl 0\n";
-      static int    last_speed_left_len = sizeof ("speed_left 0\n") - 1;
+      static int    last_speed_left_len = sizeof ("sl 0\n") - 1;
       if (last_speed_left != op->speed_left)
         {
           last_speed_left = op->speed_left;
-          last_speed_left_len = sizeof ("speed_left ") - 1
+          last_speed_left_len = sizeof ("sl ") - 1
-                              + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
+                              + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
         }
       f.add (last_speed_left_str, last_speed_left_len);
     }
   if (op->flag [FLAG_IS_LINKED])
     if (auto (ol, op->find_link ()))
       f.put (KW(connected), ol->id);
   CMP_OUT (randomitems);
   CMP_OUT2 (container, weight_limit);
   CMP_OUT (run_away);
   CMP_OUT (pick_up);
   CMP_OUT (will_apply);

Diff Legend

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

Comparing deliantra/server/common/loader.C (file contents): Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC vs. Revision 1.153 by root, Sun Apr 11 00:34:05 2010 UTC

Diff Legend

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC vs.
Revision 1.153 by root, Sun Apr 11 00:34:05 2010 UTC