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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.139 by root, Sun Nov 8 22:28:10 2009 UTC vs.
Revision 1.140 by root, Sun Nov 8 22:30:48 2009 UTC

1396 if (expect_true (diff.any ())) 1396 if (expect_true (diff.any ()))
1397 { 1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ())) 1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 { 1399 {
1400 // some other flags differ, too 1400 // some other flags differ, too
1401 if (op->flag != arch->flag)
1402 for (int i = 0; i <= NUM_FLAGS; i++) 1401 for (int i = 0; i < NUM_FLAGS; i++)
1403 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) 1402 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1404 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1403 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1405 } 1404 }
1406 else 1405 else
1407 { 1406 {
1408 // only obj_original differs 1407 // only obj_original differs
1409 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1408 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines