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.29 by root, Tue Apr 17 18:24:30 2007 UTC vs.
Revision 1.34 by root, Wed Jul 11 16:55:18 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <unistd.h> 25#include <unistd.h>
27 26
196 { 195 {
197 case KW_parent: 196 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 197 rgn->parent = region::find (f.get_str ());
199 break; 198 break;
200 199
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;
204 case KW_jail_x: f.get (rgn->jailx); break;
205 case KW_jail_y: f.get (rgn->jaily); break;
206 case KW_fallback: f.get (rgn->fallback); break;
207 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;
202 case KW_jail_map: f.get (rgn->jailmap); break;
203 case KW_jail_x: f.get (rgn->jailx); break;
204 case KW_jail_y: f.get (rgn->jaily); break;
205 case KW_portal_map: f.get (rgn->portalmap);break;
206 case KW_portal_x: f.get (rgn->portalx); break;
207 case KW_portal_y: f.get (rgn->portaly); break;
208 case KW_fallback: f.get (rgn->fallback); break;
209 case KW_chance: f.get (rgn->treasure_density); break;
210
211 case KW_randomitems:
212 rgn->treasure = treasurelist::get (f.get_str ());
213 break;
208 214
209 case KW_end: 215 case KW_end:
210 f.next (); 216 f.next ();
211 217
212 for_all_regions (old) 218 for_all_regions (old)
222 228
223 // just append 229 // just append
224 regions.push_back (rgn); 230 regions.push_back (rgn);
225 return rgn; 231 return rgn;
226 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
227 default: 238 default:
228 if (!f.parse_error ("region", rgn->name)) 239 if (!f.parse_error ("region", rgn->name))
229 { 240 {
230 delete rgn; 241 delete rgn;
231 return 0; 242 return 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines