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.182 by root, Wed Nov 14 21:19:41 2018 UTC vs.
Revision 1.184 by root, Sat Dec 1 20:22:12 2018 UTC

530 { 530 {
531 negate = 1; 531 negate = 1;
532 str++; 532 str++;
533 } 533 }
534 534
535 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) 535 for (const flagstr *f = move_flags; f < move_flags + ecb_array_length (move_flags); ++f)
536 { 536 {
537 if (!strcmp (f->name, str)) 537 if (!strcmp (f->name, str))
538 { 538 {
539 if (negate) 539 if (negate)
540 mt &= ~f->flags; 540 mt &= ~f->flags;
1348 CMP_OUT (last_grace); 1348 CMP_OUT (last_grace);
1349 CMP_OUT (last_eat); 1349 CMP_OUT (last_eat);
1350 CMP_OUT (glow_radius); 1350 CMP_OUT (glow_radius);
1351 1351
1352 if (op->flag [FLAG_IS_LINKED]) 1352 if (op->flag [FLAG_IS_LINKED])
1353 if (auto (ol, op->find_link ())) 1353 if (auto ol = op->find_link ())
1354 f.put (KW(connected), ol->id); 1354 f.put (KW(connected), ol->id);
1355 1355
1356 CMP_OUT (randomitems); 1356 CMP_OUT (randomitems);
1357 1357
1358 CMP_OUT2 (container, weight_limit); 1358 CMP_OUT2 (container, weight_limit);
1397 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) 1397 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1398 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); 1398 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1399#endif 1399#endif
1400 1400
1401 // save body locations. gcc's memcmp does an abysmal job when used 1401 // save body locations. gcc's memcmp does an abysmal job when used
1402 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1402 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
1403 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1403 if (expect_false (op->slot[i].info != arch->slot[i].info))
1404 f.put (body_locations[i].kw, op->slot[i].info); 1404 f.put (body_locations[i].kw, op->slot[i].info);
1405} 1405}
1406 1406
1407/* 1407/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines