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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.286 by root, Wed May 4 19:04:45 2011 UTC vs.
Revision 1.291 by root, Mon Nov 12 03:14:33 2012 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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.
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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25//+GPL 25//+GPL
26 26
… …
373 */ 373 */
374int 374int
375path_to_player (object *mon, object *pl, unsigned mindiff) 375path_to_player (object *mon, object *pl, unsigned mindiff)
376{ 376{
377 rv_vector rv; 377 rv_vector rv;
378 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked; 378 int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
379 379
380 get_rangevector (mon, pl, &rv, 0); 380 get_rangevector (mon, pl, &rv, 0);
381 381
382 if (rv.distance < mindiff) 382 if (rv.distance < mindiff)
383 return 0; 383 return 0;
… …
536 } 536 }
537 } 537 }
538 538
539 /* Here we remove duplicated skills (as duplicated spell objects have 539 /* Here we remove duplicated skills (as duplicated spell objects have
540 * _very_ confusing effects for players), which could for instance be 540 * _very_ confusing effects for players), which could for instance be
541 * generated by bad treasurelists. - elmex 541 * generated by multiple treasurelists specifying the same skills.
542 */ 542 */
543 if (op->type == SKILL) 543 if (op->type == SKILL)
544 { 544 {
545 for (object *tmp = op->below; tmp; tmp = tmp->below) 545 for (object *tmp = op->below; tmp; tmp = tmp->below)
546 if (tmp->type == op->type && tmp->name == op->name) 546 if (tmp->type == op->type && tmp->name == op->name)
547 { 547 {
548 op->destroy (); 548 op->destroy ();
549 LOG (llevError,
550 "give_initial_items: Removing duplicate skill %s\n", &tmp->name);
551 break; 549 break;
552 } 550 }
553 551
554 if (op->nrof > 1) 552 if (op->nrof > 1)
555 op->nrof = 1; 553 op->nrof = 1;
… …
1593 1591
1594 if (item->type == WAND) 1592 if (item->type == WAND)
1595 { 1593 {
1596 if (!(--item->stats.food)) 1594 if (!(--item->stats.food))
1597 { 1595 {
1598 object *tmp;
1599
1600 if (item->arch) 1596 if (item->arch)
1601 { 1597 {
1602 item->clr_flag (FLAG_ANIMATE); 1598 item->clr_flag (FLAG_ANIMATE);
1603 item->face = item->arch->face; 1599 item->face = item->arch->face;
1604 item->set_speed (0); 1600 item->set_speed (0);
… …
2168void 2164void
2169do_some_living (object *op) 2165do_some_living (object *op)
2170{ 2166{
2171 int last_food = op->stats.food; 2167 int last_food = op->stats.food;
2172 int gen_hp, gen_sp, gen_grace; 2168 int gen_hp, gen_sp, gen_grace;
2173 int i;
2174 int rate_hp = 1200; 2169 int rate_hp = 1200;
2175 int rate_sp = 2500; 2170 int rate_sp = 2500;
2176 int rate_grace = 2000; 2171 int rate_grace = 2000;
2177 const int max_hp = 1; 2172 const int max_hp = 1;
2178 const int max_sp = 1; 2173 const int max_sp = 1;
… …
2702} 2697}
2703 2698
2704static void 2699static void
2705loot_object (object *op) 2700loot_object (object *op)
2706{ /* Grab and destroy some treasure */ 2701{ /* Grab and destroy some treasure */
2707 object *tmp, *tmp2, *next; 2702 object *tmp, *next;
2708 2703
2709 op->close_container (); /* close open sack first */ 2704 op->close_container (); /* close open sack first */
2710 2705
2711 for (tmp = op->inv; tmp; tmp = next) 2706 for (tmp = op->inv; tmp; tmp = next)
2712 { 2707 {
… …
2744void 2739void
2745fix_weight () 2740fix_weight ()
2746{ 2741{
2747 for_all_players (pl) 2742 for_all_players (pl)
2748 { 2743 {
2749 sint32 old = pl->ob->carrying; 2744 weight_t old = pl->ob->carrying;
2750 2745
2751 pl->ob->update_weight (); 2746 pl->ob->update_weight ();
2752 2747
2753 if (old != pl->ob->carrying) 2748 if (old != pl->ob->carrying)
2754 { 2749 {

Diff Legend

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