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.87 by root, Thu Apr 19 11:12:46 2007 UTC vs.
Revision 1.123 by root, Thu Nov 8 19:43:30 2007 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 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
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;
… …
159 { 159 {
160 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
161 { 161 {
162 int flags = 0; 162 int flags = 0;
163 163
164 if (ob->map->tile_path[0]) 164 if (ob->map->tile_path[0]) flags |= 1;
165 flags |= 1;
166 if (ob->map->tile_path[1]) 165 if (ob->map->tile_path[1]) flags |= 2;
167 flags |= 2;
168 if (ob->map->tile_path[2]) 166 if (ob->map->tile_path[2]) flags |= 4;
169 flags |= 4;
170 if (ob->map->tile_path[3]) 167 if (ob->map->tile_path[3]) flags |= 8;
171 flags |= 8;
172 168
173 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",
174 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);
175 } 172 }
176 else 173 else
177 snprintf (buf, MAX_BUF, "mapinfo current");
178
179 socket.send_packet (buf); 174 socket.send_packet ("mapinfo current");
180 } 175 }
181 } 176 }
182 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)
183 { 178 {
184 int dx = ob->x - socket.current_x; 179 int dx = ob->x - socket.current_x;
… …
197 socket.current_y = ob->y; 192 socket.current_y = ob->y;
198 193
199 region *reg = ob->region (); 194 region *reg = ob->region ();
200 if (socket.current_region != reg) 195 if (socket.current_region != reg)
201 { 196 {
197 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
202 socket.current_region = reg; 198 socket.current_region = reg;
203 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
204 } 199 }
205} 200}
206 201
207/** 202/**
208 * RequestInfo is sort of a meta command. There is some specific 203 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 204 * request of information, but we call other functions to provide
210 * that information. 205 * that information.
211 */ 206 */
212void 207void
213RequestInfo (char *buf, int len, client * ns) 208RequestInfo (char *buf, int len, client *ns)
214{ 209{
215 char *params = NULL, *cp; 210 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 211
228 /* find the first space, make it null, and update the 212 /* find the first space, make it null, and update the
229 * params pointer. 213 * params pointer.
230 */ 214 */
231 for (cp = buf; *cp != '\0'; cp++) 215 for (params = buf; *params; params++)
232 if (*cp == ' ') 216 if (*params == ' ')
233 { 217 {
234 *cp = '\0';
235 params = cp + 1; 218 *params++ = 0;
236 break; 219 break;
237 } 220 }
238 221
239 if (!strcmp (buf, "image_info")) 222 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 223 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 226 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 227 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 228 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 229 send_spell_paths (ns, params);
247 else 230 else
248 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 }
249} 238}
250 239
251void 240void
252ExtCmd (char *buf, int len, player *pl) 241ExtCmd (char *buf, int len, player *pl)
253{ 242{
… …
256 245
257void 246void
258ExtiCmd (char *buf, int len, client *ns) 247ExtiCmd (char *buf, int len, client *ns)
259{ 248{
260 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->observe->map;
269 int mapx = pl->ns->mapx / 2 - pl->observe->x;
270 int mapy = pl->ns->mapy / 2 - pl->observe->y;
271 int max_distance = 8; // limit maximum path length to something generous
272
273 while (*buf && map && max_distance)
274 {
275 int dir = *buf++ - '1';
276
277 if (dir >= 0 && dir <= 3)
278 {
279 if (!map->tile_path [dir])
280 map = 0;
281 else if (map->tile_available (dir, false))
282 {
283 maptile *neigh = map->tile_map [dir];
284
285 switch (dir)
286 {
287 case 0: mapy -= neigh->height; break;
288 case 2: mapy += map ->height; break;
289 case 3: mapx -= neigh->width ; break;
290 case 1: mapx += map ->width ; break;
291 }
292
293 map = neigh;
294 --max_distance;
295 }
296 else
297 return 0;
298 }
299 else
300 max_distance = 0;
301 }
302
303 if (!max_distance)
304 send_packet_printf ("mapinfo %s error", token);
305 else if (!map || !map->path)
306 send_packet_printf ("mapinfo %s nomap", token);
307 else
308 {
309 int flags = 0;
310
311 if (map->tile_path[0]) flags |= 1;
312 if (map->tile_path[1]) flags |= 2;
313 if (map->tile_path[2]) flags |= 4;
314 if (map->tile_path[3]) flags |= 8;
315
316 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
317 }
318
319 return 1;
320}
321
322void
323client::mapinfo_queue_run ()
324{
325 if (mapinfo_queue.empty () || !pl)
326 return;
327
328 for (int i = 0; i < mapinfo_queue.size (); ++i)
329 if (mapinfo_try (mapinfo_queue [i]))
330 {
331 free (mapinfo_queue [i]);
332 mapinfo_queue.erase (i);
333 }
334 else
335 ++i;
261} 336}
262 337
263void 338void
264MapInfoCmd (char *buf, int len, player *pl) 339MapInfoCmd (char *buf, int len, player *pl)
265{ 340{
266 // <mapinfo tag spatial tile-path 341 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 342 // >mapinfo tag spatial flags x y w h hash
268 343
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 344 char *token = buf;
272 // copy token 345
273 if (!(buf = strchr (buf, ' '))) 346 if (!(buf = strchr (buf, ' ')))
274 return; 347 return;
275 348
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 349 if (!strncmp (buf, " spatial ", 9))
279 { 350 {
280 buf += 8; 351 char *copy = strdup (token);
352 copy [buf - token] = 0;
281 353
282 // initial map and its origin 354#if 0
283 maptile *map = pl->ob->map; 355 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 356 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 357 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = map->xy_find (dx, dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = map->xy_find (dx, dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 358 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 359#endif
360 pl->ns->mapinfo_queue.push_back (copy);
343 } 361 }
344 else 362 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 363 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 364}
349 365
350/** This is the Setup cmd */ 366/** This is the Setup cmd */
351void 367void
352SetUp (char *buf, int len, client * ns) 368SetUp (char *buf, int len, client * ns)
… …
481 497
482 ns->send_packet (cmdback); 498 ns->send_packet (cmdback);
483} 499}
484 500
485/** 501/**
486 * client requested an image. send it rate-limited
487 * before flushing.
488 */
489void
490AskFaceCmd (char *buf, int len, client *ns)
491{
492 ns->askface.push_back (atoi (buf));
493}
494
495/**
496 * Tells client the picture it has to use
497 * to smooth a picture number given as argument.
498 */
499void
500AskSmooth (char *buf, int len, client *ns)
501{
502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
504}
505
506/**
507 * 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,
508 * etc.) 503 * etc.)
509 */ 504 */
510void 505void
511PlayerCmd (char *buf, int len, player *pl) 506PlayerCmd (char *buf, int len, player *pl)
… …
532 * commands. 527 * commands.
533 */ 528 */
534 pl->count = 0; 529 pl->count = 0;
535} 530}
536 531
537
538/** 532/**
539 * 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,
540 * 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
541 * '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
542 * can throttle. 536 * can throttle.
… …
544void 538void
545NewPlayerCmd (char *buf, int len, player *pl) 539NewPlayerCmd (char *buf, int len, player *pl)
546{ 540{
547 if (len <= 6) 541 if (len <= 6)
548 { 542 {
549 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);
550 return; 544 return;
551 } 545 }
552 546
553 uint16 cmdid = net_uint16 ((uint8 *)buf); 547 uint16 cmdid = net_uint16 ((uint8 *)buf);
554 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 548 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
611 { 605 {
612 case ST_PLAYING: 606 case ST_PLAYING:
613 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 607 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
614 break; 608 break;
615 609
616 case ST_CHANGE_CLASS:
617 key_change_class (pl->ob, buf[0]);
618 break;
619
620 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 610 case ST_GET_PARTY_PASSWORD: /* Get password for party */
621 receive_party_password (pl->ob, 13); 611 receive_party_password (pl->ob, 13);
622 break; 612 break;
623 613
624 default: 614 default:
… …
663 653
664 cp = strchr (cp + 1, ' '); 654 cp = strchr (cp + 1, ' ');
665 655
666 if (cp) 656 if (cp)
667 { 657 {
668 assign (ns->version, cp + 1); 658 ns->version = cp + 1;
669 659
670 if (ns->sc_version < 1026) 660 if (ns->sc_version < 1026)
671 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 661 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
672 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 662 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
673 } 663 }
… …
738send_query (client *ns, uint8 flags, const char *text) 728send_query (client *ns, uint8 flags, const char *text)
739{ 729{
740 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
741} 731}
742 732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text buf;
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
759}
760
743#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
744 Old = New; \ 762 Old = New; \
745 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
746 } 764 }
747 765
… …
753#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
754 Old = New; \ 772 Old = New; \
755 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
756 } 774 }
757 775
758#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
759 Old = New; \ 777 Old = New; \
760 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
761 } 779 }
762 780
763#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
764 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
765 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
779 797
780 client *ns = pl->ns; 798 client *ns = pl->ns;
781 if (!ns) 799 if (!ns)
782 return; 800 return;
783 801
784 object *ob = pl->ob; 802 object *ob = pl->observe;
785 if (!ob) 803 if (!ob)
786 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
787 807
788 packet sl ("stats"); 808 packet sl ("stats");
789 809
790 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
791 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
800 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
801 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
802 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
803 823
804 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
805 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob[s])
806 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
807 { 827 {
808 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
809 829
810 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
818 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
819 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
820 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
821 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
822 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
823 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
824 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
825 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);
826 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);
827 847
828 flags = 0; 848 flags = 0;
829 849
830 if (pl->fire_on) 850 if (opl->fire_on)
831 flags |= SF_FIREON; 851 flags |= SF_FIREON;
832 852
833 if (pl->run_on) 853 if (opl->run_on)
834 flags |= SF_RUNON; 854 flags |= SF_RUNON;
835 855
836 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
837 857
838 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
852 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);
853 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);
854 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);
855 } 875 }
856 876
857 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 */
858 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
859 set_title (ob, buf); 879 set_title (ob, buf);
860 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
861 881
862 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
944 964
945 if (!ns.faces_sent[face_num]) 965 if (!ns.faces_sent[face_num])
946 if (ob) 966 if (ob)
947 ns.send_faces (ob); 967 ns.send_faces (ob);
948 else 968 else
949 ns.send_face (face_num); 969 ns.send_face (face_num, 10);
950 970
951 sl << uint16 (face_num); 971 sl << uint16 (face_num);
952 return 1; 972 return 1;
953 } 973 }
954 974
… …
996{ 1016{
997 prefetch_surrounding_maps (op->map, 3); 1017 prefetch_surrounding_maps (op->map, 3);
998} 1018}
999 1019
1000/** 1020/**
1001 * This function uses the new map1 protocol command to send the map 1021 * Draws client map.
1002 * to the client. It is necessary because the old map command supports
1003 * a maximum map size of 15x15.
1004 * This function is much simpler than the old one. This is because
1005 * the old function optimized to send as few face identifiers as possible,
1006 * at the expense of sending more coordinate location (coordinates were
1007 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1008 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1009 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1010 * and use the other 4 bits for other informatiion. For full documentation
1011 * of what we send, see the doc/Protocol file.
1012 * I will describe internally what we do:
1013 * the ns->lastmap shows how the map last looked when sent to the client.
1014 * in the lastmap structure, there is a cells array, which is set to the
1015 * maximum viewable size (As set in config.h).
1016 * in the cells, there are faces and a count value.
1017 * we use the count value to hold the darkness value. If -1, then this space
1018 * is not viewable.
1019 * we use faces[0] faces[1] faces[2] to hold what the three layers
1020 * look like.
1021 */ 1022 */
1022void 1023void
1023draw_client_map1 (object *pl) 1024draw_client_map (player *pl)
1024{ 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
1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1039 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1026 sint16 nx, ny;
1027 int estartlen, eoldlen; 1040 int estartlen, eoldlen;
1028 uint8 eentrysize; 1041 uint8 eentrysize;
1029 uint16 ewhatstart, ewhatflag; 1042 uint16 ewhatstart, ewhatflag;
1030 uint8 extendedinfos; 1043 uint8 extendedinfos;
1031 maptile *m;
1032 1044
1033 client &socket = *pl->contr->ns;
1034
1035 if (!pl->active)
1036 return;
1037
1038 check_map_change (pl->contr); 1045 check_map_change (pl);
1039 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;
1040 1081
1041 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1082 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1042 packet esl; 1083 packet esl;
1043 1084
1044 startlen = sl.length (); 1085 startlen = sl.length ();
… …
1068 ay = 0; 1109 ay = 0;
1069 1110
1070 /* We could do this logic as conditionals in the if statement, 1111 /* We could do this logic as conditionals in the if statement,
1071 * but that started to get a bit messy to look at. 1112 * but that started to get a bit messy to look at.
1072 */ 1113 */
1073 max_x = pl->x + (socket.mapx + 1) / 2; 1114 max_x = ob->x + (socket.mapx + 1) / 2;
1074 max_y = pl->y + (socket.mapy + 1) / 2; 1115 max_y = ob->y + (socket.mapy + 1) / 2;
1075 1116
1076 maptile *plmap = pl->map;
1077
1078 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++)
1079 { 1118 {
1119 sint16 nx, ny;
1120 maptile *m = 0;
1121
1080 ax = 0; 1122 ax = 0;
1081 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++)
1082 { 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
1083 int emask, mask; 1140 int emask, mask;
1084 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1141 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1085 1142
1086 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1143 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1087 1144
1088 /* 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,
1089 * we tell the client as such 1146 * we tell the client as such
1090 */ 1147 */
1091 nx = x;
1092 ny = y;
1093 m = get_map_from_coord (plmap, &nx, &ny);
1094
1095 if (!m) 1148 if (!m)
1096 { 1149 {
1097 /* space is out of map. Update space and clear values 1150 /* space is out of map. Update space and clear values
1098 * 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
1099 * of the map, it shouldn't have a head 1152 * of the map, it shouldn't have a head
… …
1105 } 1158 }
1106 1159
1107 continue; 1160 continue;
1108 } 1161 }
1109 1162
1110 m->touch ();
1111
1112 int d = pl->contr->blocked_los[ax][ay]; 1163 int d = pl->blocked_los[ax][ay];
1113 1164
1114 if (d > 3) 1165 if (d > 3)
1115 { 1166 {
1116 1167
1117 int need_send = 0, count; 1168 int need_send = 0, count;
… …
1180 } 1231 }
1181 1232
1182 lastcell.count = d; 1233 lastcell.count = d;
1183 1234
1184 mapspace &ms = m->at (nx, ny); 1235 mapspace &ms = m->at (nx, ny);
1236 ms.update ();
1185 1237
1186 if (socket.extmap) 1238 if (socket.extmap)
1187 { 1239 {
1188 uint8 stat_hp = 0; 1240 uint8 stat_hp = 0;
1189 uint8 stat_width = 0; 1241 uint8 stat_width = 0;
… …
1199 || 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))
1200 { 1252 {
1201 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)
1202 { 1254 {
1203 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1255 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1204 stat_width = op->arch->tail_x; 1256 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1205 } 1257 }
1206 } 1258 }
1207 1259
1208 if (op->msg && op->msg[0] == '@') 1260 if (op->msg && op->msg[0] == '@')
1209 flags |= 1; 1261 flags |= 1;
1210 1262
1211 if (op->type == PLAYER && op != pl) 1263 if (op->type == PLAYER && op != ob)
1212 player = op->count; 1264 player = op->count;
1213 } 1265 }
1214 1266
1215 if (lastcell.stat_hp != stat_hp) 1267 if (lastcell.stat_hp != stat_hp)
1216 { 1268 {
… …
1260 1312
1261 /* Middle face */ 1313 /* Middle face */
1262 if (update_space (sl, socket, ms, lastcell, 1)) 1314 if (update_space (sl, socket, ms, lastcell, 1))
1263 mask |= 0x2; 1315 mask |= 0x2;
1264 1316
1265 if (ms.player () == pl 1317 if (ms.player () == ob
1266 && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) 1318 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1267 { 1319 {
1268 // force player to be visible to himself if invisible 1320 // force player to be visible to himself if invisible
1269 if (lastcell.faces[0] != pl->face) 1321 if (lastcell.faces[0] != ob->face)
1270 { 1322 {
1271 lastcell.faces[0] = pl->face; 1323 lastcell.faces[0] = ob->face;
1272 1324
1273 mask |= 0x1; 1325 mask |= 0x1;
1274 sl << uint16 (pl->face); 1326 sl << uint16 (ob->face);
1275 1327
1276 socket.send_faces (pl); 1328 socket.send_faces (ob);
1277 } 1329 }
1278 } 1330 }
1279 /* Top face */ 1331 /* Top face */
1280 else if (update_space (sl, socket, ms, lastcell, 0)) 1332 else if (update_space (sl, socket, ms, lastcell, 0))
1281 mask |= 0x1; 1333 mask |= 0x1;
1282
1283 1334
1284 /* 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
1285 * space by checking the mask. If so, update the mask. 1336 * space by checking the mask. If so, update the mask.
1286 * 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
1287 * value, so we don't send those bits. 1338 * value, so we don't send those bits.
… …
1346 socket.send_packet (sl); 1397 socket.send_packet (sl);
1347 socket.sent_scroll = 0; 1398 socket.sent_scroll = 0;
1348 } 1399 }
1349} 1400}
1350 1401
1351/**
1352 * Draws client map.
1353 */
1354void
1355draw_client_map (object *pl)
1356{
1357 int i, j;
1358 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1359 int mflags;
1360 struct Map newmap;
1361 maptile *m, *pm;
1362
1363 if (pl->type != PLAYER)
1364 {
1365 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1366 return;
1367 }
1368
1369 pm = pl->map;
1370
1371 /* If player is just joining the game, he isn't here yet, so the map
1372 * can get swapped out. If so, don't try to send them a map. All will
1373 * be OK once they really log in.
1374 */
1375 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1376 return;
1377
1378 memset (&newmap, 0, sizeof (struct Map));
1379
1380 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1381 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1382 {
1383 ax = i;
1384 ay = j;
1385 m = pm;
1386 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1387
1388 if (mflags & P_OUT_OF_MAP)
1389 continue;
1390
1391 /* If a map is visible to the player, we don't want to swap it out
1392 * just to reload it. This should really call something like
1393 * swap_map, but this is much more efficient and 'good enough'
1394 */
1395 if (mflags & P_NEW_MAP)
1396 m->timeout = 50;
1397 }
1398
1399 /* do LOS after calls to update_position */
1400 if (pl->contr->do_los)
1401 {
1402 update_los (pl);
1403 pl->contr->do_los = 0;
1404 }
1405
1406 /* Big maps need a different drawing mechanism to work */
1407 draw_client_map1 (pl);
1408}
1409
1410
1411/*****************************************************************************/ 1402/*****************************************************************************/
1412
1413/* 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*/
1414
1415/* 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 */
1416
1417/* manage it ! */ 1405/* manage it ! */
1418
1419/*****************************************************************************/ 1406/*****************************************************************************/
1420void 1407void
1421send_plugin_custom_message (object *pl, char *buf) 1408send_plugin_custom_message (object *pl, char *buf)
1422{ 1409{
1423 pl->contr->ns->send_packet (buf); 1410 pl->contr->ns->send_packet (buf);
… …
1434 sl << "replyinfo skill_info\n"; 1421 sl << "replyinfo skill_info\n";
1435 1422
1436 for (int i = 1; i < NUM_SKILLS; i++) 1423 for (int i = 1; i < NUM_SKILLS; i++)
1437 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]);
1438 1425
1439 if (sl.length () >= MAXSOCKBUF) 1426 if (sl.length () > MAXSOCKBUF)
1440 { 1427 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1428 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442 fatal (0); 1429 fatal (0);
1443 } 1430 }
1444 1431
… …
1457 sl << "replyinfo spell_paths\n"; 1444 sl << "replyinfo spell_paths\n";
1458 1445
1459 for (int i = 0; i < NRSPELLPATHS; i++) 1446 for (int i = 0; i < NRSPELLPATHS; i++)
1460 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1447 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461 1448
1462 if (sl.length () >= MAXSOCKBUF) 1449 if (sl.length () > MAXSOCKBUF)
1463 { 1450 {
1464 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1451 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465 fatal (0); 1452 fatal (0);
1466 } 1453 }
1467 1454
… …
1575 if (!spell->face) 1562 if (!spell->face)
1576 { 1563 {
1577 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);
1578 spell->face = face_find ("burnout.x11", blank_face); 1565 spell->face = face_find ("burnout.x11", blank_face);
1579 } 1566 }
1567
1568 pl->ns->send_face (spell->face);
1580 1569
1581 /* send the current values */ 1570 /* send the current values */
1582 sl << uint32 (spell->count) 1571 sl << uint32 (spell->count)
1583 << uint16 (spell->level) 1572 << uint16 (spell->level)
1584 << uint16 (spell->casting_time) 1573 << uint16 (spell->casting_time)
… …
1620 * 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
1621 * 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,
1622 * 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,
1623 * 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
1624 */ 1613 */
1614 if (spell->type != SPELL)
1615 continue;
1616
1625 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1617 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1626 * 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
1627 * 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
1628 * like it will fix this 1620 * like it will fix this
1629 */ 1621 */
1630 if (spell->type != SPELL)
1631 continue;
1632
1633 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))))
1634 { 1623 {
1624 pl->ns->flush_fx ();
1635 pl->ns->send_packet (sl); 1625 pl->ns->send_packet (sl);
1636 1626
1637 sl.reset (); 1627 sl.reset ();
1638 sl << "addspell "; 1628 sl << "addspell ";
1639 } 1629 }
… …
1647 return; 1637 return;
1648 } 1638 }
1649 else 1639 else
1650 append_spell (pl, sl, spell); 1640 append_spell (pl, sl, spell);
1651 1641
1652 if (sl.length () >= MAXSOCKBUF) 1642 if (sl.length () > MAXSOCKBUF)
1653 { 1643 {
1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1644 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1655 fatal (0); 1645 fatal (0);
1656 } 1646 }
1657 1647
1658 /* finally, we can send the packet */ 1648 /* finally, we can send the packet */
1649 pl->ns->flush_fx ();
1659 pl->ns->send_packet (sl); 1650 pl->ns->send_packet (sl);
1660} 1651}
1661 1652

Diff Legend

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