--- deliantra/server/socket/request.C 2009/11/06 12:49:19 1.156 +++ deliantra/server/socket/request.C 2010/04/06 22:59:28 1.168 @@ -1,9 +1,9 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2001,2007 Mark Wedel - * Copyright (©) 1992,2007 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2001 Mark Wedel + * Copyright (©) 1992 Frank Tore Johansen * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero GNU General Public License as published by the @@ -46,7 +46,6 @@ #include #include -#include /* This block is basically taken from socket.c - I assume if it works there, * it should work here. @@ -222,6 +221,51 @@ } /** + * This sends the skill number to name mapping. We ignore + * the params - we always send the same info no matter what. + */ +static void +send_skill_info (client *ns, char *params) +{ + packet sl; + sl << "replyinfo skill_info\n"; + + for (int i = 1; i < NUM_SKILLS; i++) + sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); + + if (sl.length () > MAXSOCKBUF) + { + LOG (llevError, "Buffer overflow in send_skill_info!\n"); + fatal (0); + } + + ns->send_packet (sl); +} + +/** + * This sends the spell path to name mapping. We ignore + * the params - we always send the same info no matter what. + */ +static void +send_spell_paths (client * ns, char *params) +{ + packet sl; + + sl << "replyinfo spell_paths\n"; + + for (int i = 0; i < NRSPELLPATHS; i++) + sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); + + if (sl.length () > MAXSOCKBUF) + { + LOG (llevError, "Buffer overflow in send_spell_paths!\n"); + fatal (0); + } + + ns->send_packet (sl); +} + +/** * RequestInfo is sort of a meta command. There is some specific * request of information, but we call other functions to provide * that information. @@ -533,9 +577,9 @@ pl->count = 0; //TODO: schmorp thinks whatever this calculates, it makes no sense at all - int time = fabs (pl->ob->speed) < 0.001 - ? time = MAX_TIME * 100 - : time = (int) (MAX_TIME / fabs (pl->ob->speed)); + int time = pl->ob->has_active_speed () + ? (int) (MAX_TIME / pl->ob->speed) + : MAX_TIME * 100; /* Send confirmation of command execution now */ packet sl ("comc"); @@ -693,6 +737,16 @@ { dynbuf_text &buf = msg_dynbuf; buf.clear (); +#if 0 + // print ranged/chosen_skill etc. objects every call + printf ("%s %s => %s (%s)\n", + pl->ranged_ob ? &pl->ranged_ob->name : "-", + pl->combat_ob ? &pl->combat_ob->name : "-", + pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-", + pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-" + ); +#endif + if (pl->ranged_ob) buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; @@ -795,9 +849,9 @@ AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); - AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); + AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); - AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); + AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); flags = 0; @@ -810,17 +864,14 @@ AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); - if (ns->sc_version < 1025) - { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } - else - for (int i = 0; i < NROFATTACKS; i++) - { - /* Skip ones we won't send */ - if (atnr_cs_stat[i] == -1) - continue; + for (int i = 0; i < NROFATTACKS; i++) + { + /* Skip ones we won't send */ + if (atnr_cs_stat[i] == -1) + continue; - AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); - } + AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); + } if (pl->ns->monitor_spells) { @@ -941,7 +992,7 @@ map->touch (); if (--distance) - for (int dir = 4; --dir; ) + for (int dir = 4; dir--; ) if (const shstr &path = map->tile_path [dir]) if (maptile *&neigh = map->tile_map [dir]) prefetch_surrounding_maps (neigh, distance); @@ -1044,7 +1095,7 @@ continue; } - + int d = pl->blocked_los_uc (dx, dy); if (d > 3) @@ -1223,62 +1274,6 @@ } } -/*****************************************************************************/ -/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ -/* a player. Of course, the client need to know the command to be able to */ -/* manage it ! */ -/*****************************************************************************/ -void -send_plugin_custom_message (object *pl, char *buf) -{ - pl->contr->ns->send_packet (buf); -} - -/** - * This sends the skill number to name mapping. We ignore - * the params - we always send the same info no matter what. - */ -void -send_skill_info (client *ns, char *params) -{ - packet sl; - sl << "replyinfo skill_info\n"; - - for (int i = 1; i < NUM_SKILLS; i++) - sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); - - if (sl.length () > MAXSOCKBUF) - { - LOG (llevError, "Buffer overflow in send_skill_info!\n"); - fatal (0); - } - - ns->send_packet (sl); -} - -/** - * This sends the spell path to name mapping. We ignore - * the params - we always send the same info no matter what. - */ -void -send_spell_paths (client * ns, char *params) -{ - packet sl; - - sl << "replyinfo spell_paths\n"; - - for (int i = 0; i < NRSPELLPATHS; i++) - sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); - - if (sl.length () > MAXSOCKBUF) - { - LOG (llevError, "Buffer overflow in send_spell_paths!\n"); - fatal (0); - } - - ns->send_packet (sl); -} - /** * This looks for any spells the player may have that have changed their stats. * it then sends an updspell packet for each spell that has changed in this way @@ -1289,50 +1284,54 @@ if (!pl->ns) return; + pl->ns->update_spells = false; + if (!pl->ns->monitor_spells) return; for (object *spell = pl->ob->inv; spell; spell = spell->below) - { - if (spell->type == SPELL) - { - int flags = 0; + if (spell->type == SPELL) + { + int flags = 0; + int val; - /* check if we need to update it */ - if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) - { - spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); - flags |= UPD_SP_MANA; - } + /* check if we need to update it */ + val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); + if (spell->cached_sp != val) + { + spell->cached_sp = val; + flags |= UPD_SP_MANA; + } - if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) - { - spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); - flags |= UPD_SP_GRACE; - } + val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); + if (spell->cached_grace != val) + { + spell->cached_grace = val; + flags |= UPD_SP_GRACE; + } - if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) - { - spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); - flags |= UPD_SP_DAMAGE; - } + val = casting_level (pl->ob, spell); + if (spell->cached_eat != val) + { + spell->cached_eat = val; + flags |= UPD_SP_LEVEL; + } - if (flags) - { - packet sl; + if (flags) + { + packet sl; - sl << "updspell " - << uint8 (flags) - << uint32 (spell->count); + sl << "updspell " + << uint8 (flags) + << uint32 (spell->count); - if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); - if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); - if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); + if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); + if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace); + if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat); - pl->ns->send_packet (sl); - } - } - } + pl->ns->send_packet (sl); + } + } } void @@ -1369,7 +1368,7 @@ /* store costs and damage in the object struct, to compare to later */ spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); - spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); + spell->cached_eat = casting_level (pl->ob, spell); /* figure out which skill it uses, if it uses one */ if (spell->skill)