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.1 by root, Sun Sep 3 22:45:55 2006 UTC vs.
Revision 1.2 by root, Mon Sep 4 11:07:59 2006 UTC

984 984
985 case KW_EOF: 985 case KW_EOF:
986 return LL_EOF; 986 return LL_EOF;
987 987
988 case KW_ERROR: 988 case KW_ERROR:
989 set_ob_key_value(op, thawer.line, thawer.last_value, true); 989 set_ob_key_value (op, thawer.line, thawer.last_value, true);
990 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 990 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
991 991
992 // skip line, ugly 992 //TODO: skip line, ugly, factor parsing better
993 if (thawer.last_value)
994 thawer.line = thawer.last_value;
995
993 thawer.line = thawer.last_value + strlen (thawer.last_value) + 1; 996 thawer.line += strlen (thawer.line) + 1;
997
994 break; 998 break;
995 999
996 default: 1000 default:
997 printf ("kw abort %d\n", kw);//D 1001 printf ("kw abort %d\n", kw);//D
998 abort (); 1002 abort ();
1272 1276
1273 if (!COMPARE_FLAGS (op, tmp)) 1277 if (!COMPARE_FLAGS (op, tmp))
1274 for (i = 0; i <= NUM_FLAGS; i++) 1278 for (i = 0; i <= NUM_FLAGS; i++)
1275 if (flag_names [i] 1279 if (flag_names [i]
1276 && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1280 && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i)))
1277 f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : 0); 1281 f.put (flag_names [i], QUERY_FLAG (op, i) ? "1" : "0");
1278 1282
1279 /* Save body locations */ 1283 /* Save body locations */
1280 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1284 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1281 if (op->body_info[i] != tmp->body_info[i]) 1285 if (op->body_info[i] != tmp->body_info[i])
1282 f.put (body_locations[i].save_name, op->body_info[i]); 1286 f.put (body_locations[i].save_name, op->body_info[i]);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines