… | |
… | |
153 | } |
153 | } |
154 | |
154 | |
155 | static void |
155 | static void |
156 | clear_map (player *pl) |
156 | clear_map (player *pl) |
157 | { |
157 | { |
158 | client_socket & socket = pl->socket; |
158 | client_socket &socket = *pl->socket; |
159 | |
159 | |
160 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
160 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
161 | |
161 | |
162 | if (socket.newmapcmd == 1) |
162 | if (socket.newmapcmd == 1) |
163 | socket.send_packet ("newmap"); |
163 | socket.send_packet ("newmap"); |
… | |
… | |
168 | |
168 | |
169 | /** check for map change and send new map data */ |
169 | /** check for map change and send new map data */ |
170 | static void |
170 | static void |
171 | check_map_change (player *pl) |
171 | check_map_change (player *pl) |
172 | { |
172 | { |
173 | client_socket & socket = pl->socket; |
173 | client_socket &socket = *pl->socket; |
174 | object *ob = pl->ob; |
174 | object *ob = pl->ob; |
175 | char buf[MAX_BUF]; /* eauugggh */ |
175 | char buf[MAX_BUF]; /* eauugggh */ |
176 | |
176 | |
177 | if (socket.current_map != ob->map) |
177 | if (socket.current_map != ob->map) |
178 | { |
178 | { |
… | |
… | |
249 | buf += 8; |
249 | buf += 8; |
250 | |
250 | |
251 | // initial map and its origin |
251 | // initial map and its origin |
252 | maptile *map = pl->ob->map; |
252 | maptile *map = pl->ob->map; |
253 | sint16 dx, dy; |
253 | sint16 dx, dy; |
254 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
254 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
255 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
255 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
256 | int max_distance = 8; // limit maximum path length to something generous |
256 | int max_distance = 8; // limit maximum path length to something generous |
257 | |
257 | |
258 | while (*buf && map && max_distance) |
258 | while (*buf && map && max_distance) |
259 | { |
259 | { |
260 | int dir = *buf++; |
260 | int dir = *buf++; |
… | |
… | |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
312 | } |
312 | } |
313 | else |
313 | else |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
315 | |
315 | |
316 | pl->socket.send_packet (bigbuf); |
316 | pl->socket->send_packet (bigbuf); |
317 | } |
317 | } |
318 | |
318 | |
319 | /** This is the Setup cmd - easy first implementation */ |
319 | /** This is the Setup cmd - easy first implementation */ |
320 | void |
320 | void |
321 | SetUp (char *buf, int len, client_socket * ns) |
321 | SetUp (char *buf, int len, client_socket * ns) |
… | |
… | |
544 | |
544 | |
545 | oldsettings = settings; |
545 | oldsettings = settings; |
546 | if (ns->status != Ns_Add || add_player (ns)) |
546 | if (ns->status != Ns_Add || add_player (ns)) |
547 | ns->send_packet ("addme_failed"); |
547 | ns->send_packet ("addme_failed"); |
548 | else |
548 | else |
549 | { |
|
|
550 | /* Basically, the add_player copies the socket structure into |
|
|
551 | * the player structure, so this one (which is from init_sockets) |
|
|
552 | * is not needed anymore. The write below should still work, as the |
|
|
553 | * stuff in ns is still relevant. |
|
|
554 | */ |
|
|
555 | ns->send_packet ("addme_success"); |
549 | ns->send_packet ("addme_success"); |
556 | socket_info.nconns--; |
|
|
557 | ns->status = Ns_Avail; |
|
|
558 | } |
|
|
559 | |
550 | |
560 | settings = oldsettings; |
551 | settings = oldsettings; |
561 | } |
552 | } |
562 | |
553 | |
563 | /** Reply to ExtendedInfos command */ |
554 | /** Reply to ExtendedInfos command */ |
… | |
… | |
841 | |
832 | |
842 | /* Send confirmation of command execution now */ |
833 | /* Send confirmation of command execution now */ |
843 | |
834 | |
844 | packet sl; |
835 | packet sl; |
845 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
836 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
846 | Send_With_Handling (&pl->socket, &sl); |
837 | Send_With_Handling (pl->socket, &sl); |
847 | } |
838 | } |
848 | |
839 | |
849 | |
840 | |
850 | /** This is a reply to a previous query. */ |
841 | /** This is a reply to a previous query. */ |
851 | void |
842 | void |
… | |
… | |
996 | */ |
987 | */ |
997 | #if 0 |
988 | #if 0 |
998 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
989 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
999 | * clear the "cache" |
990 | * clear the "cache" |
1000 | */ |
991 | */ |
1001 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
992 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
1002 | draw_client_map (pl->ob); |
993 | draw_client_map (pl->ob); |
1003 | #endif |
994 | #endif |
1004 | } |
995 | } |
1005 | |
996 | |
1006 | /** |
997 | /** |
… | |
… | |
1109 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1100 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1110 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1101 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1111 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1102 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1112 | } |
1103 | } |
1113 | |
1104 | |
1114 | if (pl->socket.exp64) |
1105 | if (pl->socket->exp64) |
1115 | { |
1106 | { |
1116 | uint8 s; |
1107 | uint8 s; |
1117 | |
1108 | |
1118 | for (s = 0; s < NUM_SKILLS; s++) |
1109 | for (s = 0; s < NUM_SKILLS; s++) |
1119 | { |
1110 | { |
… | |
… | |
1129 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1120 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1130 | } |
1121 | } |
1131 | } |
1122 | } |
1132 | } |
1123 | } |
1133 | |
1124 | |
1134 | if (pl->socket.exp64) |
1125 | if (pl->socket->exp64) |
1135 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1126 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1136 | else |
1127 | else |
1137 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1128 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1138 | |
1129 | |
1139 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1130 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
… | |
… | |
1152 | if (pl->run_on) |
1143 | if (pl->run_on) |
1153 | flags |= SF_RUNON; |
1144 | flags |= SF_RUNON; |
1154 | |
1145 | |
1155 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1146 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1156 | |
1147 | |
1157 | if (pl->socket.sc_version < 1025) |
1148 | if (pl->socket->sc_version < 1025) |
1158 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1149 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1159 | else |
1150 | else |
1160 | { |
1151 | { |
1161 | int i; |
1152 | int i; |
1162 | |
1153 | |
… | |
… | |
1168 | |
1159 | |
1169 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1160 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1170 | } |
1161 | } |
1171 | } |
1162 | } |
1172 | |
1163 | |
1173 | if (pl->socket.monitor_spells) |
1164 | if (pl->socket->monitor_spells) |
1174 | { |
1165 | { |
1175 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1166 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1176 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1167 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1177 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1168 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1178 | } |
1169 | } |
1179 | |
1170 | |
1180 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1171 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1181 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1172 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1182 | set_title (pl->ob, buf); |
1173 | set_title (pl->ob, buf); |
1183 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1174 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1184 | |
1175 | |
1185 | /* Only send it away if we have some actual data */ |
1176 | /* Only send it away if we have some actual data */ |
1186 | if (sl.length () > 6) |
1177 | if (sl.length () > 6) |
1187 | Send_With_Handling (&pl->socket, &sl); |
1178 | Send_With_Handling (pl->socket, &sl); |
1188 | } |
1179 | } |
1189 | |
1180 | |
1190 | /** |
1181 | /** |
1191 | * Tells the client that here is a player it should start using. |
1182 | * Tells the client that here is a player it should start using. |
1192 | */ |
1183 | */ |
… | |
… | |
1201 | sl << uint32 (pl->ob->count) |
1192 | sl << uint32 (pl->ob->count) |
1202 | << uint32 (weight) |
1193 | << uint32 (weight) |
1203 | << uint32 (pl->ob->face->number) |
1194 | << uint32 (pl->ob->face->number) |
1204 | << data8 (pl->ob->name); |
1195 | << data8 (pl->ob->name); |
1205 | |
1196 | |
1206 | Send_With_Handling (&pl->socket, &sl); |
1197 | Send_With_Handling (pl->socket, &sl); |
1207 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1198 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1208 | } |
1199 | } |
1209 | |
1200 | |
1210 | /** |
1201 | /** |
1211 | * Need to send an animation sequence to the client. |
1202 | * Need to send an animation sequence to the client. |
… | |
… | |
1788 | uint8 eentrysize; |
1779 | uint8 eentrysize; |
1789 | uint16 ewhatstart, ewhatflag; |
1780 | uint16 ewhatstart, ewhatflag; |
1790 | uint8 extendedinfos; |
1781 | uint8 extendedinfos; |
1791 | maptile *m; |
1782 | maptile *m; |
1792 | |
1783 | |
1793 | client_socket &socket = pl->contr->socket; |
1784 | client_socket &socket = *pl->contr->socket; |
1794 | |
1785 | |
1795 | check_map_change (pl->contr); |
1786 | check_map_change (pl->contr); |
1796 | |
1787 | |
1797 | packet sl; |
1788 | packet sl; |
1798 | packet esl; |
1789 | packet esl; |
… | |
… | |
2189 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2180 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2190 | return; |
2181 | return; |
2191 | |
2182 | |
2192 | memset (&newmap, 0, sizeof (struct Map)); |
2183 | memset (&newmap, 0, sizeof (struct Map)); |
2193 | |
2184 | |
2194 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2185 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2195 | { |
2186 | { |
2196 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2187 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2197 | { |
2188 | { |
2198 | ax = i; |
2189 | ax = i; |
2199 | ay = j; |
2190 | ay = j; |
2200 | m = pm; |
2191 | m = pm; |
2201 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2192 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2233 | |
2224 | |
2234 | /*****************************************************************************/ |
2225 | /*****************************************************************************/ |
2235 | void |
2226 | void |
2236 | send_plugin_custom_message (object *pl, char *buf) |
2227 | send_plugin_custom_message (object *pl, char *buf) |
2237 | { |
2228 | { |
2238 | pl->contr->socket.send_packet (buf); |
2229 | pl->contr->socket->send_packet (buf); |
2239 | } |
2230 | } |
2240 | |
2231 | |
2241 | /** |
2232 | /** |
2242 | * This sends the skill number to name mapping. We ignore |
2233 | * This sends the skill number to name mapping. We ignore |
2243 | * the params - we always send the same info no matter what. |
2234 | * the params - we always send the same info no matter what. |
… | |
… | |
2288 | * it then sends an updspell packet for each spell that has changed in this way |
2279 | * it then sends an updspell packet for each spell that has changed in this way |
2289 | */ |
2280 | */ |
2290 | void |
2281 | void |
2291 | esrv_update_spells (player *pl) |
2282 | esrv_update_spells (player *pl) |
2292 | { |
2283 | { |
2293 | if (!pl->socket.monitor_spells) |
2284 | if (!pl->socket->monitor_spells) |
2294 | return; |
2285 | return; |
2295 | |
2286 | |
2296 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2287 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2297 | { |
2288 | { |
2298 | if (spell->type == SPELL) |
2289 | if (spell->type == SPELL) |
… | |
… | |
2328 | |
2319 | |
2329 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2320 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2330 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2321 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2331 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2322 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2332 | |
2323 | |
2333 | Send_With_Handling (&pl->socket, &sl); |
2324 | Send_With_Handling (pl->socket, &sl); |
2334 | } |
2325 | } |
2335 | } |
2326 | } |
2336 | } |
2327 | } |
2337 | } |
2328 | } |
2338 | |
2329 | |
2339 | void |
2330 | void |
2340 | esrv_remove_spell (player *pl, object *spell) |
2331 | esrv_remove_spell (player *pl, object *spell) |
2341 | { |
2332 | { |
2342 | if (!pl->socket.monitor_spells) |
2333 | if (!pl->socket->monitor_spells) |
2343 | return; |
2334 | return; |
2344 | |
2335 | |
2345 | if (!pl || !spell || spell->env != pl->ob) |
2336 | if (!pl || !spell || spell->env != pl->ob) |
2346 | { |
2337 | { |
2347 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2338 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
… | |
… | |
2351 | packet sl; |
2342 | packet sl; |
2352 | |
2343 | |
2353 | sl << "delspell " |
2344 | sl << "delspell " |
2354 | << uint32 (spell->count); |
2345 | << uint32 (spell->count); |
2355 | |
2346 | |
2356 | Send_With_Handling (&pl->socket, &sl); |
2347 | Send_With_Handling (pl->socket, &sl); |
2357 | } |
2348 | } |
2358 | |
2349 | |
2359 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2350 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2360 | static void |
2351 | static void |
2361 | append_spell (player *pl, packet &sl, object *spell) |
2352 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2409 | { |
2400 | { |
2410 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2401 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2411 | return; |
2402 | return; |
2412 | } |
2403 | } |
2413 | |
2404 | |
2414 | if (!pl->socket.monitor_spells) |
2405 | if (!pl->socket->monitor_spells) |
2415 | return; |
2406 | return; |
2416 | |
2407 | |
2417 | packet sl; |
2408 | packet sl; |
2418 | |
2409 | |
2419 | sl << "addspell "; |
2410 | sl << "addspell "; |
… | |
… | |
2438 | if (spell->type != SPELL) |
2429 | if (spell->type != SPELL) |
2439 | continue; |
2430 | continue; |
2440 | |
2431 | |
2441 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2432 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2442 | { |
2433 | { |
2443 | Send_With_Handling (&pl->socket, &sl); |
2434 | Send_With_Handling (pl->socket, &sl); |
2444 | |
2435 | |
2445 | sl.reset (); |
2436 | sl.reset (); |
2446 | sl << "addspell "; |
2437 | sl << "addspell "; |
2447 | } |
2438 | } |
2448 | |
2439 | |
… | |
… | |
2462 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2453 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2463 | fatal (0); |
2454 | fatal (0); |
2464 | } |
2455 | } |
2465 | |
2456 | |
2466 | /* finally, we can send the packet */ |
2457 | /* finally, we can send the packet */ |
2467 | Send_With_Handling (&pl->socket, &sl); |
2458 | Send_With_Handling (pl->socket, &sl); |
2468 | |
|
|
2469 | } |
2459 | } |
2470 | |
2460 | |