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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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