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.170 by root, Sun Sep 2 05:18:52 2007 UTC vs.
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC

1979 return 1; /* Nothing more to do below */ 1979 return 1; /* Nothing more to do below */
1980 } 1980 }
1981 else if (door->type == LOCKED_DOOR) 1981 else if (door->type == LOCKED_DOOR)
1982 { 1982 {
1983 /* Might as well return now - no other way to open this */ 1983 /* Might as well return now - no other way to open this */
1984 op->failmsg (door->msg); 1984 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
1985 return 1; 1985 return 1;
1986 } 1986 }
1987 1987
1988 return 0; 1988 return 0;
1989} 1989}
2109 { 2109 {
2110 op->play_sound (sound_find ("push_player")); 2110 op->play_sound (sound_find ("push_player"));
2111 push_ob (mon, dir, op); 2111 push_ob (mon, dir, op);
2112 } 2112 }
2113 else 2113 else
2114 new_draw_info (0, 0, op, "You withhold your attack"); 2114 op->statusmsg ("You withhold your attack");
2115 2115
2116 if (op->contr->tmp_invis || op->hide) 2116 if (op->contr->tmp_invis || op->hide)
2117 make_visible (op); 2117 make_visible (op);
2118 2118
2119 return true; 2119 return true;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines