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

Diff Legend

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