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.95 by root, Wed Dec 31 17:35:37 2008 UTC vs.
Revision 1.99 by root, Fri Nov 6 12:49:19 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>
… …
1327 1328
1328 speed = 1.f + speed_bonus[stats.Dex]; 1329 speed = 1.f + speed_bonus[stats.Dex];
1329 1330
1330 if (settings.search_items && contr->search_str[0]) 1331 if (settings.search_items && contr->search_str[0])
1331 speed -= 1; 1332 speed -= 1;
1332
1333 if (attacktype == 0)
1334 attacktype = arch->attacktype;
1335 } /* End if player */ 1333 } /* End if player */
1336 1334
1337 if (added_speed >= 0) 1335 if (added_speed >= 0)
1338 speed += added_speed / 10.f; 1336 speed += added_speed / 10.f;
1339 else /* Something wrong here...: */ 1337 else /* Something wrong here...: */
… …
1418 // update the mapspace, if we are on a map 1416 // update the mapspace, if we are on a map
1419 if (!flag [FLAG_REMOVED] && map) 1417 if (!flag [FLAG_REMOVED] && map)
1420 map->at (x, y).flags_ = 0; 1418 map->at (x, y).flags_ = 0;
1421} 1419}
1422 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 }
1435}
1436
1423/* 1437/*
1424 * Returns true if the given player is a legal class. 1438 * Returns true if the given player is a legal class.
1425 * 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
1426 * check if the stat becomes negative, thus this function 1440 * check if the stat becomes negative, thus this function
1427 * merely checks that all stats are 1 or more, and returns 1441 * merely checks that all stats are 1 or more, and returns
… …
1489/* 1503/*
1490 * This function is called when a dragon-player gains 1504 * This function is called when a dragon-player gains
1491 * an overall level. Here, the dragon might gain new abilities 1505 * an overall level. Here, the dragon might gain new abilities
1492 * or change the ability-focus. 1506 * or change the ability-focus.
1493 */ 1507 */
1494void 1508static void
1495dragon_level_gain (object *who) 1509dragon_level_gain (object *who)
1496{ 1510{
1497 object *abil = NULL; /* pointer to dragon ability force */ 1511 object *abil = NULL; /* pointer to dragon ability force */
1498 object *skin = NULL; /* pointer to dragon skin force */ 1512 object *skin = NULL; /* pointer to dragon skin force */
1499 object *tmp = NULL; /* tmp. object */ 1513 object *tmp = NULL; /* tmp. object */
… …
1775 * adjustments based on permanent exp and the like. 1789 * adjustments based on permanent exp and the like.
1776 * This function should always be used for losing experience - 1790 * This function should always be used for losing experience -
1777 * the 'exp' value passed should be positive - this is the 1791 * the 'exp' value passed should be positive - this is the
1778 * amount that should get subtract from the player. 1792 * amount that should get subtract from the player.
1779 */ 1793 */
1780sint64 1794static sint64
1781check_exp_loss (const object *op, sint64 exp) 1795check_exp_loss (const object *op, sint64 exp)
1782{ 1796{
1783 sint64 del_exp; 1797 sint64 del_exp;
1784 1798
1785 if (exp > op->stats.exp) 1799 if (exp > op->stats.exp)

Diff Legend

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