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

Diff Legend

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