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.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.85 by root, Sat Apr 14 14:47:48 2007 UTC

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

Diff Legend

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