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.85 by elmex, Mon Jan 12 00:17:23 2009 UTC vs.
Revision 1.86 by elmex, Tue Jan 13 12:07:42 2009 UTC

1274 if (!op->glow_radius) 1274 if (!op->glow_radius)
1275 { 1275 {
1276 op->set_speed (0); 1276 op->set_speed (0);
1277 return; 1277 return;
1278 } 1278 }
1279 else
1280 {
1281 // check whether the face might needs to be updated
1282 // (currently this is needed to have already switched on torches
1283 // on maps, as they just set the glow_radius in the archetype)
1284 if (op->other_arch
1285 && (
1286 op->flag [FLAG_ANIMATE]
1287 ? (op->animation_id != op->other_arch->animation_id)
1288 : (op->face != op->other_arch->face)
1289 ))
1290 get_animation_from_arch (op, op->other_arch);
1291 }
1279 1292
1280 // lamps and torches auf maps don't use up their fuel 1293 // lamps and torches auf maps don't use up their fuel
1281 if (op->is_on_map ()) 1294 if (op->is_on_map ())
1282 return; 1295 return;
1283 1296

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines