--- deliantra/server/socket/request.C 2010/04/02 03:41:25 1.166
+++ deliantra/server/socket/request.C 2012/11/04 01:01:13 1.190
@@ -1,24 +1,24 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 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
* 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.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -46,7 +46,6 @@
#include
#include
-#include
/* This block is basically taken from socket.c - I assume if it works there,
* it should work here.
@@ -68,16 +67,30 @@
* client. If a value is -1, then we don't send that to the
* client.
*/
-static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
- CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
- CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
- CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
- CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
- CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
- CS_STAT_RES_FEAR, -1 /* Cancellation */ ,
- CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,
- -1 /* Chaos */ , -1 /* Counterspell */ ,
- -1 /* Godpower */ , CS_STAT_RES_HOLYWORD,
+static short atnr_cs_stat[NROFATTACKS] =
+{
+ CS_STAT_RES_PHYS,
+ CS_STAT_RES_MAG,
+ CS_STAT_RES_FIRE,
+ CS_STAT_RES_ELEC,
+ CS_STAT_RES_COLD,
+ CS_STAT_RES_CONF,
+ CS_STAT_RES_ACID,
+ CS_STAT_RES_DRAIN,
+ -1 /* weaponmagic */,
+ CS_STAT_RES_GHOSTHIT,
+ CS_STAT_RES_POISON,
+ CS_STAT_RES_SLOW,
+ CS_STAT_RES_PARA,
+ CS_STAT_TURN_UNDEAD,
+ CS_STAT_RES_FEAR,
+ -1 /* Cancellation */,
+ CS_STAT_RES_DEPLETE,
+ CS_STAT_RES_DEATH,
+ -1 /* Chaos */,
+ -1 /* Counterspell */,
+ -1 /* Godpower */,
+ CS_STAT_RES_HOLYWORD,
CS_STAT_RES_BLIND,
-1, /* Internal */
-1, /* life stealing */
@@ -135,10 +148,7 @@
memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
pl->ns->force_newmap = false;
-
- if (pl->ns->newmapcmd == 1)
- pl->ns->send_packet ("newmap");
-
+ pl->ns->send_packet ("newmap");
pl->ns->floorbox_reset ();
}
@@ -150,14 +160,18 @@
if (socket.mapinfocmd)
{
- if (ob->map && ob->map->path[0])
+ if (ob->map && ob->map->path)
{
int flags = 0;
- if (ob->map->tile_path[0]) flags |= 1;
- if (ob->map->tile_path[1]) flags |= 2;
- if (ob->map->tile_path[2]) flags |= 4;
- if (ob->map->tile_path[3]) flags |= 8;
+ // due to historical glitches, the bit ordering and map index ordering differs
+ if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
+ if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
+ if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
+ if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
+ // these two are debatable
+ if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
+ if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
@@ -182,7 +196,7 @@
socket.current_region = reg;
}
- // first try to aovid a full newmap on tiled map scrolls
+ // first try to avoid a full newmap on tiled map scrolls
if (socket.current_map != ob->map && !socket.force_newmap)
{
rv_vector rv;
@@ -231,14 +245,11 @@
packet sl;
sl << "replyinfo skill_info\n";
- for (int i = 1; i < NUM_SKILLS; i++)
- sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
+ for (int i = 0; i < skillvec.size (); ++i)
+ sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
if (sl.length () > MAXSOCKBUF)
- {
- LOG (llevError, "Buffer overflow in send_skill_info!\n");
- fatal (0);
- }
+ cleanup ("buffer overflow in send_skill_info!");
ns->send_packet (sl);
}
@@ -258,10 +269,7 @@
sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
if (sl.length () > MAXSOCKBUF)
- {
- LOG (llevError, "Buffer overflow in send_spell_paths!\n");
- fatal (0);
- }
+ cleanup ("buffer overflow in send_spell_paths!");
ns->send_packet (sl);
}
@@ -270,6 +278,8 @@
* RequestInfo is sort of a meta command. There is some specific
* request of information, but we call other functions to provide
* that information.
+ * requestinfo is completely deprecated, use resource exti request
+ * and the fxix or http protocols.
*/
void
RequestInfo (char *buf, int len, client *ns)
@@ -339,8 +349,14 @@
{
int dir = *buf++ - '1';
- if (dir >= 0 && dir <= 3)
+ // due to historical glitches, the mapinfo index and tile index differs
+ static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
+
+ // maybe we should only allow the four flat directions
+ if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
{
+ dir = dirmap [dir];
+
if (!map->tile_path [dir])
map = 0;
else if (map->tile_available (dir, false))
@@ -373,10 +389,14 @@
{
int flags = 0;
- if (map->tile_path[0]) flags |= 1;
- if (map->tile_path[1]) flags |= 2;
- if (map->tile_path[2]) flags |= 4;
- if (map->tile_path[3]) flags |= 8;
+ // due to historical glitches, the bit ordering and map index ordering differs
+ if (map->tile_path [TILE_NORTH]) flags |= 0x01;
+ if (map->tile_path [TILE_EAST ]) flags |= 0x02;
+ if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
+ if (map->tile_path [TILE_WEST ]) flags |= 0x08;
+ // these two are debatable
+ if (map->tile_path [TILE_UP ]) flags |= 0x10;
+ if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
}
@@ -449,70 +469,6 @@
//+GPL
-/*
-#define MSG_TYPE_BOOK 1
-#define MSG_TYPE_CARD 2
-#define MSG_TYPE_PAPER 3
-#define MSG_TYPE_SIGN 4
-#define MSG_TYPE_MONUMENT 5
-#define MSG_TYPE_SCRIPTED_DIALOG 6*/
-
-/** Reply to ExtendedInfos command */
-void
-ToggleExtendedText (char *buf, int len, client * ns)
-{
- char cmdback[MAX_BUF];
- char temp[10];
- char command[50];
- int info, nextinfo, i, flag;
-
- cmdback[0] = '\0';
-
- nextinfo = 0;
- while (1)
- {
- /* 1. Extract an info */
- info = nextinfo;
-
- while ((info < len) && (buf [info] == ' '))
- info++;
-
- if (info >= len)
- break;
-
- nextinfo = info + 1;
-
- while ((nextinfo < len) && (buf [nextinfo] != ' '))
- nextinfo++;
-
- if (nextinfo - info >= 49) /*Erroneous info asked */
- continue;
-
- memcpy (command, buf + info, nextinfo - info);
- command [nextinfo - info] = 0;
-
- /* 2. Interpret info */
- i = sscanf (command, "%d", &flag);
-
- if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
- ns->supported_readables |= (1 << flag);
- /*3. Next info */
- }
-
- /* Send resulting state */
- strcpy (cmdback, "ExtendedTextSet");
-
- for (i = 0; i <= MSG_TYPE_LAST; i++)
- if (ns->supported_readables & (1 << i))
- {
- strcat (cmdback, " ");
- snprintf (temp, sizeof (temp), "%d", i);
- strcat (cmdback, temp);
- }
-
- ns->send_packet (cmdback);
-}
-
/**
* This handles the general commands from the client (ie, north, fire, cast,
* etc.)
@@ -632,50 +588,12 @@
}
/**
- * Client tells its version. If there is a mismatch, we close the
- * socket. In real life, all we should care about is the client having
- * something older than the server. If we assume the client will be
- * backwards compatible, having it be a later version should not be a
- * problem.
+ * Client tells its version info.
*/
void
-VersionCmd (char *buf, int len, client * ns)
+VersionCmd (char *buf, int len, client *ns)
{
- if (!buf)
- {
- LOG (llevError, "CS: received corrupted version command\n");
- return;
- }
-
- ns->cs_version = atoi (buf);
- ns->sc_version = ns->cs_version;
-
- LOG (llevDebug, "connection from client <%s>\n", buf);
-
- //TODO: should log here just for statistics
-
- //if (VERSION_CS != ns->cs_version)
- // unchecked;
-
- char *cp = strchr (buf + 1, ' ');
- if (!cp)
- return;
-
- ns->sc_version = atoi (cp);
-
- //if (VERSION_SC != ns->sc_version)
- // unchecked;
-
- cp = strchr (cp + 1, ' ');
-
- if (cp)
- {
- 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!! ****");
- }
+ INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
}
/** sound related functions. */
@@ -738,12 +656,15 @@
{
dynbuf_text &buf = msg_dynbuf; buf.clear ();
- printf ("%s %s => %s (%s)\n",//D
+#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;
@@ -799,9 +720,6 @@
void
esrv_update_stats (player *pl)
{
- char buf[MAX_BUF];
- uint16 flags;
-
client *ns = pl->ns;
if (!ns)
return;
@@ -828,7 +746,7 @@
AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
- for (int s = 0; s < NUM_SKILLS; s++)
+ for (int s = 0; s < CS_NUM_SKILLS; s++)
if (object *skill = opl->last_skill_ob [s])
if (skill->stats.exp != ns->last_skill_exp [s])
{
@@ -837,7 +755,7 @@
/* Always send along the level if exp changes. This is only
* 1 extra byte, but keeps processing simpler.
*/
- sl << uint8 (s + CS_STAT_SKILLINFO)
+ sl << uint8 (CS_STAT_SKILLINFO + s)
<< uint8 (skill->level)
<< uint64 (skill->stats.exp);
}
@@ -852,24 +770,15 @@
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)
- flags |= SF_FIREON;
-
- if (opl->run_on)
- flags |= SF_RUNON;
+ int flags = (opl->fire_on ? SF_FIREON : 0)
+ | (opl->run_on ? SF_RUNON : 0);
AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
for (int i = 0; i < NROFATTACKS; i++)
- {
- /* Skip ones we won't send */
- if (atnr_cs_stat[i] == -1)
- continue;
-
+ /* Skip ones we won't send */
+ if (atnr_cs_stat[i] >= 0)
AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
- }
if (pl->ns->monitor_spells)
{
@@ -878,6 +787,7 @@
AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
}
+ char buf[MAX_BUF];
rangetostring (opl, buf); /* we want use the new fire & run system in new client */
AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
set_title (ob, buf);
@@ -981,32 +891,6 @@
return 0;
}
-//-GPL
-
-// prefetch (and touch) all maps within a specific distancd
-static void
-prefetch_surrounding_maps (maptile *map, int distance)
-{
- map->touch ();
-
- if (--distance)
- 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);
-}
-
-// prefetch a generous area around the player
-static void
-prefetch_surrounding_maps (object *op)
-{
- prefetch_surrounding_maps (op->map, 3);
-}
-
-//+GPL
-
/**
* Draws client map.
*/
@@ -1021,13 +905,13 @@
* can get swapped out. If so, don't try to send them a map. All will
* be OK once they really log in.
*/
- if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
+ if (!ob->map || ob->map->state != MAP_ACTIVE)
return;
int startlen, oldlen;
check_map_change (pl);
- prefetch_surrounding_maps (pl->ob);
+ pl->ob->prefetch_surrounding_maps ();
/* do LOS after calls to update_position */
/* unfortunately, we need to udpate los when observing, currently */
@@ -1062,7 +946,7 @@
client &socket = *pl->ns;
- packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
+ packet sl ("map1a");
startlen = sl.length ();
@@ -1164,9 +1048,9 @@
&& op->stats.maxhp > 0
&& (op->type == PLAYER
|| op->type == DOOR // does not work, have maxhp 0
- || QUERY_FLAG (op, FLAG_MONSTER)
- || QUERY_FLAG (op, FLAG_ALIVE)
- || QUERY_FLAG (op, FLAG_GENERATOR)))
+ || op->flag [FLAG_MONSTER]
+ || op->flag [FLAG_ALIVE]
+ || op->flag [FLAG_GENERATOR]))
{
stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
@@ -1355,7 +1239,7 @@
static void
append_spell (player *pl, packet &sl, object *spell)
{
- int i, skill = 0;
+ int skill = 0;
if (!(spell->name))
{
@@ -1371,7 +1255,7 @@
/* 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;
+ skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
// spells better have a face
if (!spell->face)
@@ -1455,10 +1339,7 @@
append_spell (pl, sl, spell);
if (sl.length () > MAXSOCKBUF)
- {
- LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
- fatal (0);
- }
+ cleanup ("buffer overflow in esrv_add_spells!");
/* finally, we can send the packet */
pl->ns->flush_fx ();