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.9 by root, Tue Aug 29 07:34:00 2006 UTC vs.
Revision 1.10 by root, Tue Aug 29 07:54:38 2006 UTC

1/* 1/*
2 * static char *rcsid_player_c = 2 * static char *rcsid_player_c =
3 * "$Id: player.C,v 1.9 2006/08/29 07:34:00 root Exp $"; 3 * "$Id: player.C,v 1.10 2006/08/29 07:54:38 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
2202 2202
2203 op->facing = dir; 2203 op->facing = dir;
2204 2204
2205 if(op->hide) do_hidden_move(op); 2205 if(op->hide) do_hidden_move(op);
2206 2206
2207 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2208 /*nop*/;
2207 if(op->contr->fire_on) { 2209 else if (op->contr->fire_on)
2208 fire(op,dir); 2210 fire (op, dir);
2209 } 2211 else
2212 {
2210 else move_player_attack(op,dir); 2213 move_player_attack (op, dir);
2211
2212 pick = check_pick(op); 2214 pick = check_pick(op);
2213 2215 }
2214 2216
2215 /* Add special check for newcs players and fire on - this way, the 2217 /* Add special check for newcs players and fire on - this way, the
2216 * server can handle repeat firing. 2218 * server can handle repeat firing.
2217 */ 2219 */
2218 if (op->contr->fire_on || (op->contr->run_on && pick!=0)) { 2220 if (op->contr->fire_on || (op->contr->run_on && pick!=0)) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines