ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.146 by root, Sat Dec 27 01:25:00 2008 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * "$Id: request.C,v 1.1 2006/08/13 17:16:06 elmex Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
15 (at your option) any later version. 11 * (at your option) any later version.
16 12 *
17 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details. 16 * GNU General Public License for more details.
21 17 *
22 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
25 21 * The authors can be reached via e-mail to <support@deliantra.net>
26 The author can be reached via e-mail to crossfire-devel@real-time.com
27*/ 22 */
28 23
29/** 24/**
30 * \file 25 * \file
31 * Client handling. 26 * Client handling.
32 * 27 *
… …
40 * have the prototype of (char *data, int datalen, int client_num). This 35 * have the prototype of (char *data, int datalen, int client_num). This
41 * way, we can use one dispatch table. 36 * way, we can use one dispatch table.
42 * 37 *
43 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
44 * 39 *
45 * esrv_map_setbelow allows filling in all of the faces for the map.
46 * if a face has not already been sent to the client, it is sent now.
47 *
48 * mapcellchanged, compactlayer, compactstack, perform the map compressing
49 * operations
50 *
51 * esrv_map_doneredraw finishes the map update, and ships across the
52 * map updates.
53 *
54 * esrv_map_scroll tells the client to scroll the map, and does similarily
55 * for the locally cached copy.
56 */ 40 */
57 41
58#include <global.h> 42#include <global.h>
59#include <sproto.h> 43#include <sproto.h>
60 44
61#include <newclient.h>
62#include <newserver.h>
63#include <living.h> 45#include <living.h>
64#include <commands.h> 46#include <commands.h>
65 47
66/* This block is basically taken from socket.c - I assume if it works there, 48/* This block is basically taken from socket.c - I assume if it works there,
67 * it should work here. 49 * it should work here.
68 */ 50 */
69#ifndef WIN32 /* ---win32 exclude unix headers */
70#include <sys/types.h> 51#include <sys/types.h>
71#include <sys/time.h> 52#include <sys/time.h>
72#include <sys/socket.h> 53#include <sys/socket.h>
73#include <netinet/in.h> 54#include <netinet/in.h>
74#include <netdb.h> 55#include <netdb.h>
75#endif /* win32 */
76 56
77#ifdef HAVE_UNISTD_H
78#include <unistd.h> 57#include <unistd.h>
79#endif
80
81#ifdef HAVE_SYS_TIME_H
82#include <sys/time.h> 58#include <sys/time.h>
83#endif
84 59
85#include "sounds.h" 60#include "sounds.h"
86 61
87/** 62/**
88 * This table translates the attack numbers as used within the 63 * This table translates the attack numbers as used within the
89 * program to the value we use when sending STATS command to the 64 * program to the value we use when sending STATS command to the
90 * client. If a value is -1, then we don't send that to the 65 * client. If a value is -1, then we don't send that to the
91 * client. 66 * client.
92 */ 67 */
93short atnr_cs_stat[NROFATTACKS] = {CS_STAT_RES_PHYS, 68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
94 CS_STAT_RES_MAG,CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
95 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
96 CS_STAT_RES_DRAIN, -1 /* weaponmagic */, 71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
97 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
98 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
99 CS_STAT_RES_FEAR, -1 /* Cancellation */, 74 CS_STAT_RES_FEAR, -1 /* Cancellation */ ,
100 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH, 75 CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,
101 -1 /* Chaos */, -1 /* Counterspell */, 76 -1 /* Chaos */ , -1 /* Counterspell */ ,
102 -1 /* Godpower */, CS_STAT_RES_HOLYWORD, 77 -1 /* Godpower */ , CS_STAT_RES_HOLYWORD,
103 CS_STAT_RES_BLIND, 78 CS_STAT_RES_BLIND,
104 -1, /* Internal */ 79 -1, /* Internal */
105 -1, /* life stealing */ 80 -1, /* life stealing */
106 -1 /* Disease - not fully done yet */ 81 -1 /* Disease - not fully done yet */
107}; 82};
108 83
84static void
85socket_map_scroll (client *ns, int dx, int dy)
86{
87 struct Map newmap;
88 int x, y, mx, my;
89
90 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
91
92 /* If we are using the Map1aCmd, we may in fact send
93 * head information that is outside the viewable map.
94 * So set the mx,my to the max value we want to
95 * look for. Removed code to do so - it caused extra
96 * complexities for the client, and probably doesn't make
97 * that much difference in bandwidth.
98 */
99 mx = ns->mapx;
100 my = ns->mapy;
101
102 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them.
107 */
108 for (x = 0; x < mx; x++)
109 for (y = 0; y < my; y++)
110 if (x >= ns->mapx || y >= ns->mapy)
111 /* clear cells outside the viewable area */
112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
114 /* clear newly visible tiles within the viewable area */
115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
116 else
117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
118
119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
120
121 /* Make sure that the next "map1" command will be sent (even if it is
122 * empty).
123 */
124 ns->sent_scroll = 1;
125}
126
127static void
128clear_map (player *pl)
129{
130 pl->ns->mapinfo_queue_clear ();
131
132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133
134 pl->ns->force_newmap = false;
135
136 if (pl->ns->newmapcmd == 1)
137 pl->ns->send_packet ("newmap");
138
139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
166}
167
109/** check for map change and send new map data */ 168/** check for map/region change and send new map data */
110static void 169static void
111check_map_change (player *pl) 170check_map_change (player *pl)
112{ 171{
113 char buf[MAX_BUF]; /* eauugggh */ 172 client &socket = *pl->ns;
114
115 object *ob = pl->ob; 173 object *ob = pl->observe;
116 174
117 if (!pl->socket.mapinfocmd) 175 region *reg = ob->region ();
118 return; 176 if (socket.current_region != reg)
119 177 {
120 if (pl->socket.current_map != ob->map) 178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
121 { 180 }
122 pl->socket.current_map = ob->map;
123 181
124 if (ob->map && ob->map->path [0]) 182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
125 { 191 {
126 int flags = 0; 192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
127 195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
202 if (socket.current_map != ob->map || socket.force_newmap)
203 {
204 clear_map (pl);
205 socket.current_map = ob->map;
206 send_map_info (pl);
207 }
208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
209 {
210 int dx = ob->x - socket.current_x;
211 int dy = ob->y - socket.current_y;
212
213 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
214 socket.floorbox_reset ();
215 }
216
217 socket.current_x = ob->x;
218 socket.current_y = ob->y;
219}
220
221/**
222 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide
224 * that information.
225 */
226void
227RequestInfo (char *buf, int len, client *ns)
228{
229 char *params;
230
231 /* find the first space, make it null, and update the
232 * params pointer.
233 */
234 for (params = buf; *params; params++)
235 if (*params == ' ')
236 {
237 *params++ = 0;
238 break;
239 }
240
241 if (!strcmp (buf, "image_info"))
242 send_image_info (ns, params);
243 else if (!strcmp (buf, "image_sums"))
244 send_image_sums (ns, params);
245 else if (!strcmp (buf, "skill_info"))
246 send_skill_info (ns, params);
247 else if (!strcmp (buf, "spell_paths"))
248 send_spell_paths (ns, params);
249 else
250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
257}
258
259void
260ExtCmd (char *buf, int len, player *pl)
261{
262 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
263}
264
265void
266ExtiCmd (char *buf, int len, client *ns)
267{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
128 if (ob->map->tile_path [0]) flags |= 1; 298 if (!map->tile_path [dir])
129 if (ob->map->tile_path [1]) flags |= 2; 299 map = 0;
130 if (ob->map->tile_path [2]) flags |= 4; 300 else if (map->tile_available (dir, false))
131 if (ob->map->tile_path [3]) flags |= 8; 301 {
302 maptile *neigh = map->tile_map [dir];
132 303
133 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 304 switch (dir)
134 flags, pl->socket.mapx / 2 - ob->x, pl->socket.mapy / 2 - ob->y, 305 {
135 ob->map->width, ob->map->height, ob->map->path); 306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
136 } 317 }
137 else 318 else
138 snprintf (buf, MAX_BUF, "mapinfo current"); 319 max_distance = 0;
320 }
139 321
140 Write_String_To_Socket (&pl->socket, buf, strlen (buf)); 322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
141 } 352 }
353 else
354 ++i;
142} 355}
143 356
144void ExtCmd (char *buf, int len, player *pl) 357void
145{
146 execute_global_event (EVENT_EXTCMD, pl, buf, len);
147}
148
149void MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
150{ 359{
151 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
152 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
153
154 char bigbuf[MAX_BUF], *cp, *token;
155 362
156 token = buf; 363 char *token = buf;
157 // copy token 364
158 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
159 return; 366 return;
160 367
161 *buf++ = 0;
162
163 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
164 { 369 {
165 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
166 372
167 // initial map and its origin 373#if 0
168 mapstruct *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
169 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
170 int mapx = pl->socket.mapx / 2 - pl->ob->x; 376 free (copy);
171 int mapy = pl->socket.mapy / 2 - pl->ob->y;
172 int max_distance = 8; // limit maximum path length to something generous
173
174 while (*buf && map && max_distance)
175 {
176 int dir = *buf++;
177
178 switch (dir)
179 {
180 case '1':
181 dx = 0; dy = -1; map = get_map_from_coord (map, &dx, &dy);
182 map && (mapy -= map->height);
183 break;
184 case '2':
185 mapx += map->width;
186 dx = map->width; dy = 0; map = get_map_from_coord (map, &dx, &dy);
187 break;
188 case '3':
189 mapy += map->height;
190 dx = 0; dy = map->height; map = get_map_from_coord (map, &dx, &dy);
191 break;
192 case '4':
193 dx = -1; dy = 0; map = get_map_from_coord (map, &dx, &dy);
194 map && (mapx -= map->width);
195 break;
196 }
197
198 --max_distance;
199 }
200
201 if (!max_distance)
202 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
203 else if (map && map->path [0])
204 {
205 int flags = 0;
206
207 if (map->tile_path [0]) flags |= 1;
208 if (map->tile_path [1]) flags |= 2;
209 if (map->tile_path [2]) flags |= 4;
210 if (map->tile_path [3]) flags |= 8;
211
212 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s",
213 token, flags, mapx, mapy,
214 map->width, map->height, map->path);
215 }
216 else 377 else
217 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
218 } 380 }
219 else 381 else
220 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
221
222 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf));
223} 383}
224 384
225/** This is the Setup cmd - easy first implementation */ 385/** This is the Setup cmd */
386void
226void SetUp(char *buf, int len, NewSocket *ns) 387SetUp (char *buf, int len, client * ns)
227{ 388{
228 int s, slen; 389 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
229 char *cmd, *param, cmdback[HUGE_BUF];
230
231 /* run through the cmds of setup
232 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
233 *
234 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
235 * The client then must sort this out
236 */
237
238 LOG(llevInfo,"Get SetupCmd:: %s\n", buf);
239 strcpy(cmdback,"setup");
240 for(s=0;s<len; ) {
241
242 cmd = &buf[s];
243
244 /* find the next space, and put a null there */
245 for(;buf[s] && buf[s] != ' ';s++) ;
246 buf[s++]=0;
247 while (buf[s] == ' ') s++;
248
249 if(s>=len)
250 break;
251
252 param = &buf[s];
253
254 for(;buf[s] && buf[s] != ' ';s++) ;
255 buf[s++]=0;
256 while (buf[s] == ' ') s++;
257
258 slen = strlen(cmdback);
259 safe_strcat(cmdback, " ", &slen, HUGE_BUF);
260 safe_strcat(cmdback, cmd, &slen, HUGE_BUF);
261 safe_strcat(cmdback, " ", &slen, HUGE_BUF);
262
263 if (!strcmp(cmd,"sound")) {
264 ns->sound = atoi(param);
265 safe_strcat(cmdback, param, &slen, HUGE_BUF);
266 }
267 else if (!strcmp(cmd,"exp64")) {
268 ns->exp64 = atoi(param);
269 safe_strcat(cmdback, param, &slen, HUGE_BUF);
270 } else if (!strcmp(cmd, "spellmon")) {
271 ns->monitor_spells = atoi(param);
272 safe_strcat(cmdback, param, &slen, HUGE_BUF);
273 } else if (!strcmp(cmd,"darkness")) {
274 ns->darkness = atoi(param);
275 safe_strcat(cmdback, param, &slen, HUGE_BUF);
276 } else if (!strcmp(cmd,"map1cmd")) {
277 if (atoi(param)) ns->mapmode = Map1Cmd;
278 /* if beyond this size, need to use map1cmd no matter what */
279 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd;
280 safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF);
281 } else if (!strcmp(cmd,"map1acmd")) {
282 if (atoi(param)) ns->mapmode = Map1aCmd;
283 /* if beyond this size, need to use map1acmd no matter what */
284 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd;
285 safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF);
286 } else if (!strcmp(cmd,"newmapcmd")) {
287 ns->newmapcmd= atoi(param);
288 safe_strcat(cmdback, param, &slen, HUGE_BUF);
289// } else if (!strcmp(cmd,"plugincmd")) {
290// ns->plugincmd = atoi(param);
291// safe_strcat(cmdback, param, &slen, HUGE_BUF);
292 } else if (!strcmp(cmd,"mapinfocmd")) {
293 ns->mapinfocmd = atoi(param);
294 safe_strcat(cmdback, "1", &slen, HUGE_BUF);
295 } else if (!strcmp(cmd,"extcmd")) {
296 ns->extcmd = atoi(param);
297 safe_strcat(cmdback, "1", &slen, HUGE_BUF);
298 } else if (!strcmp(cmd,"facecache")) {
299 ns->facecache = atoi(param);
300 safe_strcat(cmdback, param, &slen, HUGE_BUF);
301 } else if (!strcmp(cmd,"faceset")) {
302 char tmpbuf[20];
303 int q = atoi(param);
304
305 if (is_valid_faceset(q))
306 ns->faceset=q;
307 sprintf(tmpbuf,"%d", ns->faceset);
308 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
309 /* if the client is using faceset, it knows about image2 command */
310 ns->image2=1;
311 } else if (!strcmp(cmd,"itemcmd")) {
312 /* Version of the item protocol command to use. Currently,
313 * only supported versions are 1 and 2. Using a numeric
314 * value will make it very easy to extend this in the future.
315 */
316 char tmpbuf[20];
317 int q = atoi(param);
318 if (q<1 || q>2) {
319 strcpy(tmpbuf,"FALSE");
320 } else {
321 ns->itemcmd = q;
322 sprintf(tmpbuf,"%d", ns->itemcmd);
323 }
324 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
325 } else if (!strcmp(cmd,"mapsize")) {
326 int x, y=0;
327 char tmpbuf[MAX_BUF], *cp;
328
329 x = atoi(param);
330 for (cp = param; *cp!=0; cp++)
331 if (*cp == 'x' || *cp == 'X') {
332 y = atoi(cp+1);
333 break;
334 }
335 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) {
336 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
337 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
338 } else {
339 ns->mapx = x;
340 ns->mapy = y;
341 /* better to send back what we are really using and not the
342 * param as given to us in case it gets parsed differently.
343 */
344 sprintf(tmpbuf,"%dx%d", x,y);
345 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
346 /* If beyond this size and still using orig map command, need to
347 * go to map1cmd.
348 */
349 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd;
350 }
351 } else if (!strcmp(cmd,"extendedMapInfos")) {
352 /* Added by tchize
353 * prepare to use the mapextended command
354 */
355 char tmpbuf[20];
356 ns->ext_mapinfos = (atoi(param));
357 sprintf(tmpbuf,"%d", ns->ext_mapinfos);
358 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
359 } else if (!strcmp(cmd,"extendedTextInfos")) {
360 /* Added by tchize
361 * prepare to use the extended text commands
362 * Client toggle this to non zero to get exttext
363 */
364 char tmpbuf[20];
365
366 ns->has_readable_type = (atoi(param));
367 sprintf(tmpbuf,"%d", ns->has_readable_type);
368 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
369 } else {
370 /* Didn't get a setup command we understood -
371 * report a failure to the client.
372 */
373 safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF);
374 }
375 } /* for processing all the setup commands */
376 LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback);
377 Write_String_To_Socket(ns, cmdback, strlen(cmdback));
378} 390}
379 391
380/** 392/**
381 * The client has requested to be added to the game. 393 * The client has requested to be added to the game.
382 * This is what takes care of it. We tell the client how things worked out. 394 * This is what takes care of it. We tell the client how things worked out.
383 * I am not sure if this file is the best place for this function. however, 395 * I am not sure if this file is the best place for this function. however,
384 * it either has to be here or init_sockets needs to be exported. 396 * it either has to be here or init_sockets needs to be exported.
385 */ 397 */
398void
386void AddMeCmd(char *buf, int len, NewSocket *ns) 399AddMeCmd (char *buf, int len, client *ns)
387{ 400{
388 Settings oldsettings; 401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
389 oldsettings=settings;
390 if (ns->status != Ns_Add || add_player(ns)) {
391 Write_String_To_Socket(ns, "addme_failed",12);
392 } else {
393 /* Basically, the add_player copies the socket structure into
394 * the player structure, so this one (which is from init_sockets)
395 * is not needed anymore. The write below should still work, as the
396 * stuff in ns is still relevant.
397 */
398 Write_String_To_Socket(ns, "addme_success",13);
399 socket_info.nconns--;
400 ns->status = Ns_Avail;
401 }
402 settings=oldsettings;
403} 402}
404 403
405/** Reply to ExtendedInfos command */
406void ToggleExtendedInfos (char *buf, int len, NewSocket *ns){
407 char cmdback[MAX_BUF];
408 char command[50];
409 int info,nextinfo;
410 cmdback[0]='\0';
411 nextinfo=0;
412 while (1){
413 /* 1. Extract an info*/
414 info=nextinfo;
415 while ( (info<len) && (buf[info]==' ') ) info++;
416 if (info>=len)
417 break;
418 nextinfo=info+1;
419 while ( (nextinfo<len) && (buf[nextinfo]!=' ') )
420 nextinfo++;
421 if (nextinfo-info>=49) /*Erroneous info asked*/
422 continue;
423 strncpy (command,&(buf[info]),nextinfo-info);
424 command[nextinfo-info]='\0';
425 /* 2. Interpret info*/
426 if (!strcmp("smooth",command)){
427 /* Toggle smoothing*/
428 ns->EMI_smooth=!ns->EMI_smooth;
429 }else{
430 /*bad value*/
431 }
432 /*3. Next info*/
433 }
434 strcpy (cmdback,"ExtendedInfoSet");
435 if (ns->EMI_smooth){
436 strcat (cmdback," ");
437 strcat (cmdback,"smoothing");
438 }
439 Write_String_To_Socket(ns, cmdback,strlen(cmdback));
440}
441/* 404/*
442#define MSG_TYPE_BOOK 1 405#define MSG_TYPE_BOOK 1
443#define MSG_TYPE_CARD 2 406#define MSG_TYPE_CARD 2
444#define MSG_TYPE_PAPER 3 407#define MSG_TYPE_PAPER 3
445#define MSG_TYPE_SIGN 4 408#define MSG_TYPE_SIGN 4
446#define MSG_TYPE_MONUMENT 5 409#define MSG_TYPE_MONUMENT 5
447#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 410#define MSG_TYPE_SCRIPTED_DIALOG 6*/
411
448/** Reply to ExtendedInfos command */ 412/** Reply to ExtendedInfos command */
413void
449void ToggleExtendedText (char *buf, int len, NewSocket *ns){ 414ToggleExtendedText (char *buf, int len, client * ns)
415{
450 char cmdback[MAX_BUF]; 416 char cmdback[MAX_BUF];
451 char temp[10]; 417 char temp[10];
452 char command[50]; 418 char command[50];
453 int info,nextinfo,i,flag; 419 int info, nextinfo, i, flag;
420
454 cmdback[0]='\0'; 421 cmdback[0] = '\0';
422
455 nextinfo=0; 423 nextinfo = 0;
456 while (1){ 424 while (1)
425 {
457 /* 1. Extract an info*/ 426 /* 1. Extract an info */
458 info=nextinfo; 427 info = nextinfo;
428
459 while ( (info<len) && (buf[info]==' ') ) info++; 429 while ((info < len) && (buf[info] == ' '))
430 info++;
431
460 if (info>=len) 432 if (info >= len)
461 break; 433 break;
434
462 nextinfo=info+1; 435 nextinfo = info + 1;
436
463 while ( (nextinfo<len) && (buf[nextinfo]!=' ') ) 437 while ((nextinfo < len) && (buf[nextinfo] != ' '))
464 nextinfo++; 438 nextinfo++;
439
465 if (nextinfo-info>=49) /*Erroneous info asked*/ 440 if (nextinfo - info >= 49) /*Erroneous info asked */
466 continue; 441 continue;
442
467 strncpy (command,&(buf[info]),nextinfo-info); 443 strncpy (command, &(buf[info]), nextinfo - info);
468 command[nextinfo-info]='\0'; 444 command[nextinfo - info] = '\0';
469 /* 2. Interpret info*/ 445 /* 2. Interpret info */
470 i = sscanf(command,"%d",&flag); 446 i = sscanf (command, "%d", &flag);
447
471 if ( (i==1) && (flag>0) && (flag<=MSG_TYPE_LAST)) 448 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
472 ns->supported_readables|=(1<<flag); 449 ns->supported_readables |= (1 << flag);
473 /*3. Next info*/ 450 /*3. Next info */
474 } 451 }
452
475 /* Send resulting state */ 453 /* Send resulting state */
476 strcpy (cmdback,"ExtendedTextSet"); 454 strcpy (cmdback, "ExtendedTextSet");
455
477 for (i=0;i<=MSG_TYPE_LAST;i++) 456 for (i = 0; i <= MSG_TYPE_LAST; i++)
478 if (ns->supported_readables &(1<<i)){ 457 if (ns->supported_readables & (1 << i))
458 {
479 strcat (cmdback," "); 459 strcat (cmdback, " ");
480 snprintf(temp,sizeof(temp),"%d",i); 460 snprintf (temp, sizeof (temp), "%d", i);
481 strcat (cmdback,temp); 461 strcat (cmdback, temp);
482 } 462 }
483 Write_String_To_Socket(ns, cmdback,strlen(cmdback));
484}
485 463
486/** 464 ns->send_packet (cmdback);
487 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
488 * Basically, it makes no sense to wait for the client to request a
489 * a piece of data from us that we know the client wants. So
490 * if we know the client wants it, might as well push it to the
491 * client.
492 */
493static void SendSmooth(NewSocket *ns, uint16 face) {
494 uint16 smoothface;
495 unsigned char reply[MAX_BUF];
496 SockList sl;
497
498 /* If we can't find a face, return and set it so we won't try to send this
499 * again.
500 */
501 if ((!FindSmooth (face, &smoothface)) &&
502 (!FindSmooth ( smooth_face->number, &smoothface))) {
503
504 LOG(llevError,"could not findsmooth for %d. Neither default (%s)\n",face,smooth_face->name);
505 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
506 return;
507 }
508
509 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
510 esrv_send_face(ns, smoothface, 0);
511
512 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
513
514 sl.buf=reply;
515 strcpy((char*)sl.buf,"smooth ");
516 sl.len=strlen((char*)sl.buf);
517 SockList_AddShort(&sl, face);
518 SockList_AddShort(&sl, smoothface);
519 Send_With_Handling(ns, &sl);
520} 465}
521
522 /**
523 * Tells client the picture it has to use
524 * to smooth a picture number given as argument.
525 */
526void AskSmooth (char *buf, int len, NewSocket *ns){
527 uint16 facenbr;
528
529 facenbr=atoi (buf);
530 SendSmooth(ns, facenbr);
531}
532
533
534
535
536 466
537/** 467/**
538 * This handles the general commands from the client (ie, north, fire, cast, 468 * This handles the general commands from the client (ie, north, fire, cast,
539 * etc.) 469 * etc.)
540 */ 470 */
471void
541void PlayerCmd(char *buf, int len, player *pl) 472PlayerCmd (char *buf, int len, player *pl)
542{ 473{
543
544 /* The following should never happen with a proper or honest client.
545 * Therefore, the error message doesn't have to be too clear - if
546 * someone is playing with a hacked/non working client, this gives them
547 * an idea of the problem, but they deserve what they get
548 */
549 if (pl->state!=ST_PLAYING) {
550 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
551 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
552 return;
553 }
554 /* Check if there is a count. In theory, a zero count could also be 474 /* Check if there is a count. In theory, a zero count could also be
555 * sent, so check for that also. 475 * sent, so check for that also.
556 */ 476 */
557 if (atoi(buf) || buf[0]=='0') { 477 if (atoi (buf) || buf[0] == '0')
478 {
558 pl->count=atoi((char*)buf); 479 pl->count = atoi ((char *) buf);
480
559 buf=strchr(buf,' '); /* advance beyond the numbers */ 481 buf = strchr (buf, ' '); /* advance beyond the numbers */
560 if (!buf) { 482 if (!buf)
561#ifdef ESRV_DEBUG
562 LOG(llevDebug,"PlayerCmd: Got count but no command.\n");
563#endif
564 return; 483 return;
565 } 484
566 buf++; 485 buf++;
567 } 486 }
568 /* This should not happen anymore. */ 487
569 if (pl->ob->speed_left<-1.0) {
570 LOG(llevError,"Player has negative time - shouldn't do command.\n");
571 }
572 /* In c_new.c */
573 execute_newserver_command(pl->ob, (char*)buf); 488 execute_newserver_command (pl->ob, (char *) buf);
489
574 /* Perhaps something better should be done with a left over count. 490 /* Perhaps something better should be done with a left over count.
575 * Cleaning up the input should probably be done first - all actions 491 * Cleaning up the input should probably be done first - all actions
576 * for the command that issued the count should be done before any other 492 * for the command that issued the count should be done before any other
577 * commands. 493 * commands.
578 */ 494 */
579
580 pl->count=0; 495 pl->count = 0;
581
582} 496}
583
584 497
585/** 498/**
586 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
587 * etc.). It is a lot like PlayerCmd above, but is called with the 500 * etc.). It is a lot like PlayerCmd above, but is called with the
588 * 'ncom' method which gives more information back to the client so it 501 * 'ncom' method which gives more information back to the client so it
589 * can throttle. 502 * can throttle.
590 */ 503 */
504void
591void NewPlayerCmd(uint8 *buf, int len, player *pl) 505NewPlayerCmd (char *buf, int len, player *pl)
592{ 506{
593 int time,repeat; 507 if (len <= 6)
594 short packet;
595 unsigned char command[MAX_BUF];
596 SockList sl;
597
598 if (len < 7) {
599 LOG(llevDebug,"Corrupt ncom command <%s> not long enough - discarding\n", buf);
600 return;
601 } 508 {
509 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
510 return;
511 }
602 512
603 packet = GetShort_String(buf); 513 uint16 cmdid = net_uint16 ((uint8 *)buf);
604 repeat = GetInt_String(buf+2); 514 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
515
605 /* -1 is special - no repeat, but don't update */ 516 /* -1 is special - no repeat, but don't update */
606 if (repeat!=-1) { 517 if (repeat != -1)
607 pl->count=repeat; 518 pl->count = repeat;
608 }
609 if ((len-4) >= MAX_BUF) len=MAX_BUF-5;
610 519
611 strncpy((char*)command, (char*)buf+6, len-4); 520 buf += 6; //len -= 6;
612 command[len-4]='\0';
613 521
614 /* The following should never happen with a proper or honest client.
615 * Therefore, the error message doesn't have to be too clear - if
616 * someone is playing with a hacked/non working client, this gives them
617 * an idea of the problem, but they deserve what they get
618 */
619 if (pl->state!=ST_PLAYING) {
620 new_draw_info_format(NDI_UNIQUE, 0,pl->ob,
621 "You can not issue commands - state is not ST_PLAYING (%s)", buf);
622 return;
623 }
624
625 /* This should not happen anymore. */
626 if (pl->ob->speed_left<-1.0) {
627 LOG(llevError,"Player has negative time - shouldn't do command.\n");
628 }
629 /* In c_new.c */
630 execute_newserver_command(pl->ob, (char*)command); 522 execute_newserver_command (pl->ob, buf);
523
631 /* Perhaps something better should be done with a left over count. 524 /* Perhaps something better should be done with a left over count.
632 * Cleaning up the input should probably be done first - all actions 525 * Cleaning up the input should probably be done first - all actions
633 * for the command that issued the count should be done before any other 526 * for the command that issued the count should be done before any other
634 * commands. 527 * commands.
635 */ 528 */
636 pl->count=0; 529 pl->count = 0;
637 530
531 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
532 int time = fabs (pl->ob->speed) < 0.001
533 ? time = MAX_TIME * 100
534 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
535
638 /* Send confirmation of command execution now */ 536 /* Send confirmation of command execution now */
639 sl.buf = command; 537 packet sl ("comc");
640 strcpy((char*)sl.buf,"comc "); 538 sl << uint16 (cmdid) << uint32 (time);
641 sl.len=5; 539 pl->ns->send_packet (sl);
642 SockList_AddShort(&sl,packet);
643 if (FABS(pl->ob->speed) < 0.001) time=MAX_TIME * 100;
644 else
645 time = ( int )( MAX_TIME/ FABS(pl->ob->speed) );
646 SockList_AddInt(&sl,time);
647 Send_With_Handling(&pl->socket, &sl);
648} 540}
649
650 541
651/** This is a reply to a previous query. */ 542/** This is a reply to a previous query. */
543void
652void ReplyCmd(char *buf, int len, player *pl) 544ReplyCmd (char *buf, int len, client *ns)
653{ 545{
546 if (ns->state == ST_CUSTOM)
547 {
548 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
549 return;
550 }
551
552 if (!ns->pl)
553 return; //TODO: depends on the exact reply we are after
554 //TODO: but right now, we always have a ns->pl
555
556 player *pl = ns->pl;
557
654 /* This is to synthesize how the data would be stored if it 558 /* This is to synthesize how the data would be stored if it
655 * was normally entered. A bit of a hack, and should be cleaned up 559 * was normally entered. A bit of a hack, and should be cleaned up
656 * once all the X11 code is removed from the server. 560 * once all the X11 code is removed from the server.
657 * 561 *
658 * We pass 13 to many of the functions because this way they 562 * We pass 13 to many of the functions because this way they
659 * think it was the carriage return that was entered, and the 563 * think it was the carriage return that was entered, and the
660 * function then does not try to do additional input. 564 * function then does not try to do additional input.
661 */ 565 */
662 snprintf(pl->write_buf, sizeof(pl->write_buf), ":%s", buf); 566 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
663 567
664 /* this avoids any hacking here */ 568 /* this avoids any hacking here */
569
570 switch (ns->state)
665 571 {
666 switch (pl->state) {
667 case ST_PLAYING: 572 case ST_PLAYING:
668 LOG(llevError,"Got reply message with ST_PLAYING input state\n"); 573 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
669 break;
670
671 case ST_PLAY_AGAIN:
672 /* We can check this for return value (2==quit). Maybe we
673 * should, and do something appropriate?
674 */
675 receive_play_again(pl->ob, buf[0]);
676 break;
677
678 case ST_ROLL_STAT:
679 key_roll_stat(pl->ob,buf[0]);
680 break;
681
682 case ST_CHANGE_CLASS:
683
684 key_change_class(pl->ob, buf[0]);
685 break; 574 break;
686 575
687 case ST_CONFIRM_QUIT:
688 key_confirm_quit(pl->ob, buf[0]);
689 break;
690
691 case ST_CONFIGURE:
692 LOG(llevError,"In client input handling, but into configure state\n");
693 pl->state = ST_PLAYING;
694 break;
695
696 case ST_GET_NAME:
697 receive_player_name(pl->ob,13);
698 break;
699
700 case ST_GET_PASSWORD:
701 case ST_CONFIRM_PASSWORD:
702 receive_player_password(pl->ob,13);
703 break;
704
705 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 576 case ST_GET_PARTY_PASSWORD: /* Get password for party */
706 receive_party_password(pl->ob,13); 577 receive_party_password (pl->ob, 13);
707 break; 578 break;
708 579
709 default: 580 default:
710 LOG(llevError,"Unknown input state: %d\n", pl->state); 581 LOG (llevError, "Unknown input state: %d\n", ns->state);
711 } 582 }
712} 583}
713 584
714/** 585/**
715 * Client tells its version. If there is a mismatch, we close the 586 * Client tells its version. If there is a mismatch, we close the
716 * socket. In real life, all we should care about is the client having 587 * socket. In real life, all we should care about is the client having
717 * something older than the server. If we assume the client will be 588 * something older than the server. If we assume the client will be
718 * backwards compatible, having it be a later version should not be a 589 * backwards compatible, having it be a later version should not be a
719 * problem. 590 * problem.
720 */ 591 */
592void
721void VersionCmd(char *buf, int len,NewSocket *ns) 593VersionCmd (char *buf, int len, client * ns)
722{ 594{
723 char *cp;
724 char version_warning[256];
725
726 if (!buf) { 595 if (!buf)
596 {
727 LOG(llevError, "CS: received corrupted version command\n"); 597 LOG (llevError, "CS: received corrupted version command\n");
728 return; 598 return;
729 } 599 }
730 600
731 ns->cs_version = atoi(buf); 601 ns->cs_version = atoi (buf);
732 ns->sc_version = ns->cs_version; 602 ns->sc_version = ns->cs_version;
603
604 LOG (llevDebug, "connection from client <%s>\n", buf);
605
606 //TODO: should log here just for statistics
607
733 if (VERSION_CS != ns->cs_version) { 608 //if (VERSION_CS != ns->cs_version)
734#ifdef ESRV_DEBUG 609 // unchecked;
735 LOG(llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS,ns->cs_version); 610
736#endif
737 }
738 cp = strchr(buf+1,' '); 611 char *cp = strchr (buf + 1, ' ');
739 if (!cp) return; 612 if (!cp)
613 return;
614
740 ns->sc_version = atoi(cp); 615 ns->sc_version = atoi (cp);
616
741 if (VERSION_SC != ns->sc_version) { 617 //if (VERSION_SC != ns->sc_version)
742#ifdef ESRV_DEBUG 618 // unchecked;
743 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version); 619
744#endif
745 }
746 cp = strchr(cp+1, ' '); 620 cp = strchr (cp + 1, ' ');
621
747 if (cp) { 622 if (cp)
748 LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 623 {
624 ns->version = cp + 1;
749 625
750 /* This is first implementation - i skip all beta DX clients with it 626 if (ns->sc_version < 1026)
751 * Add later stuff here for other clients 627 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
752 */ 628 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
753
754 /* these are old dxclients */
755 /* Version 1024 added support for singular + plural name values -
756 * requiing this minimal value reduces complexity of that code, and it
757 * has been around for a long time.
758 */
759 if(!strcmp(" CF DX CLIENT", cp) || ns->sc_version < 1024 )
760 {
761 sprintf(version_warning,"drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
762 Write_String_To_Socket(ns, version_warning, strlen(version_warning));
763 }
764
765 } 629 }
766} 630}
767 631
768/** sound related functions. */ 632/** sound related functions. */
769 633void
770void SetSound(char *buf, int len, NewSocket *ns) 634SetSound (char *buf, int len, client * ns)
771{ 635{
772 ns->sound = atoi(buf); 636 ns->sound = atoi (buf);
773} 637}
774 638
775/** client wants the map resent */ 639/** client wants the map resent */
776 640void
777void MapRedrawCmd(char *buf, int len, player *pl) 641MapRedrawCmd (char *buf, int len, player *pl)
778{ 642{
779/* This function is currently disabled; just clearing the map state results in 643/* This function is currently disabled; just clearing the map state results in
780 * display errors. It should clear the cache and send a newmap command. 644 * display errors. It should clear the cache and send a newmap command.
781 * Unfortunately this solution does not work because some client versions send 645 * Unfortunately this solution does not work because some client versions send
782 * a mapredraw command after receiving a newmap command. 646 * a mapredraw command after receiving a newmap command.
783 */ 647 */
784#if 0
785 /* Okay, this is MAJOR UGLY. but the only way I know how to
786 * clear the "cache"
787 */
788 memset(&pl->socket.lastmap, 0, sizeof(struct Map));
789 draw_client_map(pl->ob);
790#endif
791} 648}
792
793/** Newmap command */
794void MapNewmapCmd( player *pl)
795{
796 if( pl->socket.newmapcmd == 1) {
797 memset(&pl->socket.lastmap, 0, sizeof(pl->socket.lastmap));
798 Write_String_To_Socket( &pl->socket, "newmap", 6);
799 }
800 pl->socket.current_map = 0;
801}
802
803
804 649
805/** 650/**
806 * Moves an object (typically, container to inventory). 651 * Moves an object (typically, container to inventory).
807 * syntax is: move (to) (tag) (nrof) 652 * syntax is: move (to) (tag) (nrof)
808 */ 653 */
654void
809void MoveCmd(char *buf, int len,player *pl) 655MoveCmd (char *buf, int len, player *pl)
810{ 656{
811 int vals[3], i; 657 int to, tag, nrof;
812 658
813 /* A little funky here. We only cycle for 2 records, because 659 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
814 * we obviously am not going to find a space after the third 660 {
815 * record. Perhaps we should just replace this with a
816 * sscanf?
817 */
818 for (i=0; i<2; i++) {
819 vals[i]=atoi(buf);
820 if (!(buf = strchr(buf, ' '))) {
821 LOG(llevError,"Incomplete move command: %s\n", buf); 661 LOG (llevError, "Incomplete move command: %s\n", buf);
822 return; 662 return;
823 }
824 buf++;
825 } 663 }
826 vals[2]=atoi(buf);
827 664
828/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 665 esrv_move_object (pl->ob, to, tag, nrof);
829 esrv_move_object(pl->ob,vals[0], vals[1], vals[2]);
830} 666}
831
832
833 667
834/****************************************************************************** 668/******************************************************************************
835 * 669 *
836 * Start of commands the server sends to the client. 670 * Start of commands the server sends to the client.
837 * 671 *
… …
839 673
840/** 674/**
841 * Asks the client to query the user. This way, the client knows 675 * Asks the client to query the user. This way, the client knows
842 * it needs to send something back (vs just printing out a message) 676 * it needs to send something back (vs just printing out a message)
843 */ 677 */
678void
844void send_query(NewSocket *ns, uint8 flags, char *text) 679send_query (client *ns, uint8 flags, const char *text)
845{ 680{
846 char buf[MAX_BUF];
847
848 sprintf(buf,"query %d %s", flags, text?text:""); 681 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
849 Write_String_To_Socket(ns, buf, strlen(buf)); 682}
683
684/**
685 * Get player's current range attack in obuf.
686 */
687static void
688rangetostring (player *pl, char *obuf)
689{
690 dynbuf_text buf;
691
692 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694
695 if (pl->combat_ob)
696 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
697
698#if 0
699 //TODO: remove this when slot system is working, this is only for debugging
700 if (pl->ob->chosen_skill)
701 buf << " Skill*: " << pl->ob->chosen_skill->name;
702#endif
703
704 //TODO: maybe golem should become the current_weapon, quite simply?
705 if (pl->golem)
706 buf << " Golem*: " << pl->golem->name;
707
708 buf << '\0';
709 buf.linearise (obuf);
850} 710}
851 711
852#define AddIfInt64(Old,New,Type) if (Old != New) {\ 712#define AddIfInt64(Old,New,Type) if (Old != New) {\
853 Old = New; \ 713 Old = New; \
854 SockList_AddChar(&sl, Type); \ 714 sl << uint8 (Type) << uint64 (New); \
855 SockList_AddInt64(&sl, New); \ 715 }
856 }
857 716
858#define AddIfInt(Old,New,Type) if (Old != New) {\ 717#define AddIfInt(Old,New,Type) if (Old != New) {\
859 Old = New; \ 718 Old = New; \
860 SockList_AddChar(&sl, Type); \ 719 sl << uint8 (Type) << uint32 (New); \
861 SockList_AddInt(&sl, New); \ 720 }
862 }
863 721
864#define AddIfShort(Old,New,Type) if (Old != New) {\ 722#define AddIfShort(Old,New,Type) if (Old != New) {\
865 Old = New; \ 723 Old = New; \
866 SockList_AddChar(&sl, Type); \ 724 sl << uint8 (Type) << uint16 (New); \
867 SockList_AddShort(&sl, New); \ 725 }
868 }
869 726
870#define AddIfFloat(Old,New,Type) if (Old != New) {\ 727#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
871 Old = New; \ 728 Old = New; \
872 SockList_AddChar(&sl, Type); \ 729 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
873 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ 730 }
874 }
875 731
876#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 732#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
877 if (Old) free(Old);\ 733 free(Old); Old = strdup (New);\
878 Old = strdup_local(New);\ 734 sl << uint8 (Type) << data8 (New); \
879 SockList_AddChar(&sl, Type); \ 735 }
880 SockList_AddChar(&sl, ( char )strlen(New)); \
881 strcpy((char*)sl.buf + sl.len, New); \
882 sl.len += strlen(New); \
883 }
884 736
885/** 737/**
886 * Sends a statistics update. We look at the old values, 738 * Sends a statistics update. We look at the old values,
887 * and only send what has changed. Stat mapping values are in newclient.h 739 * and only send what has changed. Stat mapping values are in newclient.h
888 * Since this gets sent a lot, this is actually one of the few binary 740 * Since this gets sent a lot, this is actually one of the few binary
889 * commands for now. 741 * commands for now.
890 */ 742 */
743void
891void esrv_update_stats(player *pl) 744esrv_update_stats (player *pl)
892{ 745{
893 SockList sl;
894 char buf[MAX_BUF]; 746 char buf[MAX_BUF];
895 uint16 flags; 747 uint16 flags;
896 748
897 sl.buf=(unsigned char*)malloc(MAXSOCKBUF); 749 client *ns = pl->ns;
898 strcpy((char*)sl.buf,"stats "); 750 if (!ns)
899 sl.len=strlen((char*)sl.buf); 751 return;
900 752
901 if(pl->ob != NULL) 753 object *ob = pl->observe;
902 { 754 if (!ob)
755 return;
756
757 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
758
759 packet sl ("stats");
760
903 AddIfShort(pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 761 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
904 AddIfShort(pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 762 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
905 AddIfShort(pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 763 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
906 AddIfShort(pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 764 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
907 AddIfShort(pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 765 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
908 AddIfShort(pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 766 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
909 AddIfShort(pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 767 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
910 AddIfShort(pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
911 AddIfShort(pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
912 AddIfShort(pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
913 AddIfShort(pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 768 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
914 AddIfShort(pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 769 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
770 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
915 AddIfShort(pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
916 } 774
917 if(pl->socket.exp64) {
918 uint8 s;
919 for(s=0;s<NUM_SKILLS;s++) { 775 for (int s = 0; s < NUM_SKILLS; s++)
920 if (pl->last_skill_ob[s] && 776 if (object *skill = opl->last_skill_ob [s])
921 pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) { 777 if (skill->stats.exp != ns->last_skill_exp [s])
778 {
779 ns->last_skill_exp [s] = skill->stats.exp;
922 780
923 /* Always send along the level if exp changes. This is only 781 /* Always send along the level if exp changes. This is only
924 * 1 extra byte, but keeps processing simpler. 782 * 1 extra byte, but keeps processing simpler.
925 */ 783 */
926 SockList_AddChar(&sl, ( char )( s + CS_STAT_SKILLINFO )); 784 sl << uint8 (s + CS_STAT_SKILLINFO)
927 SockList_AddChar(&sl, ( char )pl->last_skill_ob[s]->level); 785 << uint8 (skill->level)
928 SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp); 786 << uint64 (skill->stats.exp);
929 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 787 }
930 } 788
931 }
932 }
933 if (pl->socket.exp64) {
934 AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
935 } else {
936 AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP);
937 }
938 AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL); 790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
939 AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
940 AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
941 AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
942 AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
943 AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
944 AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
945 AddIfInt(pl->last_weight_limit, (sint32)weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798
946 flags=0; 799 flags = 0;
947 if (pl->fire_on) flags |=SF_FIREON;
948 if (pl->run_on) flags |= SF_RUNON;
949 800
801 if (opl->fire_on)
802 flags |= SF_FIREON;
803
804 if (opl->run_on)
805 flags |= SF_RUNON;
806
950 AddIfShort(pl->last_flags, flags, CS_STAT_FLAGS); 807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
951 if (pl->socket.sc_version<1025) { 808
809 if (ns->sc_version < 1025)
952 AddIfShort(pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 810 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
953 } else { 811 else
954 int i;
955
956 for (i=0; i<NROFATTACKS; i++) { 812 for (int i = 0; i < NROFATTACKS; i++)
813 {
957 /* Skip ones we won't send */ 814 /* Skip ones we won't send */
958 if (atnr_cs_stat[i]==-1) continue; 815 if (atnr_cs_stat[i] == -1)
816 continue;
817
959 AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]); 818 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
960 }
961 } 819 }
820
962 if (pl->socket.monitor_spells) { 821 if (pl->ns->monitor_spells)
822 {
963 AddIfInt(pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
964 AddIfInt(pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
965 AddIfInt(pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
966 } 826 }
827
967 rangetostring(pl->ob, buf); /* we want use the new fire & run system in new client */ 828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
968 AddIfString(pl->socket.stats.range, buf, CS_STAT_RANGE); 829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
969 set_title(pl->ob, buf); 830 set_title (ob, buf);
970 AddIfString(pl->socket.stats.title, buf, CS_STAT_TITLE); 831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
971 832
972 /* Only send it away if we have some actual data */ 833 /* Only send it away if we have some actual data */
973 if (sl.len>6) { 834 if (sl.length () > 6)
974#ifdef ESRV_DEBUG 835 ns->send_packet (sl);
975 LOG(llevDebug,"Sending stats command, %d bytes long.\n", sl.len);
976#endif
977 Send_With_Handling(&pl->socket, &sl);
978 }
979 free(sl.buf);
980} 836}
981
982 837
983/** 838/**
984 * Tells the client that here is a player it should start using. 839 * Tells the client that here is a player it should start using.
985 */ 840 */
986void esrv_new_player(player *pl, uint32 weight) 841void
842esrv_new_player (player *pl)
987{ 843{
988 SockList sl; 844 sint32 weight = pl->ob->client_weight ();
989 845
846 packet sl ("player");
847
848 sl << uint32 (pl->ob->count)
849 << uint32 (weight)
850 << uint32 (pl->ob->face)
851 << data8 (pl->ob->name);
852
990 pl->last_weight = weight; 853 pl->ns->last_weight = weight;
991 854 pl->ns->send_packet (sl);
992 sl.buf=(unsigned char*)malloc(MAXSOCKBUF);
993
994 strcpy((char*)sl.buf,"player ");
995 sl.len=strlen((char*)sl.buf);
996 SockList_AddInt(&sl, pl->ob->count);
997 SockList_AddInt(&sl, weight);
998 SockList_AddInt(&sl, pl->ob->face->number);
999
1000 SockList_AddChar(&sl, ( char )strlen(pl->ob->name));
1001 strcpy((char*)sl.buf+sl.len, pl->ob->name);
1002 sl.len += strlen(pl->ob->name);
1003
1004 Send_With_Handling(&pl->socket, &sl);
1005 free(sl.buf);
1006 SET_FLAG(pl->ob, FLAG_CLIENT_SENT);
1007} 855}
1008
1009
1010/**
1011 * Need to send an animation sequence to the client.
1012 * We will send appropriate face commands to the client if we haven't
1013 * sent them the face yet (this can become quite costly in terms of
1014 * how much we are sending - on the other hand, this should only happen
1015 * when the player logs in and picks stuff up.
1016 */
1017void esrv_send_animation(NewSocket *ns, short anim_num)
1018{
1019 SockList sl;
1020 int i;
1021
1022 /* Do some checking on the anim_num we got. Note that the animations
1023 * are added in contigous order, so if the number is in the valid
1024 * range, it must be a valid animation.
1025 */
1026 if (anim_num < 0 || anim_num > num_animations) {
1027 LOG(llevError,"esrv_send_anim (%d) out of bounds??\n",anim_num);
1028 return;
1029 }
1030
1031 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
1032 strcpy((char*)sl.buf, "anim ");
1033 sl.len=5;
1034 SockList_AddShort(&sl, anim_num);
1035 SockList_AddShort(&sl, 0); /* flags - not used right now */
1036 /* Build up the list of faces. Also, send any information (ie, the
1037 * the face itself) down to the client.
1038 */
1039 for (i=0; i<animations[anim_num].num_animations; i++) {
1040 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1041 esrv_send_face(ns,animations[anim_num].faces[i],0);
1042 SockList_AddShort(&sl, animations[anim_num].faces[i]); /* flags - not used right now */
1043 }
1044 Send_With_Handling(ns, &sl);
1045 free(sl.buf);
1046 ns->anims_sent[anim_num] = 1;
1047}
1048
1049 856
1050/****************************************************************************** 857/******************************************************************************
1051 * 858 *
1052 * Start of map related commands. 859 * Start of map related commands.
1053 * 860 *
1054 ******************************************************************************/ 861 ******************************************************************************/
1055 862
1056/**
1057 * This adds face_num to a map cell at x,y. If the client doesn't have
1058 * the face yet, we will also send it.
1059 */
1060static void esrv_map_setbelow(NewSocket *ns, int x,int y,
1061 short face_num, struct Map *newmap)
1062{
1063 if(newmap->cells[x][y].count >= MAP_LAYERS) {
1064 LOG(llevError,"Too many faces in map cell %d %d\n",x,y);
1065 return;
1066 abort();
1067 }
1068 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1069 newmap->cells[x][y].count ++;
1070 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1071 esrv_send_face(ns,face_num,0);
1072}
1073
1074struct LayerCell {
1075 uint16 xy;
1076 short face;
1077};
1078
1079struct MapLayer {
1080 int count;
1081 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1082};
1083
1084/** Checkes if map cells have changed */
1085static int mapcellchanged(NewSocket *ns,int i,int j, struct Map *newmap)
1086{
1087 int k;
1088
1089 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1090 return 1;
1091 for(k=0;k<newmap->cells[i][j].count;k++) {
1092 if (ns->lastmap.cells[i][j].faces[k] !=
1093 newmap->cells[i][j].faces[k]) {
1094 return 1;
1095 }
1096 }
1097 return 0;
1098}
1099
1100/**
1101 * Basically, what this does is pack the data into layers.
1102 * cnum is the client number, cur is the the buffer we put all of
1103 * this data into. we return the end of the data. layers is
1104 * how many layers of data we should back.
1105 */
1106static uint8 *compactlayer(NewSocket *ns, unsigned char *cur, int numlayers,
1107 struct Map *newmap)
1108{
1109 int x,y,k;
1110 int face;
1111 unsigned char *fcur;
1112 struct MapLayer layers[MAP_LAYERS];
1113
1114 for(k = 0;k<MAP_LAYERS;k++)
1115 layers[k].count = 0;
1116 fcur = cur;
1117 for(x=0;x<ns->mapx;x++) {
1118 for(y=0;y<ns->mapy;y++) {
1119 if (!mapcellchanged(ns,x,y,newmap))
1120 continue;
1121 if (newmap->cells[x][y].count == 0) {
1122 *cur = x*ns->mapy+y; /* mark empty space */
1123 cur++;
1124 continue;
1125 }
1126 for(k=0;k<newmap->cells[x][y].count;k++) {
1127 layers[k].lcells[layers[k].count].xy = x*ns->mapy+y;
1128 layers[k].lcells[layers[k].count].face =
1129 newmap->cells[x][y].faces[k];
1130 layers[k].count++;
1131 }
1132 }
1133 }
1134 /* If no data, return now. */
1135 if (fcur == cur && layers[0].count == 0)
1136 return cur;
1137 *cur = 255; /* mark end of explicitly cleared cells */
1138 cur++;
1139 /* First pack by layers. */
1140 for(k=0;k<numlayers;k++) {
1141 if (layers[k].count == 0)
1142 break; /* once a layer is entirely empty, no layer below it can
1143 have anything in it either */
1144 /* Pack by entries in thie layer */
1145 for(x=0;x<layers[k].count;) {
1146 fcur = cur;
1147 *cur = layers[k].lcells[x].face >> 8;
1148 cur++;
1149 *cur = layers[k].lcells[x].face & 0xFF;
1150 cur++;
1151 face = layers[k].lcells[x].face;
1152 /* Now, we back the redundant data into 1 byte xy pairings */
1153 for(y=x;y<layers[k].count;y++) {
1154 if (layers[k].lcells[y].face == face) {
1155 *cur = ( uint8 )layers[k].lcells[y].xy;
1156 cur++;
1157 layers[k].lcells[y].face = -1;
1158 }
1159 }
1160 *(cur-1) = *(cur-1) | 128; /* mark for end of xy's; 11*11 < 128 */
1161 /* forward over the now redundant data */
1162 while(x < layers[k].count &&
1163 layers[k].lcells[x].face == -1)
1164 x++;
1165 }
1166 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1167 }
1168 return cur;
1169}
1170
1171static void esrv_map_doneredraw(NewSocket *ns, struct Map *newmap)
1172{
1173 static long frames,bytes,tbytes,tframes;
1174 char *cur;
1175 SockList sl;
1176
1177
1178 sl.buf=(unsigned char*)malloc(MAXSOCKBUF);
1179 strcpy((char*)sl.buf,"map ");
1180 sl.len=strlen((char*)sl.buf);
1181
1182 cur = (char *) compactlayer(ns,(unsigned char*) sl.buf+sl.len,MAP_LAYERS,newmap);
1183 sl.len=cur-(char*)sl.buf;
1184
1185/* LOG(llevDebug, "Sending map command.\n");*/
1186
1187 if (sl.len>( int )strlen("map ") || ns->sent_scroll) {
1188 /* All of this is just accounting stuff */
1189 if (tframes>100) {
1190 tframes = tbytes = 0;
1191 }
1192 tframes++;
1193 frames++;
1194 tbytes += sl.len;
1195 bytes += sl.len;
1196 memcpy(&ns->lastmap,newmap,sizeof(struct Map));
1197 Send_With_Handling(ns, &sl);
1198 ns->sent_scroll = 0;
1199 }
1200 free(sl.buf);
1201}
1202
1203
1204/** Clears a map cell */ 863/** Clears a map cell */
1205static void map_clearcell(struct MapCell *cell, int face0, int face1, int face2, int count) 864static void
865map_clearcell (struct MapCell *cell, int count)
1206{ 866{
1207 cell->count=count;
1208 cell->faces[0] = face0; 867 cell->faces[0] = 0;
1209 cell->faces[1] = face1; 868 cell->faces[1] = 0;
1210 cell->faces[2] = face2; 869 cell->faces[2] = 0;
870 cell->smooth[0] = 0;
871 cell->smooth[1] = 0;
872 cell->smooth[2] = 0;
873 cell->count = count;
874 cell->stat_hp = 0;
875 cell->flags = 0;
876 cell->player = 0;
1211} 877}
1212 878
1213#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1214#define MAX_LAYERS 3 879#define MAX_LAYERS 3
1215
1216/* Using a global really isn't a good approach, but saves the over head of
1217 * allocating and deallocating such a block of data each time run through,
1218 * and saves the space of allocating this in the socket object when we only
1219 * need it for this cycle. If the serve is ever threaded, this needs to be
1220 * re-examined.
1221 */
1222
1223static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1224
1225/**
1226 * Returns true if any of the heads for this
1227 * space is set. Returns false if all are blank - this is used
1228 * for empty space checking.
1229 */
1230static inline int have_head(int ax, int ay) {
1231
1232 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1233 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] ||
1234 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) return 1;
1235 return 0;
1236}
1237
1238/**
1239 * check_head is a bit simplistic version of update_space below.
1240 * basically, it only checks the that the head on space ax,ay at layer
1241 * needs to get sent - if so, it adds the data, sending the head
1242 * if needed, and returning 1. If this no data needs to get
1243 * sent, it returns zero.
1244 */
1245static inline int check_head(SockList *sl, NewSocket *ns, int ax, int ay, int layer)
1246{
1247 short face_num;
1248
1249 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1250 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1251 else
1252 face_num = 0;
1253
1254 if (face_num != ns->lastmap.cells[ax][ay].faces[layer]) {
1255 SockList_AddShort(sl, face_num);
1256 if (face_num && !(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1257 esrv_send_face(ns, face_num, 0);
1258 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1259 ns->lastmap.cells[ax][ay].faces[layer] = face_num;
1260 return 1;
1261 }
1262
1263 return 0; /* No change */
1264}
1265 880
1266/** 881/**
1267 * Removes the need to replicate the same code for each layer. 882 * Removes the need to replicate the same code for each layer.
1268 * this returns true if this space is now in fact different than 883 * this returns true if this space is now in fact different than
1269 * it was. 884 * it was.
1270 * sl is the socklist this data is going into. 885 * sl is the socklist this data is going into.
1271 * ns is the socket we are working on - all the info we care 886 * ns is the socket we are working on - all the info we care
1272 * about is in this socket structure, so now need not pass the 887 * about is in this socket structure, so now need not pass the
1273 * entire player object. 888 * entire player object.
1274 * mx and my are map coordinate offsets for map mp
1275 * sx and sy are the offsets into the socket structure that
1276 * holds the old values.
1277 * layer is the layer to update, with 2 being the floor and 0 the 889 * layer is the layer to update, with 2 being the floor and 0 the
1278 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 890 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1279 * take. Interesting to note that before this function, the map1 function 891 * take. Interesting to note that before this function, the map1 function
1280 * numbers the spaces differently - I think this was a leftover from 892 * numbers the spaces differently - I think this was a leftover from
1281 * the map command, where the faces stack up. Sinces that is no longer 893 * the map command, where the faces stack up. Sinces that is no longer
1282 * the case, it seems to make more sense to have these layer values 894 * the case, it seems to make more sense to have these layer values
1283 * actually match. 895 * actually match.
1284 */ 896 */
1285 897static int
1286static inline int update_space(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 898update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1287{ 899{
1288 object *ob, *head; 900 object *ob = ms.faces_obj [layer];
901
902 /* If there is no object for this space, or if the face for the object
903 * is the blank face, set the face number to zero.
904 * else if we have the stored head object for this space, that takes
905 * precedence over the other object for this space.
906 * otherwise, we do special head processing
907 */
908 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
909
910 /* We've gotten what face we want to use for the object. Now see if
911 * if it has changed since we last sent it to the client.
912 */
913 if (lastcell.faces[layer] != face_num)
914 {
915 lastcell.faces[layer] = face_num;
916
917 if (!ns.faces_sent[face_num])
918 if (ob)
919 ns.send_faces (ob);
920 else
921 ns.send_face (face_num, 10);
922
1289 uint16 face_num; 923 sl << uint16 (face_num);
1290 int bx, by,i; 924 return 1;
925 }
1291 926
1292 /* If there is a multipart object stored away, treat that as more important. 927 /* Nothing changed */
1293 * If not, then do the normal processing. 928 return 0;
929}
930
931// prefetch (and touch) all maps within a specific distancd
932static void
933prefetch_surrounding_maps (maptile *map, int distance)
934{
935 map->last_access = runtime;
936
937 if (--distance)
938 for (int dir = 4; --dir; )
939 if (const shstr &path = map->tile_path [dir])
940 if (maptile *&neigh = map->tile_map [dir])
941 prefetch_surrounding_maps (neigh, distance);
942 else
943 neigh = maptile::find_async (path, map);
944}
945
946// prefetch a generous area around the player
947static void
948prefetch_surrounding_maps (object *op)
949{
950 prefetch_surrounding_maps (op->map, 3);
951}
952
953/**
954 * Draws client map.
955 */
956void
957draw_client_map (player *pl)
958{
959 object *ob = pl->observe;
960 if (!ob->active)
961 return;
962
963 /* If player is just joining the game, he isn't here yet, so the map
964 * can get swapped out. If so, don't try to send them a map. All will
965 * be OK once they really log in.
966 */
967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
968 return;
969
970 int startlen, oldlen;
971
972 check_map_change (pl);
973 prefetch_surrounding_maps (pl->ob);
974
975 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob)
978 {
979 pl->do_los = 0;
980 pl->update_los ();
981 }
982
983 /**
984 * This function uses the new map1 protocol command to send the map
985 * to the client. It is necessary because the old map command supports
986 * a maximum map size of 15x15.
987 * This function is much simpler than the old one. This is because
988 * the old function optimized to send as few face identifiers as possible,
989 * at the expense of sending more coordinate location (coordinates were
990 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
991 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
992 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
993 * and use the other 4 bits for other informatiion. For full documentation
994 * of what we send, see the doc/Protocol file.
995 * I will describe internally what we do:
996 * the ns->lastmap shows how the map last looked when sent to the client.
997 * in the lastmap structure, there is a cells array, which is set to the
998 * maximum viewable size (As set in config.h).
999 * in the cells, there are faces and a count value.
1000 * we use the count value to hold the darkness value. If -1, then this space
1001 * is not viewable.
1002 * we use faces[0] faces[1] faces[2] to hold what the three layers
1003 * look like.
1004 */
1005
1006 client &socket = *pl->ns;
1007
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1009
1010 startlen = sl.length ();
1011
1012 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2;
1014
1015 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1016 int ax = dx + hx;
1017 int ay = dy + hy;
1018
1019 int mask = (ax << 10) | (ay << 4);
1020 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1021
1022 /* If the coordinates are not valid, or it is too dark to see,
1023 * we tell the client as such
1294 */ 1024 */
1295 1025 if (!m)
1296 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1026 {
1297 1027 /* space is out of map. Update space and clear values
1298 /* Check to see if this head is part of the set of objects 1028 * if this hasn't already been done. If the space is out
1299 * we would normally send for this space. If so, then 1029 * of the map, it shouldn't have a head.
1300 * don't use the head value. We need to do the check
1301 * here and not when setting up the heads[] value for two reasons -
1302 * 1) the heads[] values will get used even if the space is not visible.
1303 * 2) its possible the head is not on the same map as a part, and I'd
1304 * rather not need to do the map translation overhead.
1305 * 3) We need to do some extra checking to make sure that we will
1306 * otherwise send the image as this layer, eg, either it matches
1307 * the head value, or is not multipart.
1308 */ 1030 */
1309 if (head && !head->more) { 1031 if (lastcell.count != -1)
1310 for (i=0; i<MAP_LAYERS; i++) { 1032 {
1311 ob = GET_MAP_FACE_OBJ(mp, mx, my, i); 1033 sl << uint16 (mask);
1312 if (!ob) continue; 1034 map_clearcell (&lastcell, -1);
1035 }
1313 1036
1314 if (ob->head) ob=ob->head; 1037 continue;
1315
1316 if (ob == head) {
1317 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1318 head = NULL;
1319 break;
1320 }
1321 }
1322 } 1038 }
1039
1040 int d = pl->blocked_los_uc (dx, dy);
1323 1041
1324 ob = head; 1042 if (d > 3)
1325 if (!ob) ob = GET_MAP_FACE_OBJ(mp, mx, my, layer); 1043 {
1326 1044 /* This block deals with spaces that are not visible for whatever
1327 /* If there is no object for this space, or if the face for the object 1045 * reason. Still may need to send the head for this space.
1328 * is the blank face, set the face number to zero.
1329 * else if we have the stored head object for this space, that takes
1330 * precedence over the other object for this space.
1331 * otherwise, we do special head processing
1332 */ 1046 */
1333 if (!ob || ob->face == blank_face) face_num=0; 1047 if (lastcell.count != -1
1334 else if (head){ 1048 || lastcell.faces[0]
1335 /* if this is a head that had previously been stored */ 1049 || lastcell.faces[1]
1336 face_num = ob->face->number; 1050 || lastcell.faces[2]
1337 } else { 1051 || lastcell.stat_hp
1338 /* if the faces for the different parts of a multipart object 1052 || lastcell.flags
1339 * are the same, we only want to send the bottom right most 1053 || lastcell.player)
1340 * portion of the object. That info is in the tail_.. values 1054 sl << uint16 (mask);
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345 1055
1346 /* tail_x and tail_y will only be set in the head object. If 1056 /* properly clear a previously sent big face */
1347 * this is the head object and these are set, we proceed 1057 map_clearcell (&lastcell, -1);
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) ||
1356 (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) {
1357
1358 if (ob->head) head = ob->head;
1359 else head = ob;
1360
1361 /* Basically figure out where the offset is from where we are right
1362 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1363 * piece is from the head, and the tail is where the tail is from the
1364 * head. Note that bx and by will equal sx and sy if we are already working
1365 * on the bottom right corner. If ob is the head, the clone values
1366 * will be zero, so the right thing will still happen.
1367 */
1368 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1369 by = sy + head->arch->tail_y - ob->arch->clone.y;
1370
1371 /* I don't think this can ever happen, but better to check for it just
1372 * in case.
1373 */
1374 if (bx < sx || by < sy) {
1375 LOG(llevError,"update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n",
1376 bx, by, sx, sy);
1377 face_num = 0;
1378 }
1379 /* single part object, multipart object with non merged faces,
1380 * of multipart object already at lower right.
1381 */
1382 else if (bx == sx && by == sy) {
1383 face_num = ob->face->number;
1384
1385 /* if this face matches one stored away, clear that one away.
1386 * this code relies on the fact that the map1 commands
1387 * goes from 2 down to 0.
1388 */
1389 for (i=0; i<MAP_LAYERS; i++)
1390 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393 }
1394 else {
1395 /* If this head is stored away, clear it - otherwise,
1396 * there can be cases where a object is on multiple layers -
1397 * we only want to send it once.
1398 */
1399 face_num = head->face->number;
1400 for (i=0; i<MAP_LAYERS; i++)
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1403 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1404
1405 /* First, try to put the new head on the same layer. If that is used up,
1406 * then find another layer.
1407 */
1408 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) {
1409 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1410 } else for (i=0; i<MAX_LAYERS; i++) {
1411 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) {
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1414 }
1415 }
1416 face_num = 0; /* Don't send this object - we'll send the head later */
1417 }
1418 } else {
1419 /* In this case, we are already at the lower right or single part object,
1420 * so nothing special
1421 */
1422 face_num = ob->face->number;
1423
1424 /* clear out any head entries that have the same face as this one */
1425 for (bx=0; bx<layer; bx++)
1426 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1427 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1428 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1429 }
1430 } /* else not already head object or blank face */
1431
1432 /* This is a real hack. Basically, if we have nothing to send for this layer,
1433 * but there is a head on the next layer, send that instead.
1434 * Without this, what happens is you can get the case where the player stands
1435 * on the same space as the head. However, if you have overlapping big objects
1436 * of the same type, what happens then is it doesn't think it needs to send
1437 * This tends to make stacking also work/look better.
1438 */
1439 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]) {
1440 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1]->face->number;
1441 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer -1] = NULL;
1442 } 1058 }
1443
1444 /* Another hack - because of heads and whatnot, this face may match one
1445 * we already sent for a lower layer. In that case, don't send
1446 * this one.
1447 */
1448 if (face_num && layer+1<MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer+1] == face_num) {
1449 face_num = 0;
1450 }
1451
1452 /* We've gotten what face we want to use for the object. Now see if
1453 * if it has changed since we last sent it to the client.
1454 */
1455 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) {
1456 ns->lastmap.cells[sx][sy].faces[layer] = face_num;
1457 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1458 esrv_send_face(ns, face_num, 0);
1459 SockList_AddShort(sl, face_num);
1460 return 1;
1461 }
1462 /* Nothing changed */
1463 return 0;
1464}
1465
1466/**
1467 * This function is mainly a copy of update_space,
1468 * except it handles update of the smoothing updates,
1469 * not the face updates.
1470 * Removes the need to replicate the same code for each layer.
1471 * this returns true if this smooth is now in fact different
1472 * than it was.
1473 * sl is the socklist this data is going into.
1474 * ns is the socket we are working on - all the info we care
1475 * about is in this socket structure, so know need to pass the
1476 * entire player object.
1477 * mx and my are map coordinate offsets for map mp
1478 * sx and sy are the offsets into the socket structure that
1479 * holds the old values.
1480 * layer is the layer to update, with 2 being the floor and 0 the
1481 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1482 * take.
1483 */
1484
1485static inline int update_smooth(SockList *sl, NewSocket *ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer)
1486{
1487 object *ob;
1488 int smoothlevel; /* old face_num;*/
1489
1490 ob = GET_MAP_FACE_OBJ(mp, mx, my, layer);
1491
1492 /* If there is no object for this space, or if the face for the object
1493 * is the blank face, set the smoothlevel to zero.
1494 */
1495 if (!ob || ob->face == blank_face || MAP_NOSMOOTH(mp)) smoothlevel=0;
1496 else {
1497 smoothlevel = ob->smoothlevel;
1498 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1499 SendSmooth(ns, ob->face->number);
1500 } /* else not already head object or blank face */
1501
1502 /* We've gotten what face we want to use for the object. Now see if
1503 * if it has changed since we last sent it to the client.
1504 */
1505 if (smoothlevel>255)
1506 smoothlevel=255;
1507 else if (smoothlevel<0)
1508 smoothlevel=0;
1509 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) {
1510 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1511 SockList_AddChar(sl, (uint8) (smoothlevel&0xFF));
1512 return 1;
1513 }
1514 /* Nothing changed */
1515 return 0;
1516}
1517
1518/**
1519 * Returns the size of a data for a map square as returned by
1520 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1521 * available.
1522 */
1523int getExtendedMapInfoSize(NewSocket* ns){
1524 int result=0;
1525 if (ns->ext_mapinfos){
1526 if (ns->EMI_smooth)
1527 result+=1; /*One byte for smoothlevel*/
1528 }
1529 return result;
1530}
1531/**
1532 * This function uses the new map1 protocol command to send the map
1533 * to the client. It is necessary because the old map command supports
1534 * a maximum map size of 15x15.
1535 * This function is much simpler than the old one. This is because
1536 * the old function optimized to send as few face identifiers as possible,
1537 * at the expense of sending more coordinate location (coordinates were
1538 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1539 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1540 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1541 * and use the other 4 bits for other informatiion. For full documentation
1542 * of what we send, see the doc/Protocol file.
1543 * I will describe internally what we do:
1544 * the socket->lastmap shows how the map last looked when sent to the client.
1545 * in the lastmap structure, there is a cells array, which is set to the
1546 * maximum viewable size (As set in config.h).
1547 * in the cells, there are faces and a count value.
1548 * we use the count value to hold the darkness value. If -1, then this space
1549 * is not viewable.
1550 * we use faces[0] faces[1] faces[2] to hold what the three layers
1551 * look like.
1552 */
1553void draw_client_map1(object *pl)
1554{
1555 int x,y,ax, ay, d, startlen, max_x, max_y, oldlen;
1556 sint16 nx, ny;
1557 int estartlen, eoldlen;
1558 SockList sl;
1559 SockList esl; /*For extended Map info*/
1560 uint16 mask,emask;
1561 uint8 eentrysize;
1562 uint16 ewhatstart,ewhatflag;
1563 uint8 extendedinfos;
1564 mapstruct *m;
1565
1566 sl.buf=(unsigned char*)malloc(MAXSOCKBUF);
1567 if (pl->contr->socket.mapmode == Map1Cmd)
1568 strcpy((char*)sl.buf,"map1 ");
1569 else 1059 else
1570 strcpy((char*)sl.buf,"map1a "); 1060 {
1571 sl.len=strlen((char*)sl.buf); 1061 /* In this block, the space is visible.
1572 startlen = sl.len;
1573 /*Extendedmapinfo structure initialisation*/
1574 if (pl->contr->socket.ext_mapinfos){
1575 esl.buf=(unsigned char*)malloc(MAXSOCKBUF);
1576 strcpy((char*)esl.buf,"mapextended ");
1577 esl.len=strlen((char*)esl.buf);
1578 extendedinfos=EMI_NOREDRAW;
1579 if (pl->contr->socket.EMI_smooth)
1580 extendedinfos|=EMI_SMOOTH;
1581 ewhatstart=esl.len;
1582 ewhatflag=extendedinfos; /*The EMI_NOREDRAW bit
1583 could need to be taken away*/
1584 SockList_AddChar(&esl, extendedinfos);
1585 eentrysize=getExtendedMapInfoSize(&(pl->contr->socket));
1586 SockList_AddChar(&esl, eentrysize);
1587 estartlen = esl.len;
1588 } else {
1589 /* suppress compiler warnings */
1590 ewhatstart = 0;
1591 ewhatflag = 0;
1592 estartlen = 0;
1593 }
1594 /* Init data to zero */
1595 memset(heads, 0, sizeof(object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1596
1597 /* x,y are the real map locations. ax, ay are viewport relative
1598 * locations.
1599 */ 1062 */
1600 ay=0;
1601 1063
1602 /* We could do this logic as conditionals in the if statement, 1064 /* Rather than try to figure out what everything that we might
1603 * but that started to get a bit messy to look at. 1065 * need to send is, then form the packet after that,
1066 * we presume that we will in fact form a packet, and update
1067 * the bits by what we do actually send. If we send nothing,
1068 * we just back out sl.length () to the old value, and no harm
1069 * is done.
1070 * I think this is simpler than doing a bunch of checks to see
1071 * what if anything we need to send, setting the bits, then
1072 * doing those checks again to add the real data.
1604 */ 1073 */
1605 max_x = pl->x+(pl->contr->socket.mapx+1)/2; 1074 oldlen = sl.length ();
1606 max_y = pl->y+(pl->contr->socket.mapy+1)/2;
1607 if (pl->contr->socket.mapmode == Map1aCmd) {
1608 max_x += MAX_HEAD_OFFSET;
1609 max_y += MAX_HEAD_OFFSET;
1610 }
1611 1075
1612 for(y=pl->y-pl->contr->socket.mapy/2; y<max_y; y++,ay++) { 1076 sl << uint16 (mask);
1613 ax=0;
1614 for(x=pl->x-pl->contr->socket.mapx/2;x<max_x;x++,ax++) {
1615 1077
1616 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1078 unsigned char dummy;
1079 unsigned char *last_ext = &dummy;
1617 1080
1618 /* If this space is out of the normal viewable area, we only check 1081 /* Darkness changed */
1619 * the heads value ax or ay will only be greater than what 1082 if (lastcell.count != d)
1620 * the client wants if using the map1a command - this is because 1083 {
1621 * if the map1a command is not used, max_x and max_y will be 1084 mask |= 0x8;
1622 * set to lower values.
1623 */
1624 if (ax >= pl->contr->socket.mapx || ay >= pl->contr->socket.mapy) {
1625 int i, got_one;
1626 1085
1627 oldlen = sl.len; 1086 if (socket.extmap)
1628 1087 {
1629 1088 *last_ext |= 0x80;
1630 SockList_AddShort(&sl, mask); 1089 last_ext = &sl[sl.length ()];
1631 1090 sl << uint8 (d);
1632 if (check_head(&sl, &pl->contr->socket, ax, ay, 2)) 1091 }
1633 mask |= 0x4;
1634 if (check_head(&sl, &pl->contr->socket, ax, ay, 1))
1635 mask |= 0x2;
1636 if (check_head(&sl, &pl->contr->socket, ax, ay, 0))
1637 mask |= 0x1;
1638
1639 /* If all we are doing is sending 0 (blank) faces, we don't
1640 * actually need to send that - just the coordinates
1641 * with no faces tells the client to blank out the
1642 * space.
1643 */
1644 got_one=0;
1645 for (i=oldlen+2; i<sl.len; i++) {
1646 if (sl.buf[i]) got_one=1;
1647 }
1648
1649 if (got_one && (mask & 0xf)) {
1650 sl.buf[oldlen+1] = mask & 0xff;
1651 } else { /*either all faces blank, either no face at all*/
1652 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates*/
1653 sl.len = oldlen + 2;
1654 else 1092 else
1655 sl.len = oldlen; 1093 sl << uint8 (255 - 64 * d);
1656 } 1094 }
1657 /*What concerns extendinfos, nothing to be done for now
1658 * (perhaps effects layer later)
1659 */
1660 continue; /* don't do processing below */
1661 }
1662 1095
1663 d = pl->contr->blocked_los[ax][ay]; 1096 lastcell.count = d;
1664 1097
1665 /* If the coordinates are not valid, or it is too dark to see, 1098 mapspace &ms = m->at (nx, ny);
1666 * we tell the client as such 1099 ms.update ();
1667 */
1668 nx=x;
1669 ny=y;
1670 m = get_map_from_coord(pl->map, &nx, &ny);
1671 if (!m) {
1672 /* space is out of map. Update space and clear values
1673 * if this hasn't already been done. If the space is out
1674 * of the map, it shouldn't have a head
1675 */
1676 if (pl->contr->socket.lastmap.cells[ax][ay].count != -1) {
1677 SockList_AddShort(&sl, mask);
1678 map_clearcell(&pl->contr->socket.lastmap.cells[ax][ay],0,0,0,-1);
1679 }
1680 } else if (d>3) {
1681 int need_send=0, count;
1682 /* This block deals with spaces that are not visible for whatever
1683 * reason. Still may need to send the head for this space.
1684 */
1685 1100
1686 oldlen = sl.len; 1101 if (expect_true (socket.extmap))
1687#if 0 1102 {
1688 /* First thing we do is blank out this space (clear it) 1103 uint8 stat_hp = 0;
1689 * if not already done. If the client is using darkness, and 1104 uint8 stat_width = 0;
1690 * this space is at the edge, we also include the darkness. 1105 uint8 flags = 0;
1691 */ 1106 tag_t player = 0;
1692 if (d==4) {
1693 if (pl->contr->socket.darkness && pl->contr->socket.lastmap.cells[ax][ay].count != d) {
1694 mask |= 8;
1695 SockList_AddShort(&sl, mask);
1696 SockList_AddChar(&sl, 0);
1697 }
1698 count = d;
1699 } else
1700#endif
1701 {
1702 SockList_AddShort(&sl, mask);
1703 if (pl->contr->socket.lastmap.cells[ax][ay].count != -1) need_send=1;
1704 count = -1;
1705 }
1706 1107
1707 if (pl->contr->socket.mapmode == Map1aCmd && have_head(ax, ay)) { 1108 // send hp information, if applicable
1708 /* Now check to see if any heads need to be sent */ 1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1709 1123
1710 if (check_head(&sl, &pl->contr->socket, ax, ay, 2)) 1124 if (expect_false (op->has_dialogue ()))
1711 mask |= 0x4; 1125 flags |= 1;
1712 if (check_head(&sl, &pl->contr->socket, ax, ay, 1))
1713 mask |= 0x2;
1714 if (check_head(&sl, &pl->contr->socket, ax, ay, 0))
1715 mask |= 0x1;
1716 pl->contr->socket.lastmap.cells[ax][ay].count = count;
1717 1126
1718 } else { 1127 if (expect_false (op->type == PLAYER))
1719 struct MapCell *cell = &pl->contr->socket.lastmap.cells[ax][ay]; 1128 player = op == ob ? pl->ob->count
1720 /* properly clear a previously sent big face */ 1129 : op == pl->ob ? ob->count
1721 if(cell->faces[0] != 0 1130 : op->count;
1722 || cell->faces[1] != 0 1131 }
1723 || cell->faces[2] != 0)
1724 need_send = 1;
1725 map_clearcell(&pl->contr->socket.lastmap.cells[ax][ay], 0, 0, 0, count);
1726 }
1727 1132
1728 if ((mask & 0xf) || need_send) { 1133 if (expect_false (lastcell.stat_hp != stat_hp))
1729 sl.buf[oldlen+1] = mask & 0xff; 1134 {
1730 } else { 1135 lastcell.stat_hp = stat_hp;
1731 sl.len = oldlen;
1732 }
1733 } else {
1734 /* In this block, the space is visible or there are head objects
1735 * we need to send.
1736 */
1737 1136
1738 /* Rather than try to figure out what everything that we might 1137 mask |= 0x8;
1739 * need to send is, then form the packet after that, 1138 *last_ext |= 0x80;
1740 * we presume that we will in fact form a packet, and update 1139 last_ext = &sl[sl.length ()];
1741 * the bits by what we do actually send. If we send nothing,
1742 * we just back out sl.len to the old value, and no harm
1743 * is done.
1744 * I think this is simpler than doing a bunch of checks to see
1745 * what if anything we need to send, setting the bits, then
1746 * doing those checks again to add the real data.
1747 */
1748 oldlen = sl.len;
1749 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1750 eoldlen = esl.len;
1751 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1752 SockList_AddShort(&sl, mask);
1753 1140
1754 if (pl->contr->socket.ext_mapinfos) 1141 sl << uint8 (5) << uint8 (stat_hp);
1755 SockList_AddShort(&esl, emask);
1756 1142
1757 /* Darkness changed */ 1143 if (stat_width > 1)
1758 if (pl->contr->socket.lastmap.cells[ax][ay].count != d && pl->contr->socket.darkness) { 1144 {
1759 pl->contr->socket.lastmap.cells[ax][ay].count = d; 1145 *last_ext |= 0x80;
1760 mask |= 0x8; /* darkness bit */ 1146 last_ext = &sl[sl.length ()];
1761 1147
1762 /* Protocol defines 255 full bright, 0 full dark. 1148 sl << uint8 (6) << uint8 (stat_width);
1763 * We currently don't have that many darkness ranges, 1149 }
1764 * so we current what limited values we do have. 1150 }
1765 */
1766 if (d==0) SockList_AddChar(&sl, 255);
1767 else if (d==1) SockList_AddChar(&sl, 191);
1768 else if (d==2) SockList_AddChar(&sl, 127);
1769 else if (d==3) SockList_AddChar(&sl, 63);
1770 }
1771 else {
1772 /* need to reset from -1 so that if it does become blocked again,
1773 * the code that deals with that can detect that it needs to tell
1774 * the client that this space is now blocked.
1775 */
1776 pl->contr->socket.lastmap.cells[ax][ay].count = d;
1777 }
1778 1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 }
1173 }
1174
1779 /* Floor face */ 1175 /* Floor face */
1780 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 2)) 1176 if (update_space (sl, socket, ms, lastcell, 2))
1781 mask |= 0x4; 1177 mask |= 0x4;
1782 1178
1783 if (pl->contr->socket.EMI_smooth)
1784 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 2)){
1785 emask |= 0x4;
1786 }
1787
1788 /* Middle face */ 1179 /* Middle face */
1789 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 1)) 1180 if (update_space (sl, socket, ms, lastcell, 1))
1790 mask |= 0x2; 1181 mask |= 0x2;
1791 1182
1792 if (pl->contr->socket.EMI_smooth) 1183 if (expect_false (ob->invisible)
1793 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 1)){ 1184 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1794 emask |= 0x2; 1185 && ms.player () == ob)
1795 } 1186 {
1187 // force player to be visible to himself if invisible
1188 if (lastcell.faces[0] != ob->face)
1189 {
1190 lastcell.faces[0] = ob->face;
1796 1191
1192 mask |= 0x1;
1193 sl << uint16 (ob->face);
1797 1194
1798 if(nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 1195 socket.send_faces (ob);
1799 if (pl->contr->socket.lastmap.cells[ax][ay].faces[0] != pl->face->number) { 1196 }
1800 pl->contr->socket.lastmap.cells[ax][ay].faces[0] = pl->face->number; 1197 }
1801 mask |= 0x1; 1198 /* Top face */
1802 if (!(pl->contr->socket.faces_sent[pl->face->number] &NS_FACESENT_FACE)) 1199 else if (update_space (sl, socket, ms, lastcell, 0))
1803 esrv_send_face(&pl->contr->socket, pl->face->number, 0);
1804 SockList_AddShort(&sl, pl->face->number);
1805 }
1806 }
1807 /* Top face */
1808 else {
1809 if (update_space(&sl, &pl->contr->socket, m, nx, ny, ax, ay, 0))
1810 mask |= 0x1; 1200 mask |= 0x1;
1811 if (pl->contr->socket.EMI_smooth) 1201
1812 if (update_smooth(&esl, &pl->contr->socket, m, nx, ny, ax, ay, 0)){
1813 emask |= 0x1;
1814 }
1815 }
1816 /* Check to see if we are in fact sending anything for this 1202 /* Check to see if we are in fact sending anything for this
1817 * space by checking the mask. If so, update the mask. 1203 * space by checking the mask. If so, update the mask.
1818 * if not, reset the len to that from before adding the mask 1204 * if not, reset the len to that from before adding the mask
1819 * value, so we don't send those bits. 1205 * value, so we don't send those bits.
1820 */
1821 if (mask & 0xf) {
1822 sl.buf[oldlen+1] = mask & 0xff;
1823 } else {
1824 sl.len = oldlen;
1825 }
1826 if (emask & 0xf) {
1827 esl.buf[eoldlen+1] = emask & 0xff;
1828 } else {
1829 esl.len = eoldlen;
1830 }
1831 } /* else this is a viewable space */
1832 } /* for x loop */
1833 } /* for y loop */
1834
1835 /* Verify that we in fact do need to send this */
1836 if (pl->contr->socket.ext_mapinfos){
1837 if (!(sl.len>startlen || pl->contr->socket.sent_scroll)){
1838 /* No map data will follow, so don't say the client
1839 * it doesn't need draw!
1840 */ 1206 */
1841 ewhatflag&=(~EMI_NOREDRAW); 1207 if (mask & 0xf)
1842 esl.buf[ewhatstart+1] = ewhatflag & 0xff; 1208 sl[oldlen + 1] = mask & 0xff;
1843 }
1844 if (esl.len>estartlen) {
1845 Send_With_Handling(&pl->contr->socket, &esl);
1846 }
1847 free(esl.buf);
1848 }
1849 if (sl.len>startlen || pl->contr->socket.sent_scroll) {
1850 Send_With_Handling(&pl->contr->socket, &sl);
1851 pl->contr->socket.sent_scroll = 0;
1852 }
1853 free(sl.buf);
1854
1855 check_map_change (pl->contr);
1856}
1857
1858/**
1859 * Draws client map.
1860 */
1861void draw_client_map(object *pl)
1862{
1863 int i,j;
1864 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */
1865 New_Face *face,*floor;
1866 New_Face *floor2;
1867 int d, mflags;
1868 struct Map newmap;
1869 mapstruct *m, *pm;
1870
1871 if (pl->type != PLAYER) {
1872 LOG(llevError,"draw_client_map called with non player/non eric-server\n");
1873 return;
1874 }
1875
1876 if (pl->contr->transport) {
1877 pm = pl->contr->transport->map;
1878 }
1879 else 1209 else
1880 pm = pl->map; 1210 sl.reset (oldlen);
1211 } /* else this is a viewable space */
1212 ordered_mapwalk_end
1881 1213
1882 /* If player is just joining the game, he isn't here yet, so the map 1214 socket.flush_fx ();
1883 * can get swapped out. If so, don't try to send them a map. All will
1884 * be OK once they really log in.
1885 */
1886 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return;
1887 1215
1888 memset(&newmap, 0, sizeof(struct Map)); 1216 if (sl.length () > startlen || socket.sent_scroll)
1889
1890 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) {
1891 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) {
1892 ax=i;
1893 ay=j;
1894 m = pm;
1895 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay);
1896 if (mflags & P_OUT_OF_MAP)
1897 continue;
1898 if (mflags & P_NEED_UPDATE)
1899 update_position(m, ax, ay);
1900 /* If a map is visible to the player, we don't want to swap it out
1901 * just to reload it. This should really call something like
1902 * swap_map, but this is much more efficient and 'good enough'
1903 */
1904 if (mflags & P_NEW_MAP)
1905 m->timeout = 50;
1906 }
1907 }
1908 /* do LOS after calls to update_position */
1909 if(pl->contr->do_los) {
1910 update_los(pl);
1911 pl->contr->do_los = 0;
1912 }
1913
1914 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) {
1915 /* Big maps need a different drawing mechanism to work */
1916 draw_client_map1(pl);
1917 return;
1918 }
1919 1217 {
1920 if(pl->invisible & (pl->invisible < 50 ? 4 : 1)) { 1218 socket.send_packet (sl);
1921 esrv_map_setbelow(&pl->contr->socket,pl->contr->socket.mapx/2, 1219 socket.sent_scroll = 0;
1922 pl->contr->socket.mapy/2,pl->face->number,&newmap);
1923 }
1924
1925 /* j and i are the y and x coordinates of the real map (which is
1926 * basically some number of spaces around the player)
1927 * ax and ay are values from within the viewport (ie, 0, 0 is upper
1928 * left corner) and are thus disconnected from the map values.
1929 * Subtract 1 from the max values so that we properly handle cases where
1930 * player has specified an even map. Otherwise, we try to send them too
1931 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
1932 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
1933 * odd, this still works fine.
1934 */
1935 ay=0;
1936 for(j=pl->y-pl->contr->socket.mapy/2; j<=pl->y+(pl->contr->socket.mapy-1)/2;j++, ay++) {
1937 ax=0;
1938 for(i=pl->x-pl->contr->socket.mapx/2;i<=pl->x+(pl->contr->socket.mapx-1)/2;i++, ax++) {
1939
1940 d = pl->contr->blocked_los[ax][ay];
1941 /* note the out_of_map and d>3 checks are both within the same
1942 * negation check.
1943 */
1944 nx = i;
1945 ny = j;
1946 m = get_map_from_coord(pm, &nx, &ny);
1947 if (m && d<4) {
1948 face = GET_MAP_FACE(m, nx, ny,0);
1949 floor2 = GET_MAP_FACE(m, nx, ny,1);
1950 floor = GET_MAP_FACE(m, nx, ny,2);
1951
1952 /* If all is blank, send a blank face. */
1953 if ((!face || face == blank_face) &&
1954 (!floor2 || floor2 == blank_face) &&
1955 (!floor || floor == blank_face)) {
1956 esrv_map_setbelow(&pl->contr->socket,ax,ay,
1957 blank_face->number,&newmap);
1958 } else { /* actually have something interesting */
1959 /* send the darkness mask, if any. */
1960 if (d && pl->contr->socket.darkness)
1961 esrv_map_setbelow(&pl->contr->socket,ax,ay,
1962 dark_faces[d-1]->number,&newmap);
1963
1964 if (face && face != blank_face)
1965 esrv_map_setbelow(&pl->contr->socket,ax,ay,
1966 face->number,&newmap);
1967 if (floor2 && floor2 != blank_face)
1968 esrv_map_setbelow(&pl->contr->socket,ax,ay,
1969 floor2->number,&newmap);
1970 if (floor && floor != blank_face)
1971 esrv_map_setbelow(&pl->contr->socket,ax,ay,
1972 floor->number,&newmap);
1973 }
1974 } /* Is a valid space */
1975 }
1976 }
1977 esrv_map_doneredraw(&pl->contr->socket, &newmap);
1978
1979 check_map_change (pl->contr);
1980}
1981
1982
1983void esrv_map_scroll(NewSocket *ns,int dx,int dy)
1984{
1985 struct Map newmap;
1986 int x,y, mx, my;
1987 char buf[MAXSOCKBUF];
1988
1989 sprintf(buf,"map_scroll %d %d", dx, dy);
1990 Write_String_To_Socket(ns, buf, strlen(buf));
1991
1992 /* If we are using the Map1aCmd, we may in fact send
1993 * head information that is outside the viewable map.
1994 * So set the mx,my to the max value we want to
1995 * look for. Removed code to do so - it caused extra
1996 * complexities for the client, and probably doesn't make
1997 * that much difference in bandwidth.
1998 */
1999 mx = ns->mapx;
2000 my = ns->mapy;
2001
2002 if (ns->mapmode == Map1aCmd) {
2003 mx += MAX_HEAD_OFFSET;
2004 my += MAX_HEAD_OFFSET;
2005 }
2006
2007 /* the x and y here are coordinates for the new map, i.e. if we moved
2008 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
2009 * if the destination x or y coordinate is outside the viewable
2010 * area, we clear the values - otherwise, the old values
2011 * are preserved, and the check_head thinks it needs to clear them.
2012 */
2013 for(x=0; x<mx; x++) {
2014 for(y=0; y<my; y++) {
2015 if(x >= ns->mapx || y >= ns->mapy) {
2016 /* clear cells outside the viewable area */
2017 memset(&newmap.cells[x][y], 0, sizeof(struct MapCell));
2018 } 1220 }
2019 else if ((x+dx) < 0 || (x+dx) >= ns->mapx || (y+dy) < 0 || (y + dy) >= ns->mapy) {
2020 /* clear newly visible tiles within the viewable area */
2021 memset(&(newmap.cells[x][y]), 0, sizeof(struct MapCell));
2022 }
2023 else {
2024 memcpy(&(newmap.cells[x][y]),
2025 &(ns->lastmap.cells[x+dx][y+dy]),sizeof(struct MapCell));
2026 }
2027 }
2028 }
2029
2030 memcpy(&(ns->lastmap), &newmap,sizeof(struct Map));
2031
2032 /* Make sure that the next "map1" command will be sent (even if it is
2033 * empty).
2034 */
2035 ns->sent_scroll = 1;
2036} 1221}
2037 1222
2038/*****************************************************************************/ 1223/*****************************************************************************/
2039/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1224/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2040/* a player. Of course, the client need to know the command to be able to */ 1225/* a player. Of course, the client need to know the command to be able to */
2041/* manage it ! */ 1226/* manage it ! */
2042/*****************************************************************************/ 1227/*****************************************************************************/
1228void
2043void send_plugin_custom_message(object *pl, char *buf) 1229send_plugin_custom_message (object *pl, char *buf)
2044{ 1230{
2045 cs_write_string(&pl->contr->socket,buf,strlen(buf)); 1231 pl->contr->ns->send_packet (buf);
2046} 1232}
2047 1233
2048/** 1234/**
2049 * This sends the skill number to name mapping. We ignore 1235 * This sends the skill number to name mapping. We ignore
2050 * the params - we always send the same info no matter what. 1236 * the params - we always send the same info no matter what.
2051 */ 1237 */
1238void
2052void send_skill_info(NewSocket *ns, char *params) 1239send_skill_info (client *ns, char *params)
2053{ 1240{
2054 SockList sl; 1241 packet sl;
2055 int i; 1242 sl << "replyinfo skill_info\n";
2056 1243
2057 sl.buf = (unsigned char*) malloc(MAXSOCKBUF);
2058 strcpy((char*)sl.buf,"replyinfo skill_info\n");
2059 for (i=1; i< NUM_SKILLS; i++) { 1244 for (int i = 1; i < NUM_SKILLS; i++)
2060 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
2061 skill_names[i]); 1246
2062 }
2063 sl.len = strlen((char*)sl.buf);
2064 if (sl.len >= MAXSOCKBUF) { 1247 if (sl.length () > MAXSOCKBUF)
1248 {
2065 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2066 fatal(0); 1250 fatal (0);
2067 } 1251 }
2068 Send_With_Handling(ns, &sl); 1252
2069 free(sl.buf); 1253 ns->send_packet (sl);
2070} 1254}
2071 1255
2072/** 1256/**
2073 * This sends the spell path to name mapping. We ignore 1257 * This sends the spell path to name mapping. We ignore
2074 * the params - we always send the same info no matter what. 1258 * the params - we always send the same info no matter what.
2075 */ 1259 */
1260void
2076void send_spell_paths (NewSocket *ns, char *params) { 1261send_spell_paths (client * ns, char *params)
2077 SockList sl; 1262{
2078 int i; 1263 packet sl;
2079 1264
2080 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1265 sl << "replyinfo spell_paths\n";
2081 strcpy((char*)sl.buf,"replyinfo spell_paths\n"); 1266
2082 for(i=0; i<NRSPELLPATHS; i++) 1267 for (int i = 0; i < NRSPELLPATHS; i++)
2083 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2084 sl.len = strlen((char*)sl.buf); 1269
2085 if (sl.len >= MAXSOCKBUF) { 1270 if (sl.length () > MAXSOCKBUF)
1271 {
2086 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2087 fatal(0); 1273 fatal (0);
2088 } 1274 }
2089 Send_With_Handling(ns, &sl); 1275
2090 free(sl.buf); 1276 ns->send_packet (sl);
2091} 1277}
2092 1278
2093/** 1279/**
2094 * This looks for any spells the player may have that have changed their stats. 1280 * This looks for any spells the player may have that have changed their stats.
2095 * it then sends an updspell packet for each spell that has changed in this way 1281 * it then sends an updspell packet for each spell that has changed in this way
2096 */ 1282 */
1283void
2097void esrv_update_spells(player *pl) { 1284esrv_update_spells (player *pl)
2098 SockList sl; 1285{
2099 int flags=0; 1286 if (!pl->ns)
2100 object *spell; 1287 return;
2101 if (!pl->socket.monitor_spells) return; 1288
1289 if (!pl->ns->monitor_spells)
1290 return;
1291
2102 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 1292 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293 {
2103 if (spell->type == SPELL) { 1294 if (spell->type == SPELL)
1295 {
1296 int flags = 0;
1297
2104 /* check if we need to update it*/ 1298 /* check if we need to update it */
2105 if (spell->last_sp != SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA)) { 1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1300 {
2106 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2107 flags |= UPD_SP_MANA; 1302 flags |= UPD_SP_MANA;
1303 }
1304
1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1306 {
1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1308 flags |= UPD_SP_GRACE;
1309 }
1310
1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1312 {
1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1314 flags |= UPD_SP_DAMAGE;
1315 }
1316
1317 if (flags)
1318 {
1319 packet sl;
1320
1321 sl << "updspell "
1322 << uint8 (flags)
1323 << uint32 (spell->count);
1324
1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1328
1329 pl->ns->send_packet (sl);
1330 }
1331 }
2108 } 1332 }
2109 if (spell->last_grace != SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE)) {
2110 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE);
2111 flags |= UPD_SP_GRACE;
2112 }
2113 if (spell->last_eat != spell->stats.dam+SP_level_dam_adjust(pl->ob, spell)) {
2114 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell);
2115 flags |= UPD_SP_DAMAGE;
2116 }
2117 if (flags !=0) {
2118 sl.buf =(unsigned char*) malloc(MAXSOCKBUF);
2119 strcpy((char*)sl.buf,"updspell ");
2120 sl.len=strlen((char*)sl.buf);
2121 SockList_AddChar(&sl, flags);
2122 SockList_AddInt(&sl, spell->count);
2123 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp);
2124 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace);
2125 if (flags & UPD_SP_DAMAGE) SockList_AddShort(&sl, spell->last_eat);
2126 flags = 0;
2127 Send_With_Handling(&pl->socket, &sl);
2128 free(sl.buf);
2129 }
2130 }
2131 }
2132} 1333}
2133 1334
1335void
2134void esrv_remove_spell(player *pl, object *spell) { 1336esrv_remove_spell (player *pl, object *spell)
2135 SockList sl; 1337{
1338 if (!pl->ns->monitor_spells)
1339 return;
2136 1340
2137 if (!pl->socket.monitor_spells) return;
2138 if (!pl || !spell || spell->env != pl->ob) { 1341 if (!pl || !spell || spell->env != pl->ob)
1342 {
2139 LOG(llevError, "Invalid call to esrv_remove_spell"); 1343 LOG (llevError, "Invalid call to esrv_remove_spell");
2140 return; 1344 return;
2141 } 1345 }
2142 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1346
2143 strcpy((char*)sl.buf,"delspell "); 1347 packet sl ("delspell");
2144 sl.len=strlen((char*)sl.buf); 1348
2145 SockList_AddInt(&sl, spell->count); 1349 sl << uint32 (spell->count);
2146 Send_With_Handling(&pl->socket, &sl); 1350
2147 free(sl.buf); 1351 pl->ns->send_packet (sl);
2148} 1352}
2149 1353
2150/* appends the spell *spell to the Socklist we will send the data to. */ 1354/* appends the spell *spell to the Socklist we will send the data to. */
1355static void
2151static void append_spell (player *pl, SockList *sl, object *spell) { 1356append_spell (player *pl, packet &sl, object *spell)
1357{
2152 int len, i, skill=0; 1358 int i, skill = 0;
2153 1359
2154 if (!(spell->name)) { 1360 if (!(spell->name))
1361 {
2155 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 1362 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2156 return; 1363 return;
2157 } 1364 }
2158 SockList_AddInt(sl, spell->count); 1365
2159 SockList_AddShort(sl, spell->level);
2160 SockList_AddShort(sl, spell->casting_time);
2161 /* store costs and damage in the object struct, to compare to later */ 1366 /* store costs and damage in the object struct, to compare to later */
2162 spell->last_sp = SP_level_spellpoint_cost(pl->ob, spell, SPELL_MANA); 1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2163 spell->last_grace = SP_level_spellpoint_cost(pl->ob, spell, SPELL_GRACE); 1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2164 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2165 /* send the current values */
2166 SockList_AddShort(sl, spell->last_sp);
2167 SockList_AddShort(sl, spell->last_grace);
2168 SockList_AddShort(sl, spell->last_eat);
2169 1370
2170 /* figure out which skill it uses, if it uses one */ 1371 /* figure out which skill it uses, if it uses one */
2171 if (spell->skill) { 1372 if (spell->skill)
2172 for (i=1; i< NUM_SKILLS; i++) 1373 if (object *tmp = pl->find_skill (spell->skill))
2173 if (!strcmp(spell->skill, skill_names[i])) { 1374 skill = tmp->subtype + CS_STAT_SKILLINFO;
2174 skill = i+CS_STAT_SKILLINFO; 1375
2175 break; 1376 // spells better have a face
1377 if (!spell->face)
1378 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1380 spell->face = face_find ("burnout.x11", blank_face);
2176 } 1381 }
2177 }
2178 SockList_AddChar(sl, skill);
2179 1382
2180 SockList_AddInt(sl, spell->path_attuned); 1383 pl->ns->send_face (spell->face);
2181 SockList_AddInt(sl, (spell->face)?spell->face->number:0);
2182 1384
2183 len = strlen(spell->name); 1385 /* send the current values */
2184 SockList_AddChar(sl, (char)len); 1386 sl << uint32 (spell->count)
2185 memcpy(sl->buf+sl->len, spell->name, len); 1387 << uint16 (spell->level)
2186 sl->len+=len; 1388 << uint16 (spell->casting_time)
2187 1389 << uint16 (spell->cached_sp)
2188 if (!spell->msg) { 1390 << uint16 (spell->cached_grace)
2189 SockList_AddShort(sl, 0); 1391 << uint16 (spell->cached_eat)
2190 } 1392 << uint8 (skill)
2191 else { 1393 << uint32 (spell->path_attuned)
2192 len = strlen(spell->msg); 1394 << uint32 (spell->face)
2193 SockList_AddShort(sl, len); 1395 << data8 (spell->name)
2194 memcpy(sl->buf+sl->len, spell->msg, len); 1396 << data16 (spell->msg);
2195 sl->len+=len;
2196 }
2197} 1397}
2198 1398
2199/** 1399/**
2200 * This tells the client to add the spell *ob, if *ob is NULL, then add 1400 * This tells the client to add the spell *ob, if *ob is NULL, then add
2201 * all spells in the player's inventory. 1401 * all spells in the player's inventory.
2202 */ 1402 */
1403void
2203void esrv_add_spells(player *pl, object *spell) { 1404esrv_add_spells (player *pl, object *spell)
2204 SockList sl; 1405{
2205 if (!pl) { 1406 if (!pl)
1407 {
2206 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1408 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2207 return; 1409 return;
2208 } 1410 }
2209 if (!pl->socket.monitor_spells) return; 1411
2210 sl.buf = (unsigned char*) malloc(MAXSOCKBUF); 1412 if (!pl->ns->monitor_spells)
2211 strcpy((char*)sl.buf,"addspell "); 1413 return;
2212 sl.len=strlen((char*)sl.buf); 1414
1415 packet sl ("addspell");
1416
2213 if (!spell) { 1417 if (!spell)
1418 {
2214 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 1419 for (spell = pl->ob->inv; spell; spell = spell->below)
1420 {
2215 /* were we to simply keep appending data here, we could exceed 1421 /* were we to simply keep appending data here, we could exceed
2216 * MAXSOCKBUF if the player has enough spells to add, we know that 1422 * MAXSOCKBUF if the player has enough spells to add, we know that
2217 * append_spells will always append 19 data bytes, plus 4 length 1423 * append_spells will always append 19 data bytes, plus 4 length
2218 * bytes and 3 strings (because that is the spec) so we need to 1424 * bytes and 3 strings (because that is the spec) so we need to
2219 * check that the length of those 3 strings, plus the 23 bytes, 1425 * check that the length of those 3 strings, plus the 23 bytes,
2220 * won't take us over the length limit for the socket, if it does, 1426 * won't take us over the length limit for the socket, if it does,
2221 * we need to send what we already have, and restart packet formation 1427 * we need to send what we already have, and restart packet formation
2222 */ 1428 */
1429 if (spell->type != SPELL)
1430 continue;
1431
2223 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1432 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2224 * to show add_spell is 26 bytes + 2 strings. However, the overun 1433 * to show add_spell is 26 bytes + 2 strings. However, the overun
2225 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1434 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2226 * like it will fix this 1435 * like it will fix this
2227 */ 1436 */
2228 if (spell->type != SPELL) continue; 1437 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2229 if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) + 1438 {
2230 (spell->msg?strlen(spell->msg):0)))) { 1439 pl->ns->flush_fx ();
2231 Send_With_Handling(&pl->socket, &sl); 1440 pl->ns->send_packet (sl);
2232 strcpy((char*)sl.buf,"addspell "); 1441
2233 sl.len=strlen((char*)sl.buf); 1442 sl.reset ();
1443 sl << "addspell ";
1444 }
1445
1446 append_spell (pl, sl, spell);
1447 }
2234 } 1448 }
1449 else if (spell->type != SPELL)
1450 {
1451 LOG (llevError, "Asked to send a non-spell object as a spell");
1452 return;
1453 }
1454 else
2235 append_spell(pl, &sl, spell); 1455 append_spell (pl, sl, spell);
2236 } 1456
2237 }
2238 else if (spell->type != SPELL) {
2239 LOG(llevError, "Asked to send a non-spell object as a spell");
2240 return;
2241 }
2242 else append_spell(pl, &sl, spell);
2243 if (sl.len >= MAXSOCKBUF) { 1457 if (sl.length () > MAXSOCKBUF)
1458 {
2244 LOG(llevError,"Buffer overflow in esrv_add_spells!\n"); 1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2245 fatal(0); 1460 fatal (0);
2246 } 1461 }
1462
2247 /* finally, we can send the packet */ 1463 /* finally, we can send the packet */
2248 Send_With_Handling(&pl->socket, &sl); 1464 pl->ns->flush_fx ();
2249 free(sl.buf); 1465 pl->ns->send_packet (sl);
2250} 1466}
2251 1467

Diff Legend

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