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.57 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07:43 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;
… …
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
… …
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
… …
1010esrv_update_stats (player *pl) 1002esrv_update_stats (player *pl)
1011{ 1003{
1012 char buf[MAX_BUF]; 1004 char buf[MAX_BUF];
1013 uint16 flags; 1005 uint16 flags;
1014 1006
1007 client *ns = pl->ns;
1015 if (!pl->ns) 1008 if (!ns)
1016 return; 1009 return;
1017 1010
1011 object *ob = pl->ob;
1012 if (!ob)
1013 return;
1014
1018 packet sl ("stats"); 1015 packet sl ("stats");
1019 1016
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1019 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1020 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1021 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1022 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1023 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1024 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1025 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1026 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 1030
1037 for (int s = 0; s < NUM_SKILLS; s++) 1031 for (int s = 0; s < NUM_SKILLS; s++)
1038 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])
1039 { 1034 {
1035 ns->last_skill_exp [s] = skill->stats.exp;
1036
1040 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1042 */ 1039 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 1043 }
1049 1044
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 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);
1058 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
1059 flags = 0; 1055 flags = 0;
1060 1056
1061 if (pl->fire_on) 1057 if (pl->fire_on)
1062 flags |= SF_FIREON; 1058 flags |= SF_FIREON;
1063 1059
1064 if (pl->run_on) 1060 if (pl->run_on)
1065 flags |= SF_RUNON; 1061 flags |= SF_RUNON;
1066 1062
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 1064
1069 if (pl->ns->sc_version < 1025) 1065 if (ns->sc_version < 1025)
1070 { 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) }
1071 else 1067 else
1072 for (int i = 0; i < NROFATTACKS; i++) 1068 for (int i = 0; i < NROFATTACKS; i++)
1073 { 1069 {
1074 /* Skip ones we won't send */ 1070 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 1071 if (atnr_cs_stat[i] == -1)
1076 continue; 1072 continue;
1077 1073
1078 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]);
1079 } 1075 }
1080 1076
1081 if (pl->ns->monitor_spells) 1077 if (pl->ns->monitor_spells)
1082 { 1078 {
1083 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);
1084 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);
1085 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);
1086 } 1082 }
1087 1083
1088 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 */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 1086 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 1088
1093 /* Only send it away if we have some actual data */ 1089 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 1090 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 1091 ns->send_packet (sl);
1096} 1092}
1097 1093
1098/** 1094/**
1099 * 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.
1100 */ 1096 */
1101void 1097void
1102esrv_new_player (player *pl, uint32 weight) 1098esrv_new_player (player *pl, uint32 weight)
1103{ 1099{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 1100 packet sl ("player");
1107 1101
1108 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 1103 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1111 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1112 1106
1107 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 1110}
1116 1111
1117/** 1112/**
… …
1160 * 1155 *
1161 * Start of map related commands. 1156 * Start of map related commands.
1162 * 1157 *
1163 ******************************************************************************/ 1158 ******************************************************************************/
1164 1159
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 1160/** Clears a map cell */
1188static void 1161static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1190{ 1163{
1191 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1194 cell->count = count; 1167 cell->count = count;
1195 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1196 cell->flags = 0; 1169 cell->flags = 0;
1197 cell->player = 0; 1170 cell->player = 0;
1198} 1171}
1199 1172
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 1174
1257/** 1175/**
1258 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1259 * 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
1260 * it was. 1178 * it was.
… …
1274 * actually match. 1192 * actually match.
1275 */ 1193 */
1276static int 1194static int
1277update_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)
1278{ 1196{
1279 object *ob, *head;
1280 uint16 face_num; 1197 uint16 face_num;
1281 int bx, by, i; 1198 int bx, by, i;
1282 1199
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 1201
1323 /* 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
1324 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1325 * 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
1326 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1328 */ 1207 */
1329 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1330 face_num = 0; 1209 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else 1210 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* 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,
1431 * so nothing special 1212 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */ 1213 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0; 1214 face_num = ob->face;
1462 1215
1463 /* 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
1464 * 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.
1465 */ 1218 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1493 * holds the old values. 1246 * holds the old values.
1494 * 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
1495 * 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
1496 * take. 1249 * take.
1497 */ 1250 */
1498
1499static inline int 1251static inline int
1500update_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)
1501{ 1253{
1502 object *ob; 1254 object *ob;
1503 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1510 if (!ob || ob->face == blank_face) 1262 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0; 1263 smoothlevel = 0;
1512 else 1264 else
1513 { 1265 {
1514 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1517 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1518 1270
1519 /* 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
1520 * 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.
1521 */ 1273 */
… …
1550 if (ns->EMI_smooth) 1302 if (ns->EMI_smooth)
1551 result += 1; /*One byte for smoothlevel */ 1303 result += 1; /*One byte for smoothlevel */
1552 } 1304 }
1553 1305
1554 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);
1555} 1329}
1556 1330
1557/** 1331/**
1558 * 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
1559 * 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
… …
1577 * look like. 1351 * look like.
1578 */ 1352 */
1579void 1353void
1580draw_client_map1 (object *pl) 1354draw_client_map1 (object *pl)
1581{ 1355{
1582 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1356 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583 sint16 nx, ny; 1357 sint16 nx, ny;
1584 int estartlen, eoldlen; 1358 int estartlen, eoldlen;
1585 uint16 mask, emask;
1586 uint8 eentrysize; 1359 uint8 eentrysize;
1587 uint16 ewhatstart, ewhatflag; 1360 uint16 ewhatstart, ewhatflag;
1588 uint8 extendedinfos; 1361 uint8 extendedinfos;
1589 maptile *m; 1362 maptile *m;
1590 1363
1591 client &socket = *pl->contr->ns; 1364 client &socket = *pl->contr->ns;
1592 1365
1366 if (!pl->active)
1367 return;
1368
1593 check_map_change (pl->contr); 1369 check_map_change (pl->contr);
1370 prefetch_surrounding_maps (pl);
1594 1371
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1372 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1373 packet esl;
1597 1374
1598 startlen = sl.length (); 1375 startlen = sl.length ();
… …
1621 ewhatstart = 0; 1398 ewhatstart = 0;
1622 ewhatflag = 0; 1399 ewhatflag = 0;
1623 estartlen = 0; 1400 estartlen = 0;
1624 } 1401 }
1625 1402
1626 /* Init data to zero */
1627 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628
1629 /* x,y are the real map locations. ax, ay are viewport relative 1403 /* x,y are the real map locations. ax, ay are viewport relative
1630 * locations. 1404 * locations.
1631 */ 1405 */
1632 ay = 0; 1406 ay = 0;
1633 1407
… …
1635 * but that started to get a bit messy to look at. 1409 * but that started to get a bit messy to look at.
1636 */ 1410 */
1637 max_x = pl->x + (socket.mapx + 1) / 2; 1411 max_x = pl->x + (socket.mapx + 1) / 2;
1638 max_y = pl->y + (socket.mapy + 1) / 2; 1412 max_y = pl->y + (socket.mapy + 1) / 2;
1639 1413
1640 if (socket.mapmode == Map1aCmd)
1641 {
1642 max_x += MAX_HEAD_OFFSET;
1643 max_y += MAX_HEAD_OFFSET;
1644 }
1645
1646 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1414 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1647 { 1415 {
1648 ax = 0; 1416 ax = 0;
1649 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1417 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1650 { 1418 {
1419 int emask, mask;
1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652 1421
1653 /* If this space is out of the normal viewable area, we only check
1654 * the heads value ax or ay will only be greater than what
1655 * the client wants if using the map1a command - this is because
1656 * if the map1a command is not used, max_x and max_y will be
1657 * set to lower values.
1658 */
1659 if (ax >= socket.mapx || ay >= socket.mapy)
1660 {
1661 int i, got_one;
1662
1663 oldlen = sl.length ();
1664
1665 sl << uint16 (mask);
1666
1667 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671 /* If all we are doing is sending 0 (blank) faces, we don't
1672 * actually need to send that - just the coordinates
1673 * with no faces tells the client to blank out the
1674 * space.
1675 */
1676 got_one = 0;
1677 for (i = oldlen + 2; i < sl.length (); i++)
1678 if (sl[i])
1679 got_one = 1;
1680
1681 if (got_one && (mask & 0xf))
1682 sl[oldlen + 1] = mask & 0xff;
1683 else
1684 { /*either all faces blank, either no face at all */
1685 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686 sl.reset (oldlen + 2);
1687 else
1688 sl.reset (oldlen);
1689 }
1690
1691 /*What concerns extendinfos, nothing to be done for now
1692 * (perhaps effects layer later)
1693 */
1694 continue; /* don't do processing below */
1695 }
1696
1697 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698
1699 d = pl->contr->blocked_los[ax][ay];
1700 1423
1701 /* If the coordinates are not valid, or it is too dark to see, 1424 /* If the coordinates are not valid, or it is too dark to see,
1702 * we tell the client as such 1425 * we tell the client as such
1703 */ 1426 */
1704 nx = x; 1427 nx = x;
… …
1712 * of the map, it shouldn't have a head 1435 * of the map, it shouldn't have a head
1713 */ 1436 */
1714 if (lastcell.count != -1) 1437 if (lastcell.count != -1)
1715 { 1438 {
1716 sl << uint16 (mask); 1439 sl << uint16 (mask);
1717 map_clearcell (&lastcell, 0, 0, 0, -1); 1440 map_clearcell (&lastcell, -1);
1718 } 1441 }
1442
1443 continue;
1719 } 1444 }
1445
1446 m->touch ();
1447
1448 int d = pl->contr->blocked_los[ax][ay];
1449
1720 else if (d > 3) 1450 if (d > 3)
1721 { 1451 {
1722 m->touch ();
1723 1452
1724 int need_send = 0, count; 1453 int need_send = 0, count;
1725 1454
1726 /* This block deals with spaces that are not visible for whatever 1455 /* This block deals with spaces that are not visible for whatever
1727 * reason. Still may need to send the head for this space. 1456 * reason. Still may need to send the head for this space.
1728 */ 1457 */
1729 1458
1730 oldlen = sl.length (); 1459 oldlen = sl.length ();
1731 1460
1732 sl << uint16 (mask); 1461 sl << uint16 (mask);
… …
1734 if (lastcell.count != -1) 1463 if (lastcell.count != -1)
1735 need_send = 1; 1464 need_send = 1;
1736 1465
1737 count = -1; 1466 count = -1;
1738 1467
1739 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740 {
1741 /* Now check to see if any heads need to be sent */
1742
1743 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747 lastcell.count = count;
1748 }
1749 else
1750 {
1751 /* properly clear a previously sent big face */ 1468 /* properly clear a previously sent big face */
1752 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1469 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1753 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1470 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1754 need_send = 1; 1471 need_send = 1;
1755 1472
1756 map_clearcell (&lastcell, 0, 0, 0, count); 1473 map_clearcell (&lastcell, count);
1757 }
1758 1474
1759 if ((mask & 0xf) || need_send) 1475 if ((mask & 0xf) || need_send)
1760 sl[oldlen + 1] = mask & 0xff; 1476 sl[oldlen + 1] = mask & 0xff;
1761 else 1477 else
1762 sl.reset (oldlen); 1478 sl.reset (oldlen);
1763 } 1479 }
1764 else 1480 else
1765 { 1481 {
1766 m->touch ();
1767
1768 /* In this block, the space is visible or there are head objects 1482 /* In this block, the space is visible.
1769 * we need to send.
1770 */ 1483 */
1771 1484
1772 /* Rather than try to figure out what everything that we might 1485 /* Rather than try to figure out what everything that we might
1773 * need to send is, then form the packet after that, 1486 * need to send is, then form the packet after that,
1774 * we presume that we will in fact form a packet, and update 1487 * we presume that we will in fact form a packet, and update
… …
1777 * is done. 1490 * is done.
1778 * I think this is simpler than doing a bunch of checks to see 1491 * I think this is simpler than doing a bunch of checks to see
1779 * what if anything we need to send, setting the bits, then 1492 * what if anything we need to send, setting the bits, then
1780 * doing those checks again to add the real data. 1493 * doing those checks again to add the real data.
1781 */ 1494 */
1782 oldlen = sl.length (); 1495 oldlen = sl.length ();
1783 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1784 eoldlen = esl.length (); 1496 eoldlen = esl.length ();
1785 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1497
1786 sl << uint16 (mask); 1498 sl << uint16 (mask);
1787 1499
1788 if (socket.ext_mapinfos) 1500 if (socket.ext_mapinfos)
1789 esl << uint16 (emask); 1501 esl << uint16 (emask);
1790 1502
… …
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1607 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1896 emask |= 0x2; 1608 emask |= 0x2;
1897 1609
1898 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1610 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899 { 1611 {
1900 if (lastcell.faces[0] != pl->face->number) 1612 if (lastcell.faces[0] != pl->face)
1901 { 1613 {
1902 lastcell.faces[0] = pl->face->number; 1614 lastcell.faces[0] = pl->face;
1903 mask |= 0x1; 1615 mask |= 0x1;
1904 1616
1905 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1617 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1906 esrv_send_face (&socket, pl->face->number, 0); 1618 esrv_send_face (&socket, pl->face, 0);
1907 1619
1908 sl << uint16 (pl->face->number); 1620 sl << uint16 (pl->face);
1909 } 1621 }
1910 } 1622 }
1911 else 1623 else
1912 { 1624 {
1913 /* Top face */ 1625 /* Top face */
… …
1943 if (!(sl.length () > startlen || socket.sent_scroll)) 1655 if (!(sl.length () > startlen || socket.sent_scroll))
1944 { 1656 {
1945 /* No map data will follow, so don't say the client 1657 /* No map data will follow, so don't say the client
1946 * it doesn't need draw! 1658 * it doesn't need draw!
1947 */ 1659 */
1948 ewhatflag &= (~EMI_NOREDRAW); 1660 ewhatflag &= ~EMI_NOREDRAW;
1949 esl[ewhatstart + 1] = ewhatflag & 0xff; 1661 esl[ewhatstart + 1] = ewhatflag & 0xff;
1950 } 1662 }
1951 1663
1952 if (esl.length () > estartlen) 1664 if (esl.length () > estartlen)
1953 socket.send_packet (esl); 1665 socket.send_packet (esl);
… …
1965 */ 1677 */
1966void 1678void
1967draw_client_map (object *pl) 1679draw_client_map (object *pl)
1968{ 1680{
1969 int i, j; 1681 int i, j;
1970 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1682 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1971 New_Face *face, *floor;
1972 New_Face *floor2;
1973 int d, mflags; 1683 int mflags;
1974 struct Map newmap; 1684 struct Map newmap;
1975 maptile *m, *pm; 1685 maptile *m, *pm;
1976 1686
1977 if (pl->type != PLAYER) 1687 if (pl->type != PLAYER)
1978 { 1688 {
… …
2159 1869
2160/* appends the spell *spell to the Socklist we will send the data to. */ 1870/* appends the spell *spell to the Socklist we will send the data to. */
2161static void 1871static void
2162append_spell (player *pl, packet &sl, object *spell) 1872append_spell (player *pl, packet &sl, object *spell)
2163{ 1873{
2164 int len, i, skill = 0; 1874 int i, skill = 0;
2165 1875
2166 if (!(spell->name)) 1876 if (!(spell->name))
2167 { 1877 {
2168 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1878 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169 return; 1879 return;
… …
2181 if (!strcmp (spell->skill, skill_names[i])) 1891 if (!strcmp (spell->skill, skill_names[i]))
2182 { 1892 {
2183 skill = i + CS_STAT_SKILLINFO; 1893 skill = i + CS_STAT_SKILLINFO;
2184 break; 1894 break;
2185 } 1895 }
1896 }
1897
1898 // spells better have a face
1899 if (!spell->face)
1900 {
1901 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1902 spell->face = face_find ("burnout.x11", blank_face);
2186 } 1903 }
2187 1904
2188 /* send the current values */ 1905 /* send the current values */
2189 sl << uint32 (spell->count) 1906 sl << uint32 (spell->count)
2190 << uint16 (spell->level) 1907 << uint16 (spell->level)
… …
2192 << uint16 (spell->last_sp) 1909 << uint16 (spell->last_sp)
2193 << uint16 (spell->last_grace) 1910 << uint16 (spell->last_grace)
2194 << uint16 (spell->last_eat) 1911 << uint16 (spell->last_eat)
2195 << uint8 (skill) 1912 << uint8 (skill)
2196 << uint32 (spell->path_attuned) 1913 << uint32 (spell->path_attuned)
2197 << uint32 (spell->face ? spell->face->number : 0) 1914 << uint32 (spell->face)
2198 << data8 (spell->name) 1915 << data8 (spell->name)
2199 << data16 (spell->msg); 1916 << data16 (spell->msg);
2200} 1917}
2201 1918
2202/** 1919/**
… …
2217 1934
2218 packet sl ("addspell"); 1935 packet sl ("addspell");
2219 1936
2220 if (!spell) 1937 if (!spell)
2221 { 1938 {
2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1939 for (spell = pl->ob->inv; spell; spell = spell->below)
2223 { 1940 {
2224 /* were we to simply keep appending data here, we could exceed 1941 /* were we to simply keep appending data here, we could exceed
2225 * MAXSOCKBUF if the player has enough spells to add, we know that 1942 * MAXSOCKBUF if the player has enough spells to add, we know that
2226 * append_spells will always append 19 data bytes, plus 4 length 1943 * append_spells will always append 19 data bytes, plus 4 length
2227 * bytes and 3 strings (because that is the spec) so we need to 1944 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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