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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.4 by root, Fri Aug 18 02:23:28 2006 UTC vs.
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC

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

Diff Legend

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