ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.77 by root, Wed Mar 14 15:44:47 2007 UTC vs.
Revision 1.142 by root, Sat Dec 20 02:32:31 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* 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
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* 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
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
…		…
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		137
		138	pl->ns->force_newmap = false;
136		139
137	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
139		142
140	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
		144	}
		145
		146	static void
		147	send_map_info (player *pl)
		148	{
		149	client &socket = *pl->ns;
		150	object *ob = pl->observe;
		151
		152	if (socket.mapinfocmd)
		153	{
		154	if (ob->map && ob->map->path[0])
		155	{
		156	int flags = 0;
		157
		158	if (ob->map->tile_path[0]) flags |= 1;
		159	if (ob->map->tile_path[1]) flags |= 2;
		160	if (ob->map->tile_path[2]) flags |= 4;
		161	if (ob->map->tile_path[3]) flags |= 8;
		162
		163	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		164	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		165	ob->map->width, ob->map->height, &ob->map->path);
		166	}
		167	else
		168	socket.send_packet ("mapinfo current");
		169	}
141	}	170	}
142		171
143	/** check for map/region change and send new map data */	172	/** check for map/region change and send new map data */
144	static void	173	static void
145	check_map_change (player *pl)	174	check_map_change (player *pl)
146	{	175	{
147	client &socket = *pl->ns;	176	client &socket = *pl->ns;
148	object *ob = pl->ob;	177	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		178
151	if (socket.current_map != ob->map)	179	region *reg = ob->region ();
		180	if (socket.current_region != reg)
		181	{
		182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		183	socket.current_region = reg;
152	{	184	}
		185
		186	// first try to aovid a full newmap on tiled map scrolls
		187	if (socket.current_map != ob->map && !socket.force_newmap)
		188	{
		189	rv_vector rv;
		190
		191	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		192
		193	// manhattan distance is very handy here
		194	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		195	{
		196	socket.current_map = ob->map;
		197	socket.current_x = ob->x;
		198	socket.current_y = ob->y;
		199
		200	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		201	socket.floorbox_reset ();
		202	send_map_info (pl);
		203	}
		204	}
		205
		206	if (socket.current_map != ob->map || socket.force_newmap)
		207	{
		208	clear_map (pl);
153	socket.current_map = ob->map;	209	socket.current_map = ob->map;
154		210	send_map_info (pl);
155	clear_map (pl);
156
157	if (socket.mapinfocmd)
158	{
159	if (ob->map && ob->map->path[0])
160	{
161	int flags = 0;
162
163	if (ob->map->tile_path[0])
164	flags |= 1;
165	if (ob->map->tile_path[1])
166	flags |= 2;
167	if (ob->map->tile_path[2])
168	flags |= 4;
169	if (ob->map->tile_path[3])
170	flags |= 8;
171
172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174	}
175	else
176	snprintf (buf, MAX_BUF, "mapinfo current");
177
178	socket.send_packet (buf);
179	}
180	}	211	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	212	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	213	{
183	int dx = ob->x - socket.current_x;	214	int dx = ob->x - socket.current_x;
184	int dy = ob->y - socket.current_y;	215	int dy = ob->y - socket.current_y;
…		…
192	}	223	}
193	}	224	}
194		225
195	socket.current_x = ob->x;	226	socket.current_x = ob->x;
196	socket.current_y = ob->y;	227	socket.current_y = ob->y;
197
198	region *reg = ob->region ();
199	if (socket.current_region != reg)
200	{
201	socket.current_region = reg;
202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203	}
204	}	228	}
205		229
206	/**	230	/**
207	* RequestInfo is sort of a meta command. There is some specific	231	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	232	* request of information, but we call other functions to provide
209	* that information.	233	* that information.
210	*/	234	*/
211	void	235	void
212	RequestInfo (char *buf, int len, client * ns)	236	RequestInfo (char *buf, int len, client *ns)
213	{	237	{
214	char *params = NULL, *cp;	238	char *params;
215
216	/* No match */
217	char bigbuf[MAX_BUF];
218	int slen;
219
220	/* Set up replyinfo before we modify any of the buffers - this is used
221	* if we don't find a match.
222	*/
223	strcpy (bigbuf, "replyinfo ");
224	slen = strlen (bigbuf);
225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226		239
227	/* find the first space, make it null, and update the	240	/* find the first space, make it null, and update the
228	* params pointer.	241	* params pointer.
229	*/	242	*/
230	for (cp = buf; *cp != '\0'; cp++)	243	for (params = buf; *params; params++)
231	if (*cp == ' ')	244	if (*params == ' ')
232	{	245	{
233	*cp = '\0';
234	params = cp + 1;	246	*params++ = 0;
235	break;	247	break;
236	}	248	}
237		249
238	if (!strcmp (buf, "image_info"))	250	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	251	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	254	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	255	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	256	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	257	send_spell_paths (ns, params);
246	else	258	else
247	ns->send_packet (bigbuf, len);	259	{
		260	// undo tokenisation above and send replyinfo with the request unchanged
		261	if (*params)
		262	*--params = ' ';
		263
		264	ns->send_packet_printf ("replyinfo %s", buf);
		265	}
248	}	266	}
249		267
250	void	268	void
251	ExtCmd (char *buf, int len, player *pl)	269	ExtCmd (char *buf, int len, player *pl)
252	{	270	{
…		…
255		273
256	void	274	void
257	ExtiCmd (char *buf, int len, client *ns)	275	ExtiCmd (char *buf, int len, client *ns)
258	{	276	{
259	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		278	}
		279
		280	void
		281	client::mapinfo_queue_clear ()
		282	{
		283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		284	free (*i);
		285
		286	mapinfo_queue.clear ();
		287	}
		288
		289	bool
		290	client::mapinfo_try (char *buf)
		291	{
		292	char *token = buf;
		293	buf += strlen (buf) + 9;
		294
		295	// initial map and its origin
		296	maptile *map = pl->observe->map;
		297	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		298	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		299	int max_distance = 8; // limit maximum path length to something generous
		300
		301	while (*buf && map && max_distance)
		302	{
		303	int dir = *buf++ - '1';
		304
		305	if (dir >= 0 && dir <= 3)
		306	{
		307	if (!map->tile_path [dir])
		308	map = 0;
		309	else if (map->tile_available (dir, false))
		310	{
		311	maptile *neigh = map->tile_map [dir];
		312
		313	switch (dir)
		314	{
		315	case 0: mapy -= neigh->height; break;
		316	case 2: mapy += map ->height; break;
		317	case 3: mapx -= neigh->width ; break;
		318	case 1: mapx += map ->width ; break;
		319	}
		320
		321	map = neigh;
		322	--max_distance;
		323	}
		324	else
		325	return 0;
		326	}
		327	else
		328	max_distance = 0;
		329	}
		330
		331	if (!max_distance)
		332	send_packet_printf ("mapinfo %s error", token);
		333	else if (!map || !map->path)
		334	send_packet_printf ("mapinfo %s nomap", token);
		335	else
		336	{
		337	int flags = 0;
		338
		339	if (map->tile_path[0]) flags |= 1;
		340	if (map->tile_path[1]) flags |= 2;
		341	if (map->tile_path[2]) flags |= 4;
		342	if (map->tile_path[3]) flags |= 8;
		343
		344	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		345	}
		346
		347	return 1;
		348	}
		349
		350	void
		351	client::mapinfo_queue_run ()
		352	{
		353	if (mapinfo_queue.empty () || !pl)
		354	return;
		355
		356	for (int i = 0; i < mapinfo_queue.size (); ++i)
		357	if (mapinfo_try (mapinfo_queue [i]))
		358	{
		359	free (mapinfo_queue [i]);
		360	mapinfo_queue.erase (i);
		361	}
		362	else
		363	++i;
260	}	364	}
261		365
262	void	366	void
263	MapInfoCmd (char *buf, int len, player *pl)	367	MapInfoCmd (char *buf, int len, player *pl)
264	{	368	{
265	// <mapinfo tag spatial tile-path	369	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	370	// >mapinfo tag spatial flags x y w h hash
267		371
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	372	char *token = buf;
271	// copy token	373
272	if (!(buf = strchr (buf, ' ')))	374	if (!(buf = strchr (buf, ' ')))
273	return;	375	return;
274		376
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	377	if (!strncmp (buf, " spatial ", 9))
278	{	378	{
279	buf += 8;	379	char *copy = strdup (token);
		380	copy [buf - token] = 0;
280		381
281	// initial map and its origin	382	#if 0
282	maptile *map = pl->ob->map;	383	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	384	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	385	free (copy);
285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
286	int max_distance = 8; // limit maximum path length to something generous
287
288	while (*buf && map && max_distance)
289	{
290	int dir = *buf++;
291
292	switch (dir)
293	{
294	case '1':
295	dx = 0;
296	dy = -1;
297	map = map->xy_find (dx, dy);
298	map && (mapy -= map->height);
299	break;
300	case '2':
301	mapx += map->width;
302	dx = map->width;
303	dy = 0;
304	map = map->xy_find (dx, dy);
305	break;
306	case '3':
307	mapy += map->height;
308	dx = 0;
309	dy = map->height;
310	map = map->xy_find (dx, dy);
311	break;
312	case '4':
313	dx = -1;
314	dy = 0;
315	map = map->xy_find (dx, dy);
316	map && (mapx -= map->width);
317	break;
318	}
319
320	--max_distance;
321	}
322
323	if (!max_distance)
324	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325	else if (map && map->path[0])
326	{
327	int flags = 0;
328
329	if (map->tile_path[0])
330	flags |= 1;
331	if (map->tile_path[1])
332	flags |= 2;
333	if (map->tile_path[2])
334	flags |= 4;
335	if (map->tile_path[3])
336	flags |= 8;
337
338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339	}
340	else	386	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	387	#endif
		388	pl->ns->mapinfo_queue.push_back (copy);
342	}	389	}
343	else	390	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	391	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	392	}
348		393
349	/** This is the Setup cmd - easy first implementation */	394	/** This is the Setup cmd */
350	void	395	void
351	SetUp (char *buf, int len, client * ns)	396	SetUp (char *buf, int len, client * ns)
352	{	397	{
353	int s, slen;	398	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354	char *cmd, *param, cmdback[HUGE_BUF];
355
356	/* run through the cmds of setup
357	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358	*
359	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360	* The client then must sort this out
361	*/
362
363	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365	strcpy (cmdback, "setup");
366	for (s = 0; s < len; )
367	{
368	cmd = &buf[s];
369
370	/* find the next space, and put a null there */
371	for (; buf[s] && buf[s] != ' '; s++)
372	;
373
374	buf[s++] = 0;
375
376	while (buf[s] == ' ')
377	s++;
378
379	if (s >= len)
380	break;
381
382	param = &buf[s];
383
384	for (; buf[s] && buf[s] != ' '; s++)
385	;
386
387	buf[s++] = 0;
388
389	while (buf[s] == ' ')
390	s++;
391
392	slen = strlen (cmdback);
393	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397	if (!strcmp (cmd, "sound"))
398	{
399	ns->sound = atoi (param);
400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
401	}
402	else if (!strcmp (cmd, "exp64"))
403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
404	else if (!strcmp (cmd, "spellmon"))
405	{
406	ns->monitor_spells = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "darkness"))
410	{
411	ns->darkness = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "map1cmd"))
415	{
416	if (atoi (param))
417	ns->mapmode = Map1Cmd;
418	/* if beyond this size, need to use map1cmd no matter what */
419	if (ns->mapx > 11 || ns->mapy > 11)
420	ns->mapmode = Map1Cmd;
421	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1acmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1aCmd;
427	/* if beyond this size, need to use map1acmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1aCmd;
430	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "newmapcmd"))
433	{
434	ns->newmapcmd = atoi (param);
435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "mapinfocmd"))
438	{
439	ns->mapinfocmd = atoi (param);
440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "extcmd"))
443	{
444	ns->extcmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extmap"))
448	{
449	ns->extmap = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "facecache"))
453	{
454	ns->facecache = atoi (param);
455	safe_strcat (cmdback, param, &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "faceset"))
458	{
459	char tmpbuf[20];
460	int q = atoi (param);
461
462	if (is_valid_faceset (q))
463	ns->faceset = q;
464
465	sprintf (tmpbuf, "%d", ns->faceset);
466	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467	/* if the client is using faceset, it knows about image2 command */
468	ns->image2 = 1;
469	}
470	else if (!strcmp (cmd, "itemcmd"))
471	{
472	/* Version of the item protocol command to use. Currently,
473	* only supported versions are 1 and 2. Using a numeric
474	* value will make it very easy to extend this in the future.
475	*/
476	char tmpbuf[20];
477	int q = atoi (param);
478
479	if (q < 1 || q > 2)
480	{
481	strcpy (tmpbuf, "FALSE");
482	}
483	else
484	{
485	ns->itemcmd = q;
486	sprintf (tmpbuf, "%d", ns->itemcmd);
487	}
488	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
489	}
490	else if (!strcmp (cmd, "mapsize"))
491	{
492	int x, y = 0;
493	char tmpbuf[MAX_BUF], *cp;
494
495	x = atoi (param);
496	for (cp = param; *cp != 0; cp++)
497	if (*cp == 'x' || *cp == 'X')
498	{
499	y = atoi (cp + 1);
500	break;
501	}
502
503	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
504	{
505	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
506	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
507	}
508	else
509	{
510	ns->mapx = x;
511	ns->mapy = y;
512	/* better to send back what we are really using and not the
513	* param as given to us in case it gets parsed differently.
514	*/
515	sprintf (tmpbuf, "%dx%d", x, y);
516	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517	/* If beyond this size and still using orig map command, need to
518	* go to map1cmd.
519	*/
520	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
521	ns->mapmode = Map1Cmd;
522	}
523	}
524	else if (!strcmp (cmd, "extendedMapInfos"))
525	{
526	/* Added by tchize
527	* prepare to use the mapextended command
528	*/
529	char tmpbuf[20];
530
531	ns->ext_mapinfos = (atoi (param));
532	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
533	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
534	}
535	else if (!strcmp (cmd, "extendedTextInfos"))
536	{
537	/* Added by tchize
538	* prepare to use the extended text commands
539	* Client toggle this to non zero to get exttext
540	*/
541	char tmpbuf[20];
542
543	ns->has_readable_type = (atoi (param));
544	sprintf (tmpbuf, "%d", ns->has_readable_type);
545	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
546	}
547	else
548	{
549	/* Didn't get a setup command we understood -
550	* report a failure to the client.
551	*/
552	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
553	}
554	} /* for processing all the setup commands */
555
556	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
557	ns->send_packet (cmdback);
558	}	399	}
559		400
560	/**	401	/**
561	* The client has requested to be added to the game.	402	* The client has requested to be added to the game.
562	* This is what takes care of it. We tell the client how things worked out.	403	* This is what takes care of it. We tell the client how things worked out.
…		…
564	* it either has to be here or init_sockets needs to be exported.	405	* it either has to be here or init_sockets needs to be exported.
565	*/	406	*/
566	void	407	void
567	AddMeCmd (char *buf, int len, client *ns)	408	AddMeCmd (char *buf, int len, client *ns)
568	{	409	{
569	// face caching is mandatory
570	if (!ns->facecache)
571	{
572	ns->send_drawinfo (
573	"\n"
574	"\n"
575	"***\n"
576	"*** WARNING:\n"
577	"*** Your client does not support face/image caching,\n"
578	"*** or it has been disabled. Face caching is mandatory\n"
579	"*** so please enable it or use a newer client.\n"
580	"***\n"
581	"*** I will proceed as if face caching were enabled.\n"
582	"\n"
583	"***\n",
584	NDI_RED
585	);
586	//ns->facecache = true;
587	}
588
589	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
590	}	411	}
591		412
592	/** Reply to ExtendedInfos command */	413	/** Reply to ExtendedInfos command */
593	void	414	void
…		…
704		525
705	ns->send_packet (cmdback);	526	ns->send_packet (cmdback);
706	}	527	}
707		528
708	/**	529	/**
709	* client requested an image. send it rate-limited
710	* before flushing.
711	*/
712	void
713	AskFaceCmd (char *buf, int len, client *ns)
714	{
715	ns->askface.push_back (atoi (buf));
716	}
717
718	/**
719	* Tells client the picture it has to use
720	* to smooth a picture number given as argument.
721	*/
722	void
723	AskSmooth (char *buf, int len, client *ns)
724	{
725	ns->send_face (atoi (buf));
726	}
727
728	/**
729	* This handles the general commands from the client (ie, north, fire, cast,	530	* This handles the general commands from the client (ie, north, fire, cast,
730	* etc.)	531	* etc.)
731	*/	532	*/
732	void	533	void
733	PlayerCmd (char *buf, int len, player *pl)	534	PlayerCmd (char *buf, int len, player *pl)
…		…
754	* commands.	555	* commands.
755	*/	556	*/
756	pl->count = 0;	557	pl->count = 0;
757	}	558	}
758		559
759
760	/**	560	/**
761	* This handles the general commands from the client (ie, north, fire, cast,	561	* This handles the general commands from the client (ie, north, fire, cast,
762	* etc.). It is a lot like PlayerCmd above, but is called with the	562	* etc.). It is a lot like PlayerCmd above, but is called with the
763	* 'ncom' method which gives more information back to the client so it	563	* 'ncom' method which gives more information back to the client so it
764	* can throttle.	564	* can throttle.
…		…
766	void	566	void
767	NewPlayerCmd (char *buf, int len, player *pl)	567	NewPlayerCmd (char *buf, int len, player *pl)
768	{	568	{
769	if (len <= 6)	569	if (len <= 6)
770	{	570	{
771	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	571	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
772	return;	572	return;
773	}	573	}
774		574
775	uint16 cmdid = net_uint16 ((uint8 *)buf);	575	uint16 cmdid = net_uint16 ((uint8 *)buf);
776	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
833	{	633	{
834	case ST_PLAYING:	634	case ST_PLAYING:
835	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	635	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
836	break;	636	break;
837		637
838	case ST_CHANGE_CLASS:
839	key_change_class (pl->ob, buf[0]);
840	break;
841
842	case ST_GET_PARTY_PASSWORD: /* Get password for party */	638	case ST_GET_PARTY_PASSWORD: /* Get password for party */
843	receive_party_password (pl->ob, 13);	639	receive_party_password (pl->ob, 13);
844	break;	640	break;
845		641
846	default:	642	default:
…		…
885		681
886	cp = strchr (cp + 1, ' ');	682	cp = strchr (cp + 1, ' ');
887		683
888	if (cp)	684	if (cp)
889	{	685	{
890	assign (ns->version, cp + 1);	686	ns->version = cp + 1;
891		687
892	if (ns->sc_version < 1026)	688	if (ns->sc_version < 1026)
893	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
894	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
895	}	691	}
…		…
918	* syntax is: move (to) (tag) (nrof)	714	* syntax is: move (to) (tag) (nrof)
919	*/	715	*/
920	void	716	void
921	MoveCmd (char *buf, int len, player *pl)	717	MoveCmd (char *buf, int len, player *pl)
922	{	718	{
923	int vals[3], i;	719	int to, tag, nrof;
924		720
925	/* A little funky here. We only cycle for 2 records, because	721	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
926	* we obviously are not going to find a space after the third
927	* record. Perhaps we should just replace this with a
928	* sscanf?
929	*/
930	for (i = 0; i < 2; i++)
931	{	722	{
932	vals[i] = atoi (buf);
933
934	if (!(buf = strchr (buf, ' ')))
935	{
936	LOG (llevError, "Incomplete move command: %s\n", buf);	723	LOG (llevError, "Incomplete move command: %s\n", buf);
937	return;	724	return;
938	}
939
940	buf++;
941	}	725	}
942		726
943	vals[2] = atoi (buf);	727	esrv_move_object (pl->ob, to, tag, nrof);
944
945	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
946	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
947	}	728	}
948		729
949	/******************************************************************************	730	/******************************************************************************
950	*	731	*
951	* Start of commands the server sends to the client.	732	* Start of commands the server sends to the client.
…		…
955	/**	736	/**
956	* Asks the client to query the user. This way, the client knows	737	* Asks the client to query the user. This way, the client knows
957	* it needs to send something back (vs just printing out a message)	738	* it needs to send something back (vs just printing out a message)
958	*/	739	*/
959	void	740	void
960	send_query (client *ns, uint8 flags, char *text)	741	send_query (client *ns, uint8 flags, const char *text)
961	{	742	{
962	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	743	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		744	}
		745
		746	/**
		747	* Get player's current range attack in obuf.
		748	*/
		749	static void
		750	rangetostring (player *pl, char *obuf)
		751	{
		752	dynbuf_text buf;
		753
		754	if (pl->ranged_ob)
		755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		756
		757	if (pl->combat_ob)
		758	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		759
		760	#if 0
		761	//TODO: remove this when slot system is working, this is only for debugging
		762	if (pl->ob->chosen_skill)
		763	buf << " Skill*: " << pl->ob->chosen_skill->name;
		764	#endif
		765
		766	//TODO: maybe golem should become the current_weapon, quite simply?
		767	if (pl->golem)
		768	buf << " Golem*: " << pl->golem->name;
		769
		770	buf << '\0';
		771	buf.linearise (obuf);
963	}	772	}
964		773
965	#define AddIfInt64(Old,New,Type) if (Old != New) {\	774	#define AddIfInt64(Old,New,Type) if (Old != New) {\
966	Old = New; \	775	Old = New; \
967	sl << uint8 (Type) << uint64 (New); \	776	sl << uint8 (Type) << uint64 (New); \
…		…
975	#define AddIfShort(Old,New,Type) if (Old != New) {\	784	#define AddIfShort(Old,New,Type) if (Old != New) {\
976	Old = New; \	785	Old = New; \
977	sl << uint8 (Type) << uint16 (New); \	786	sl << uint8 (Type) << uint16 (New); \
978	}	787	}
979		788
980	#define AddIfFloat(Old,New,Type) if (Old != New) {\	789	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
981	Old = New; \	790	Old = New; \
982	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	791	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
983	}	792	}
984		793
985	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	794	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
986	free(Old); Old = strdup (New);\	795	free(Old); Old = strdup (New);\
987	sl << uint8 (Type) << data8 (New); \	796	sl << uint8 (Type) << data8 (New); \
…		…
1001		810
1002	client *ns = pl->ns;	811	client *ns = pl->ns;
1003	if (!ns)	812	if (!ns)
1004	return;	813	return;
1005		814
1006	object *ob = pl->ob;	815	object *ob = pl->observe;
1007	if (!ob)	816	if (!ob)
1008	return;	817	return;
		818
		819	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1009		820
1010	packet sl ("stats");	821	packet sl ("stats");
1011		822
1012	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	823	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1013	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	824	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1022	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1023	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1024	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1025		836
1026	for (int s = 0; s < NUM_SKILLS; s++)	837	for (int s = 0; s < NUM_SKILLS; s++)
1027	if (object *skill = pl->last_skill_ob[s])	838	if (object *skill = opl->last_skill_ob [s])
1028	if (skill->stats.exp != ns->last_skill_exp [s])	839	if (skill->stats.exp != ns->last_skill_exp [s])
1029	{	840	{
1030	ns->last_skill_exp [s] = skill->stats.exp;	841	ns->last_skill_exp [s] = skill->stats.exp;
1031		842
1032	/* Always send along the level if exp changes. This is only	843	/* Always send along the level if exp changes. This is only
…		…
1040	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1041	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1042	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1043	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1044	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1045	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1046	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1047	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	858	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1048	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	859	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1049		860
1050	flags = 0;	861	flags = 0;
1051		862
1052	if (pl->fire_on)	863	if (opl->fire_on)
1053	flags |= SF_FIREON;	864	flags |= SF_FIREON;
1054		865
1055	if (pl->run_on)	866	if (opl->run_on)
1056	flags |= SF_RUNON;	867	flags |= SF_RUNON;
1057		868
1058	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1059		870
1060	if (ns->sc_version < 1025)	871	if (ns->sc_version < 1025)
…		…
1074	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1075	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	886	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1076	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	887	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1077	}	888	}
1078		889
1079	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	890	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1080	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1081	set_title (ob, buf);	892	set_title (ob, buf);
1082	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1083		894
1084	/* Only send it away if we have some actual data */	895	/* Only send it away if we have some actual data */
…		…
1088		899
1089	/**	900	/**
1090	* Tells the client that here is a player it should start using.	901	* Tells the client that here is a player it should start using.
1091	*/	902	*/
1092	void	903	void
1093	esrv_new_player (player *pl, uint32 weight)	904	esrv_new_player (player *pl)
1094	{	905	{
		906	sint32 weight = pl->ob->client_weight ();
		907
1095	packet sl ("player");	908	packet sl ("player");
1096		909
1097	sl << uint32 (pl->ob->count)	910	sl << uint32 (pl->ob->count)
1098	<< uint32 (weight)	911	<< uint32 (weight)
1099	<< uint32 (pl->ob->face)	912	<< uint32 (pl->ob->face)
1100	<< data8 (pl->ob->name);	913	<< data8 (pl->ob->name);
1101		914
1102	pl->ns->last_weight = weight;	915	pl->ns->last_weight = weight;
1103	pl->ns->send_packet (sl);	916	pl->ns->send_packet (sl);
1104	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1105	}	917	}
1106		918
1107	/******************************************************************************	919	/******************************************************************************
1108	*	920	*
1109	* Start of map related commands.	921	* Start of map related commands.
…		…
1166		978
1167	if (!ns.faces_sent[face_num])	979	if (!ns.faces_sent[face_num])
1168	if (ob)	980	if (ob)
1169	ns.send_faces (ob);	981	ns.send_faces (ob);
1170	else	982	else
1171	ns.send_face (face_num);	983	ns.send_face (face_num, 10);
1172		984
1173	sl << uint16 (face_num);	985	sl << uint16 (face_num);
1174	return 1;	986	return 1;
1175	}	987	}
1176		988
…		…
1218	{	1030	{
1219	prefetch_surrounding_maps (op->map, 3);	1031	prefetch_surrounding_maps (op->map, 3);
1220	}	1032	}
1221		1033
1222	/**	1034	/**
1223	* This function uses the new map1 protocol command to send the map	1035	* Draws client map.
1224	* to the client. It is necessary because the old map command supports
1225	* a maximum map size of 15x15.
1226	* This function is much simpler than the old one. This is because
1227	* the old function optimized to send as few face identifiers as possible,
1228	* at the expense of sending more coordinate location (coordinates were
1229	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1230	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1231	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1232	* and use the other 4 bits for other informatiion. For full documentation
1233	* of what we send, see the doc/Protocol file.
1234	* I will describe internally what we do:
1235	* the ns->lastmap shows how the map last looked when sent to the client.
1236	* in the lastmap structure, there is a cells array, which is set to the
1237	* maximum viewable size (As set in config.h).
1238	* in the cells, there are faces and a count value.
1239	* we use the count value to hold the darkness value. If -1, then this space
1240	* is not viewable.
1241	* we use faces[0] faces[1] faces[2] to hold what the three layers
1242	* look like.
1243	*/	1036	*/
1244	void	1037	void
1245	draw_client_map1 (object *pl)	1038	draw_client_map (player *pl)
1246	{	1039	{
1247	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1040	object *ob = pl->observe;
1248	sint16 nx, ny;	1041	if (!ob->active)
		1042	return;
		1043
		1044	/* If player is just joining the game, he isn't here yet, so the map
		1045	* can get swapped out. If so, don't try to send them a map. All will
		1046	* be OK once they really log in.
		1047	*/
		1048	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
		1049	return;
		1050
		1051	int startlen, oldlen;
1249	int estartlen, eoldlen;	1052	int estartlen, eoldlen;
1250	uint8 eentrysize;	1053	uint8 eentrysize;
1251	uint16 ewhatstart, ewhatflag;	1054	uint16 ewhatstart, ewhatflag;
1252	uint8 extendedinfos;	1055	uint8 extendedinfos;
1253	maptile *m;
1254		1056
1255	client &socket = *pl->contr->ns;
1256
1257	if (!pl->active)
1258	return;
1259
1260	check_map_change (pl->contr);	1057	check_map_change (pl);
1261	prefetch_surrounding_maps (pl);	1058	prefetch_surrounding_maps (pl->ob);
		1059
		1060	/* do LOS after calls to update_position */
		1061	if (ob != pl->ob)
		1062	pl->clear_los (0);
		1063	else if (pl->do_los)
		1064	{
		1065	update_los (ob);
		1066	pl->do_los = 0;
		1067	}
		1068
		1069	/**
		1070	* This function uses the new map1 protocol command to send the map
		1071	* to the client. It is necessary because the old map command supports
		1072	* a maximum map size of 15x15.
		1073	* This function is much simpler than the old one. This is because
		1074	* the old function optimized to send as few face identifiers as possible,
		1075	* at the expense of sending more coordinate location (coordinates were
		1076	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1077	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1078	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1079	* and use the other 4 bits for other informatiion. For full documentation
		1080	* of what we send, see the doc/Protocol file.
		1081	* I will describe internally what we do:
		1082	* the ns->lastmap shows how the map last looked when sent to the client.
		1083	* in the lastmap structure, there is a cells array, which is set to the
		1084	* maximum viewable size (As set in config.h).
		1085	* in the cells, there are faces and a count value.
		1086	* we use the count value to hold the darkness value. If -1, then this space
		1087	* is not viewable.
		1088	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1089	* look like.
		1090	*/
		1091
		1092	client &socket = *pl->ns;
1262		1093
1263	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1094	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1264	packet esl;	1095	packet esl;
1265		1096
1266	startlen = sl.length ();	1097	startlen = sl.length ();
…		…
1282	<< uint8 (eentrysize);	1113	<< uint8 (eentrysize);
1283		1114
1284	estartlen = esl.length ();	1115	estartlen = esl.length ();
1285	}	1116	}
1286		1117
1287	/* x,y are the real map locations. ax, ay are viewport relative
1288	* locations.
1289	*/
1290	ay = 0;
1291
1292	/* We could do this logic as conditionals in the if statement,	1118	/* We could do this logic as conditionals in the if statement,
1293	* but that started to get a bit messy to look at.	1119	* but that started to get a bit messy to look at.
1294	*/	1120	*/
1295	max_x = pl->x + (socket.mapx + 1) / 2;	1121	int hx = socket.mapx / 2;
1296	max_y = pl->y + (socket.mapy + 1) / 2;	1122	int hy = socket.mapy / 2;
1297		1123
1298	maptile *plmap = pl->map;	1124	for (int dx = -hx; dx <= hx; dx++)
1299
1300	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1301	{	1125	{
1302	ax = 0;	1126	sint16 nx, ny;
1303	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1127	maptile *m = 0;
		1128
		1129	for (int dy = -hy; dy <= hy; dy++)
1304	{	1130	{
		1131	// check to see if we can simply go one down quickly
		1132	if (m && ++ny >= m->height)
		1133	m = 0;
		1134
		1135	// no, so do it the slow way
		1136	if (!m)
		1137	{
		1138	nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
		1139
		1140	if (xy_normalise (m, nx, ny))
		1141	m->touch ();
		1142	else
		1143	m = 0;
		1144	}
		1145
		1146	int ax = dx + hx;
		1147	int ay = dy + hy;
		1148
1305	int emask, mask;	1149	int emask, mask;
1306	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1150	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1307		1151
1308	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1152	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1309		1153
1310	/* If the coordinates are not valid, or it is too dark to see,	1154	/* If the coordinates are not valid, or it is too dark to see,
1311	* we tell the client as such	1155	* we tell the client as such
1312	*/	1156	*/
1313	nx = x;
1314	ny = y;
1315	m = get_map_from_coord (plmap, &nx, &ny);
1316
1317	if (!m)	1157	if (!m)
1318	{	1158	{
1319	/* space is out of map. Update space and clear values	1159	/* space is out of map. Update space and clear values
1320	* if this hasn't already been done. If the space is out	1160	* if this hasn't already been done. If the space is out
1321	* of the map, it shouldn't have a head	1161	* of the map, it shouldn't have a head.
1322	*/	1162	*/
1323	if (lastcell.count != -1)	1163	if (lastcell.count != -1)
1324	{	1164	{
1325	sl << uint16 (mask);	1165	sl << uint16 (mask);
1326	map_clearcell (&lastcell, -1);	1166	map_clearcell (&lastcell, -1);
1327	}	1167	}
1328		1168
1329	continue;	1169	continue;
1330	}	1170	}
1331		1171
1332	m->touch ();
1333
1334	int d = pl->contr->blocked_los[ax][ay];	1172	int d = pl->blocked_los_uc (dx, dy);
1335		1173
1336	if (d > 3)	1174	if (d > 3)
1337	{	1175	{
1338
1339	int need_send = 0, count;	1176	int need_send = 0, count;
1340		1177
1341	/* This block deals with spaces that are not visible for whatever	1178	/* This block deals with spaces that are not visible for whatever
1342	* reason. Still may need to send the head for this space.	1179	* reason. Still may need to send the head for this space.
1343	*/	1180	*/
…		…
1349	if (lastcell.count != -1)	1186	if (lastcell.count != -1)
1350	need_send = 1;	1187	need_send = 1;
1351		1188
1352	count = -1;	1189	count = -1;
1353		1190
1354	/* properly clear a previously sent big face */
1355	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]	1191	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1356	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1192	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1357	need_send = 1;	1193	need_send = 1;
1358		1194
		1195	/* properly clear a previously sent big face */
1359	map_clearcell (&lastcell, count);	1196	map_clearcell (&lastcell, count);
1360		1197
1361	if ((mask & 0xf) || need_send)	1198	if ((mask & 0xf) || need_send)
1362	sl[oldlen + 1] = mask & 0xff;	1199	sl[oldlen + 1] = mask & 0xff;
1363	else	1200	else
…		…
1402	}	1239	}
1403		1240
1404	lastcell.count = d;	1241	lastcell.count = d;
1405		1242
1406	mapspace &ms = m->at (nx, ny);	1243	mapspace &ms = m->at (nx, ny);
		1244	ms.update ();
1407		1245
1408	if (socket.extmap)	1246	if (socket.extmap)
1409	{	1247	{
1410	uint8 stat_hp = 0;	1248	uint8 stat_hp = 0;
1411	uint8 stat_width = 0;	1249	uint8 stat_width = 0;
1412	uint8 flags = 0;	1250	uint8 flags = 0;
1413	UUID player = 0;	1251	tag_t player = 0;
1414		1252
1415	// send hp information, if applicable	1253	// send hp information, if applicable
1416	if (object *op = ms.faces_obj [0])	1254	if (object *op = ms.faces_obj [0])
1417	{
1418	if (op->head || op->invisible)	1255	if (op->is_head () && !op->invisible)
1419	; // do not show
1420	else if (op->type == PLAYER
1421	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1422	{	1256	{
1423	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)	1257	if (op->stats.maxhp > op->stats.hp
		1258	&& op->stats.maxhp > 0
		1259	&& (op->type == PLAYER
		1260	|| op->type == DOOR // does not work, have maxhp 0
		1261	|| QUERY_FLAG (op, FLAG_MONSTER)
		1262	|| QUERY_FLAG (op, FLAG_ALIVE)
		1263	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1424	{	1264	{
1425	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1265	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1426	stat_width = op->arch->tail_x;	1266	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1427	}	1267	}
1428	}
1429		1268
1430	if (op->msg && op->msg[0] == '@')	1269	if (op->has_dialogue ())
1431	flags |= 1;	1270	flags |= 1;
1432		1271
1433	if (op->type == PLAYER && op != pl)	1272	if (op->type == PLAYER)
1434	player = op->count;	1273	player = op == ob ? pl->ob->count
		1274	: op == pl->ob ? ob->count
		1275	: op->count;
1435	}	1276	}
1436		1277
1437	if (lastcell.stat_hp != stat_hp)	1278	if (lastcell.stat_hp != stat_hp)
1438	{	1279	{
1439	lastcell.stat_hp = stat_hp;	1280	lastcell.stat_hp = stat_hp;
1440		1281
…		…
1459		1300
1460	mask |= 0x8;	1301	mask |= 0x8;
1461	*last_ext |= 0x80;	1302	*last_ext |= 0x80;
1462	last_ext = &sl[sl.length ()];	1303	last_ext = &sl[sl.length ()];
1463		1304
1464	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1305	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1465	}	1306	}
1466		1307
1467	if (lastcell.flags != flags)	1308	if (lastcell.flags != flags)
1468	{	1309	{
1469	lastcell.flags = flags;	1310	lastcell.flags = flags;
…		…
1482		1323
1483	/* Middle face */	1324	/* Middle face */
1484	if (update_space (sl, socket, ms, lastcell, 1))	1325	if (update_space (sl, socket, ms, lastcell, 1))
1485	mask |= 0x2;	1326	mask |= 0x2;
1486		1327
1487	if (ms.player () == pl	1328	if (ob->invisible
1488	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))	1329	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1330	&& ms.player () == ob)
1489	{	1331	{
1490	// force player to be visible to himself if invisible	1332	// force player to be visible to himself if invisible
1491	if (lastcell.faces[0] != pl->face)	1333	if (lastcell.faces[0] != ob->face)
1492	{	1334	{
1493	lastcell.faces[0] = pl->face;	1335	lastcell.faces[0] = ob->face;
1494		1336
1495	mask |= 0x1;	1337	mask |= 0x1;
1496	sl << uint16 (pl->face);	1338	sl << uint16 (ob->face);
1497		1339
1498	socket.send_faces (pl);	1340	socket.send_faces (ob);
1499	}	1341	}
1500	}	1342	}
1501	/* Top face */	1343	/* Top face */
1502	else if (update_space (sl, socket, ms, lastcell, 0))	1344	else if (update_space (sl, socket, ms, lastcell, 0))
1503	mask |= 0x1;	1345	mask |= 0x1;
1504
1505		1346
1506	/* Check to see if we are in fact sending anything for this	1347	/* Check to see if we are in fact sending anything for this
1507	* space by checking the mask. If so, update the mask.	1348	* space by checking the mask. If so, update the mask.
1508	* if not, reset the len to that from before adding the mask	1349	* if not, reset the len to that from before adding the mask
1509	* value, so we don't send those bits.	1350	* value, so we don't send those bits.
…		…
1543	}	1384	}
1544	} /* else this is a viewable space */	1385	} /* else this is a viewable space */
1545	} /* for x loop */	1386	} /* for x loop */
1546	} /* for y loop */	1387	} /* for y loop */
1547		1388
		1389	socket.flush_fx ();
		1390
1548	/* Verify that we in fact do need to send this */	1391	/* Verify that we in fact do need to send this */
1549	if (socket.ext_mapinfos)	1392	if (socket.ext_mapinfos)
1550	{	1393	{
1551	if (!(sl.length () > startlen || socket.sent_scroll))	1394	if (!(sl.length () > startlen || socket.sent_scroll))
1552	{	1395	{
…		…
1566	socket.send_packet (sl);	1409	socket.send_packet (sl);
1567	socket.sent_scroll = 0;	1410	socket.sent_scroll = 0;
1568	}	1411	}
1569	}	1412	}
1570		1413
1571	/**
1572	* Draws client map.
1573	*/
1574	void
1575	draw_client_map (object *pl)
1576	{
1577	int i, j;
1578	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1579	int mflags;
1580	struct Map newmap;
1581	maptile *m, *pm;
1582
1583	if (pl->type != PLAYER)
1584	{
1585	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1586	return;
1587	}
1588
1589	pm = pl->map;
1590
1591	/* If player is just joining the game, he isn't here yet, so the map
1592	* can get swapped out. If so, don't try to send them a map. All will
1593	* be OK once they really log in.
1594	*/
1595	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1596	return;
1597
1598	memset (&newmap, 0, sizeof (struct Map));
1599
1600	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1601	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1602	{
1603	ax = i;
1604	ay = j;
1605	m = pm;
1606	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1607
1608	if (mflags & P_OUT_OF_MAP)
1609	continue;
1610
1611	/* If a map is visible to the player, we don't want to swap it out
1612	* just to reload it. This should really call something like
1613	* swap_map, but this is much more efficient and 'good enough'
1614	*/
1615	if (mflags & P_NEW_MAP)
1616	m->timeout = 50;
1617	}
1618
1619	/* do LOS after calls to update_position */
1620	if (pl->contr->do_los)
1621	{
1622	update_los (pl);
1623	pl->contr->do_los = 0;
1624	}
1625
1626	/* Big maps need a different drawing mechanism to work */
1627	draw_client_map1 (pl);
1628	}
1629
1630
1631	/*****************************************************************************/	1414	/*****************************************************************************/
1632
1633	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1415	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1634
1635	/* a player. Of course, the client need to know the command to be able to */	1416	/* a player. Of course, the client need to know the command to be able to */
1636
1637	/* manage it ! */	1417	/* manage it ! */
1638
1639	/*****************************************************************************/	1418	/*****************************************************************************/
1640	void	1419	void
1641	send_plugin_custom_message (object *pl, char *buf)	1420	send_plugin_custom_message (object *pl, char *buf)
1642	{	1421	{
1643	pl->contr->ns->send_packet (buf);	1422	pl->contr->ns->send_packet (buf);
…		…
1652	{	1431	{
1653	packet sl;	1432	packet sl;
1654	sl << "replyinfo skill_info\n";	1433	sl << "replyinfo skill_info\n";
1655		1434
1656	for (int i = 1; i < NUM_SKILLS; i++)	1435	for (int i = 1; i < NUM_SKILLS; i++)
1657	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1436	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1658		1437
1659	if (sl.length () >= MAXSOCKBUF)	1438	if (sl.length () > MAXSOCKBUF)
1660	{	1439	{
1661	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1440	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1662	fatal (0);	1441	fatal (0);
1663	}	1442	}
1664		1443
…		…
1677	sl << "replyinfo spell_paths\n";	1456	sl << "replyinfo spell_paths\n";
1678		1457
1679	for (int i = 0; i < NRSPELLPATHS; i++)	1458	for (int i = 0; i < NRSPELLPATHS; i++)
1680	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1459	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1681		1460
1682	if (sl.length () >= MAXSOCKBUF)	1461	if (sl.length () > MAXSOCKBUF)
1683	{	1462	{
1684	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1463	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1685	fatal (0);	1464	fatal (0);
1686	}	1465	}
1687		1466
…		…
1706	if (spell->type == SPELL)	1485	if (spell->type == SPELL)
1707	{	1486	{
1708	int flags = 0;	1487	int flags = 0;
1709		1488
1710	/* check if we need to update it */	1489	/* check if we need to update it */
1711	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1490	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1712	{	1491	{
1713	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1492	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1714	flags |= UPD_SP_MANA;	1493	flags |= UPD_SP_MANA;
1715	}	1494	}
1716		1495
1717	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1496	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1718	{	1497	{
1719	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1498	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1720	flags |= UPD_SP_GRACE;	1499	flags |= UPD_SP_GRACE;
1721	}	1500	}
1722		1501
1723	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1502	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1724	{	1503	{
1725	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1504	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1726	flags |= UPD_SP_DAMAGE;	1505	flags |= UPD_SP_DAMAGE;
1727	}	1506	}
1728		1507
1729	if (flags)	1508	if (flags)
1730	{	1509	{
…		…
1732		1511
1733	sl << "updspell "	1512	sl << "updspell "
1734	<< uint8 (flags)	1513	<< uint8 (flags)
1735	<< uint32 (spell->count);	1514	<< uint32 (spell->count);
1736		1515
1737	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1516	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1738	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1517	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1739	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1518	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1740		1519
1741	pl->ns->send_packet (sl);	1520	pl->ns->send_packet (sl);
1742	}	1521	}
1743	}	1522	}
1744	}	1523	}
…		…
1774	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1553	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1775	return;	1554	return;
1776	}	1555	}
1777		1556
1778	/* store costs and damage in the object struct, to compare to later */	1557	/* store costs and damage in the object struct, to compare to later */
1779	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1558	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1780	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1559	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1781	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1560	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1782		1561
1783	/* figure out which skill it uses, if it uses one */	1562	/* figure out which skill it uses, if it uses one */
1784	if (spell->skill)	1563	if (spell->skill)
1785	{	1564	if (object *tmp = pl->find_skill (spell->skill))
1786	for (i = 1; i < NUM_SKILLS; i++)
1787	if (!strcmp (spell->skill, skill_names[i]))
1788	{
1789	skill = i + CS_STAT_SKILLINFO;	1565	skill = tmp->subtype + CS_STAT_SKILLINFO;
1790	break;
1791	}
1792	}
1793		1566
1794	// spells better have a face	1567	// spells better have a face
1795	if (!spell->face)	1568	if (!spell->face)
1796	{	1569	{
1797	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1570	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1798	spell->face = face_find ("burnout.x11", blank_face);	1571	spell->face = face_find ("burnout.x11", blank_face);
1799	}	1572	}
		1573
		1574	pl->ns->send_face (spell->face);
1800		1575
1801	/* send the current values */	1576	/* send the current values */
1802	sl << uint32 (spell->count)	1577	sl << uint32 (spell->count)
1803	<< uint16 (spell->level)	1578	<< uint16 (spell->level)
1804	<< uint16 (spell->casting_time)	1579	<< uint16 (spell->casting_time)
1805	<< uint16 (spell->last_sp)	1580	<< uint16 (spell->cached_sp)
1806	<< uint16 (spell->last_grace)	1581	<< uint16 (spell->cached_grace)
1807	<< uint16 (spell->last_eat)	1582	<< uint16 (spell->cached_eat)
1808	<< uint8 (skill)	1583	<< uint8 (skill)
1809	<< uint32 (spell->path_attuned)	1584	<< uint32 (spell->path_attuned)
1810	<< uint32 (spell->face)	1585	<< uint32 (spell->face)
1811	<< data8 (spell->name)	1586	<< data8 (spell->name)
1812	<< data16 (spell->msg);	1587	<< data16 (spell->msg);
…		…
1840	* bytes and 3 strings (because that is the spec) so we need to	1615	* bytes and 3 strings (because that is the spec) so we need to
1841	* check that the length of those 3 strings, plus the 23 bytes,	1616	* check that the length of those 3 strings, plus the 23 bytes,
1842	* won't take us over the length limit for the socket, if it does,	1617	* won't take us over the length limit for the socket, if it does,
1843	* we need to send what we already have, and restart packet formation	1618	* we need to send what we already have, and restart packet formation
1844	*/	1619	*/
		1620	if (spell->type != SPELL)
		1621	continue;
		1622
1845	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1623	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1846	* to show add_spell is 26 bytes + 2 strings. However, the overun	1624	* to show add_spell is 26 bytes + 2 strings. However, the overun
1847	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1625	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1848	* like it will fix this	1626	* like it will fix this
1849	*/	1627	*/
1850	if (spell->type != SPELL)
1851	continue;
1852
1853	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1628	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1854	{	1629	{
		1630	pl->ns->flush_fx ();
1855	pl->ns->send_packet (sl);	1631	pl->ns->send_packet (sl);
1856		1632
1857	sl.reset ();	1633	sl.reset ();
1858	sl << "addspell ";	1634	sl << "addspell ";
1859	}	1635	}
…		…
1867	return;	1643	return;
1868	}	1644	}
1869	else	1645	else
1870	append_spell (pl, sl, spell);	1646	append_spell (pl, sl, spell);
1871		1647
1872	if (sl.length () >= MAXSOCKBUF)	1648	if (sl.length () > MAXSOCKBUF)
1873	{	1649	{
1874	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1650	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1875	fatal (0);	1651	fatal (0);
1876	}	1652	}
1877		1653
1878	/* finally, we can send the packet */	1654	/* finally, we can send the packet */
		1655	pl->ns->flush_fx ();
1879	pl->ns->send_packet (sl);	1656	pl->ns->send_packet (sl);
1880	}	1657	}
1881		1658

Diff Legend

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