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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 2001 Mark Wedel
- * 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.
    * commands.
    */
   pl->count = 0;
   //TODO: schmorp thinks whatever this calculates, it makes no sense at all
-  int time = fabs (pl->ob->speed) < 0.001
+  int time = pl->ob->has_active_speed ()
-                ? time = MAX_TIME * 100
-                : time = (int) (MAX_TIME / fabs (pl->ob->speed));
+             ? (int) (MAX_TIME / pl->ob->speed)
+             : MAX_TIME * 100;
   /* Send confirmation of command execution now */
   packet sl ("comc");
   sl << uint16 (cmdid) << uint32 (time);
   pl->ns->send_packet (sl);
  */
 static void
 rangetostring (player *pl, char *obuf)
 {
   dynbuf_text &buf = msg_dynbuf; buf.clear ();
+#if 0
+  // print ranged/chosen_skill etc. objects every call
+  printf ("%s %s => %s (%s)\n",
+          pl->ranged_ob ? &pl->ranged_ob->name : "-",
+          pl->combat_ob ? &pl->combat_ob->name : "-",
+          pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
+          pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
+          );
+#endif
   if (pl->ranged_ob)
     buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
   if (pl->combat_ob)
   AddIfInt64 (ns->last_stats.exp,  ob->stats.exp, CS_STAT_EXP64);
   AddIfShort (ns->last_level,      ob->level, CS_STAT_LEVEL);
   AddIfShort (ns->last_stats.wc,   ob->stats.wc, CS_STAT_WC);
   AddIfShort (ns->last_stats.ac,   ob->stats.ac, CS_STAT_AC);
   AddIfShort (ns->last_stats.dam,  ob->stats.dam, CS_STAT_DAM);
-  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f/TICK);
+  AddIfFloat (ns->last_speed,      ob->speed, CS_STAT_SPEED, 1.f / TICK);
   AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
-  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
+  AddIfFloat (ns->last_weapon_sp,  pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
   AddIfInt   (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
   flags = 0;
   if (opl->fire_on)
   if (opl->run_on)
     flags |= SF_RUNON;
   AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
-  if (ns->sc_version < 1025)
-    { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
-  else
-    for (int i = 0; i < NROFATTACKS; i++)
+  for (int i = 0; i < NROFATTACKS; i++)
-      {
+    {
-        /* Skip ones we won't send */
+      /* Skip ones we won't send */
-        if (atnr_cs_stat[i] == -1)
+      if (atnr_cs_stat[i] == -1)
-          continue;
+        continue;
-        AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
+      AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
-      }
+    }
   if (pl->ns->monitor_spells)
     {
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
 prefetch_surrounding_maps (maptile *map, int distance)
 {
   map->touch ();
   if (--distance)
-    for (int dir = 4; --dir; )
+    for (int dir = 4; dir--; )
       if (const shstr &path = map->tile_path [dir])
         if (maptile *&neigh = map->tile_map [dir])
           prefetch_surrounding_maps (neigh, distance);
         else
           neigh = maptile::find_async (path, map);
             map_clearcell (&lastcell, -1);
           }
         continue;
       }
     int d = pl->blocked_los_uc (dx, dy);
     if (d > 3)
       {
         /* This block deals with spaces that are not visible for whatever
 esrv_update_spells (player *pl)
 {
   if (!pl->ns)
     return;
+  pl->ns->update_spells = false;
   if (!pl->ns->monitor_spells)
     return;
   for (object *spell = pl->ob->inv; spell; spell = spell->below)
-    {
-      if (spell->type == SPELL)
+    if (spell->type == SPELL)
-        {
+      {
-          int flags = 0;
+        int flags = 0;
+        int val;
-          /* check if we need to update it */
+        /* check if we need to update it */
-          if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
+        val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+        if (spell->cached_sp != val)
-            {
+          {
-              spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+            spell->cached_sp = val;
-              flags |= UPD_SP_MANA;
+            flags |= UPD_SP_MANA;
-            }
+          }
-          if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
+        val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+        if (spell->cached_grace != val)
-            {
+          {
-              spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+            spell->cached_grace = val;
-              flags |= UPD_SP_GRACE;
+            flags |= UPD_SP_GRACE;
-            }
+          }
-          if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
+        val = casting_level (pl->ob, spell);
+        if (spell->cached_eat != val)
-            {
+          {
-              spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+            spell->cached_eat = val;
-              flags |= UPD_SP_DAMAGE;
+            flags |= UPD_SP_LEVEL;
-            }
+          }
-          if (flags)
+        if (flags)
-            {
+          {
-              packet sl;
+            packet sl;
-              sl << "updspell "
+            sl << "updspell "
-                 << uint8 (flags)
+               << uint8 (flags)
-                 << uint32 (spell->count);
+               << uint32 (spell->count);
-              if (flags & UPD_SP_MANA  ) sl << uint16 (spell->cached_sp);
+            if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
-              if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
+            if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
-              if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
+            if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
-              pl->ns->send_packet (sl);
+            pl->ns->send_packet (sl);
-            }
+          }
-        }
+      }
-    }
 }
 void
 esrv_remove_spell (player *pl, object *spell)
 {
     }
   /* store costs and damage in the object struct, to compare to later */
   spell->cached_sp    = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
   spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
-  spell->cached_eat   = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+  spell->cached_eat   = casting_level (pl->ob, spell);
   /* figure out which skill it uses, if it uses one */
   if (spell->skill)
     if (object *tmp = pl->find_skill (spell->skill))
       skill = tmp->subtype + CS_STAT_SKILLINFO;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC vs. Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC vs.
Revision 1.167 by root, Sat Apr 3 22:30:21 2010 UTC