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.14 by root, Tue Aug 29 05:03:54 2006 UTC vs.
Revision 1.16 by root, Thu Aug 31 06:23:19 2006 UTC

1%{ 1%{
2/* 2/*
3 * static char *rcsid_object_c = 3 * static char *rcsid_object_c =
4 * "$Id: loader.l,v 1.14 2006/08/29 05:03:54 root Exp $"; 4 * "$Id: loader.l,v 1.16 2006/08/31 06:23:19 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
1060 1060
1061^event_ { 1061^event_ {
1062 LOG (llevError, "stray event_* in map file, skipping."); 1062 LOG (llevError, "stray event_* in map file, skipping.");
1063} 1063}
1064 1064
1065^current_weapon_script{S} { LOG (llevError, "stray current_weapon_script in map file, skipping."); }
1066
1067<*>(^{WS}$)|\n {/* ignore empty lines, newlines we don't do above */} 1065<*>(^{WS}$)|\n {/* ignore empty lines, newlines we don't do above */}
1068#.*\n {} 1066#.*\n {}
1069 1067
1070<<EOF>> {/* If we got an error, return the error. Otherwise, return that we got EOF */ 1068<<EOF>> {/* If we got an error, return the error. Otherwise, return that we got EOF */
1071 if (lex_error!=0) return lex_error; else return LL_EOF;} 1069 if (lex_error!=0) return lex_error; else return LL_EOF;}
1755 object *tmp,*old; 1753 object *tmp,*old;
1756 1754
1757 /* Even if the object does have an owner, it would seem that we should 1755 /* Even if the object does have an owner, it would seem that we should
1758 * still save it. 1756 * still save it.
1759 */ 1757 */
1760 if(op->owner!=NULL || fp == NULL) 1758 if(op->owner!=NULL)
1761 return; 1759 return;
1762 1760
1763 /* If it is unpaid and we don't want to save those, just return. */ 1761 /* If it is unpaid and we don't want to save those, just return. */
1764 if(!(flag&1)&&(QUERY_FLAG(op, FLAG_UNPAID))) { 1762 if(!(flag&1)&&(QUERY_FLAG(op, FLAG_UNPAID))) {
1765 return; 1763 return;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines