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.151 by root, Sat Jun 16 00:12:20 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
… …
227 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
229 { 228 {
230 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
231 230
232 shstr_cmp dragon_ability_force ("dragon_ability_force");
233 shstr_cmp dragon_skin_force ("dragon_skin_force");
234
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
237 if (tmp->arch->archname == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
238 abil = tmp; 234 abil = tmp;
239 else if (tmp->arch->archname == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
240 skin = tmp; 236 skin = tmp;
241 237
242 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
243 } 239 }
244 240
… …
301 ns->pl = 0; 297 ns->pl = 0;
302 ns = 0; 298 ns = 0;
303 } 299 }
304 300
305 if (ob) 301 if (ob)
302 {
306 ob->close_container (); //TODO: client-specific 303 ob->close_container (); //TODO: client-specific
304 ob->drop_unpaid_items ();
305 }
307 306
308 observe = ob; 307 observe = ob;
309 308
310 deactivate (); 309 deactivate ();
311} 310}
… …
1189 pick_up (op, tmp); 1188 pick_up (op, tmp);
1190 continue; 1189 continue;
1191 } 1190 }
1192 1191
1193 if (op->contr->mode & PU_READABLES) 1192 if (op->contr->mode & PU_READABLES)
1194 if (tmp->type == BOOK || tmp->type == SCROLL) 1193 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1195 { 1194 {
1196 pick_up (op, tmp); 1195 pick_up (op, tmp);
1197 continue; 1196 continue;
1198 } 1197 }
1199 1198
… …
1684 1683
1685 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1684 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1686 arrow->move_type = MOVE_FLY_LOW; 1685 arrow->move_type = MOVE_FLY_LOW;
1687 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1686 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1688 1687
1689 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1688 op->play_sound (sound_find ("fire_arrow"));
1690 m->insert (arrow, sx, sy, op); 1689 m->insert (arrow, sx, sy, op);
1691 1690
1692 if (!arrow->destroyed ()) 1691 if (!arrow->destroyed ())
1693 move_arrow (arrow); 1692 move_arrow (arrow);
1694 1693
… …
1772 1771
1773 if (item->type == WAND) 1772 if (item->type == WAND)
1774 { 1773 {
1775 if (item->stats.food <= 0) 1774 if (item->stats.food <= 0)
1776 { 1775 {
1777 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1776 op->contr->play_sound (sound_find ("wand_poof"));
1778 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1779 1778
1780 return; 1779 return;
1781 } 1780 }
1782 } 1781 }
1783 else if (item->type == ROD || item->type == HORN) 1782 else if (item->type == ROD || item->type == HORN)
1784 { 1783 {
1785 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1784 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1786 { 1785 {
1787 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 op->contr->play_sound (sound_find ("wand_poof"));
1788 1787
1789 if (item->type == ROD) 1788 if (item->type == ROD)
1790 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1791 else 1790 else
1792 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
… …
1981 /* If we found a key, do some extra work */ 1980 /* If we found a key, do some extra work */
1982 if (key) 1981 if (key)
1983 { 1982 {
1984 object *container = key->env; 1983 object *container = key->env;
1985 1984
1986 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1987
1988 if (action_makes_visible (op)) 1985 if (action_makes_visible (op))
1989 make_visible (op); 1986 make_visible (op);
1990 1987
1991 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1988 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1992 spring_trap (door->inv, op); 1989 spring_trap (door->inv, op);
… …
2105 2102
2106 if (op->speed_left > 0.f) 2103 if (op->speed_left > 0.f)
2107 { 2104 {
2108 --op->speed_left; 2105 --op->speed_left;
2109 2106
2110 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2107 op->play_sound (sound_find ("push_player"));
2111 push_ob (mon, dir, op); 2108 push_ob (mon, dir, op);
2112 2109
2113 if (op->contr->tmp_invis || op->hide) 2110 if (op->contr->tmp_invis || op->hide)
2114 make_visible (op); 2111 make_visible (op);
2115 2112
… …
2134 { 2131 {
2135 --op->speed_left; 2132 --op->speed_left;
2136 2133
2137 if (!op->contr->braced) 2134 if (!op->contr->braced)
2138 { 2135 {
2139 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2136 op->play_sound (sound_find ("push_player"));
2140 push_ob (mon, dir, op); 2137 push_ob (mon, dir, op);
2141 } 2138 }
2142 else 2139 else
2143 new_draw_info (0, 0, op, "You withhold your attack"); 2140 new_draw_info (0, 0, op, "You withhold your attack");
2144 2141
… …
2287 return 0; 2284 return 0;
2288 2285
2289 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2286 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2290 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2287 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2291 { 2288 {
2292 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2289 op->play_sound (sound_find ("ob_evaporate"));
2293 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2290 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2294 2291
2295 if (op->contr) 2292 if (op->contr)
2296 esrv_del_item (op->contr, tmp->count); 2293 esrv_del_item (op->contr, tmp->count);
2297 2294
… …
2317/* This goes throws the inventory and removes unpaid objects, and puts them 2314/* This goes throws the inventory and removes unpaid objects, and puts them
2318 * back in the map (location and map determined by values of env). This 2315 * back in the map (location and map determined by values of env). This
2319 * function will descend into containers. op is the object to start the search 2316 * function will descend into containers. op is the object to start the search
2320 * from. 2317 * from.
2321 */ 2318 */
2322void 2319static void
2323remove_unpaid_objects (object *op, object *env) 2320drop_unpaid_items (object *op, object *env)
2324{ 2321{
2325 while (op) 2322 while (op)
2326 { 2323 {
2327 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2324 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2328 2325
… …
2332 esrv_del_item (env->contr, op->count); 2329 esrv_del_item (env->contr, op->count);
2333 2330
2334 op->insert_at (env); 2331 op->insert_at (env);
2335 } 2332 }
2336 else if (op->inv) 2333 else if (op->inv)
2337 remove_unpaid_objects (op->inv, env); 2334 drop_unpaid_items (op->inv, env);
2338 2335
2339 op = next; 2336 op = next;
2340 } 2337 }
2338}
2339
2340void
2341object::drop_unpaid_items ()
2342{
2343 if (!flag [FLAG_REMOVED])
2344 ::drop_unpaid_items (inv, this);
2341} 2345}
2342 2346
2343/* 2347/*
2344 * Returns pointer a static string containing gravestone text 2348 * Returns pointer a static string containing gravestone text
2345 * Moved from apply.c to player.c - player.c is what 2349 * Moved from apply.c to player.c - player.c is what
… …
2551 } 2555 }
2552 2556
2553 /* Digestion */ 2557 /* Digestion */
2554 if (--op->last_eat < 0) 2558 if (--op->last_eat < 0)
2555 { 2559 {
2556 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2560 int bonus = max (0, op->contr->digestion),
2561 penalty = max (0, -op->contr->digestion);
2557 2562
2558 if (op->contr->gen_hp > 0)
2559 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2563 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2560 else
2561 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2562 2564
2563 /* dms do not consume food */ 2565 /* dms do not consume food */
2564 if (!QUERY_FLAG (op, FLAG_WIZ)) 2566 if (!QUERY_FLAG (op, FLAG_WIZ))
2565 op->stats.food--; 2567 op->stats.food--;
2566 } 2568 }
… …
2627 object *tmp; 2629 object *tmp;
2628 2630
2629 if (save_life (op)) 2631 if (save_life (op))
2630 return; 2632 return;
2631 2633
2632
2633 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2634 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2634 * in cities ONLY!!! It is very important that this doesn't get abused. 2635 * in cities ONLY!!! It is very important that this doesn't get abused.
2635 * Look at op_on_battleground() for more info --AndreasV 2636 * Look at op_on_battleground() for more info --AndreasV
2636 */ 2637 */
2637 if (op_on_battleground (op, &x, &y)) 2638 if (op_on_battleground (op, &x, &y))
… …
2689 strcpy (op->contr->killer, "starvation"); 2690 strcpy (op->contr->killer, "starvation");
2690 } 2691 }
2691 else 2692 else
2692 sprintf (buf, "%s died.", &op->name); 2693 sprintf (buf, "%s died.", &op->name);
2693 2694
2694 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2695 op->contr->play_sound (sound_find ("player_dies"));
2695 2696
2696 /* save the map location for corpse, gravestone */ 2697 /* save the map location for corpse, gravestone */
2697 x = op->x; 2698 x = op->x;
2698 y = op->y; 2699 y = op->y;
2699 map = op->map; 2700 map = op->map;
… …
2876 2877
2877 /* 2878 /*
2878 * Check to see if the player has any unpaid items. If so, remove them 2879 * Check to see if the player has any unpaid items. If so, remove them
2879 * and put them back in the map. 2880 * and put them back in the map.
2880 */ 2881 */
2881 remove_unpaid_objects (op->inv, op); 2882 op->drop_unpaid_items ();
2882 2883
2883 /****************************************/ 2884 /****************************************/
2884 /* */ 2885 /* */
2885 /* Move player to his current respawn- */ 2886 /* Move player to his current respawn- */
2886 /* position (usually last savebed) */ 2887 /* position (usually last savebed) */
… …
3423 { 3424 {
3424 /* forces in the treasurelist can alter the player's stats */ 3425 /* forces in the treasurelist can alter the player's stats */
3425 object *skin; 3426 object *skin;
3426 3427
3427 /* first get the dragon skin force */ 3428 /* first get the dragon skin force */
3428 shstr_cmp dragon_skin_force ("dragon_skin_force");
3429 for (skin = who->inv; skin && !(skin->arch->archname == dragon_skin_force); skin = skin->below) 3429 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3430 ; 3430 ;
3431 3431
3432 if (!skin) 3432 if (!skin)
3433 return; 3433 return;
3434 3434

Diff Legend

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