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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.100 by root, Sat Jan 20 22:09:55 2007 UTC

   players.insert (this);
   ob->remove ();
   ob->map = 0;
   ob->activate_recursive ();
+  CLEAR_FLAG (ob, FLAG_FRIENDLY);
+  add_friendly_object (ob);
   enter_map ();
 }
 void
 player::deactivate ()
 {
   if (!active)
     return;
   terminate_all_pets (ob);
+  remove_friendly_object (ob);
   ob->deactivate_recursive ();
+  maplevel = ob->map->path;
   ob->remove ();
   ob->map = 0;
+  // for weird reasons, this is often "ob", keeping a circular reference
+  ranges [range_skill] = 0;
   players.erase (this);
 }
 // connect the player with a specific client
 player::connect (client *ns)
 {
   this->ns = ns;
   ns->pl = this;
+  run_on = 0;
+  fire_on = 0;
+  ob->container = 0; //TODO: client-specific
   ns->update_look = 0;
   ns->look_position = 0;
   clear_los (ob);
+  ns->reset_stats ();
   /* make sure he's a player -- needed because of class change. */
   ob->type = PLAYER; // we are paranoid
   ob->race = ob->arch->clone.race;
             skin = tmp;
       set_dragon_name (ob, abil, skin);
     }
-  CLEAR_FLAG (ob, FLAG_FRIENDLY);
-  add_friendly_object (ob);
   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
   esrv_new_player (this, ob->weight + ob->carrying);
   ob->update_stats ();
       if (active)
         INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
       INVOKE_PLAYER (DISCONNECT, this);
+      ns->reset_stats ();
       ns->pl = 0;
       this->ns = 0;
     }
+  ob->container = 0; //TODO: client-specific
   deactivate ();
 }
 // the need for this function can be explained
 // by load_object not returning the object
   unapply = unapply_nochoice;
   savebed_map = first_map_path;      /* Init. respawn position */
   gen_sp_armour = 10;
-  last_speed = -1;
   shoottype = range_none;
   bowtype = bow_normal;
   petmode = pet_normal;
   listening = 10;
   usekeys = containers;
-  last_weapon_sp = -1;
   peaceful = 1;              /* default peaceful */
   do_los = 1;
-  /* we need to clear these to -1 and not zero - otherwise,
-   * if a player quits and starts a new character, we wont
-   * send new values to the client, as things like exp start
-   * at zero.
-   */
-  for (int i = 0; i < NUM_SKILLS; i++)
-    last_skill_exp[i] = -1;
-  for (int i = 0; i < NROFATTACKS; i++)
-    last_resist[i] = -1;
-  last_stats.exp = -1;
-  last_weight = (uint32) - 1;
 }
 void
 player::do_destroy ()
 {
   object *op = NULL;
   objectlink *ol;
   unsigned lastdist;
   rv_vector rv;
-  for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
+  for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
     {
       /* We should not find free objects on this friendly list, but it
        * does periodically happen.  Given that, lets deal with it.
        * While unlikely, it is possible the next object on the friendly
        * list is also free, so encapsulate this in a while loop.
           object *tmp = ol->ob;
           /* Can't do much more other than log the fact, because the object
            * itself will have been cleared.
            */
-          LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
+          LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
+               tmp->debug_desc ());
           ol = ol->next;
           remove_friendly_object (tmp);
           if (!ol)
             return op;
         }
   x = mon->x;
   y = mon->y;
   m = mon->map;
   dir = rv.direction;
   lastdir = firstdir = rv.direction;    /* perhaps we stand next to pl, init firstdir too */
-  diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);
+  diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
   /* If we can't solve it within the search distance, return now. */
   if (diff > max)
     return 0;
   while (diff > 1 && max > 0)
     {
       lastx = x;
       lasty = y;
       lastmap = m;
           max--;
           lastdir = dir;
           if (!firstdir)
             firstdir = dir;
         }
       if (diff <= 1)
         {
           /* Recalculate diff (distance) because we may not have actually
            * headed toward player for entire distance.
            */
           get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
-          diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);
+          diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
         }
       if (diff > max)
         return 0;
     }
   /* If we reached the max, didn't find a direction in time */
   if (!max)
     return 0;
   return firstdir;
 roll_stat (void)
 {
   int a[4], i, j, k;
   for (i = 0; i < 4; i++)
-    a[i] = (int) RANDOM () % 6 + 1;
+    a[i] = (int) rndm (6) + 1;
   for (i = 0, j = 0, k = 7; i < 4; i++)
     if (a[i] < k)
       k = a[i], j = i;
        * to save here.
        */
       sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
       make_path_to_file (buf);
-#ifdef AUTOSAVE
-      op->contr->last_save_tick = pticks;
-#endif
       start_info (op);
       CLEAR_FLAG (op, FLAG_WIZ);
       give_initial_items (op, op->randomitems);
       link_player_skills (op);
       esrv_send_inventory (op, op);
           {
             if (op->type == PLAYER)
               new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
             return;
           }
-        (void) do_skill (op, op, op->chosen_skill, dir, NULL);
+        do_skill (op, op, op->chosen_skill, dir, NULL);
         return;
       case range_builder:
         apply_map_builder (op, dir);
         return;
       default:
       return 0;
     }
   /* peterm: added following line */
   if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
-    dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
+    dir = absdir (dir + rndm (3) + rndm (3) - 2);
   op->facing = dir;
   if (op->hide)
     do_hidden_move (op);
       tmp->x = op->x, tmp->y = op->y;
       if (tmp->type == CONTAINER)
         {                       /* empty container to ground */
           loot_object (tmp);
         }
-      if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))
+      if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
         {
           if (tmp->nrof > 1)
             {
               tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
               tmp2->destroy ();
  * not readied.
  */
 void
 player_unready_range_ob (player *pl, object *ob)
 {
-  rangetype i;
-  for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
+  for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
-    {
-      if (pl->ranges[i] == ob)
+    if (pl->ranges[i] == ob)
-        {
+      {
-          pl->ranges[i] = NULL;
+        pl->ranges[i] = 0;
-          if (pl->shoottype == i)
+        if (pl->shoottype == i)
-            {
-              pl->shoottype = range_none;
+          pl->shoottype = range_none;
-            }
-        }
+      }
-    }
 }

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs. Revision 1.100 by root, Sat Jan 20 22:09:55 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.91 by root, Sun Jan 7 23:10:43 2007 UTC vs.
Revision 1.100 by root, Sat Jan 20 22:09:55 2007 UTC