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.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.58 by root, Thu Jan 4 16:19:32 2007 UTC

… …
138} 138}
139 139
140static void 140static void
141clear_map (player *pl) 141clear_map (player *pl)
142{ 142{
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 144
145 if (pl->socket->newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
147 147
148 pl->socket->floorbox_reset (); 148 pl->ns->floorbox_reset ();
149} 149}
150 150
151/** check for map change and send new map data */ 151/** check for map change and send new map data */
152static void 152static void
153check_map_change (player *pl) 153check_map_change (player *pl)
154{ 154{
155 client &socket = *pl->socket; 155 client &socket = *pl->ns;
156 object *ob = pl->ob; 156 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
158 158
159 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
160 { 160 {
… …
176 flags |= 4; 176 flags |= 4;
177 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
178 flags |= 8; 178 flags |= 8;
179 179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 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); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 182 }
183 else 183 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
185 185
186 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
280 buf += 8; 280 buf += 8;
281 281
282 // initial map and its origin 282 // initial map and its origin
283 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
284 sint16 dx, dy; 284 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
288 288
289 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
290 { 290 {
291 int dir = *buf++; 291 int dir = *buf++;
292 292
293 switch (dir) 293 switch (dir)
294 { 294 {
295 case '1': 295 case '1':
296 dx = 0; 296 dx = 0;
297 dy = -1; 297 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 298 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 299 map && (mapy -= map->height);
300 break; 300 break;
301 case '2': 301 case '2':
302 mapx += map->width; 302 mapx += map->width;
303 dx = map->width; 303 dx = map->width;
304 dy = 0; 304 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
306 break; 306 break;
307 case '3': 307 case '3':
308 mapy += map->height; 308 mapy += map->height;
309 dx = 0; 309 dx = 0;
310 dy = map->height; 310 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 311 map = map->xy_find (dx, dy);
312 break; 312 break;
313 case '4': 313 case '4':
314 dx = -1; 314 dx = -1;
315 dy = 0; 315 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 317 map && (mapx -= map->width);
318 break; 318 break;
319 } 319 }
320 320
321 --max_distance; 321 --max_distance;
322 } 322 }
323 323
… …
334 if (map->tile_path[2]) 334 if (map->tile_path[2])
335 flags |= 4; 335 flags |= 4;
336 if (map->tile_path[3]) 336 if (map->tile_path[3])
337 flags |= 8; 337 flags |= 8;
338 338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 340 }
341 else 341 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 343 }
344 else 344 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 346
347 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
348} 348}
349 349
350/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
351void 351void
352SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
399 { 399 {
400 ns->sound = atoi (param); 400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 402 }
403 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
409 { 406 {
410 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 409 }
… …
569 * it either has to be here or init_sockets needs to be exported. 566 * it either has to be here or init_sockets needs to be exported.
570 */ 567 */
571void 568void
572AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
573{ 570{
574 if (INVOKE_CLIENT (ADDME, ns)) 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 return;
576
577 if (ns->pl || add_player (ns))
578 ns->send_packet ("addme_failed");
579 else
580 ns->send_packet ("addme_success");
581} 572}
582 573
583/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
584void 575void
585ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
813 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
814 805
815 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
816 packet sl ("comc"); 807 packet sl ("comc");
817 sl << uint16 (cmdid) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
818 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
819} 810}
820 811
821/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
822void 813void
823ReplyCmd (char *buf, int len, client *ns) 814ReplyCmd (char *buf, int len, client *ns)
824{ 815{
816 if (ns->state == ST_CUSTOM)
817 {
818 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
819 return;
820 }
821
825 if (!ns->pl) 822 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after 823 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl 824 //TODO: but right now, we always have a ns->pl
828 825
829 player *pl = ns->pl; 826 player *pl = ns->pl;
… …
838 */ 835 */
839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
840 837
841 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
842 839
843 switch (pl->state) 840 switch (ns->state)
844 { 841 {
845 case ST_PLAYING: 842 case ST_PLAYING:
846 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
847 break; 844 break;
848 845
849 case ST_PLAY_AGAIN:
850 /* We can check this for return value (2==quit). Maybe we
851 * should, and do something appropriate?
852 */
853 receive_play_again (pl->ob, buf[0]);
854 break;
855
856 case ST_ROLL_STAT:
857 key_roll_stat (pl->ob, buf[0]);
858 break;
859
860 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
861 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
862 break; 848 break;
863 849
864 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
865 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
866 break; 852 break;
867 853
868 case ST_CONFIGURE:
869 LOG (llevError, "In client input handling, but into configure state\n");
870 pl->state = ST_PLAYING;
871 break;
872
873 case ST_GET_NAME:
874 receive_player_name (pl->ob, 13);
875 break;
876
877 case ST_GET_PASSWORD:
878 case ST_CONFIRM_PASSWORD:
879 receive_player_password (pl->ob, 13);
880 break;
881
882 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
883 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
884 break; 856 break;
885 857
886 default: 858 default:
887 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
888 } 860 }
889} 861}
890 862
891/** 863/**
892 * Client tells its version. If there is a mismatch, we close the 864 * Client tells its version. If there is a mismatch, we close the
… …
942{ 914{
943 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
944} 916}
945 917
946/** client wants the map resent */ 918/** client wants the map resent */
947
948void 919void
949MapRedrawCmd (char *buf, int len, player *pl) 920MapRedrawCmd (char *buf, int len, player *pl)
950{ 921{
951/* This function is currently disabled; just clearing the map state results in 922/* This function is currently disabled; just clearing the map state results in
952 * display errors. It should clear the cache and send a newmap command. 923 * display errors. It should clear the cache and send a newmap command.
… …
1038void 1009void
1039esrv_update_stats (player *pl) 1010esrv_update_stats (player *pl)
1040{ 1011{
1041 char buf[MAX_BUF]; 1012 char buf[MAX_BUF];
1042 uint16 flags; 1013 uint16 flags;
1014
1015 if (!pl->ns)
1016 return;
1043 1017
1044 packet sl ("stats"); 1018 packet sl ("stats");
1045 1019
1046 if (pl->ob) 1020 if (pl->ob)
1047 { 1021 {
… …
1050 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1051 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1052 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1053 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1054 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1055 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1056 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1057 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1058 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1059 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1060 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1061 } 1035 }
1062 1036
1063 if (pl->socket->exp64)
1064 for (int s = 0; s < NUM_SKILLS; s++) 1037 for (int s = 0; s < NUM_SKILLS; s++)
1065 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1066 { 1039 {
1067 /* Always send along the level if exp changes. This is only 1040 /* Always send along the level if exp changes. This is only
1068 * 1 extra byte, but keeps processing simpler. 1041 * 1 extra byte, but keeps processing simpler.
1069 */ 1042 */
1070 sl << uint8 (s + CS_STAT_SKILLINFO) 1043 sl << uint8 (s + CS_STAT_SKILLINFO)
1071 << uint8 (pl->last_skill_ob[s]->level) 1044 << uint8 (pl->last_skill_ob[s]->level)
1072 << uint64 (pl->last_skill_ob[s]->stats.exp); 1045 << uint64 (pl->last_skill_ob[s]->stats.exp);
1073 1046
1074 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1075 } 1048 }
1076 1049
1077 if (pl->socket->exp64)
1078 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1079 else
1080 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1081
1082 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1083 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1084 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1085 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1086 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1095 if (pl->run_on) 1064 if (pl->run_on)
1096 flags |= SF_RUNON; 1065 flags |= SF_RUNON;
1097 1066
1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1099 1068
1100 if (pl->socket->sc_version < 1025) 1069 if (pl->ns->sc_version < 1025)
1101 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1102 else 1071 else
1103 for (int i = 0; i < NROFATTACKS; i++) 1072 for (int i = 0; i < NROFATTACKS; i++)
1104 { 1073 {
1105 /* Skip ones we won't send */ 1074 /* Skip ones we won't send */
… …
1107 continue; 1076 continue;
1108 1077
1109 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1110 } 1079 }
1111 1080
1112 if (pl->socket->monitor_spells) 1081 if (pl->ns->monitor_spells)
1113 { 1082 {
1114 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1115 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1116 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1117 } 1086 }
1118 1087
1119 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1120 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1121 set_title (pl->ob, buf); 1090 set_title (pl->ob, buf);
1122 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1123 1092
1124 /* Only send it away if we have some actual data */ 1093 /* Only send it away if we have some actual data */
1125 if (sl.length () > 6) 1094 if (sl.length () > 6)
1126 pl->socket->send_packet (sl); 1095 pl->ns->send_packet (sl);
1127} 1096}
1128 1097
1129/** 1098/**
1130 * Tells the client that here is a player it should start using. 1099 * Tells the client that here is a player it should start using.
1131 */ 1100 */
… …
1139 sl << uint32 (pl->ob->count) 1108 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1109 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1110 << uint32 (pl->ob->face->number)
1142 << data8 (pl->ob->name); 1111 << data8 (pl->ob->name);
1143 1112
1144 pl->socket->send_packet (sl); 1113 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1115}
1147 1116
1148/** 1117/**
1149 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
… …
1536 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1537 1506
1538 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1539 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1540 */ 1509 */
1541 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1542 smoothlevel = 0; 1511 smoothlevel = 0;
1543 else 1512 else
1544 { 1513 {
1545 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1546 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1596 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1565 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1597 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1566 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1598 * and use the other 4 bits for other informatiion. For full documentation 1567 * and use the other 4 bits for other informatiion. For full documentation
1599 * of what we send, see the doc/Protocol file. 1568 * of what we send, see the doc/Protocol file.
1600 * I will describe internally what we do: 1569 * I will describe internally what we do:
1601 * the socket->lastmap shows how the map last looked when sent to the client. 1570 * the ns->lastmap shows how the map last looked when sent to the client.
1602 * in the lastmap structure, there is a cells array, which is set to the 1571 * in the lastmap structure, there is a cells array, which is set to the
1603 * maximum viewable size (As set in config.h). 1572 * maximum viewable size (As set in config.h).
1604 * in the cells, there are faces and a count value. 1573 * in the cells, there are faces and a count value.
1605 * we use the count value to hold the darkness value. If -1, then this space 1574 * we use the count value to hold the darkness value. If -1, then this space
1606 * is not viewable. 1575 * is not viewable.
… …
1617 uint8 eentrysize; 1586 uint8 eentrysize;
1618 uint16 ewhatstart, ewhatflag; 1587 uint16 ewhatstart, ewhatflag;
1619 uint8 extendedinfos; 1588 uint8 extendedinfos;
1620 maptile *m; 1589 maptile *m;
1621 1590
1622 client &socket = *pl->contr->socket; 1591 client &socket = *pl->contr->ns;
1592
1593 if (!pl->active ())
1594 return;
1623 1595
1624 check_map_change (pl->contr); 1596 check_map_change (pl->contr);
1625 1597
1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1627 packet esl; 1599 packet esl;
… …
1748 map_clearcell (&lastcell, 0, 0, 0, -1); 1720 map_clearcell (&lastcell, 0, 0, 0, -1);
1749 } 1721 }
1750 } 1722 }
1751 else if (d > 3) 1723 else if (d > 3)
1752 { 1724 {
1725 m->touch ();
1726
1753 int need_send = 0, count; 1727 int need_send = 0, count;
1754 1728
1755 /* This block deals with spaces that are not visible for whatever 1729 /* This block deals with spaces that are not visible for whatever
1756 * reason. Still may need to send the head for this space. 1730 * reason. Still may need to send the head for this space.
1757 */ 1731 */
… …
1790 else 1764 else
1791 sl.reset (oldlen); 1765 sl.reset (oldlen);
1792 } 1766 }
1793 else 1767 else
1794 { 1768 {
1769 m->touch ();
1770
1795 /* In this block, the space is visible or there are head objects 1771 /* In this block, the space is visible or there are head objects
1796 * we need to send. 1772 * we need to send.
1797 */ 1773 */
1798 1774
1799 /* Rather than try to figure out what everything that we might 1775 /* Rather than try to figure out what everything that we might
… …
2016 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1992 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2017 return; 1993 return;
2018 1994
2019 memset (&newmap, 0, sizeof (struct Map)); 1995 memset (&newmap, 0, sizeof (struct Map));
2020 1996
2021 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1997 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1998 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023 { 1999 {
2024 ax = i; 2000 ax = i;
2025 ay = j; 2001 ay = j;
2026 m = pm; 2002 m = pm;
2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2003 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2059 2035
2060/*****************************************************************************/ 2036/*****************************************************************************/
2061void 2037void
2062send_plugin_custom_message (object *pl, char *buf) 2038send_plugin_custom_message (object *pl, char *buf)
2063{ 2039{
2064 pl->contr->socket->send_packet (buf); 2040 pl->contr->ns->send_packet (buf);
2065} 2041}
2066 2042
2067/** 2043/**
2068 * This sends the skill number to name mapping. We ignore 2044 * This sends the skill number to name mapping. We ignore
2069 * the params - we always send the same info no matter what. 2045 * the params - we always send the same info no matter what.
… …
2114 * it then sends an updspell packet for each spell that has changed in this way 2090 * it then sends an updspell packet for each spell that has changed in this way
2115 */ 2091 */
2116void 2092void
2117esrv_update_spells (player *pl) 2093esrv_update_spells (player *pl)
2118{ 2094{
2095 if (!pl->ns)
2096 return;
2097
2119 if (!pl->socket->monitor_spells) 2098 if (!pl->ns->monitor_spells)
2120 return; 2099 return;
2121 2100
2122 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2101 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2123 { 2102 {
2124 if (spell->type == SPELL) 2103 if (spell->type == SPELL)
… …
2154 2133
2155 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2134 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2156 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2135 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2157 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2136 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2158 2137
2159 pl->socket->send_packet (sl); 2138 pl->ns->send_packet (sl);
2160 } 2139 }
2161 } 2140 }
2162 } 2141 }
2163} 2142}
2164 2143
2165void 2144void
2166esrv_remove_spell (player *pl, object *spell) 2145esrv_remove_spell (player *pl, object *spell)
2167{ 2146{
2168 if (!pl->socket->monitor_spells) 2147 if (!pl->ns->monitor_spells)
2169 return; 2148 return;
2170 2149
2171 if (!pl || !spell || spell->env != pl->ob) 2150 if (!pl || !spell || spell->env != pl->ob)
2172 { 2151 {
2173 LOG (llevError, "Invalid call to esrv_remove_spell"); 2152 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2176 2155
2177 packet sl ("delspell"); 2156 packet sl ("delspell");
2178 2157
2179 sl << uint32 (spell->count); 2158 sl << uint32 (spell->count);
2180 2159
2181 pl->socket->send_packet (sl); 2160 pl->ns->send_packet (sl);
2182} 2161}
2183 2162
2184/* appends the spell *spell to the Socklist we will send the data to. */ 2163/* appends the spell *spell to the Socklist we will send the data to. */
2185static void 2164static void
2186append_spell (player *pl, packet &sl, object *spell) 2165append_spell (player *pl, packet &sl, object *spell)
… …
2234 { 2213 {
2235 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2214 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2236 return; 2215 return;
2237 } 2216 }
2238 2217
2239 if (!pl->socket->monitor_spells) 2218 if (!pl->ns->monitor_spells)
2240 return; 2219 return;
2241 2220
2242 packet sl ("addspell"); 2221 packet sl ("addspell");
2243 2222
2244 if (!spell) 2223 if (!spell)
… …
2261 if (spell->type != SPELL) 2240 if (spell->type != SPELL)
2262 continue; 2241 continue;
2263 2242
2264 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2243 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2265 { 2244 {
2266 pl->socket->send_packet (sl); 2245 pl->ns->send_packet (sl);
2267 2246
2268 sl.reset (); 2247 sl.reset ();
2269 sl << "addspell "; 2248 sl << "addspell ";
2270 } 2249 }
2271 2250
… …
2285 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2264 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2286 fatal (0); 2265 fatal (0);
2287 } 2266 }
2288 2267
2289 /* finally, we can send the packet */ 2268 /* finally, we can send the packet */
2290 pl->socket->send_packet (sl); 2269 pl->ns->send_packet (sl);
2291} 2270}
2292 2271

Diff Legend

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