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.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.39 by root, Fri Dec 15 03:53:44 2006 UTC

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

Diff Legend

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