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.44 by root, Sat Dec 16 21:40:26 2006 UTC

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

Diff Legend

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