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.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.121 by root, Fri Aug 24 01:03:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
130} 129}
131 130
132static void 131static void
133clear_map (player *pl) 132clear_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));
136 137
137 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
138 139
139 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
… …
145/** check for map/region change and send new map data */ 146/** check for map/region change and send new map data */
146static void 147static void
147check_map_change (player *pl) 148check_map_change (player *pl)
148{ 149{
149 client &socket = *pl->ns; 150 client &socket = *pl->ns;
150 object *ob = pl->ob; 151 object *ob = pl->observe;
151 char buf[MAX_BUF]; /* eauugggh */
152 152
153 if (socket.current_map != ob->map || socket.force_newmap) 153 if (socket.current_map != ob->map || socket.force_newmap)
154 { 154 {
155 clear_map (pl); 155 clear_map (pl);
156 socket.current_map = ob->map; 156 socket.current_map = ob->map;
… …
164 if (ob->map->tile_path[0]) flags |= 1; 164 if (ob->map->tile_path[0]) flags |= 1;
165 if (ob->map->tile_path[1]) flags |= 2; 165 if (ob->map->tile_path[1]) flags |= 2;
166 if (ob->map->tile_path[2]) flags |= 4; 166 if (ob->map->tile_path[2]) flags |= 4;
167 if (ob->map->tile_path[3]) flags |= 8; 167 if (ob->map->tile_path[3]) flags |= 8;
168 168
169 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",
170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 170 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171 ob->map->width, ob->map->height, &ob->map->path);
171 } 172 }
172 else 173 else
173 snprintf (buf, MAX_BUF, "mapinfo current");
174
175 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
176 } 175 }
177 } 176 }
178 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)
179 { 178 {
180 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
193 socket.current_y = ob->y; 192 socket.current_y = ob->y;
194 193
195 region *reg = ob->region (); 194 region *reg = ob->region ();
196 if (socket.current_region != reg) 195 if (socket.current_region != reg)
197 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198 socket.current_region = reg; 198 socket.current_region = reg;
199 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
200 } 199 }
201} 200}
202 201
203/** 202/**
204 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
205 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
206 * that information. 205 * that information.
207 */ 206 */
208void 207void
209RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
210{ 209{
211 char *params = NULL, *cp; 210 char *params;
212
213 /* No match */
214 char bigbuf[MAX_BUF];
215 int slen;
216
217 /* Set up replyinfo before we modify any of the buffers - this is used
218 * if we don't find a match.
219 */
220 strcpy (bigbuf, "replyinfo ");
221 slen = strlen (bigbuf);
222 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
223 211
224 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
225 * params pointer. 213 * params pointer.
226 */ 214 */
227 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
228 if (*cp == ' ') 216 if (*params == ' ')
229 { 217 {
230 *cp = '\0';
231 params = cp + 1; 218 *params++ = 0;
232 break; 219 break;
233 } 220 }
234 221
235 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
236 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
239 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
240 send_skill_info (ns, params); 227 send_skill_info (ns, params);
241 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
242 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
243 else 230 else
244 ns->send_packet (bigbuf, len); 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 }
245} 238}
246 239
247void 240void
248ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
249{ 242{
… …
252 245
253void 246void
254ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
255{ 248{
256 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 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->ob->map;
269 int mapx = pl->ns->mapx / 2 - pl->ob->x;
270 int mapy = pl->ns->mapy / 2 - pl->ob->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;
257} 336}
258 337
259void 338void
260MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
261{ 340{
262 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
263 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
264 343
265 char bigbuf[MAX_BUF], *token;
266
267 token = buf; 344 char *token = buf;
268 // copy token 345
269 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
270 return; 347 return;
271 348
272 *buf++ = 0;
273
274 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
275 { 350 {
276 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
277 353
278 // initial map and its origin 354#if 0
279 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
280 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
281 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
282 int mapy = pl->ns->mapy / 2 - pl->ob->y;
283 int max_distance = 8; // limit maximum path length to something generous
284
285 while (*buf && map && max_distance)
286 {
287 int dir = *buf++;
288
289 switch (dir)
290 {
291 case '1':
292 dx = 0;
293 dy = -1;
294 map = map->xy_find (dx, dy);
295 map && (mapy -= map->height);
296 break;
297 case '2':
298 mapx += map->width;
299 dx = map->width;
300 dy = 0;
301 map = map->xy_find (dx, dy);
302 break;
303 case '3':
304 mapy += map->height;
305 dx = 0;
306 dy = map->height;
307 map = map->xy_find (dx, dy);
308 break;
309 case '4':
310 dx = -1;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 map && (mapx -= map->width);
314 break;
315 }
316
317 --max_distance;
318 }
319
320 if (!max_distance)
321 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
322 else if (map && map->path[0])
323 {
324 int flags = 0;
325
326 if (map->tile_path[0]) flags |= 1;
327 if (map->tile_path[1]) flags |= 2;
328 if (map->tile_path[2]) flags |= 4;
329 if (map->tile_path[3]) flags |= 8;
330
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
332 }
333 else 358 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
335 } 361 }
336 else 362 else
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339 pl->ns->send_packet (bigbuf);
340} 364}
341 365
342/** This is the Setup cmd */ 366/** This is the Setup cmd */
343void 367void
344SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
473 497
474 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
475} 499}
476 500
477/** 501/**
478 * client requested an image. send it rate-limited
479 * before flushing.
480 */
481void
482AskFaceCmd (char *buf, int len, client *ns)
483{
484 ns->askface.push_back (atoi (buf));
485}
486
487/**
488 * Tells client the picture it has to use
489 * to smooth a picture number given as argument.
490 */
491void
492AskSmooth (char *buf, int len, client *ns)
493{
494 ns->send_face (atoi (buf));
495 ns->flush_fx ();
496}
497
498/**
499 * 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,
500 * etc.) 503 * etc.)
501 */ 504 */
502void 505void
503PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
524 * commands. 527 * commands.
525 */ 528 */
526 pl->count = 0; 529 pl->count = 0;
527} 530}
528 531
529
530/** 532/**
531 * 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,
532 * 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
533 * '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
534 * can throttle. 536 * can throttle.
… …
536void 538void
537NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
538{ 540{
539 if (len <= 6) 541 if (len <= 6)
540 { 542 {
541 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 543 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
542 return; 544 return;
543 } 545 }
544 546
545 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
546 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
730 732
731/** 733/**
732 * Get player's current range attack in obuf. 734 * Get player's current range attack in obuf.
733 */ 735 */
734static void 736static void
735rangetostring (object *ob, char *obuf) 737rangetostring (player *pl, char *obuf)
736{ 738{
737 dynbuf_text buf; 739 dynbuf_text buf;
738 740
739 player *pl = ob->contr;
740
741 if (pl->ranged_skill)
742 {
743 buf.printf (" Range: %s", &pl->ranged_skill->name);
744
745 if (pl->ranged_ob) 741 if (pl->ranged_ob)
746 buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0)); 742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747 }
748 743
749 if (pl->combat_skill)
750 {
751 buf.printf (" Combat: %s", &pl->combat_skill->name);
752
753 if (pl->combat_ob) 744 if (pl->combat_ob)
754 buf.printf (" (%s)", query_base_name (pl->combat_ob, 0)); 745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755 }
756 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?
757 if (pl->golem) 754 if (pl->golem)
758 buf.printf (" Golem: %s", &pl->golem->name); 755 buf << " Golem*: " << pl->golem->name;
759 756
760 strcpy (obuf, buf.linearise () + 1); 757 buf << '\0';
758 buf.linearise (obuf);
761} 759}
762 760
763#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
764 Old = New; \ 762 Old = New; \
765 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
… …
773#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
774 Old = New; \ 772 Old = New; \
775 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
776 } 774 }
777 775
778#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
779 Old = New; \ 777 Old = New; \
780 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
781 } 779 }
782 780
783#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
784 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
785 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
799 797
800 client *ns = pl->ns; 798 client *ns = pl->ns;
801 if (!ns) 799 if (!ns)
802 return; 800 return;
803 801
804 object *ob = pl->ob; 802 object *ob = pl->observe;
805 if (!ob) 803 if (!ob)
806 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
807 807
808 packet sl ("stats"); 808 packet sl ("stats");
809 809
810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823 823
824 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
825 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob[s])
826 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
827 { 827 {
828 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
829 829
830 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->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);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 847
848 flags = 0; 848 flags = 0;
849 849
850 if (pl->fire_on) 850 if (opl->fire_on)
851 flags |= SF_FIREON; 851 flags |= SF_FIREON;
852 852
853 if (pl->run_on) 853 if (opl->run_on)
854 flags |= SF_RUNON; 854 flags |= SF_RUNON;
855 855
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 857
858 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
875 } 875 }
876 876
877 rangetostring (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 */
878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879 set_title (ob, buf); 879 set_title (ob, buf);
880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881 881
882 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
964 964
965 if (!ns.faces_sent[face_num]) 965 if (!ns.faces_sent[face_num])
966 if (ob) 966 if (ob)
967 ns.send_faces (ob); 967 ns.send_faces (ob);
968 else 968 else
969 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
970 970
971 sl << uint16 (face_num); 971 sl << uint16 (face_num);
972 return 1; 972 return 1;
973 } 973 }
974 974
… …
1016{ 1016{
1017 prefetch_surrounding_maps (op->map, 3); 1017 prefetch_surrounding_maps (op->map, 3);
1018} 1018}
1019 1019
1020/** 1020/**
1021 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1022 * to the client. It is necessary because the old map command supports
1023 * a maximum map size of 15x15.
1024 * This function is much simpler than the old one. This is because
1025 * the old function optimized to send as few face identifiers as possible,
1026 * at the expense of sending more coordinate location (coordinates were
1027 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1028 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1029 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1030 * and use the other 4 bits for other informatiion. For full documentation
1031 * of what we send, see the doc/Protocol file.
1032 * I will describe internally what we do:
1033 * the ns->lastmap shows how the map last looked when sent to the client.
1034 * in the lastmap structure, there is a cells array, which is set to the
1035 * maximum viewable size (As set in config.h).
1036 * in the cells, there are faces and a count value.
1037 * we use the count value to hold the darkness value. If -1, then this space
1038 * is not viewable.
1039 * we use faces[0] faces[1] faces[2] to hold what the three layers
1040 * look like.
1041 */ 1022 */
1042void 1023void
1043draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1044{ 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
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 sint16 nx, ny;
1047 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1048 uint8 eentrysize; 1041 uint8 eentrysize;
1049 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1050 uint8 extendedinfos; 1043 uint8 extendedinfos;
1051 maptile *m;
1052 1044
1053 client &socket = *pl->contr->ns;
1054
1055 if (!pl->active)
1056 return;
1057
1058 check_map_change (pl->contr); 1045 check_map_change (pl);
1059 prefetch_surrounding_maps (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
1057 /**
1058 * This function uses the new map1 protocol command to send the map
1059 * to the client. It is necessary because the old map command supports
1060 * a maximum map size of 15x15.
1061 * This function is much simpler than the old one. This is because
1062 * the old function optimized to send as few face identifiers as possible,
1063 * at the expense of sending more coordinate location (coordinates were
1064 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1065 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1066 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1067 * and use the other 4 bits for other informatiion. For full documentation
1068 * of what we send, see the doc/Protocol file.
1069 * I will describe internally what we do:
1070 * the ns->lastmap shows how the map last looked when sent to the client.
1071 * in the lastmap structure, there is a cells array, which is set to the
1072 * maximum viewable size (As set in config.h).
1073 * in the cells, there are faces and a count value.
1074 * we use the count value to hold the darkness value. If -1, then this space
1075 * is not viewable.
1076 * we use faces[0] faces[1] faces[2] to hold what the three layers
1077 * look like.
1078 */
1079
1080 client &socket = *pl->ns;
1060 1081
1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062 packet esl; 1083 packet esl;
1063 1084
1064 startlen = sl.length (); 1085 startlen = sl.length ();
… …
1088 ay = 0; 1109 ay = 0;
1089 1110
1090 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1091 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1092 */ 1113 */
1093 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1094 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1095 1116
1096 maptile *plmap = pl->map;
1097
1098 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1117 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1099 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1100 ax = 0; 1122 ax = 0;
1101 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1123 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1102 { 1124 {
1125 // check to see if we can simply go one right quickly
1126 ++nx;
1127 if (m && nx >= m->width)
1128 m = 0;
1129
1130 if (!m)
1131 {
1132 nx = x; ny = y; m = plmap;
1133
1134 if (xy_normalise (m, nx, ny))
1135 m->touch ();
1136 else
1137 m = 0;
1138 }
1139
1103 int emask, mask; 1140 int emask, mask;
1104 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1105 1142
1106 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1143 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1107 1144
1108 /* 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,
1109 * we tell the client as such 1146 * we tell the client as such
1110 */ 1147 */
1111 nx = x;
1112 ny = y;
1113 m = get_map_from_coord (plmap, &nx, &ny);
1114
1115 if (!m) 1148 if (!m)
1116 { 1149 {
1117 /* space is out of map. Update space and clear values 1150 /* space is out of map. Update space and clear values
1118 * 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
1119 * of the map, it shouldn't have a head 1152 * of the map, it shouldn't have a head
… …
1125 } 1158 }
1126 1159
1127 continue; 1160 continue;
1128 } 1161 }
1129 1162
1130 m->touch ();
1131
1132 int d = pl->contr->blocked_los[ax][ay]; 1163 int d = pl->blocked_los[ax][ay];
1133 1164
1134 if (d > 3) 1165 if (d > 3)
1135 { 1166 {
1136 1167
1137 int need_send = 0, count; 1168 int need_send = 0, count;
… …
1200 } 1231 }
1201 1232
1202 lastcell.count = d; 1233 lastcell.count = d;
1203 1234
1204 mapspace &ms = m->at (nx, ny); 1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1205 1237
1206 if (socket.extmap) 1238 if (socket.extmap)
1207 { 1239 {
1208 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1209 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
… …
1219 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1251 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1220 { 1252 {
1221 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1253 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1222 { 1254 {
1223 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1224 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1225 } 1257 }
1226 } 1258 }
1227 1259
1228 if (op->msg && op->msg[0] == '@') 1260 if (op->msg && op->msg[0] == '@')
1229 flags |= 1; 1261 flags |= 1;
1230 1262
1231 if (op->type == PLAYER && op != pl) 1263 if (op->type == PLAYER && op != ob)
1232 player = op->count; 1264 player = op->count;
1233 } 1265 }
1234 1266
1235 if (lastcell.stat_hp != stat_hp) 1267 if (lastcell.stat_hp != stat_hp)
1236 { 1268 {
… …
1280 1312
1281 /* Middle face */ 1313 /* Middle face */
1282 if (update_space (sl, socket, ms, lastcell, 1)) 1314 if (update_space (sl, socket, ms, lastcell, 1))
1283 mask |= 0x2; 1315 mask |= 0x2;
1284 1316
1285 if (ms.player () == pl 1317 if (ms.player () == ob
1286 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1287 { 1319 {
1288 // force player to be visible to himself if invisible 1320 // force player to be visible to himself if invisible
1289 if (lastcell.faces[0] != pl->face) 1321 if (lastcell.faces[0] != ob->face)
1290 { 1322 {
1291 lastcell.faces[0] = pl->face; 1323 lastcell.faces[0] = ob->face;
1292 1324
1293 mask |= 0x1; 1325 mask |= 0x1;
1294 sl << uint16 (pl->face); 1326 sl << uint16 (ob->face);
1295 1327
1296 socket.send_faces (pl); 1328 socket.send_faces (ob);
1297 } 1329 }
1298 } 1330 }
1299 /* Top face */ 1331 /* Top face */
1300 else if (update_space (sl, socket, ms, lastcell, 0)) 1332 else if (update_space (sl, socket, ms, lastcell, 0))
1301 mask |= 0x1; 1333 mask |= 0x1;
1302
1303 1334
1304 /* 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
1305 * space by checking the mask. If so, update the mask. 1336 * space by checking the mask. If so, update the mask.
1306 * 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
1307 * value, so we don't send those bits. 1338 * value, so we don't send those bits.
… …
1366 socket.send_packet (sl); 1397 socket.send_packet (sl);
1367 socket.sent_scroll = 0; 1398 socket.sent_scroll = 0;
1368 } 1399 }
1369} 1400}
1370 1401
1371/**
1372 * Draws client map.
1373 */
1374void
1375draw_client_map (object *pl)
1376{
1377 int i, j;
1378 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1379 int mflags;
1380 struct Map newmap;
1381 maptile *m, *pm;
1382
1383 if (pl->type != PLAYER)
1384 {
1385 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1386 return;
1387 }
1388
1389 pm = pl->map;
1390
1391 /* If player is just joining the game, he isn't here yet, so the map
1392 * can get swapped out. If so, don't try to send them a map. All will
1393 * be OK once they really log in.
1394 */
1395 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1396 return;
1397
1398 memset (&newmap, 0, sizeof (struct Map));
1399
1400 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1401 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1402 {
1403 ax = i;
1404 ay = j;
1405 m = pm;
1406 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1407
1408 if (mflags & P_OUT_OF_MAP)
1409 continue;
1410
1411 /* If a map is visible to the player, we don't want to swap it out
1412 * just to reload it. This should really call something like
1413 * swap_map, but this is much more efficient and 'good enough'
1414 */
1415 if (mflags & P_NEW_MAP)
1416 m->timeout = 50;
1417 }
1418
1419 /* do LOS after calls to update_position */
1420 if (pl->contr->do_los)
1421 {
1422 update_los (pl);
1423 pl->contr->do_los = 0;
1424 }
1425
1426 /* Big maps need a different drawing mechanism to work */
1427 draw_client_map1 (pl);
1428}
1429
1430
1431/*****************************************************************************/ 1402/*****************************************************************************/
1432
1433/* 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*/
1434
1435/* 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 */
1436
1437/* manage it ! */ 1405/* manage it ! */
1438
1439/*****************************************************************************/ 1406/*****************************************************************************/
1440void 1407void
1441send_plugin_custom_message (object *pl, char *buf) 1408send_plugin_custom_message (object *pl, char *buf)
1442{ 1409{
1443 pl->contr->ns->send_packet (buf); 1410 pl->contr->ns->send_packet (buf);
… …
1454 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1455 1422
1456 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1457 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1424 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1458 1425
1459 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1460 { 1427 {
1461 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1462 fatal (0); 1429 fatal (0);
1463 } 1430 }
1464 1431
… …
1477 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1478 1445
1479 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1480 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1481 1448
1482 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1483 { 1450 {
1484 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1485 fatal (0); 1452 fatal (0);
1486 } 1453 }
1487 1454
… …
1595 if (!spell->face) 1562 if (!spell->face)
1596 { 1563 {
1597 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1564 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1598 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1599 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1600 1569
1601 /* send the current values */ 1570 /* send the current values */
1602 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1603 << uint16 (spell->level) 1572 << uint16 (spell->level)
1604 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1640 * 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
1641 * 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,
1642 * 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,
1643 * 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
1644 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1645 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1646 * 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
1647 * 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
1648 * like it will fix this 1620 * like it will fix this
1649 */ 1621 */
1650 if (spell->type != SPELL)
1651 continue;
1652
1653 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1622 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1654 { 1623 {
1624 pl->ns->flush_fx ();
1655 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1656 1626
1657 sl.reset (); 1627 sl.reset ();
1658 sl << "addspell "; 1628 sl << "addspell ";
1659 } 1629 }
… …
1667 return; 1637 return;
1668 } 1638 }
1669 else 1639 else
1670 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1671 1641
1672 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1673 { 1643 {
1674 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1675 fatal (0); 1645 fatal (0);
1676 } 1646 }
1677 1647
1678 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1679 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1680} 1651}
1681 1652

Diff Legend

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