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.127 by root, Sun Nov 18 15:19:48 2018 UTC vs.
Revision 1.128 by root, Wed Dec 5 19:03:27 2018 UTC

1290} 1290}
1291 1291
1292void 1292void
1293process_object (object *op) 1293process_object (object *op)
1294{ 1294{
1295 if (expect_false (op->flag [FLAG_IS_A_TEMPLATE])) 1295 if (ecb_expect_false (op->flag [FLAG_IS_A_TEMPLATE]))
1296 return; 1296 return;
1297 1297
1298 if (expect_false (INVOKE_OBJECT (TICK, op))) 1298 if (ecb_expect_false (INVOKE_OBJECT (TICK, op)))
1299 return; 1299 return;
1300 1300
1301 if (op->flag [FLAG_MONSTER]) 1301 if (op->flag [FLAG_MONSTER])
1302 if (move_monster (op) || op->flag [FLAG_FREED]) 1302 if (move_monster (op) || op->flag [FLAG_FREED])
1303 return; 1303 return;
1308 1308
1309 if (op->flag [FLAG_SEE_ANYWHERE]) 1309 if (op->flag [FLAG_SEE_ANYWHERE])
1310 make_sure_seen (op); 1310 make_sure_seen (op);
1311 } 1311 }
1312 1312
1313 if (expect_false ( 1313 if (ecb_expect_false (
1314 op->flag [FLAG_GENERATOR] 1314 op->flag [FLAG_GENERATOR]
1315 || op->flag [FLAG_CHANGING] 1315 || op->flag [FLAG_CHANGING]
1316 || op->flag [FLAG_IS_USED_UP] 1316 || op->flag [FLAG_IS_USED_UP]
1317 )) 1317 ))
1318 { 1318 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines