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.10 by root, Fri Aug 25 17:11:54 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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