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.2 by root, Thu Aug 17 20:23:32 2006 UTC vs.
Revision 1.123 by root, Thu Nov 8 19:43:30 2007 UTC

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

Diff Legend

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