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.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.69 by root, Sun Mar 11 02:12:45 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
28 * 28 *
… …
36 * 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
37 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
38 * 38 *
39 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
40 * 40 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
48 45
… …
147 pl->ns->send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
148 145
149 pl->ns->floorbox_reset (); 146 pl->ns->floorbox_reset ();
150} 147}
151 148
152/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
153static void 150static void
154check_map_change (player *pl) 151check_map_change (player *pl)
155{ 152{
156 client &socket = *pl->ns; 153 client &socket = *pl->ns;
157 object *ob = pl->ob; 154 object *ob = pl->ob;
… …
201 } 198 }
202 } 199 }
203 200
204 socket.current_x = ob->x; 201 socket.current_x = ob->x;
205 socket.current_y = ob->y; 202 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
206} 210}
207 211
208/** 212/**
209 * RequestInfo is sort of a meta command. There is some specific 213 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 214 * request of information, but we call other functions to provide
… …
701 uint16 smoothface; 705 uint16 smoothface;
702 706
703 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
704 * again. 708 * again.
705 */ 709 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
707 { 711 {
708 712
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return; 715 return;
712 } 716 }
713 717
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
722 << uint16 (smoothface); 726 << uint16 (smoothface);
723 727
724 ns->send_packet (sl); 728 ns->send_packet (sl);
725} 729}
726 730
727 /** 731/**
728 * Tells client the picture it has to use 732 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
730 */ 734 */
731void 735void
732AskSmooth (char *buf, int len, client *ns) 736AskSmooth (char *buf, int len, client *ns)
733{ 737{
734 SendSmooth (ns, atoi (buf)); 738 SendSmooth (ns, atoi (buf));
735} 739}
… …
798 * commands. 802 * commands.
799 */ 803 */
800 pl->count = 0; 804 pl->count = 0;
801 805
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 807 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 808 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 810
807 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
808 packet sl ("comc"); 812 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 814 pl->ns->send_packet (sl);
… …
1007esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1008{ 1012{
1009 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1010 uint16 flags; 1014 uint16 flags;
1011 1015
1016 client *ns = pl->ns;
1012 if (!pl->ns) 1017 if (!ns)
1013 return; 1018 return;
1014 1019
1020 object *ob = pl->ob;
1021 if (!ob)
1022 return;
1023
1015 packet sl ("stats"); 1024 packet sl ("stats");
1016 1025
1017 if (pl->ob)
1018 {
1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1034 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1035 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1036 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1037 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032 }
1033 1039
1034 for (int s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1035 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1041 if (object *skill = pl->last_skill_ob[s])
1042 if (skill->stats.exp != ns->last_skill_exp [s])
1036 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1037 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1038 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1039 */ 1048 */
1040 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1041 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1042 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1043
1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045 } 1052 }
1046 1053
1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1053 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1061 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1055 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063
1056 flags = 0; 1064 flags = 0;
1057 1065
1058 if (pl->fire_on) 1066 if (pl->fire_on)
1059 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1060 1068
1061 if (pl->run_on) 1069 if (pl->run_on)
1062 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1063 1071
1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065 1073
1066 if (pl->ns->sc_version < 1025) 1074 if (ns->sc_version < 1025)
1067 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1075 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1068 else 1076 else
1069 for (int i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1070 { 1078 {
1071 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1072 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1073 continue; 1081 continue;
1074 1082
1075 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1083 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1076 } 1084 }
1077 1085
1078 if (pl->ns->monitor_spells) 1086 if (pl->ns->monitor_spells)
1079 { 1087 {
1080 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1081 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1082 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1083 } 1091 }
1084 1092
1085 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089 1097
1090 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1091 if (sl.length () > 6) 1099 if (sl.length () > 6)
1092 pl->ns->send_packet (sl); 1100 ns->send_packet (sl);
1093} 1101}
1094 1102
1095/** 1103/**
1096 * Tells the client that here is a player it should start using. 1104 * Tells the client that here is a player it should start using.
1097 */ 1105 */
1098void 1106void
1099esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1100{ 1108{
1101 pl->last_weight = weight;
1102
1103 packet sl ("player"); 1109 packet sl ("player");
1104 1110
1105 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1106 << uint32 (weight) 1112 << uint32 (weight)
1107 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face)
1108 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1109 1115
1116 pl->ns->last_weight = weight;
1110 pl->ns->send_packet (sl); 1117 pl->ns->send_packet (sl);
1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112} 1119}
1113 1120
1114/** 1121/**
… …
1156/****************************************************************************** 1163/******************************************************************************
1157 * 1164 *
1158 * Start of map related commands. 1165 * Start of map related commands.
1159 * 1166 *
1160 ******************************************************************************/ 1167 ******************************************************************************/
1161
1162/**
1163 * This adds face_num to a map cell at x,y. If the client doesn't have
1164 * the face yet, we will also send it.
1165 */
1166static void
1167esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1168{
1169 if (newmap->cells[x][y].count >= MAP_LAYERS)
1170 {
1171 //TODO: one or the other, can't both have abort and return, verify and act
1172 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1173 return;
1174 abort ();
1175 }
1176
1177 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1178 newmap->cells[x][y].count++;
1179
1180 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1181 esrv_send_face (ns, face_num, 0);
1182}
1183 1168
1184/** Clears a map cell */ 1169/** Clears a map cell */
1185static void 1170static void
1186map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1187{ 1172{
… …
1231check_head (packet &sl, client &ns, int ax, int ay, int layer) 1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1232{ 1217{
1233 short face_num; 1218 short face_num;
1234 1219
1235 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1236 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face;
1237 else 1222 else
1238 face_num = 0; 1223 face_num = 0;
1239 1224
1240 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1241 { 1226 {
… …
1326 if (!ob || ob->face == blank_face) 1311 if (!ob || ob->face == blank_face)
1327 face_num = 0; 1312 face_num = 0;
1328 else if (head) 1313 else if (head)
1329 { 1314 {
1330 /* if this is a head that had previously been stored */ 1315 /* if this is a head that had previously been stored */
1331 face_num = ob->face->number; 1316 face_num = ob->face;
1332 } 1317 }
1333 else 1318 else
1334 { 1319 {
1335 /* if the faces for the different parts of a multipart object 1320 /* if the faces for the different parts of a multipart object
1336 * are the same, we only want to send the bottom right most 1321 * are the same, we only want to send the bottom right most
… …
1378 /* single part object, multipart object with non merged faces, 1363 /* single part object, multipart object with non merged faces,
1379 * of multipart object already at lower right. 1364 * of multipart object already at lower right.
1380 */ 1365 */
1381 else if (bx == sx && by == sy) 1366 else if (bx == sx && by == sy)
1382 { 1367 {
1383 face_num = ob->face->number; 1368 face_num = ob->face;
1384 1369
1385 /* if this face matches one stored away, clear that one away. 1370 /* if this face matches one stored away, clear that one away.
1386 * this code relies on the fact that the map1 commands 1371 * this code relies on the fact that the map1 commands
1387 * goes from 2 down to 0. 1372 * goes from 2 down to 0.
1388 */ 1373 */
1389 for (i = 0; i < MAP_LAYERS; i++) 1374 for (i = 0; i < MAP_LAYERS; i++)
1390 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num)
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393 } 1378 }
1394 else 1379 else
1395 { 1380 {
1396 /* If this head is stored away, clear it - otherwise, 1381 /* If this head is stored away, clear it - otherwise,
1397 * there can be cases where a object is on multiple layers - 1382 * there can be cases where a object is on multiple layers -
1398 * we only want to send it once. 1383 * we only want to send it once.
1399 */ 1384 */
1400 face_num = head->face->number; 1385 face_num = head->face;
1401 for (i = 0; i < MAP_LAYERS; i++) 1386 for (i = 0; i < MAP_LAYERS; i++)
1402 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1403 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num)
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1405 1390
1406 /* First, try to put the new head on the same layer. If that is used up, 1391 /* First, try to put the new head on the same layer. If that is used up,
1407 * then find another layer. 1392 * then find another layer.
1408 */ 1393 */
… …
1425 else 1410 else
1426 { 1411 {
1427 /* In this case, we are already at the lower right or single part object, 1412 /* In this case, we are already at the lower right or single part object,
1428 * so nothing special 1413 * so nothing special
1429 */ 1414 */
1430 face_num = ob->face->number; 1415 face_num = ob->face;
1431 1416
1432 /* clear out any head entries that have the same face as this one */ 1417 /* clear out any head entries that have the same face as this one */
1433 for (bx = 0; bx < layer; bx++) 1418 for (bx = 0; bx < layer; bx++)
1434 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num)
1436 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1437 } 1422 }
1438 } /* else not already head object or blank face */ 1423 } /* else not already head object or blank face */
1439 1424
1440 /* This is a real hack. Basically, if we have nothing to send for this layer, 1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
… …
1444 * of the same type, what happens then is it doesn't think it needs to send 1429 * of the same type, what happens then is it doesn't think it needs to send
1445 * This tends to make stacking also work/look better. 1430 * This tends to make stacking also work/look better.
1446 */ 1431 */
1447 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) 1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1448 { 1433 {
1449 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; 1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face;
1450 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; 1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1451 } 1436 }
1452 1437
1453 /* Another hack - because of heads and whatnot, this face may match one 1438 /* Another hack - because of heads and whatnot, this face may match one
1454 * we already sent for a lower layer. In that case, don't send 1439 * we already sent for a lower layer. In that case, don't send
… …
1507 if (!ob || ob->face == blank_face) 1492 if (!ob || ob->face == blank_face)
1508 smoothlevel = 0; 1493 smoothlevel = 0;
1509 else 1494 else
1510 { 1495 {
1511 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1513 SendSmooth (&ns, ob->face->number); 1498 SendSmooth (&ns, ob->face);
1514 } /* else not already head object or blank face */ 1499 } /* else not already head object or blank face */
1515 1500
1516 /* We've gotten what face we want to use for the object. Now see if 1501 /* We've gotten what face we want to use for the object. Now see if
1517 * if it has changed since we last sent it to the client. 1502 * if it has changed since we last sent it to the client.
1518 */ 1503 */
… …
1547 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1548 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1549 } 1534 }
1550 1535
1551 return result; 1536 return result;
1537}
1538
1539// prefetch (and touch) all maps within a specific distancd
1540static void
1541prefetch_surrounding_maps (maptile *map, int distance)
1542{
1543 map->last_access = runtime;
1544
1545 if (--distance)
1546 for (int dir = 4; --dir; )
1547 if (const shstr &path = map->tile_path [dir])
1548 if (maptile *&neigh = map->tile_map [dir])
1549 prefetch_surrounding_maps (neigh, distance);
1550 else
1551 neigh = maptile::find_async (path, map);
1552}
1553
1554// prefetch a generous area around the player
1555static void
1556prefetch_surrounding_maps (object *op)
1557{
1558 prefetch_surrounding_maps (op->map, 3);
1552} 1559}
1553 1560
1554/** 1561/**
1555 * This function uses the new map1 protocol command to send the map 1562 * This function uses the new map1 protocol command to send the map
1556 * to the client. It is necessary because the old map command supports 1563 * to the client. It is necessary because the old map command supports
… …
1589 1596
1590 if (!pl->active) 1597 if (!pl->active)
1591 return; 1598 return;
1592 1599
1593 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1594 1602
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1604 packet esl;
1597 1605
1598 startlen = sl.length (); 1606 startlen = sl.length ();
… …
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1896 emask |= 0x2; 1904 emask |= 0x2;
1897 1905
1898 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899 { 1907 {
1900 if (lastcell.faces[0] != pl->face->number) 1908 if (lastcell.faces[0] != pl->face)
1901 { 1909 {
1902 lastcell.faces[0] = pl->face->number; 1910 lastcell.faces[0] = pl->face;
1903 mask |= 0x1; 1911 mask |= 0x1;
1904 1912
1905 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1913 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1906 esrv_send_face (&socket, pl->face->number, 0); 1914 esrv_send_face (&socket, pl->face, 0);
1907 1915
1908 sl << uint16 (pl->face->number); 1916 sl << uint16 (pl->face);
1909 } 1917 }
1910 } 1918 }
1911 else 1919 else
1912 { 1920 {
1913 /* Top face */ 1921 /* Top face */
… …
1965 */ 1973 */
1966void 1974void
1967draw_client_map (object *pl) 1975draw_client_map (object *pl)
1968{ 1976{
1969 int i, j; 1977 int i, j;
1970 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1978 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; 1979 int mflags;
1974 struct Map newmap; 1980 struct Map newmap;
1975 maptile *m, *pm; 1981 maptile *m, *pm;
1976 1982
1977 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
1978 { 1984 {
… …
2159 2165
2160/* appends the spell *spell to the Socklist we will send the data to. */ 2166/* appends the spell *spell to the Socklist we will send the data to. */
2161static void 2167static void
2162append_spell (player *pl, packet &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2163{ 2169{
2164 int len, i, skill = 0; 2170 int i, skill = 0;
2165 2171
2166 if (!(spell->name)) 2172 if (!(spell->name))
2167 { 2173 {
2168 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2174 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169 return; 2175 return;
… …
2181 if (!strcmp (spell->skill, skill_names[i])) 2187 if (!strcmp (spell->skill, skill_names[i]))
2182 { 2188 {
2183 skill = i + CS_STAT_SKILLINFO; 2189 skill = i + CS_STAT_SKILLINFO;
2184 break; 2190 break;
2185 } 2191 }
2192 }
2193
2194 // spells better have a face
2195 if (!spell->face)
2196 {
2197 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
2198 spell->face = face_find ("burnout.x11", blank_face);
2186 } 2199 }
2187 2200
2188 /* send the current values */ 2201 /* send the current values */
2189 sl << uint32 (spell->count) 2202 sl << uint32 (spell->count)
2190 << uint16 (spell->level) 2203 << uint16 (spell->level)
… …
2192 << uint16 (spell->last_sp) 2205 << uint16 (spell->last_sp)
2193 << uint16 (spell->last_grace) 2206 << uint16 (spell->last_grace)
2194 << uint16 (spell->last_eat) 2207 << uint16 (spell->last_eat)
2195 << uint8 (skill) 2208 << uint8 (skill)
2196 << uint32 (spell->path_attuned) 2209 << uint32 (spell->path_attuned)
2197 << uint32 (spell->face ? spell->face->number : 0) 2210 << uint32 (spell->face)
2198 << data8 (spell->name) 2211 << data8 (spell->name)
2199 << data16 (spell->msg); 2212 << data16 (spell->msg);
2200} 2213}
2201 2214
2202/** 2215/**
… …
2217 2230
2218 packet sl ("addspell"); 2231 packet sl ("addspell");
2219 2232
2220 if (!spell) 2233 if (!spell)
2221 { 2234 {
2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2235 for (spell = pl->ob->inv; spell; spell = spell->below)
2223 { 2236 {
2224 /* were we to simply keep appending data here, we could exceed 2237 /* were we to simply keep appending data here, we could exceed
2225 * MAXSOCKBUF if the player has enough spells to add, we know that 2238 * MAXSOCKBUF if the player has enough spells to add, we know that
2226 * append_spells will always append 19 data bytes, plus 4 length 2239 * 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 2240 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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