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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.87 by root, Thu Apr 19 11:12:46 2007 UTC vs.
Revision 1.99 by root, Tue May 22 10:50:01 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
  * Copyright (C) 2001 Mark Wedel
  * Copyright (C) 1992 Frank Tore Johansen
  *
         {
           if (ob->map && ob->map->path[0])
             {
               int flags = 0;
-              if (ob->map->tile_path[0])
+              if (ob->map->tile_path[0]) flags |= 1;
-                flags |= 1;
-              if (ob->map->tile_path[1])
+              if (ob->map->tile_path[1]) flags |= 2;
-                flags |= 2;
-              if (ob->map->tile_path[2])
+              if (ob->map->tile_path[2]) flags |= 4;
-                flags |= 4;
-              if (ob->map->tile_path[3])
+              if (ob->map->tile_path[3]) flags |= 8;
-                flags |= 8;
               snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
                         flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
             }
           else
         snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
       else if (map && map->path[0])
         {
           int flags = 0;
-          if (map->tile_path[0])
+          if (map->tile_path[0]) flags |= 1;
-            flags |= 1;
-          if (map->tile_path[1])
+          if (map->tile_path[1]) flags |= 2;
-            flags |= 2;
-          if (map->tile_path[2])
+          if (map->tile_path[2]) flags |= 4;
-            flags |= 4;
-          if (map->tile_path[3])
+          if (map->tile_path[3]) flags |= 8;
-            flags |= 8;
           snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
         }
       else
         snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
     {
       case ST_PLAYING:
         LOG (llevError, "Got reply message with ST_PLAYING input state\n");
         break;
-      case ST_CHANGE_CLASS:
-        key_change_class (pl->ob, buf[0]);
-        break;
       case ST_GET_PARTY_PASSWORD:    /* Get password for party */
         receive_party_password (pl->ob, 13);
         break;
       default:
   cp = strchr (cp + 1, ' ');
   if (cp)
     {
-      assign (ns->version, cp + 1);
+      ns->version = cp + 1;
       if (ns->sc_version < 1026)
         ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
                    "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
     }
 send_query (client *ns, uint8 flags, const char *text)
 {
   ns->send_packet_printf ("query %d %s", flags, text ? text : "");
 }
+/**
+ * Get player's current range attack in obuf.
+ */
+static void
+rangetostring (player *pl, char *obuf)
+{
+  dynbuf_text buf;
+  if (pl->ranged_ob)
+    buf << " Range"  << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
+  if (pl->combat_ob)
+    buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
+  //TODO: remove this when slot system is working, this is only for debugging
+  if (pl->ob->chosen_skill)
+    buf << " Skill*: "  << pl->ob->chosen_skill->name;
+  //TODO: maybe golem should become the current_weapon, quite simply?
+  if (pl->golem)
+    buf << " Golem*: "  << pl->golem->name;
+  buf.linearise (obuf);
+  obuf [buf.size ()] = 0;
+}
 #define AddIfInt64(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint64 (New); \
                        }
 #define AddIfShort(Old,New,Type) if (Old != New) {\
                         Old = New; \
                         sl << uint8 (Type) << uint16 (New); \
                        }
-#define AddIfFloat(Old,New,Type) if (Old != New) {\
+#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
                         Old = New; \
-                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
+                        sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
                         }
 #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
                         free(Old); Old = strdup (New);\
                         sl << uint8 (Type) << data8 (New); \
   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);
+  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);
+  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 (pl->fire_on)
       AddIfInt (ns->last_path_attuned,  ob->path_attuned,  CS_STAT_SPELL_ATTUNE);
       AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
       AddIfInt (ns->last_path_denied,   ob->path_denied,   CS_STAT_SPELL_DENY);
     }
-  rangetostring (ob, buf);  /* we want use the new fire & run system in new client */
+  rangetostring (pl, buf);  /* we want use the new fire & run system in new client */
   AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
   set_title (ob, buf);
   AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
   /* Only send it away if we have some actual data */

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.87 by root, Thu Apr 19 11:12:46 2007 UTC vs. Revision 1.99 by root, Tue May 22 10:50:01 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.87 by root, Thu Apr 19 11:12:46 2007 UTC vs.
Revision 1.99 by root, Tue May 22 10:50:01 2007 UTC