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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.344 by root, Sun May 1 13:18:23 2011 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * 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
     }
   mapspace &m = op->ms ();
   if (!(m.flags_ & P_UPTODATE))
-    /* nop */;
+    m.update_up (); // nothing to do except copy up
   else if (action == UP_OBJ_INSERT)
     {
 #if 0
       // this is likely overkill, TODO: revisit (schmorp)
       if ((op->flag [FLAG_BLOCKSVIEW]  && !(m.flags_ & P_BLOCKSVIEW))
      * that is being removed.
      */
   else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
     m.invalidate ();
   else if (action == UP_OBJ_FACE)
-    /* Nothing to do for that case */ ;
+    m.update_up (); // nothing to do for that case, except copy up
   else
     LOG (llevError, "update_object called with invalid action: %d\n", action);
   if (op->more)
     update_object (op->more, action);
    * if some form of movement is allowed, let objects
    * drop on that space.
    */
   if (!drop_to_ground
       || !map
-      || map->in_memory != MAP_ACTIVE
+      || !map->linkable ()
       || map->no_drop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         inv->destroy ();
   li->count = count;
   freelist = li;
   ++free_count;
 }
-static struct freed_map : maptile
-{
-  freed_map ()
-  : maptile (3, 3)
-  {
-    path     = "<freed objects map>";
-    name     = "/internal/freed_objects_map";
-    no_drop  = 1;
-    no_reset = 1;
-    in_memory = MAP_ACTIVE;
-  }
-  ~freed_map ()
-  {
-    destroy ();
-  }
-} freed_map; // freed objects are moved here to avoid crashes
 void
 object::do_destroy ()
 {
   if (flag [FLAG_IS_LINKED])
       above = 0;
       below = 0;
       ms.invalidate ();
-      if (map->in_memory == MAP_SAVING)
-        return;
       int check_walk_off = !flag [FLAG_NO_APPLY];
       if (object *pl = ms.player ())
         {
 {
   op->remove ();
   if (m == &freed_map)//D TODO: remove soon
     {//D
-      LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
+      LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
     }//D
   /* Ideally, the caller figures this out.  However, it complicates a lot
    * of areas of callers (eg, anything that uses find_free_spot would now
    * need extra work
  */
 int
 find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
 {
   int altern[SIZEOFFREE];
-  int index = 0, flag;
+  int index = 0;
   for (int i = start; i < stop; i++)
     {
       mapxy pos (m, x, y); pos.move (i);
  * there is capable of.
  */
 int
 find_dir (maptile *m, int x, int y, object *exclude)
 {
-  int max = SIZEOFFREE, mflags;
+  int max = SIZEOFFREE;
   MoveType move_type;
   if (exclude && exclude->head_ () != exclude)
     {
       exclude = exclude->head;
   return                        /*who->flag [FLAG_WIZ]|| */
     (item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
      !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
 }
+//-GPL
 /*
  * create clone from object to another
  */
 object *
 object::deep_clone ()
 object::region () const
 {
   return map ? map->region (x, y)
              : region::default_region ();
 }
+//+GPL
 void
 object::open_container (object *new_container)
 {
   if (container == new_container)
     }
 //  else if (!old_container->env && contr && contr->ns)
 //    contr->ns->floorbox_reset ();
 }
+//-GPL
+// prefetch some flat area around the player
+static void
+prefetch_surrounding_area (object *op, maptile *map, int range)
+{
+  for (maprect *rect = map->split_to_tiles (mapwalk_buf,
+                          op->x - range    , op->y - range    ,
+                          op->x + range + 1, op->y + range + 1);
+       rect->m;
+       ++rect)
+    {
+      rect->m->touch ();
+      rect->m->activate ();
+    }
+}
+// prefetch a generous area around the player, also up and down
+void
+object::prefetch_surrounding_maps ()
+{
+  prefetch_surrounding_area (this, map, 40);
+  if (maptile *m = map->tile_available (TILE_DOWN))
+    prefetch_surrounding_area (this, m, 20);
+  if (maptile *m = map->tile_available (TILE_UP))
+    prefetch_surrounding_area (this, m, 20);
+}
+//+GPL
 object *
 object::force_find (shstr_tmp name)
 {
   /* cycle through his inventory to look for the MARK we want to
    * place
       return splay (tmp);
   return 0;
 }
-//-GPL
 void
 object::force_set_timer (int duration)
 {
   this->duration   = 1;
   this->speed_left = -1.f;
 object::force_add (shstr_tmp name, int duration)
 {
   if (object *force = force_find (name))
     force->destroy ();
-  object *force = get_archetype (FORCE_NAME);
+  object *force = archetype::get (FORCE_NAME);
   force->slaying = name;
   force->force_set_timer (duration);
   force->flag [FLAG_APPLIED] = true;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.344 by root, Sun May 1 13:18:23 2011 UTC vs. Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.344 by root, Sun May 1 13:18:23 2011 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC