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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.12 by elmex, Sun Sep 3 14:33:47 2006 UTC vs.
Revision 1.13 by root, Sun Sep 3 22:45:55 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.12 2006/09/03 14:33:47 elmex Exp $"; 3 * "$Id: object.C,v 1.13 2006/09/03 22:45:55 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
2485 fclose(tempfile); 2485 fclose(tempfile);
2486 2486
2487 op=get_object(); 2487 op=get_object();
2488 2488
2489 object_thawer thawer (filename); 2489 object_thawer thawer (filename);
2490
2490 if (thawer) 2491 if (thawer)
2491 load_object(thawer,op,LO_NEWFILE,0); 2492 load_object(thawer,op,0);
2493
2492 LOG(llevDebug," load str completed, object=%s\n", &op->name); 2494 LOG(llevDebug," load str completed, object=%s\n", &op->name);
2493 CLEAR_FLAG(op,FLAG_REMOVED); 2495 CLEAR_FLAG(op,FLAG_REMOVED);
2494 2496
2495 return op; 2497 return op;
2496} 2498}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines