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.53 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.54 by root, Sun Jun 3 11:22:07 2007 UTC

1299} 1299}
1300 1300
1301void 1301void
1302process_object (object *op) 1302process_object (object *op)
1303{ 1303{
1304 if (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 1304 if (expect_false (QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)))
1305 return; 1305 return;
1306 1306
1307 if (INVOKE_OBJECT (TICK, op)) 1307 if (expect_false (INVOKE_OBJECT (TICK, op)))
1308 return; 1308 return;
1309 1309
1310 if (QUERY_FLAG (op, FLAG_MONSTER)) 1310 if (QUERY_FLAG (op, FLAG_MONSTER))
1311 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED)) 1311 if (move_monster (op) || QUERY_FLAG (op, FLAG_FREED))
1312 return; 1312 return;
1317 1317
1318 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE)) 1318 if (QUERY_FLAG (op, FLAG_SEE_ANYWHERE))
1319 make_sure_seen (op); 1319 make_sure_seen (op);
1320 } 1320 }
1321 1321
1322 if (expect_false (
1322 if (op->flag [FLAG_GENERATOR] 1323 op->flag [FLAG_GENERATOR]
1323 || op->flag [FLAG_CHANGING] 1324 || op->flag [FLAG_CHANGING]
1324 || op->flag [FLAG_IS_USED_UP]) 1325 || op->flag [FLAG_IS_USED_UP]
1326 ))
1325 { 1327 {
1326 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state) 1328 if (QUERY_FLAG (op, FLAG_CHANGING) && !op->state)
1327 { 1329 {
1328 change_object (op); 1330 change_object (op);
1329 return; 1331 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines