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.158 by root, Fri Nov 6 13:11:28 2009 UTC vs.
Revision 1.165 by root, Fri Mar 26 01:04:45 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.
… …
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);
… …
838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 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); 845 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); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
847 847
848 flags = 0; 848 flags = 0;
849 849
850 if (opl->fire_on) 850 if (opl->fire_on)
… …
853 if (opl->run_on) 853 if (opl->run_on)
854 flags |= SF_RUNON; 854 flags |= SF_RUNON;
855 855
856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857 857
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++) 858 for (int i = 0; i < NROFATTACKS; i++)
862 { 859 {
863 /* Skip ones we won't send */ 860 /* Skip ones we won't send */
864 if (atnr_cs_stat[i] == -1) 861 if (atnr_cs_stat[i] == -1)
865 continue; 862 continue;
866 863
867 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
868 } 865 }
869 866
870 if (pl->ns->monitor_spells) 867 if (pl->ns->monitor_spells)
871 { 868 {
872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 869 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); 870 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
… …
984prefetch_surrounding_maps (maptile *map, int distance) 981prefetch_surrounding_maps (maptile *map, int distance)
985{ 982{
986 map->touch (); 983 map->touch ();
987 984
988 if (--distance) 985 if (--distance)
989 for (int dir = 4; --dir; ) 986 for (int dir = 4; dir--; )
990 if (const shstr &path = map->tile_path [dir]) 987 if (const shstr &path = map->tile_path [dir])
991 if (maptile *&neigh = map->tile_map [dir]) 988 if (maptile *&neigh = map->tile_map [dir])
992 prefetch_surrounding_maps (neigh, distance); 989 prefetch_surrounding_maps (neigh, distance);
993 else 990 else
994 neigh = maptile::find_async (path, map); 991 neigh = maptile::find_async (path, map);
… …
1087 map_clearcell (&lastcell, -1); 1084 map_clearcell (&lastcell, -1);
1088 } 1085 }
1089 1086
1090 continue; 1087 continue;
1091 } 1088 }
1092 1089
1093 int d = pl->blocked_los_uc (dx, dy); 1090 int d = pl->blocked_los_uc (dx, dy);
1094 1091
1095 if (d > 3) 1092 if (d > 3)
1096 { 1093 {
1097 /* This block deals with spaces that are not visible for whatever 1094 /* This block deals with spaces that are not visible for whatever
… …
1276esrv_update_spells (player *pl) 1273esrv_update_spells (player *pl)
1277{ 1274{
1278 if (!pl->ns) 1275 if (!pl->ns)
1279 return; 1276 return;
1280 1277
1278 pl->ns->update_spells = false;
1279
1281 if (!pl->ns->monitor_spells) 1280 if (!pl->ns->monitor_spells)
1282 return; 1281 return;
1283 1282
1284 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1283 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1285 {
1286 if (spell->type == SPELL) 1284 if (spell->type == SPELL)
1287 { 1285 {
1288 int flags = 0; 1286 int flags = 0;
1287 int val;
1289 1288
1290 /* check if we need to update it */ 1289 /* check if we need to update it */
1291 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1290 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1291 if (spell->cached_sp != val)
1292 { 1292 {
1293 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1293 spell->cached_sp = val;
1294 flags |= UPD_SP_MANA; 1294 flags |= UPD_SP_MANA;
1295 } 1295 }
1296 1296
1297 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1297 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1298 if (spell->cached_grace != val)
1298 { 1299 {
1299 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1300 spell->cached_grace = val;
1300 flags |= UPD_SP_GRACE; 1301 flags |= UPD_SP_GRACE;
1301 } 1302 }
1302 1303
1303 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1304 val = casting_level (pl->ob, spell);
1305 if (spell->cached_eat != val)
1304 { 1306 {
1305 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1307 spell->cached_eat = val;
1306 flags |= UPD_SP_DAMAGE; 1308 flags |= UPD_SP_LEVEL;
1307 } 1309 }
1308 1310
1309 if (flags) 1311 if (flags)
1310 { 1312 {
1311 packet sl; 1313 packet sl;
1312 1314
1313 sl << "updspell " 1315 sl << "updspell "
1314 << uint8 (flags) 1316 << uint8 (flags)
1315 << uint32 (spell->count); 1317 << uint32 (spell->count);
1316 1318
1317 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); 1319 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1318 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); 1320 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1319 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); 1321 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1320 1322
1321 pl->ns->send_packet (sl); 1323 pl->ns->send_packet (sl);
1322 } 1324 }
1323 } 1325 }
1324 }
1325} 1326}
1326 1327
1327void 1328void
1328esrv_remove_spell (player *pl, object *spell) 1329esrv_remove_spell (player *pl, object *spell)
1329{ 1330{
… …
1356 } 1357 }
1357 1358
1358 /* store costs and damage in the object struct, to compare to later */ 1359 /* store costs and damage in the object struct, to compare to later */
1359 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1360 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1360 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1361 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1362 spell->cached_eat = casting_level (pl->ob, spell);
1362 1363
1363 /* figure out which skill it uses, if it uses one */ 1364 /* figure out which skill it uses, if it uses one */
1364 if (spell->skill) 1365 if (spell->skill)
1365 if (object *tmp = pl->find_skill (spell->skill)) 1366 if (object *tmp = pl->find_skill (spell->skill))
1366 skill = tmp->subtype + CS_STAT_SKILLINFO; 1367 skill = tmp->subtype + CS_STAT_SKILLINFO;

Diff Legend

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