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.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.44 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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