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.48 by root, Wed Dec 20 11:36:39 2006 UTC vs.
Revision 1.59 by pippijn, Sat Jan 6 14:42:31 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
… …
138} 139}
139 140
140static void 141static void
141clear_map (player *pl) 142clear_map (player *pl)
142{ 143{
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 145
145 if (pl->socket->newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
147 148
148 pl->socket->floorbox_reset (); 149 pl->ns->floorbox_reset ();
149} 150}
150 151
151/** check for map change and send new map data */ 152/** check for map change and send new map data */
152static void 153static void
153check_map_change (player *pl) 154check_map_change (player *pl)
154{ 155{
155 client &socket = *pl->socket; 156 client &socket = *pl->ns;
156 object *ob = pl->ob; 157 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
158 159
159 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
160 { 161 {
… …
176 flags |= 4; 177 flags |= 4;
177 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
178 flags |= 8; 179 flags |= 8;
179 180
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 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); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 183 }
183 else 184 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
185 186
186 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
280 buf += 8; 281 buf += 8;
281 282
282 // initial map and its origin 283 // initial map and its origin
283 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
284 sint16 dx, dy; 285 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
288 289
289 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
290 { 291 {
291 int dir = *buf++; 292 int dir = *buf++;
292 293
293 switch (dir) 294 switch (dir)
294 { 295 {
295 case '1': 296 case '1':
296 dx = 0; 297 dx = 0;
297 dy = -1; 298 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 300 map && (mapy -= map->height);
300 break; 301 break;
301 case '2': 302 case '2':
302 mapx += map->width; 303 mapx += map->width;
303 dx = map->width; 304 dx = map->width;
304 dy = 0; 305 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
306 break; 307 break;
307 case '3': 308 case '3':
308 mapy += map->height; 309 mapy += map->height;
309 dx = 0; 310 dx = 0;
310 dy = map->height; 311 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
312 break; 313 break;
313 case '4': 314 case '4':
314 dx = -1; 315 dx = -1;
315 dy = 0; 316 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 318 map && (mapx -= map->width);
318 break; 319 break;
319 } 320 }
320 321
321 --max_distance; 322 --max_distance;
322 } 323 }
323 324
… …
334 if (map->tile_path[2]) 335 if (map->tile_path[2])
335 flags |= 4; 336 flags |= 4;
336 if (map->tile_path[3]) 337 if (map->tile_path[3])
337 flags |= 8; 338 flags |= 8;
338 339
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 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 341 }
341 else 342 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 344 }
344 else 345 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 347
347 pl->socket->send_packet (bigbuf); 348 pl->ns->send_packet (bigbuf);
348} 349}
349 350
350/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
351void 352void
352SetUp (char *buf, int len, client * ns) 353SetUp (char *buf, int len, client * ns)
… …
399 { 400 {
400 ns->sound = atoi (param); 401 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 403 }
403 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
409 { 407 {
410 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 410 }
… …
569 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
570 */ 568 */
571void 569void
572AddMeCmd (char *buf, int len, client * ns) 570AddMeCmd (char *buf, int len, client * ns)
573{ 571{
574 if (ns->status != Ns_Add || add_player (ns)) 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 ns->send_packet ("addme_failed");
576 else
577 ns->send_packet ("addme_success");
578} 573}
579 574
580/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
581void 576void
582ToggleExtendedInfos (char *buf, int len, client * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
… …
810 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
811 806
812 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
813 packet sl ("comc"); 808 packet sl ("comc");
814 sl << uint16 (cmdid) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
815 pl->socket->send_packet (sl); 810 pl->ns->send_packet (sl);
816} 811}
817
818 812
819/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
820void 814void
821ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
822{ 816{
817 if (ns->state == ST_CUSTOM)
818 {
819 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
820 return;
821 }
822
823 if (!ns->pl)
824 return; //TODO: depends on the exact reply we are after
825 //TODO: but right now, we always have a ns->pl
826
827 player *pl = ns->pl;
828
823 /* This is to synthesize how the data would be stored if it 829 /* This is to synthesize how the data would be stored if it
824 * was normally entered. A bit of a hack, and should be cleaned up 830 * was normally entered. A bit of a hack, and should be cleaned up
825 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
826 * 832 *
827 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
… …
830 */ 836 */
831 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832 838
833 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
834 840
835 switch (pl->state) 841 switch (ns->state)
836 { 842 {
837 case ST_PLAYING: 843 case ST_PLAYING:
838 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839 break; 845 break;
840 846
841 case ST_PLAY_AGAIN:
842 /* We can check this for return value (2==quit). Maybe we
843 * should, and do something appropriate?
844 */
845 receive_play_again (pl->ob, buf[0]);
846 break;
847
848 case ST_ROLL_STAT:
849 key_roll_stat (pl->ob, buf[0]);
850 break;
851
852 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
853
854 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
855 break; 849 break;
856 850
857 case ST_CONFIRM_QUIT: 851 case ST_CONFIRM_QUIT:
858 key_confirm_quit (pl->ob, buf[0]); 852 key_confirm_quit (pl->ob, buf[0]);
859 break; 853 break;
860 854
861 case ST_CONFIGURE:
862 LOG (llevError, "In client input handling, but into configure state\n");
863 pl->state = ST_PLAYING;
864 break;
865
866 case ST_GET_NAME:
867 receive_player_name (pl->ob, 13);
868 break;
869
870 case ST_GET_PASSWORD:
871 case ST_CONFIRM_PASSWORD:
872 receive_player_password (pl->ob, 13);
873 break;
874
875 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
876 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
877 break; 857 break;
878 858
879 default: 859 default:
880 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
881 } 861 }
882} 862}
883 863
884/** 864/**
885 * Client tells its version. If there is a mismatch, we close the 865 * Client tells its version. If there is a mismatch, we close the
… …
935{ 915{
936 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
937} 917}
938 918
939/** client wants the map resent */ 919/** client wants the map resent */
940
941void 920void
942MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
943{ 922{
944/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
945 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
… …
1031void 1010void
1032esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1033{ 1012{
1034 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1035 uint16 flags; 1014 uint16 flags;
1015
1016 if (!pl->ns)
1017 return;
1036 1018
1037 packet sl ("stats"); 1019 packet sl ("stats");
1038 1020
1039 if (pl->ob) 1021 if (pl->ob)
1040 { 1022 {
… …
1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1045 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1046 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1048 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1054 } 1036 }
1055 1037
1056 if (pl->socket->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1059 { 1040 {
1060 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1062 */ 1043 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1066 1047
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 1049 }
1069 1050
1070 if (pl->socket->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1072 else
1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1076 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1077 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1078 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1088 if (pl->run_on) 1065 if (pl->run_on)
1089 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1090 1067
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1092 1069
1093 if (pl->socket->sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 1072 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1074 {
1098 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
… …
1100 continue; 1077 continue;
1101 1078
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1103 } 1080 }
1104 1081
1105 if (pl->socket->monitor_spells) 1082 if (pl->ns->monitor_spells)
1106 { 1083 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1109 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 1087 }
1111 1088
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1116 1093
1117 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1095 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1096 pl->ns->send_packet (sl);
1120} 1097}
1121 1098
1122/** 1099/**
1123 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1124 */ 1101 */
… …
1132 sl << uint32 (pl->ob->count) 1109 sl << uint32 (pl->ob->count)
1133 << uint32 (weight) 1110 << uint32 (weight)
1134 << uint32 (pl->ob->face->number) 1111 << uint32 (pl->ob->face->number)
1135 << data8 (pl->ob->name); 1112 << data8 (pl->ob->name);
1136 1113
1137 pl->socket->send_packet (sl); 1114 pl->ns->send_packet (sl);
1138 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139} 1116}
1140 1117
1141/** 1118/**
1142 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
… …
1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1530 1507
1531 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1532 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1533 */ 1510 */
1534 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face)
1535 smoothlevel = 0; 1512 smoothlevel = 0;
1536 else 1513 else
1537 { 1514 {
1538 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1539 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1589 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1566 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1590 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1567 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1591 * and use the other 4 bits for other informatiion. For full documentation 1568 * and use the other 4 bits for other informatiion. For full documentation
1592 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1593 * I will describe internally what we do: 1570 * I will describe internally what we do:
1594 * the socket->lastmap shows how the map last looked when sent to the client. 1571 * the ns->lastmap shows how the map last looked when sent to the client.
1595 * in the lastmap structure, there is a cells array, which is set to the 1572 * in the lastmap structure, there is a cells array, which is set to the
1596 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1597 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1598 * we use the count value to hold the darkness value. If -1, then this space 1575 * we use the count value to hold the darkness value. If -1, then this space
1599 * is not viewable. 1576 * is not viewable.
… …
1610 uint8 eentrysize; 1587 uint8 eentrysize;
1611 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1612 uint8 extendedinfos; 1589 uint8 extendedinfos;
1613 maptile *m; 1590 maptile *m;
1614 1591
1615 client &socket = *pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1593
1594 if (!pl->active ())
1595 return;
1616 1596
1617 check_map_change (pl->contr); 1597 check_map_change (pl->contr);
1618 1598
1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1599 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620 packet esl; 1600 packet esl;
… …
1741 map_clearcell (&lastcell, 0, 0, 0, -1); 1721 map_clearcell (&lastcell, 0, 0, 0, -1);
1742 } 1722 }
1743 } 1723 }
1744 else if (d > 3) 1724 else if (d > 3)
1745 { 1725 {
1726 m->touch ();
1727
1746 int need_send = 0, count; 1728 int need_send = 0, count;
1747 1729
1748 /* This block deals with spaces that are not visible for whatever 1730 /* This block deals with spaces that are not visible for whatever
1749 * reason. Still may need to send the head for this space. 1731 * reason. Still may need to send the head for this space.
1750 */ 1732 */
… …
1783 else 1765 else
1784 sl.reset (oldlen); 1766 sl.reset (oldlen);
1785 } 1767 }
1786 else 1768 else
1787 { 1769 {
1770 m->touch ();
1771
1788 /* In this block, the space is visible or there are head objects 1772 /* In this block, the space is visible or there are head objects
1789 * we need to send. 1773 * we need to send.
1790 */ 1774 */
1791 1775
1792 /* Rather than try to figure out what everything that we might 1776 /* Rather than try to figure out what everything that we might
… …
2009 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1993 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2010 return; 1994 return;
2011 1995
2012 memset (&newmap, 0, sizeof (struct Map)); 1996 memset (&newmap, 0, sizeof (struct Map));
2013 1997
2014 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1998 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2015 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1999 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2016 { 2000 {
2017 ax = i; 2001 ax = i;
2018 ay = j; 2002 ay = j;
2019 m = pm; 2003 m = pm;
2020 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2004 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2052 2036
2053/*****************************************************************************/ 2037/*****************************************************************************/
2054void 2038void
2055send_plugin_custom_message (object *pl, char *buf) 2039send_plugin_custom_message (object *pl, char *buf)
2056{ 2040{
2057 pl->contr->socket->send_packet (buf); 2041 pl->contr->ns->send_packet (buf);
2058} 2042}
2059 2043
2060/** 2044/**
2061 * This sends the skill number to name mapping. We ignore 2045 * This sends the skill number to name mapping. We ignore
2062 * the params - we always send the same info no matter what. 2046 * the params - we always send the same info no matter what.
… …
2107 * it then sends an updspell packet for each spell that has changed in this way 2091 * it then sends an updspell packet for each spell that has changed in this way
2108 */ 2092 */
2109void 2093void
2110esrv_update_spells (player *pl) 2094esrv_update_spells (player *pl)
2111{ 2095{
2096 if (!pl->ns)
2097 return;
2098
2112 if (!pl->socket->monitor_spells) 2099 if (!pl->ns->monitor_spells)
2113 return; 2100 return;
2114 2101
2115 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2102 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2116 { 2103 {
2117 if (spell->type == SPELL) 2104 if (spell->type == SPELL)
… …
2147 2134
2148 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2135 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2149 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2136 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2150 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2137 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2151 2138
2152 pl->socket->send_packet (sl); 2139 pl->ns->send_packet (sl);
2153 } 2140 }
2154 } 2141 }
2155 } 2142 }
2156} 2143}
2157 2144
2158void 2145void
2159esrv_remove_spell (player *pl, object *spell) 2146esrv_remove_spell (player *pl, object *spell)
2160{ 2147{
2161 if (!pl->socket->monitor_spells) 2148 if (!pl->ns->monitor_spells)
2162 return; 2149 return;
2163 2150
2164 if (!pl || !spell || spell->env != pl->ob) 2151 if (!pl || !spell || spell->env != pl->ob)
2165 { 2152 {
2166 LOG (llevError, "Invalid call to esrv_remove_spell"); 2153 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2169 2156
2170 packet sl ("delspell"); 2157 packet sl ("delspell");
2171 2158
2172 sl << uint32 (spell->count); 2159 sl << uint32 (spell->count);
2173 2160
2174 pl->socket->send_packet (sl); 2161 pl->ns->send_packet (sl);
2175} 2162}
2176 2163
2177/* appends the spell *spell to the Socklist we will send the data to. */ 2164/* appends the spell *spell to the Socklist we will send the data to. */
2178static void 2165static void
2179append_spell (player *pl, packet &sl, object *spell) 2166append_spell (player *pl, packet &sl, object *spell)
… …
2227 { 2214 {
2228 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2215 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2229 return; 2216 return;
2230 } 2217 }
2231 2218
2232 if (!pl->socket->monitor_spells) 2219 if (!pl->ns->monitor_spells)
2233 return; 2220 return;
2234 2221
2235 packet sl ("addspell"); 2222 packet sl ("addspell");
2236 2223
2237 if (!spell) 2224 if (!spell)
… …
2254 if (spell->type != SPELL) 2241 if (spell->type != SPELL)
2255 continue; 2242 continue;
2256 2243
2257 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2244 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2258 { 2245 {
2259 pl->socket->send_packet (sl); 2246 pl->ns->send_packet (sl);
2260 2247
2261 sl.reset (); 2248 sl.reset ();
2262 sl << "addspell "; 2249 sl << "addspell ";
2263 } 2250 }
2264 2251
… …
2278 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2265 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2279 fatal (0); 2266 fatal (0);
2280 } 2267 }
2281 2268
2282 /* finally, we can send the packet */ 2269 /* finally, we can send the packet */
2283 pl->socket->send_packet (sl); 2270 pl->ns->send_packet (sl);
2284} 2271}
2285 2272

Diff Legend

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