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.157 by root, Fri Nov 6 13:05:57 2009 UTC vs.
Revision 1.166 by root, Fri Apr 2 03:41:25 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.
… …
223 223
224/** 224/**
225 * This sends the skill number to name mapping. We ignore 225 * This sends the skill number to name mapping. We ignore
226 * the params - we always send the same info no matter what. 226 * the params - we always send the same info no matter what.
227 */ 227 */
228void 228static void
229send_skill_info (client *ns, char *params) 229send_skill_info (client *ns, char *params)
230{ 230{
231 packet sl; 231 packet sl;
232 sl << "replyinfo skill_info\n"; 232 sl << "replyinfo skill_info\n";
233 233
… …
245 245
246/** 246/**
247 * This sends the spell path to name mapping. We ignore 247 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what. 248 * the params - we always send the same info no matter what.
249 */ 249 */
250void 250static void
251send_spell_paths (client * ns, char *params) 251send_spell_paths (client * ns, char *params)
252{ 252{
253 packet sl; 253 packet sl;
254 254
255 sl << "replyinfo spell_paths\n"; 255 sl << "replyinfo spell_paths\n";
… …
576 * commands. 576 * commands.
577 */ 577 */
578 pl->count = 0; 578 pl->count = 0;
579 579
580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
581 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
582 ? time = MAX_TIME * 100
583 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
584 584
585 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
586 packet sl ("comc"); 586 packet sl ("comc");
587 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
588 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
735 */ 735 */
736static void 736static void
737rangetostring (player *pl, char *obuf) 737rangetostring (player *pl, char *obuf)
738{ 738{
739 dynbuf_text &buf = msg_dynbuf; buf.clear (); 739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740
741 printf ("%s %s => %s (%s)\n",//D
742 pl->ranged_ob ? &pl->ranged_ob->name : "-",
743 pl->combat_ob ? &pl->combat_ob->name : "-",
744 pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
745 pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
746 );
740 747
741 if (pl->ranged_ob) 748 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 749 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743 750
744 if (pl->combat_ob) 751 if (pl->combat_ob)
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 845 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 846 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 847 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 848 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 849 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 850 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 851 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 852 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 853 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 854
848 flags = 0; 855 flags = 0;
849 856
850 if (opl->fire_on) 857 if (opl->fire_on)
… …
853 if (opl->run_on) 860 if (opl->run_on)
854 flags |= SF_RUNON; 861 flags |= SF_RUNON;
855 862
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 863 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 864
858 if (ns->sc_version < 1025)
859 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
860 else
861 for (int i = 0; i < NROFATTACKS; i++) 865 for (int i = 0; i < NROFATTACKS; i++)
862 { 866 {
863 /* Skip ones we won't send */ 867 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 868 if (atnr_cs_stat[i] == -1)
865 continue; 869 continue;
866 870
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 871 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 } 872 }
869 873
870 if (pl->ns->monitor_spells) 874 if (pl->ns->monitor_spells)
871 { 875 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 876 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 877 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
984prefetch_surrounding_maps (maptile *map, int distance) 988prefetch_surrounding_maps (maptile *map, int distance)
985{ 989{
986 map->touch (); 990 map->touch ();
987 991
988 if (--distance) 992 if (--distance)
989 for (int dir = 4; --dir; ) 993 for (int dir = 4; dir--; )
990 if (const shstr &path = map->tile_path [dir]) 994 if (const shstr &path = map->tile_path [dir])
991 if (maptile *&neigh = map->tile_map [dir]) 995 if (maptile *&neigh = map->tile_map [dir])
992 prefetch_surrounding_maps (neigh, distance); 996 prefetch_surrounding_maps (neigh, distance);
993 else 997 else
994 neigh = maptile::find_async (path, map); 998 neigh = maptile::find_async (path, map);
… …
1087 map_clearcell (&lastcell, -1); 1091 map_clearcell (&lastcell, -1);
1088 } 1092 }
1089 1093
1090 continue; 1094 continue;
1091 } 1095 }
1092 1096
1093 int d = pl->blocked_los_uc (dx, dy); 1097 int d = pl->blocked_los_uc (dx, dy);
1094 1098
1095 if (d > 3) 1099 if (d > 3)
1096 { 1100 {
1097 /* This block deals with spaces that are not visible for whatever 1101 /* This block deals with spaces that are not visible for whatever
… …
1266 socket.send_packet (sl); 1270 socket.send_packet (sl);
1267 socket.sent_scroll = 0; 1271 socket.sent_scroll = 0;
1268 } 1272 }
1269} 1273}
1270 1274
1271/*****************************************************************************/
1272/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1273/* a player. Of course, the client need to know the command to be able to */
1274/* manage it ! */
1275/*****************************************************************************/
1276void
1277send_plugin_custom_message (object *pl, char *buf)
1278{
1279 pl->contr->ns->send_packet (buf);
1280}
1281
1282/** 1275/**
1283 * This looks for any spells the player may have that have changed their stats. 1276 * 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 1277 * it then sends an updspell packet for each spell that has changed in this way
1285 */ 1278 */
1286void 1279void
1287esrv_update_spells (player *pl) 1280esrv_update_spells (player *pl)
1288{ 1281{
1289 if (!pl->ns) 1282 if (!pl->ns)
1290 return; 1283 return;
1291 1284
1285 pl->ns->update_spells = false;
1286
1292 if (!pl->ns->monitor_spells) 1287 if (!pl->ns->monitor_spells)
1293 return; 1288 return;
1294 1289
1295 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1290 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296 {
1297 if (spell->type == SPELL) 1291 if (spell->type == SPELL)
1298 { 1292 {
1299 int flags = 0; 1293 int flags = 0;
1294 int val;
1300 1295
1301 /* check if we need to update it */ 1296 /* check if we need to update it */
1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1297 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1298 if (spell->cached_sp != val)
1303 { 1299 {
1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1300 spell->cached_sp = val;
1305 flags |= UPD_SP_MANA; 1301 flags |= UPD_SP_MANA;
1306 } 1302 }
1307 1303
1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1304 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1305 if (spell->cached_grace != val)
1309 { 1306 {
1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1307 spell->cached_grace = val;
1311 flags |= UPD_SP_GRACE; 1308 flags |= UPD_SP_GRACE;
1312 } 1309 }
1313 1310
1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1311 val = casting_level (pl->ob, spell);
1312 if (spell->cached_eat != val)
1315 { 1313 {
1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1314 spell->cached_eat = val;
1317 flags |= UPD_SP_DAMAGE; 1315 flags |= UPD_SP_LEVEL;
1318 } 1316 }
1319 1317
1320 if (flags) 1318 if (flags)
1321 { 1319 {
1322 packet sl; 1320 packet sl;
1323 1321
1324 sl << "updspell " 1322 sl << "updspell "
1325 << uint8 (flags) 1323 << uint8 (flags)
1326 << uint32 (spell->count); 1324 << uint32 (spell->count);
1327 1325
1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1326 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1327 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1328 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331 1329
1332 pl->ns->send_packet (sl); 1330 pl->ns->send_packet (sl);
1333 } 1331 }
1334 } 1332 }
1335 }
1336} 1333}
1337 1334
1338void 1335void
1339esrv_remove_spell (player *pl, object *spell) 1336esrv_remove_spell (player *pl, object *spell)
1340{ 1337{
… …
1367 } 1364 }
1368 1365
1369 /* store costs and damage in the object struct, to compare to later */ 1366 /* 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); 1367 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); 1368 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); 1369 spell->cached_eat = casting_level (pl->ob, spell);
1373 1370
1374 /* figure out which skill it uses, if it uses one */ 1371 /* figure out which skill it uses, if it uses one */
1375 if (spell->skill) 1372 if (spell->skill)
1376 if (object *tmp = pl->find_skill (spell->skill)) 1373 if (object *tmp = pl->find_skill (spell->skill))
1377 skill = tmp->subtype + CS_STAT_SKILLINFO; 1374 skill = tmp->subtype + CS_STAT_SKILLINFO;

Diff Legend

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