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

Comparing deliantra/server/common/loader.l (file contents):
Revision 1.10 by root, Sun Aug 27 16:15:11 2006 UTC vs.
Revision 1.11 by root, Sun Aug 27 17:59:25 2006 UTC

1%{ 1%{
2/* 2/*
3 * static char *rcsid_object_c = 3 * static char *rcsid_object_c =
4 * "$Id: loader.l,v 1.10 2006/08/27 16:15:11 root Exp $"; 4 * "$Id: loader.l,v 1.11 2006/08/27 17:59:25 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
743 char *yv=yval(); 743 char *yv=yval();
744 744
745 op->arch=find_archetype(yv); 745 op->arch=find_archetype(yv);
746 if (op->arch!=NULL) { 746 if (op->arch!=NULL) {
747 copy_object(&op->arch->clone,op); 747 copy_object(&op->arch->clone,op);
748 op->instantiate ();
749 } else if (!arch_init) { 748 } else if (!arch_init) {
750 if (op->name) free_string(op->name); 749 if (op->name) free_string(op->name);
751 /* record the name of the broken object */ 750 /* record the name of the broken object */
752 op->name = add_string(yv); 751 op->name = add_string(yv);
753 } 752 }
770 */ 769 */
771 ismore=1; 770 ismore=1;
772 } 771 }
773 772
774^end{WS}$ { check_loaded_object(op); 773^end{WS}$ { check_loaded_object(op);
774
775 if (!arch_init)
776 {
775 thawer.get (op); 777 thawer.get (op);
778 op->instantiate ();
779 }
780
776 if (ismore) return LL_MORE; 781 if (ismore) return LL_MORE;
777 else return LL_NORMAL; 782 else return LL_NORMAL;
778 } 783 }
779^last_heal{S} op->last_heal = IVAL; 784^last_heal{S} op->last_heal = IVAL;
780^last_sp{S} op->last_sp = IVAL; 785^last_sp{S} op->last_sp = IVAL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines