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

Diff Legend

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