ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/living.C
(Generate patch)

Comparing deliantra/server/common/living.C (file contents):
Revision 1.93 by root, Thu Dec 18 19:56:09 2008 UTC vs.
Revision 1.98 by root, Mon Oct 12 14:00:57 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
858 * then calls this function. 859 * then calls this function.
859 */ 860 */
860 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION) 861 if (QUERY_FLAG (tmp, FLAG_APPLIED) && tmp->type == POTION)
861 continue; 862 continue;
862 863
863 /* See note in map.c:update_position about making this additive
864 * since light sources are never applied, need to put check here.
865 */
866 glow_radius = max (glow_radius, tmp->glow_radius); 864 glow_radius += tmp->glow_radius;
867 865
868 /* For some things, we don't care what is equipped */ 866 /* For some things, we don't care what is equipped */
869 if (tmp->type == SKILL) 867 if (tmp->type == SKILL)
870 { 868 {
871 /* Want to take the highest skill here. */ 869 /* Want to take the highest skill here. */
… …
1137 else /* To nullify the below effect */ 1135 else /* To nullify the below effect */
1138 ac += tmp->stats.ac + tmp->magic; 1136 ac += tmp->stats.ac + tmp->magic;
1139 } 1137 }
1140 1138
1141 if (tmp->stats.wc) 1139 if (tmp->stats.wc)
1142 wc -= (tmp->stats.wc + tmp->magic); 1140 wc -= tmp->stats.wc + tmp->magic;
1143 1141
1144 if (tmp->stats.ac) 1142 if (tmp->stats.ac)
1145 ac -= (tmp->stats.ac + tmp->magic); 1143 ac -= tmp->stats.ac + tmp->magic;
1146 1144
1147 if (ARMOUR_SPEED (tmp)) 1145 if (ARMOUR_SPEED (tmp))
1148 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f); 1146 max_speed = min (max_speed, ARMOUR_SPEED (tmp) / 10.f);
1149 1147
1150 break; 1148 break;
1151 } /* switch tmp->type */ 1149 } /* switch tmp->type */
1152 } /* item is equipped */ 1150 } /* item is equipped */
1153 } /* for loop of items */ 1151 } /* for loop of items */
1152
1153 glow_radius = min (glow_radius, MAX_LIGHT_RADIUS);
1154 1154
1155 /* We've gone through all the objects the player has equipped. For many things, we 1155 /* We've gone through all the objects the player has equipped. For many things, we
1156 * have generated intermediate values which we now need to assign. 1156 * have generated intermediate values which we now need to assign.
1157 */ 1157 */
1158 1158
… …
1328 1328
1329 speed = 1.f + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1330 1330
1331 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1332 speed -= 1; 1332 speed -= 1;
1333
1334 if (attacktype == 0)
1335 attacktype = arch->attacktype;
1336 } /* End if player */ 1333 } /* End if player */
1337 1334
1338 if (added_speed >= 0) 1335 if (added_speed >= 0)
1339 speed += added_speed / 10.f; 1336 speed += added_speed / 10.f;
1340 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
… …
1417 } 1414 }
1418 1415
1419 // update the mapspace, if we are on a map 1416 // update the mapspace, if we are on a map
1420 if (!flag [FLAG_REMOVED] && map) 1417 if (!flag [FLAG_REMOVED] && map)
1421 map->at (x, y).flags_ = 0; 1418 map->at (x, y).flags_ = 0;
1419}
1420
1421void
1422object::set_glow_radius (sint8 rad)
1423{
1424 glow_radius = rad;
1425
1426 if (is_on_map ())
1427 update_all_los (map, x, y);
1428 else if (object *env = outer_env ())
1429 {
1430 env->update_stats ();
1431
1432 if (env->is_on_map ())
1433 update_all_los (env->map, env->x, env->y);
1434 }
1422} 1435}
1423 1436
1424/* 1437/*
1425 * Returns true if the given player is a legal class. 1438 * Returns true if the given player is a legal class.
1426 * The function to add and remove class-bonuses to the stats doesn't 1439 * The function to add and remove class-bonuses to the stats doesn't

Diff Legend

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