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

Comparing deliantra/server/server/time.C (file contents):
Revision 1.47 by root, Fri May 11 21:24:29 2007 UTC vs.
Revision 1.48 by root, Sat May 12 21:56:35 2007 UTC

1323 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1323 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1324 return 1; 1324 return 1;
1325 1325
1326 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0) 1326 if (QUERY_FLAG (op, FLAG_ANIMATE) && op->anim_speed == 0)
1327 { 1327 {
1328 if (op->type == PLAYER)
1329 animate_object (op, op->facing);
1330 else
1331 animate_object (op, op->direction); 1328 animate_object (op, op->contr ? op->facing : op->direction);
1332 1329
1333 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1330 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1334 make_sure_seen (op); 1331 make_sure_seen (op);
1335 } 1332 }
1336 1333
1347 { 1344 {
1348 if (QUERY_FLAG (op, FLAG_APPLIED)) 1345 if (QUERY_FLAG (op, FLAG_APPLIED))
1349 remove_force (op); 1346 remove_force (op);
1350 else 1347 else
1351 { 1348 {
1352 /* IF necessary, delete the item from the players inventory */ 1349 /* If necessary, delete the item from the players inventory */
1353 object *pl = op->in_player (); 1350 object *pl = op->in_player ();
1354 1351
1355 if (pl) 1352 if (pl)
1356 esrv_del_item (pl->contr, op->count); 1353 esrv_del_item (pl->contr, op->count);
1357 1354
1490 return 0; 1487 return 0;
1491 } 1488 }
1492 1489
1493 return 0; 1490 return 0;
1494} 1491}
1492

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines