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

Comparing deliantra/server/common/region.C (file contents):
Revision 1.33 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.34 by root, Wed Jul 11 16:55:18 2007 UTC

197 rgn->parent = region::find (f.get_str ()); 197 rgn->parent = region::find (f.get_str ());
198 break; 198 break;
199 199
200 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 200 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
201 case KW_longname: f.get (rgn->longname); break; 201 case KW_longname: f.get (rgn->longname); break;
202 case KW_match: f.get (rgn->match); break;
203 case KW_jail_map: f.get (rgn->jailmap); break; 202 case KW_jail_map: f.get (rgn->jailmap); break;
204 case KW_jail_x: f.get (rgn->jailx); break; 203 case KW_jail_x: f.get (rgn->jailx); break;
205 case KW_jail_y: f.get (rgn->jaily); break; 204 case KW_jail_y: f.get (rgn->jaily); break;
206 case KW_portal_map: f.get (rgn->portalmap);break; 205 case KW_portal_map: f.get (rgn->portalmap);break;
207 case KW_portal_x: f.get (rgn->portalx); break; 206 case KW_portal_x: f.get (rgn->portalx); break;
229 228
230 // just append 229 // just append
231 regions.push_back (rgn); 230 regions.push_back (rgn);
232 return rgn; 231 return rgn;
233 232
233 case KW_ERROR:
234 rgn->set_key (f.kw_str, f.value);
235 //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D
236 break;
237
234 default: 238 default:
235 if (!f.parse_error ("region", rgn->name)) 239 if (!f.parse_error ("region", rgn->name))
236 { 240 {
237 delete rgn; 241 delete rgn;
238 return 0; 242 return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines