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.52 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 41 */
44 42
45#include <global.h> 43#include <global.h>
46#include <sproto.h> 44#include <sproto.h>
47 45
… …
100 * that much difference in bandwidth. 98 * that much difference in bandwidth.
101 */ 99 */
102 mx = ns->mapx; 100 mx = ns->mapx;
103 my = ns->mapy; 101 my = ns->mapy;
104 102
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
112 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
113 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
115 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
… …
146 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
147 139
148 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
149} 141}
150 142
151/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
152static void 144static void
153check_map_change (player *pl) 145check_map_change (player *pl)
154{ 146{
155 client &socket = *pl->ns; 147 client &socket = *pl->ns;
156 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
176 flags |= 4; 168 flags |= 4;
177 if (ob->map->tile_path[3]) 169 if (ob->map->tile_path[3])
178 flags |= 8; 170 flags |= 8;
179 171
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 172 snprintf (buf, MAX_BUF, "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); 173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 174 }
183 else 175 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 176 snprintf (buf, MAX_BUF, "mapinfo current");
185 177
186 socket.send_packet (buf); 178 socket.send_packet (buf);
… …
200 } 192 }
201 } 193 }
202 194
203 socket.current_x = ob->x; 195 socket.current_x = ob->x;
204 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
205} 204}
206 205
207/** 206/**
208 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
290 { 289 {
291 int dir = *buf++; 290 int dir = *buf++;
292 291
293 switch (dir) 292 switch (dir)
294 { 293 {
295 case '1': 294 case '1':
296 dx = 0; 295 dx = 0;
297 dy = -1; 296 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 297 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 298 map && (mapy -= map->height);
300 break; 299 break;
301 case '2': 300 case '2':
302 mapx += map->width; 301 mapx += map->width;
303 dx = map->width; 302 dx = map->width;
304 dy = 0; 303 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
306 break; 305 break;
307 case '3': 306 case '3':
308 mapy += map->height; 307 mapy += map->height;
309 dx = 0; 308 dx = 0;
310 dy = map->height; 309 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
312 break; 311 break;
313 case '4': 312 case '4':
314 dx = -1; 313 dx = -1;
315 dy = 0; 314 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 315 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 316 map && (mapx -= map->width);
318 break; 317 break;
319 } 318 }
320 319
321 --max_distance; 320 --max_distance;
322 } 321 }
323 322
… …
334 if (map->tile_path[2]) 333 if (map->tile_path[2])
335 flags |= 4; 334 flags |= 4;
336 if (map->tile_path[3]) 335 if (map->tile_path[3])
337 flags |= 8; 336 flags |= 8;
338 337
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 339 }
341 else 340 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 342 }
344 else 343 else
… …
432 } 431 }
433 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
434 { 433 {
435 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 } 436 }
441 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
442 { 438 {
443 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
500 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
501 { 497 {
502 y = atoi (cp + 1); 498 y = atoi (cp + 1);
503 break; 499 break;
504 } 500 }
501
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 { 503 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 } 506 }
… …
700 uint16 smoothface; 697 uint16 smoothface;
701 698
702 /* If we can't find a face, return and set it so we won't try to send this 699 /* If we can't find a face, return and set it so we won't try to send this
703 * again. 700 * again.
704 */ 701 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
706 { 703 {
707 704
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 705 LOG (llevError, "could not findsmooth for %d.\n", face);
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return; 707 return;
711 } 708 }
712 709
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
721 << uint16 (smoothface); 718 << uint16 (smoothface);
722 719
723 ns->send_packet (sl); 720 ns->send_packet (sl);
724} 721}
725 722
726 /** 723/**
727 * Tells client the picture it has to use 724 * Tells client the picture it has to use
728 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
729 */ 726 */
730void 727void
731AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
732{ 729{
733 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
734} 731}
… …
797 * commands. 794 * commands.
798 */ 795 */
799 pl->count = 0; 796 pl->count = 0;
800 797
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 798 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 799 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 800 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 801 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 802
806 /* Send confirmation of command execution now */ 803 /* Send confirmation of command execution now */
807 packet sl ("comc"); 804 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 805 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 806 pl->ns->send_packet (sl);
… …
845 842
846 case ST_CHANGE_CLASS: 843 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 844 key_change_class (pl->ob, buf[0]);
848 break; 845 break;
849 846
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 847 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 848 receive_party_password (pl->ob, 13);
856 break; 849 break;
857 850
858 default: 851 default:
… …
879 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
881 874
882 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
883 876
884
885 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
886 878
887 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 880 // unchecked;
889 881
… …
914{ 906{
915 ns->sound = atoi (buf); 907 ns->sound = atoi (buf);
916} 908}
917 909
918/** client wants the map resent */ 910/** client wants the map resent */
919
920void 911void
921MapRedrawCmd (char *buf, int len, player *pl) 912MapRedrawCmd (char *buf, int len, player *pl)
922{ 913{
923/* This function is currently disabled; just clearing the map state results in 914/* This function is currently disabled; just clearing the map state results in
924 * display errors. It should clear the cache and send a newmap command. 915 * display errors. It should clear the cache and send a newmap command.
… …
1011esrv_update_stats (player *pl) 1002esrv_update_stats (player *pl)
1012{ 1003{
1013 char buf[MAX_BUF]; 1004 char buf[MAX_BUF];
1014 uint16 flags; 1005 uint16 flags;
1015 1006
1007 client *ns = pl->ns;
1008 if (!ns)
1009 return;
1010
1011 object *ob = pl->ob;
1012 if (!ob)
1013 return;
1014
1016 packet sl ("stats"); 1015 packet sl ("stats");
1017 1016
1018 if (pl->ob)
1019 {
1020 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1021 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1022 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1019 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1023 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1020 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1024 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1021 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1025 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1022 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1026 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1023 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1027 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1024 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1028 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1025 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1029 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1026 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1030 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1031 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1032 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1033 }
1034 1030
1035 for (int s = 0; s < NUM_SKILLS; s++) 1031 for (int s = 0; s < NUM_SKILLS; s++)
1036 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1032 if (object *skill = pl->last_skill_ob[s])
1033 if (skill->stats.exp != ns->last_skill_exp [s])
1037 { 1034 {
1035 ns->last_skill_exp [s] = skill->stats.exp;
1036
1038 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1039 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1040 */ 1039 */
1041 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1042 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (skill->level)
1043 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (skill->stats.exp);
1044
1045 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1046 } 1043 }
1047 1044
1048 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1049 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1050 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1051 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1052 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1053 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1054 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1055 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1052 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1056 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1053 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054
1057 flags = 0; 1055 flags = 0;
1058 1056
1059 if (pl->fire_on) 1057 if (pl->fire_on)
1060 flags |= SF_FIREON; 1058 flags |= SF_FIREON;
1061 1059
1062 if (pl->run_on) 1060 if (pl->run_on)
1063 flags |= SF_RUNON; 1061 flags |= SF_RUNON;
1064 1062
1065 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1066 1064
1067 if (pl->ns->sc_version < 1025) 1065 if (ns->sc_version < 1025)
1068 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1066 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1069 else 1067 else
1070 for (int i = 0; i < NROFATTACKS; i++) 1068 for (int i = 0; i < NROFATTACKS; i++)
1071 { 1069 {
1072 /* Skip ones we won't send */ 1070 /* Skip ones we won't send */
1073 if (atnr_cs_stat[i] == -1) 1071 if (atnr_cs_stat[i] == -1)
1074 continue; 1072 continue;
1075 1073
1076 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1074 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1077 } 1075 }
1078 1076
1079 if (pl->ns->monitor_spells) 1077 if (pl->ns->monitor_spells)
1080 { 1078 {
1081 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1079 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1082 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1080 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1083 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1081 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1084 } 1082 }
1085 1083
1086 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1084 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1087 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1088 set_title (pl->ob, buf); 1086 set_title (ob, buf);
1089 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1090 1088
1091 /* Only send it away if we have some actual data */ 1089 /* Only send it away if we have some actual data */
1092 if (sl.length () > 6) 1090 if (sl.length () > 6)
1093 pl->ns->send_packet (sl); 1091 ns->send_packet (sl);
1094} 1092}
1095 1093
1096/** 1094/**
1097 * Tells the client that here is a player it should start using. 1095 * Tells the client that here is a player it should start using.
1098 */ 1096 */
1099void 1097void
1100esrv_new_player (player *pl, uint32 weight) 1098esrv_new_player (player *pl, uint32 weight)
1101{ 1099{
1102 pl->last_weight = weight;
1103
1104 packet sl ("player"); 1100 packet sl ("player");
1105 1101
1106 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1107 << uint32 (weight) 1103 << uint32 (weight)
1108 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1109 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1110 1106
1107 pl->ns->last_weight = weight;
1111 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1112 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1113} 1110}
1114 1111
1115/** 1112/**
… …
1158 * 1155 *
1159 * Start of map related commands. 1156 * Start of map related commands.
1160 * 1157 *
1161 ******************************************************************************/ 1158 ******************************************************************************/
1162 1159
1163/**
1164 * This adds face_num to a map cell at x,y. If the client doesn't have
1165 * the face yet, we will also send it.
1166 */
1167static void
1168esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1169{
1170 if (newmap->cells[x][y].count >= MAP_LAYERS)
1171 {
1172 //TODO: one or the other, can't both have abort and return, verify and act
1173 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1174 return;
1175 abort ();
1176 }
1177
1178 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1179 newmap->cells[x][y].count++;
1180
1181 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1182 esrv_send_face (ns, face_num, 0);
1183}
1184
1185/** Clears a map cell */ 1160/** Clears a map cell */
1186static void 1161static void
1187map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1188{ 1163{
1189 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1190 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1191 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1192 cell->count = count; 1167 cell->count = count;
1193 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1194 cell->flags = 0; 1169 cell->flags = 0;
1195 cell->player = 0; 1170 cell->player = 0;
1196} 1171}
1197 1172
1198#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1199#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1200
1201/* Using a global really isn't a good approach, but saves the over head of
1202 * allocating and deallocating such a block of data each time run through,
1203 * and saves the space of allocating this in the socket object when we only
1204 * need it for this cycle. If the server is ever threaded, this needs to be
1205 * re-examined.
1206 */
1207static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1208
1209/**
1210 * Returns true if any of the heads for this
1211 * space is set. Returns false if all are blank - this is used
1212 * for empty space checking.
1213 */
1214static inline int
1215have_head (int ax, int ay)
1216{
1217 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1218 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1219 return 1;
1220
1221 return 0;
1222}
1223
1224/**
1225 * check_head is a bit simplistic version of update_space below.
1226 * basically, it only checks the that the head on space ax,ay at layer
1227 * needs to get sent - if so, it adds the data, sending the head
1228 * if needed, and returning 1. If this no data needs to get
1229 * sent, it returns zero.
1230 */
1231static int
1232check_head (packet &sl, client &ns, int ax, int ay, int layer)
1233{
1234 short face_num;
1235
1236 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1237 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1238 else
1239 face_num = 0;
1240
1241 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1242 {
1243 sl << uint16 (face_num);
1244 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1245 esrv_send_face (&ns, face_num, 0);
1246
1247 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1248 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1249 return 1;
1250 }
1251
1252 return 0; /* No change */
1253}
1254 1174
1255/** 1175/**
1256 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1257 * this returns true if this space is now in fact different than 1177 * this returns true if this space is now in fact different than
1258 * it was. 1178 * it was.
… …
1272 * actually match. 1192 * actually match.
1273 */ 1193 */
1274static int 1194static int
1275update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1276{ 1196{
1277 object *ob, *head;
1278 uint16 face_num; 1197 uint16 face_num;
1279 int bx, by, i; 1198 int bx, by, i;
1280 1199
1281 /* If there is a multipart object stored away, treat that as more important.
1282 * If not, then do the normal processing.
1283 */
1284 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1285
1286 /* Check to see if this head is part of the set of objects
1287 * we would normally send for this space. If so, then
1288 * don't use the head value. We need to do the check
1289 * here and not when setting up the heads[] value for two reasons -
1290 * 1) the heads[] values will get used even if the space is not visible.
1291 * 2) its possible the head is not on the same map as a part, and I'd
1292 * rather not need to do the map translation overhead.
1293 * 3) We need to do some extra checking to make sure that we will
1294 * otherwise send the image as this layer, eg, either it matches
1295 * the head value, or is not multipart.
1296 */
1297 if (head && !head->more)
1298 {
1299 for (i = 0; i < MAP_LAYERS; i++)
1300 {
1301 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1302 if (!ob)
1303 continue;
1304
1305 if (ob->head)
1306 ob = ob->head;
1307
1308 if (ob == head)
1309 {
1310 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1311 head = NULL;
1312 break;
1313 }
1314 }
1315 }
1316
1317 ob = head;
1318 if (!ob)
1319 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1320 1201
1321 /* If there is no object for this space, or if the face for the object 1202 /* If there is no object for this space, or if the face for the object
1322 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1323 * else if we have the stored head object for this space, that takes 1204 * else if we have the stored head object for this space, that takes
1324 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1325 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1326 */ 1207 */
1327 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1328 face_num = 0; 1209 face_num = 0;
1329 else if (head)
1330 {
1331 /* if this is a head that had previously been stored */
1332 face_num = ob->face->number;
1333 }
1334 else 1210 else
1335 {
1336 /* if the faces for the different parts of a multipart object
1337 * are the same, we only want to send the bottom right most
1338 * portion of the object. That info is in the tail_.. values
1339 * of the head. Note that for the head itself, ob->head will
1340 * be null, so we only do this block if we are working on
1341 * a tail piece.
1342 */
1343
1344 /* tail_x and tail_y will only be set in the head object. If
1345 * this is the head object and these are set, we proceed
1346 * with logic to only send bottom right. Similarly, if
1347 * this is one of the more parts but the head has those values
1348 * set, we want to do the processing. There can be cases where
1349 * the head is not visible but one of its parts is, so we just
1350 * can always expect that ob->arch->tail_x will be true for all
1351 * object we may want to display.
1352 */
1353 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1354 {
1355
1356 if (ob->head)
1357 head = ob->head;
1358 else
1359 head = ob;
1360
1361 /* Basically figure out where the offset is from where we are right
1362 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1363 * piece is from the head, and the tail is where the tail is from the
1364 * head. Note that bx and by will equal sx and sy if we are already working
1365 * on the bottom right corner. If ob is the head, the clone values
1366 * will be zero, so the right thing will still happen.
1367 */
1368 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1369 by = sy + head->arch->tail_y - ob->arch->clone.y;
1370
1371 /* I don't think this can ever happen, but better to check for it just
1372 * in case.
1373 */
1374 if (bx < sx || by < sy)
1375 {
1376 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1377 face_num = 0;
1378 }
1379 /* single part object, multipart object with non merged faces,
1380 * of multipart object already at lower right.
1381 */
1382 else if (bx == sx && by == sy)
1383 {
1384 face_num = ob->face->number;
1385
1386 /* if this face matches one stored away, clear that one away.
1387 * this code relies on the fact that the map1 commands
1388 * goes from 2 down to 0.
1389 */
1390 for (i = 0; i < MAP_LAYERS; i++)
1391 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1393 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1394 }
1395 else
1396 {
1397 /* If this head is stored away, clear it - otherwise,
1398 * there can be cases where a object is on multiple layers -
1399 * we only want to send it once.
1400 */
1401 face_num = head->face->number;
1402 for (i = 0; i < MAP_LAYERS; i++)
1403 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1405 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1406
1407 /* First, try to put the new head on the same layer. If that is used up,
1408 * then find another layer.
1409 */
1410 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1411 {
1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1413 }
1414 else
1415 for (i = 0; i < MAX_LAYERS; i++)
1416 {
1417 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1418 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1419 {
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1421 }
1422 }
1423 face_num = 0; /* Don't send this object - we'll send the head later */
1424 }
1425 }
1426 else
1427 {
1428 /* In this case, we are already at the lower right or single part object, 1211 /* In this case, we are already at the lower right or single part object,
1429 * so nothing special 1212 * so nothing special
1430 */
1431 face_num = ob->face->number;
1432
1433 /* clear out any head entries that have the same face as this one */
1434 for (bx = 0; bx < layer; bx++)
1435 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1436 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1437 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1438 }
1439 } /* else not already head object or blank face */
1440
1441 /* This is a real hack. Basically, if we have nothing to send for this layer,
1442 * but there is a head on the next layer, send that instead.
1443 * Without this, what happens is you can get the case where the player stands
1444 * on the same space as the head. However, if you have overlapping big objects
1445 * of the same type, what happens then is it doesn't think it needs to send
1446 * This tends to make stacking also work/look better.
1447 */ 1213 */
1448 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1449 {
1450 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1451 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1452 }
1453
1454 /* Another hack - because of heads and whatnot, this face may match one
1455 * we already sent for a lower layer. In that case, don't send
1456 * this one.
1457 */
1458 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1459 face_num = 0; 1214 face_num = ob->face;
1460 1215
1461 /* We've gotten what face we want to use for the object. Now see if 1216 /* We've gotten what face we want to use for the object. Now see if
1462 * if it has changed since we last sent it to the client. 1217 * if it has changed since we last sent it to the client.
1463 */ 1218 */
1464 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1491 * holds the old values. 1246 * holds the old values.
1492 * layer is the layer to update, with 2 being the floor and 0 the 1247 * layer is the layer to update, with 2 being the floor and 0 the
1493 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1494 * take. 1249 * take.
1495 */ 1250 */
1496
1497static inline int 1251static inline int
1498update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1499{ 1253{
1500 object *ob; 1254 object *ob;
1501 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1503 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1504 1258
1505 /* If there is no object for this space, or if the face for the object 1259 /* If there is no object for this space, or if the face for the object
1506 * is the blank face, set the smoothlevel to zero. 1260 * is the blank face, set the smoothlevel to zero.
1507 */ 1261 */
1508 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1262 if (!ob || ob->face == blank_face)
1509 smoothlevel = 0; 1263 smoothlevel = 0;
1510 else 1264 else
1511 { 1265 {
1512 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1513 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1514 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1515 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1516 1270
1517 /* We've gotten what face we want to use for the object. Now see if 1271 /* We've gotten what face we want to use for the object. Now see if
1518 * if it has changed since we last sent it to the client. 1272 * if it has changed since we last sent it to the client.
1519 */ 1273 */
… …
1548 if (ns->EMI_smooth) 1302 if (ns->EMI_smooth)
1549 result += 1; /*One byte for smoothlevel */ 1303 result += 1; /*One byte for smoothlevel */
1550 } 1304 }
1551 1305
1552 return result; 1306 return result;
1307}
1308
1309// prefetch (and touch) all maps within a specific distancd
1310static void
1311prefetch_surrounding_maps (maptile *map, int distance)
1312{
1313 map->last_access = runtime;
1314
1315 if (--distance)
1316 for (int dir = 4; --dir; )
1317 if (const shstr &path = map->tile_path [dir])
1318 if (maptile *&neigh = map->tile_map [dir])
1319 prefetch_surrounding_maps (neigh, distance);
1320 else
1321 neigh = maptile::find_async (path, map);
1322}
1323
1324// prefetch a generous area around the player
1325static void
1326prefetch_surrounding_maps (object *op)
1327{
1328 prefetch_surrounding_maps (op->map, 3);
1553} 1329}
1554 1330
1555/** 1331/**
1556 * This function uses the new map1 protocol command to send the map 1332 * This function uses the new map1 protocol command to send the map
1557 * to the client. It is necessary because the old map command supports 1333 * to the client. It is necessary because the old map command supports
… …
1586 uint8 extendedinfos; 1362 uint8 extendedinfos;
1587 maptile *m; 1363 maptile *m;
1588 1364
1589 client &socket = *pl->contr->ns; 1365 client &socket = *pl->contr->ns;
1590 1366
1367 if (!pl->active)
1368 return;
1369
1591 check_map_change (pl->contr); 1370 check_map_change (pl->contr);
1371 prefetch_surrounding_maps (pl);
1592 1372
1593 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1373 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1594 packet esl; 1374 packet esl;
1595 1375
1596 startlen = sl.length (); 1376 startlen = sl.length ();
… …
1619 ewhatstart = 0; 1399 ewhatstart = 0;
1620 ewhatflag = 0; 1400 ewhatflag = 0;
1621 estartlen = 0; 1401 estartlen = 0;
1622 } 1402 }
1623 1403
1624 /* Init data to zero */
1625 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1626
1627 /* x,y are the real map locations. ax, ay are viewport relative 1404 /* x,y are the real map locations. ax, ay are viewport relative
1628 * locations. 1405 * locations.
1629 */ 1406 */
1630 ay = 0; 1407 ay = 0;
1631 1408
… …
1633 * but that started to get a bit messy to look at. 1410 * but that started to get a bit messy to look at.
1634 */ 1411 */
1635 max_x = pl->x + (socket.mapx + 1) / 2; 1412 max_x = pl->x + (socket.mapx + 1) / 2;
1636 max_y = pl->y + (socket.mapy + 1) / 2; 1413 max_y = pl->y + (socket.mapy + 1) / 2;
1637 1414
1638 if (socket.mapmode == Map1aCmd)
1639 {
1640 max_x += MAX_HEAD_OFFSET;
1641 max_y += MAX_HEAD_OFFSET;
1642 }
1643
1644 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1645 { 1416 {
1646 ax = 0; 1417 ax = 0;
1647 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1418 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1648 { 1419 {
1649 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1650
1651 /* If this space is out of the normal viewable area, we only check
1652 * the heads value ax or ay will only be greater than what
1653 * the client wants if using the map1a command - this is because
1654 * if the map1a command is not used, max_x and max_y will be
1655 * set to lower values.
1656 */
1657 if (ax >= socket.mapx || ay >= socket.mapy)
1658 {
1659 int i, got_one;
1660
1661 oldlen = sl.length ();
1662
1663 sl << uint16 (mask);
1664
1665 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1666 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1667 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1668
1669 /* If all we are doing is sending 0 (blank) faces, we don't
1670 * actually need to send that - just the coordinates
1671 * with no faces tells the client to blank out the
1672 * space.
1673 */
1674 got_one = 0;
1675 for (i = oldlen + 2; i < sl.length (); i++)
1676 if (sl[i])
1677 got_one = 1;
1678
1679 if (got_one && (mask & 0xf))
1680 sl[oldlen + 1] = mask & 0xff;
1681 else
1682 { /*either all faces blank, either no face at all */
1683 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1684 sl.reset (oldlen + 2);
1685 else
1686 sl.reset (oldlen);
1687 }
1688
1689 /*What concerns extendinfos, nothing to be done for now
1690 * (perhaps effects layer later)
1691 */
1692 continue; /* don't do processing below */
1693 }
1694 1421
1695 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1696 1423
1697 d = pl->contr->blocked_los[ax][ay]; 1424 d = pl->contr->blocked_los[ax][ay];
1698 1425
… …
1710 * of the map, it shouldn't have a head 1437 * of the map, it shouldn't have a head
1711 */ 1438 */
1712 if (lastcell.count != -1) 1439 if (lastcell.count != -1)
1713 { 1440 {
1714 sl << uint16 (mask); 1441 sl << uint16 (mask);
1715 map_clearcell (&lastcell, 0, 0, 0, -1); 1442 map_clearcell (&lastcell, -1);
1716 } 1443 }
1717 } 1444 }
1718 else if (d > 3) 1445 else if (d > 3)
1719 { 1446 {
1447 m->touch ();
1448
1720 int need_send = 0, count; 1449 int need_send = 0, count;
1721 1450
1722 /* This block deals with spaces that are not visible for whatever 1451 /* This block deals with spaces that are not visible for whatever
1723 * reason. Still may need to send the head for this space. 1452 * reason. Still may need to send the head for this space.
1724 */ 1453 */
1725 1454
1726 oldlen = sl.length (); 1455 oldlen = sl.length ();
1727 1456
1728 sl << uint16 (mask); 1457 sl << uint16 (mask);
… …
1730 if (lastcell.count != -1) 1459 if (lastcell.count != -1)
1731 need_send = 1; 1460 need_send = 1;
1732 1461
1733 count = -1; 1462 count = -1;
1734 1463
1735 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1736 {
1737 /* Now check to see if any heads need to be sent */
1738
1739 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1740 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1741 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1742
1743 lastcell.count = count;
1744 }
1745 else
1746 {
1747 /* properly clear a previously sent big face */ 1464 /* properly clear a previously sent big face */
1748 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1465 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1749 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1466 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1750 need_send = 1; 1467 need_send = 1;
1751 1468
1752 map_clearcell (&lastcell, 0, 0, 0, count); 1469 map_clearcell (&lastcell, count);
1753 }
1754 1470
1755 if ((mask & 0xf) || need_send) 1471 if ((mask & 0xf) || need_send)
1756 sl[oldlen + 1] = mask & 0xff; 1472 sl[oldlen + 1] = mask & 0xff;
1757 else 1473 else
1758 sl.reset (oldlen); 1474 sl.reset (oldlen);
1759 } 1475 }
1760 else 1476 else
1761 { 1477 {
1478 m->touch ();
1479
1762 /* In this block, the space is visible or there are head objects 1480 /* In this block, the space is visible.
1763 * we need to send.
1764 */ 1481 */
1765 1482
1766 /* Rather than try to figure out what everything that we might 1483 /* Rather than try to figure out what everything that we might
1767 * need to send is, then form the packet after that, 1484 * need to send is, then form the packet after that,
1768 * we presume that we will in fact form a packet, and update 1485 * we presume that we will in fact form a packet, and update
… …
1889 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1890 emask |= 0x2; 1607 emask |= 0x2;
1891 1608
1892 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1609 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1893 { 1610 {
1894 if (lastcell.faces[0] != pl->face->number) 1611 if (lastcell.faces[0] != pl->face)
1895 { 1612 {
1896 lastcell.faces[0] = pl->face->number; 1613 lastcell.faces[0] = pl->face;
1897 mask |= 0x1; 1614 mask |= 0x1;
1898 1615
1899 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1900 esrv_send_face (&socket, pl->face->number, 0); 1617 esrv_send_face (&socket, pl->face, 0);
1901 1618
1902 sl << uint16 (pl->face->number); 1619 sl << uint16 (pl->face);
1903 } 1620 }
1904 } 1621 }
1905 else 1622 else
1906 { 1623 {
1907 /* Top face */ 1624 /* Top face */
… …
1959 */ 1676 */
1960void 1677void
1961draw_client_map (object *pl) 1678draw_client_map (object *pl)
1962{ 1679{
1963 int i, j; 1680 int i, j;
1964 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1681 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1965 New_Face *face, *floor;
1966 New_Face *floor2;
1967 int d, mflags; 1682 int mflags;
1968 struct Map newmap; 1683 struct Map newmap;
1969 maptile *m, *pm; 1684 maptile *m, *pm;
1970 1685
1971 if (pl->type != PLAYER) 1686 if (pl->type != PLAYER)
1972 { 1687 {
… …
2081 * it then sends an updspell packet for each spell that has changed in this way 1796 * it then sends an updspell packet for each spell that has changed in this way
2082 */ 1797 */
2083void 1798void
2084esrv_update_spells (player *pl) 1799esrv_update_spells (player *pl)
2085{ 1800{
1801 if (!pl->ns)
1802 return;
1803
2086 if (!pl->ns->monitor_spells) 1804 if (!pl->ns->monitor_spells)
2087 return; 1805 return;
2088 1806
2089 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1807 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2090 { 1808 {
… …
2150 1868
2151/* appends the spell *spell to the Socklist we will send the data to. */ 1869/* appends the spell *spell to the Socklist we will send the data to. */
2152static void 1870static void
2153append_spell (player *pl, packet &sl, object *spell) 1871append_spell (player *pl, packet &sl, object *spell)
2154{ 1872{
2155 int len, i, skill = 0; 1873 int i, skill = 0;
2156 1874
2157 if (!(spell->name)) 1875 if (!(spell->name))
2158 { 1876 {
2159 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1877 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2160 return; 1878 return;
… …
2172 if (!strcmp (spell->skill, skill_names[i])) 1890 if (!strcmp (spell->skill, skill_names[i]))
2173 { 1891 {
2174 skill = i + CS_STAT_SKILLINFO; 1892 skill = i + CS_STAT_SKILLINFO;
2175 break; 1893 break;
2176 } 1894 }
1895 }
1896
1897 // spells better have a face
1898 if (!spell->face)
1899 {
1900 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1901 spell->face = face_find ("burnout.x11", blank_face);
2177 } 1902 }
2178 1903
2179 /* send the current values */ 1904 /* send the current values */
2180 sl << uint32 (spell->count) 1905 sl << uint32 (spell->count)
2181 << uint16 (spell->level) 1906 << uint16 (spell->level)
… …
2183 << uint16 (spell->last_sp) 1908 << uint16 (spell->last_sp)
2184 << uint16 (spell->last_grace) 1909 << uint16 (spell->last_grace)
2185 << uint16 (spell->last_eat) 1910 << uint16 (spell->last_eat)
2186 << uint8 (skill) 1911 << uint8 (skill)
2187 << uint32 (spell->path_attuned) 1912 << uint32 (spell->path_attuned)
2188 << uint32 (spell->face ? spell->face->number : 0) 1913 << uint32 (spell->face)
2189 << data8 (spell->name) 1914 << data8 (spell->name)
2190 << data16 (spell->msg); 1915 << data16 (spell->msg);
2191} 1916}
2192 1917
2193/** 1918/**
… …
2208 1933
2209 packet sl ("addspell"); 1934 packet sl ("addspell");
2210 1935
2211 if (!spell) 1936 if (!spell)
2212 { 1937 {
2213 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1938 for (spell = pl->ob->inv; spell; spell = spell->below)
2214 { 1939 {
2215 /* were we to simply keep appending data here, we could exceed 1940 /* were we to simply keep appending data here, we could exceed
2216 * MAXSOCKBUF if the player has enough spells to add, we know that 1941 * MAXSOCKBUF if the player has enough spells to add, we know that
2217 * append_spells will always append 19 data bytes, plus 4 length 1942 * append_spells will always append 19 data bytes, plus 4 length
2218 * bytes and 3 strings (because that is the spec) so we need to 1943 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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