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.28 by root, Mon Apr 16 10:14:25 2007 UTC vs.
Revision 1.30 by root, Thu Apr 19 16:23:46 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
196 { 196 {
197 case KW_parent: 197 case KW_parent:
198 rgn->parent = region::find (f.get_str ()); 198 rgn->parent = region::find (f.get_str ());
199 break; 199 break;
200 200
201 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break;
201 case KW_longname: f.get (rgn->longname); break; 202 case KW_longname: f.get (rgn->longname); break;
202 case KW_match: f.get (rgn->match); break; 203 case KW_match: f.get (rgn->match); break;
203 case KW_jail_map: f.get (rgn->jailmap); break; 204 case KW_jail_map: f.get (rgn->jailmap); break;
204 case KW_jail_x: f.get (rgn->jailx); break; 205 case KW_jail_x: f.get (rgn->jailx); break;
205 case KW_jail_y: f.get (rgn->jaily); break; 206 case KW_jail_y: f.get (rgn->jaily); break;
206 case KW_fallback: f.get (rgn->fallback); break; 207 case KW_fallback: f.get (rgn->fallback); break;
207 case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; 208 case KW_chance: f.get (rgn->treasure_density); break;
209
210 case KW_randomitems:
211 rgn->treasure = treasurelist::get (f.get_str ());
212 break;
208 213
209 case KW_end: 214 case KW_end:
215 f.next ();
216
210 for_all_regions (old) 217 for_all_regions (old)
211 if (old->name == rgn->name) 218 if (old->name == rgn->name)
212 { 219 {
213 // replace, copy new values (ugly) 220 // replace, copy new values (ugly)
214 rgn->index = old->index; 221 rgn->index = old->index;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines