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.4 by root, Sat Aug 26 23:36:30 2006 UTC vs.
Revision 1.5 by root, Sun Aug 27 16:15:11 2006 UTC

1/* 1/*
2 * static char *rcsid_object_c = 2 * static char *rcsid_object_c =
3 * "$Id: object.C,v 1.4 2006/08/26 23:36:30 root Exp $"; 3 * "$Id: object.C,v 1.5 2006/08/27 16:15:11 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
2639 if (tempfile == NULL) 2639 if (tempfile == NULL)
2640 { 2640 {
2641 LOG(llevError,"Error - Unable to read object temp file\n"); 2641 LOG(llevError,"Error - Unable to read object temp file\n");
2642 return NULL; 2642 return NULL;
2643 }; 2643 };
2644 object_thawer thawer;
2644 load_object(tempfile,op,LO_NEWFILE,0); 2645 load_object(tempfile,thawer,op,LO_NEWFILE,0);
2645 LOG(llevDebug," load str completed, object=%s\n",op->name); 2646 LOG(llevDebug," load str completed, object=%s\n",op->name);
2646 CLEAR_FLAG(op,FLAG_REMOVED); 2647 CLEAR_FLAG(op,FLAG_REMOVED);
2647 fclose(tempfile); 2648 fclose(tempfile);
2648 return op; 2649 return op;
2649} 2650}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines