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.156 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.169 by root, Thu Apr 8 17:36:54 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
44 44
45#include <global.h> 45#include <global.h>
46#include <sproto.h> 46#include <sproto.h>
47 47
48#include <living.h> 48#include <living.h>
49#include <commands.h>
50 49
51/* This block is basically taken from socket.c - I assume if it works there, 50/* This block is basically taken from socket.c - I assume if it works there,
52 * it should work here. 51 * it should work here.
53 */ 52 */
54#include <sys/types.h> 53#include <sys/types.h>
… …
220 socket.current_x = ob->x; 219 socket.current_x = ob->x;
221 socket.current_y = ob->y; 220 socket.current_y = ob->y;
222} 221}
223 222
224/** 223/**
224 * This sends the skill number to name mapping. We ignore
225 * the params - we always send the same info no matter what.
226 */
227static void
228send_skill_info (client *ns, char *params)
229{
230 packet sl;
231 sl << "replyinfo skill_info\n";
232
233 for (int i = 1; i < NUM_SKILLS; i++)
234 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
235
236 if (sl.length () > MAXSOCKBUF)
237 {
238 LOG (llevError, "Buffer overflow in send_skill_info!\n");
239 fatal (0);
240 }
241
242 ns->send_packet (sl);
243}
244
245/**
246 * This sends the spell path to name mapping. We ignore
247 * the params - we always send the same info no matter what.
248 */
249static void
250send_spell_paths (client * ns, char *params)
251{
252 packet sl;
253
254 sl << "replyinfo spell_paths\n";
255
256 for (int i = 0; i < NRSPELLPATHS; i++)
257 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
258
259 if (sl.length () > MAXSOCKBUF)
260 {
261 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
262 fatal (0);
263 }
264
265 ns->send_packet (sl);
266}
267
268/**
225 * RequestInfo is sort of a meta command. There is some specific 269 * RequestInfo is sort of a meta command. There is some specific
226 * request of information, but we call other functions to provide 270 * request of information, but we call other functions to provide
227 * that information. 271 * that information.
228 */ 272 */
229void 273void
… …
531 * commands. 575 * commands.
532 */ 576 */
533 pl->count = 0; 577 pl->count = 0;
534 578
535 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 579 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
536 int time = fabs (pl->ob->speed) < 0.001 580 int time = pl->ob->has_active_speed ()
537 ? time = MAX_TIME * 100
538 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 581 ? (int) (MAX_TIME / pl->ob->speed)
582 : MAX_TIME * 100;
539 583
540 /* Send confirmation of command execution now */ 584 /* Send confirmation of command execution now */
541 packet sl ("comc"); 585 packet sl ("comc");
542 sl << uint16 (cmdid) << uint32 (time); 586 sl << uint16 (cmdid) << uint32 (time);
543 pl->ns->send_packet (sl); 587 pl->ns->send_packet (sl);
… …
585 LOG (llevError, "Unknown input state: %d\n", ns->state); 629 LOG (llevError, "Unknown input state: %d\n", ns->state);
586 } 630 }
587} 631}
588 632
589/** 633/**
590 * Client tells its version. If there is a mismatch, we close the 634 * Client tells its version info.
591 * socket. In real life, all we should care about is the client having
592 * something older than the server. If we assume the client will be
593 * backwards compatible, having it be a later version should not be a
594 * problem.
595 */ 635 */
596void 636void
597VersionCmd (char *buf, int len, client * ns) 637VersionCmd (char *buf, int len, client *ns)
598{ 638{
599 if (!buf) 639 INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
600 {
601 LOG (llevError, "CS: received corrupted version command\n");
602 return;
603 }
604
605 ns->cs_version = atoi (buf);
606 ns->sc_version = ns->cs_version;
607
608 LOG (llevDebug, "connection from client <%s>\n", buf);
609
610 //TODO: should log here just for statistics
611
612 //if (VERSION_CS != ns->cs_version)
613 // unchecked;
614
615 char *cp = strchr (buf + 1, ' ');
616 if (!cp)
617 return;
618
619 ns->sc_version = atoi (cp);
620
621 //if (VERSION_SC != ns->sc_version)
622 // unchecked;
623
624 cp = strchr (cp + 1, ' ');
625
626 if (cp)
627 {
628 ns->version = cp + 1;
629
630 if (ns->sc_version < 1026)
631 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
632 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
633 }
634} 640}
635 641
636/** sound related functions. */ 642/** sound related functions. */
637void 643void
638SetSound (char *buf, int len, client * ns) 644SetSound (char *buf, int len, client * ns)
… …
690 */ 696 */
691static void 697static void
692rangetostring (player *pl, char *obuf) 698rangetostring (player *pl, char *obuf)
693{ 699{
694 dynbuf_text &buf = msg_dynbuf; buf.clear (); 700 dynbuf_text &buf = msg_dynbuf; buf.clear ();
701
702#if 0
703 // print ranged/chosen_skill etc. objects every call
704 printf ("%s %s => %s (%s)\n",
705 pl->ranged_ob ? &pl->ranged_ob->name : "-",
706 pl->combat_ob ? &pl->combat_ob->name : "-",
707 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
708 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
709 );
710#endif
695 711
696 if (pl->ranged_ob) 712 if (pl->ranged_ob)
697 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 713 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
698 714
699 if (pl->combat_ob) 715 if (pl->combat_ob)
… …
793 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 809 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
794 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 810 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
795 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 811 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
796 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 812 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
797 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 813 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
798 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 814 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
799 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 815 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
800 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 816 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
801 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 817 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
802 818
803 flags = 0; 819 flags = 0;
804 820
805 if (opl->fire_on) 821 if (opl->fire_on)
… …
808 if (opl->run_on) 824 if (opl->run_on)
809 flags |= SF_RUNON; 825 flags |= SF_RUNON;
810 826
811 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 827 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
812 828
813 if (ns->sc_version < 1025)
814 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
815 else
816 for (int i = 0; i < NROFATTACKS; i++) 829 for (int i = 0; i < NROFATTACKS; i++)
817 { 830 {
818 /* Skip ones we won't send */ 831 /* Skip ones we won't send */
819 if (atnr_cs_stat[i] == -1) 832 if (atnr_cs_stat[i] == -1)
820 continue; 833 continue;
821 834
822 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 835 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
823 } 836 }
824 837
825 if (pl->ns->monitor_spells) 838 if (pl->ns->monitor_spells)
826 { 839 {
827 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 840 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
828 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 841 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
939prefetch_surrounding_maps (maptile *map, int distance) 952prefetch_surrounding_maps (maptile *map, int distance)
940{ 953{
941 map->touch (); 954 map->touch ();
942 955
943 if (--distance) 956 if (--distance)
944 for (int dir = 4; --dir; ) 957 for (int dir = 4; dir--; )
945 if (const shstr &path = map->tile_path [dir]) 958 if (const shstr &path = map->tile_path [dir])
946 if (maptile *&neigh = map->tile_map [dir]) 959 if (maptile *&neigh = map->tile_map [dir])
947 prefetch_surrounding_maps (neigh, distance); 960 prefetch_surrounding_maps (neigh, distance);
948 else 961 else
949 neigh = maptile::find_async (path, map); 962 neigh = maptile::find_async (path, map);
… …
1042 map_clearcell (&lastcell, -1); 1055 map_clearcell (&lastcell, -1);
1043 } 1056 }
1044 1057
1045 continue; 1058 continue;
1046 } 1059 }
1047 1060
1048 int d = pl->blocked_los_uc (dx, dy); 1061 int d = pl->blocked_los_uc (dx, dy);
1049 1062
1050 if (d > 3) 1063 if (d > 3)
1051 { 1064 {
1052 /* This block deals with spaces that are not visible for whatever 1065 /* This block deals with spaces that are not visible for whatever
… …
1221 socket.send_packet (sl); 1234 socket.send_packet (sl);
1222 socket.sent_scroll = 0; 1235 socket.sent_scroll = 0;
1223 } 1236 }
1224} 1237}
1225 1238
1226/*****************************************************************************/
1227/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1228/* a player. Of course, the client need to know the command to be able to */
1229/* manage it ! */
1230/*****************************************************************************/
1231void
1232send_plugin_custom_message (object *pl, char *buf)
1233{
1234 pl->contr->ns->send_packet (buf);
1235}
1236
1237/**
1238 * This sends the skill number to name mapping. We ignore
1239 * the params - we always send the same info no matter what.
1240 */
1241void
1242send_skill_info (client *ns, char *params)
1243{
1244 packet sl;
1245 sl << "replyinfo skill_info\n";
1246
1247 for (int i = 1; i < NUM_SKILLS; i++)
1248 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1249
1250 if (sl.length () > MAXSOCKBUF)
1251 {
1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1253 fatal (0);
1254 }
1255
1256 ns->send_packet (sl);
1257}
1258
1259/**
1260 * This sends the spell path to name mapping. We ignore
1261 * the params - we always send the same info no matter what.
1262 */
1263void
1264send_spell_paths (client * ns, char *params)
1265{
1266 packet sl;
1267
1268 sl << "replyinfo spell_paths\n";
1269
1270 for (int i = 0; i < NRSPELLPATHS; i++)
1271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1272
1273 if (sl.length () > MAXSOCKBUF)
1274 {
1275 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1276 fatal (0);
1277 }
1278
1279 ns->send_packet (sl);
1280}
1281
1282/** 1239/**
1283 * This looks for any spells the player may have that have changed their stats. 1240 * This looks for any spells the player may have that have changed their stats.
1284 * it then sends an updspell packet for each spell that has changed in this way 1241 * it then sends an updspell packet for each spell that has changed in this way
1285 */ 1242 */
1286void 1243void
1287esrv_update_spells (player *pl) 1244esrv_update_spells (player *pl)
1288{ 1245{
1289 if (!pl->ns) 1246 if (!pl->ns)
1290 return; 1247 return;
1291 1248
1249 pl->ns->update_spells = false;
1250
1292 if (!pl->ns->monitor_spells) 1251 if (!pl->ns->monitor_spells)
1293 return; 1252 return;
1294 1253
1295 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1254 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296 {
1297 if (spell->type == SPELL) 1255 if (spell->type == SPELL)
1298 { 1256 {
1299 int flags = 0; 1257 int flags = 0;
1258 int val;
1300 1259
1301 /* check if we need to update it */ 1260 /* check if we need to update it */
1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1261 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1262 if (spell->cached_sp != val)
1303 { 1263 {
1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1264 spell->cached_sp = val;
1305 flags |= UPD_SP_MANA; 1265 flags |= UPD_SP_MANA;
1306 } 1266 }
1307 1267
1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1268 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1269 if (spell->cached_grace != val)
1309 { 1270 {
1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1271 spell->cached_grace = val;
1311 flags |= UPD_SP_GRACE; 1272 flags |= UPD_SP_GRACE;
1312 } 1273 }
1313 1274
1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1275 val = casting_level (pl->ob, spell);
1276 if (spell->cached_eat != val)
1315 { 1277 {
1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1278 spell->cached_eat = val;
1317 flags |= UPD_SP_DAMAGE; 1279 flags |= UPD_SP_LEVEL;
1318 } 1280 }
1319 1281
1320 if (flags) 1282 if (flags)
1321 { 1283 {
1322 packet sl; 1284 packet sl;
1323 1285
1324 sl << "updspell " 1286 sl << "updspell "
1325 << uint8 (flags) 1287 << uint8 (flags)
1326 << uint32 (spell->count); 1288 << uint32 (spell->count);
1327 1289
1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1290 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1291 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1292 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331 1293
1332 pl->ns->send_packet (sl); 1294 pl->ns->send_packet (sl);
1333 } 1295 }
1334 } 1296 }
1335 }
1336} 1297}
1337 1298
1338void 1299void
1339esrv_remove_spell (player *pl, object *spell) 1300esrv_remove_spell (player *pl, object *spell)
1340{ 1301{
… …
1367 } 1328 }
1368 1329
1369 /* store costs and damage in the object struct, to compare to later */ 1330 /* store costs and damage in the object struct, to compare to later */
1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1331 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1332 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1333 spell->cached_eat = casting_level (pl->ob, spell);
1373 1334
1374 /* figure out which skill it uses, if it uses one */ 1335 /* figure out which skill it uses, if it uses one */
1375 if (spell->skill) 1336 if (spell->skill)
1376 if (object *tmp = pl->find_skill (spell->skill)) 1337 if (object *tmp = pl->find_skill (spell->skill))
1377 skill = tmp->subtype + CS_STAT_SKILLINFO; 1338 skill = tmp->subtype + CS_STAT_SKILLINFO;

Diff Legend

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