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

Diff Legend

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