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.6 by root, Thu Sep 14 22:34:00 2006 UTC vs.
Revision 1.18 by root, Sat Jan 27 23:59:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23
24 24
25#include <global.h> 25#include <global.h>
26
27#ifndef WIN32 /* ---win32 exclude header */
28# include <unistd.h> 26#include <unistd.h>
29#endif /* win32 */ 27
28region *
29region::default_region ()
30{
31 for (region *reg = first_region; reg; reg = reg->next)
32 if (reg->fallback)
33 return reg;
34
35 return first_region;
36}
30 37
31/* 38/*
32 * Pass a char array, returns a pointer to the region of the same name. 39 * Pass a char array, returns a pointer to the region of the same name.
33 * if it can't find a region of the same name it returns the first region 40 * if it can't find a region of the same name it returns the first region
34 * with the 'fallback' property set. 41 * with the 'fallback' property set.
35 * if it can't find a matching name /or/ a fallback region it logs an info message 42 * if it can't find a matching name /or/ a fallback region it logs an info message
36 * message and returns NULL 43 * message and returns NULL
37 * used by the map parsing code. 44 * used by the map parsing code.
38 */ 45 */
39region * 46region *
40get_region_by_name (const char *region_name) 47region::find (const char *name)
41{ 48{
42 region *reg;
43 char *p = strchr (region_name, '\n');
44
45 if (p)
46 *p = '\0';
47 for (reg = first_region; reg != NULL; reg = reg->next) 49 for (region *reg = first_region; reg; reg = reg->next)
48 if (!strcmp (reg->name, region_name)) 50 if (!strcmp (reg->name, name))
49 return reg; 51 return reg;
50 52
51 for (reg = first_region; reg != NULL; reg = reg->next)
52 {
53 if (reg->fallback)
54 {
55 LOG (llevDebug, "region called %s requested, but not found, fallback used.\n", region_name); 53 LOG (llevError, "region called %s requested, but not found, using fallback.\n", name);
56 return reg; 54
57 } 55 return default_region ();
58 }
59 LOG (llevInfo, "Got no region or fallback for region %s.\n", region_name);
60 return NULL;
61} 56}
62 57
63/* This might need optimising at some point. */ 58/* This might need optimising at some point. */
64region * 59region *
65get_region_by_map (mapstruct *m) 60get_region_by_map (maptile *m)
66{ 61{
67 return get_region_by_name (get_name_of_region_for_map (m)); 62 return region::find (get_name_of_region_for_map (m));
68} 63}
69 64
70/* 65/*
71 * Since we won't assume all maps have a region set properly, we need an 66 * Since we won't assume all maps have a region set properly, we need an
72 * explicit check that it is, this is much nicer here than scattered throughout 67 * explicit check that it is, this is much nicer here than scattered throughout
73 * the map code. 68 * the map code.
74 */ 69 */
75 70
76const char * 71const char *
77get_name_of_region_for_map (const mapstruct *m) 72get_name_of_region_for_map (const maptile *m)
78{ 73{
79 region *reg; 74 region *reg;
80 75
81 if (m->region != NULL) 76 if (m->default_region)
82 return m->region->name; 77 return m->default_region->name;
78
83 for (reg = first_region; reg != NULL; reg = reg->next) 79 for (reg = first_region; reg; reg = reg->next)
84 { 80 {
85 if (reg->fallback) 81 if (reg->fallback)
86 return reg->name; 82 return reg->name;
87 } 83 }
84
88 LOG (llevInfo, "map %s had no region and I couldn't find a fallback to use.\n", m->name); 85 LOG (llevInfo, "map %s had no region and I couldn't find a fallback to use.\n", &m->name);
89 return "unknown"; 86 return "unknown";
90} 87}
91 88
92/* 89/*
93 * Tries to find a region that 'name' corresponds to. 90 * Tries to find a region that 'name' corresponds to.
237 reg = get_region_by_map (op->map); 234 reg = get_region_by_map (op->map);
238 while (reg != NULL) 235 while (reg != NULL)
239 { 236 {
240 if (reg->jailmap) 237 if (reg->jailmap)
241 { 238 {
242 exit = get_object (); 239 exit = object::create ();
243 EXIT_PATH (exit) = reg->jailmap; 240 EXIT_PATH (exit) = reg->jailmap;
244 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 241 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
245 SET_FLAG (exit, FLAG_DAMNED); 242 SET_FLAG (exit, FLAG_DAMNED);
246 EXIT_X (exit) = reg->jailx; 243 EXIT_X (exit) = reg->jailx;
247 EXIT_Y (exit) = reg->jaily; 244 EXIT_Y (exit) = reg->jaily;
291 */ 288 */
292 289
293region * 290region *
294get_region_struct (void) 291get_region_struct (void)
295{ 292{
296
297 region *reg;
298
299 reg = (region *) CALLOC (1, sizeof (region));
300 if (reg == NULL)
301 fatal (OUT_OF_MEMORY);
302
303 memset (reg, '\0', sizeof (region));
304
305 return reg; 293 return new region;
306} 294}
307 295
308/* 296/*
309 * Reads/parses the region file, and copies into a linked list 297 * Reads/parses the region file, and copies into a linked list
310 * of region structs. 298 * of region structs.
357 */ 345 */
358 if (!strcmp (key, "region")) 346 if (!strcmp (key, "region"))
359 { 347 {
360 *end = 0; 348 *end = 0;
361 newreg = get_region_struct (); 349 newreg = get_region_struct ();
362 newreg->name = strdup_local (value); 350 newreg->name = strdup (value);
363 } 351 }
364 else if (!strcmp (key, "parent")) 352 else if (!strcmp (key, "parent"))
365 { 353 {
366 /* 354 /*
367 * Note that this is in the initialisation code, so we don't actually 355 * Note that this is in the initialisation code, so we don't actually
368 * assign the pointer to the parent yet, because it might not have been 356 * assign the pointer to the parent yet, because it might not have been
369 * parsed. 357 * parsed.
370 */ 358 */
371 *end = 0; 359 *end = 0;
372 newreg->parent_name = strdup_local (value); 360 newreg->parent_name = strdup (value);
373 } 361 }
374 else if (!strcmp (key, "longname")) 362 else if (!strcmp (key, "longname"))
375 { 363 {
376 *end = 0; 364 *end = 0;
377 newreg->longname = strdup_local (value); 365 newreg->longname = strdup (value);
378 } 366 }
379 else if (!strcmp (key, "jail")) 367 else if (!strcmp (key, "jail"))
380 { 368 {
381 /* jail entries are of the form: /path/to/map x y */ 369 /* jail entries are of the form: /path/to/map x y */
382 char path[MAX_BUF]; 370 char path[MAX_BUF];
385 if (sscanf (value, "%[^ ] %d %d\n", path, &x, &y) != 3) 373 if (sscanf (value, "%[^ ] %d %d\n", path, &x, &y) != 3)
386 { 374 {
387 LOG (llevError, "region.c: malformated regions entry: jail %s\n", value); 375 LOG (llevError, "region.c: malformated regions entry: jail %s\n", value);
388 continue; 376 continue;
389 } 377 }
390 newreg->jailmap = strdup_local (path); 378 newreg->jailmap = strdup (path);
391 newreg->jailx = x; 379 newreg->jailx = x;
392 newreg->jaily = y; 380 newreg->jaily = y;
393 } 381 }
394 else if (!strcmp (key, "msg")) 382 else if (!strcmp (key, "msg"))
395 { 383 {
407 * There may be regions with empty messages (eg, msg/endmsg 395 * There may be regions with empty messages (eg, msg/endmsg
408 * with nothing between). When maps are loaded, this is done 396 * with nothing between). When maps are loaded, this is done
409 * so better do it here too... 397 * so better do it here too...
410 */ 398 */
411 if (msgpos != 0) 399 if (msgpos != 0)
412 newreg->msg = strdup_local (msgbuf); 400 newreg->msg = strdup (msgbuf);
413 401
414 /* we have to reset msgpos, or the next region will store both msg blocks. */ 402 /* we have to reset msgpos, or the next region will store both msg blocks. */
415 msgpos = 0; 403 msgpos = 0;
416 } 404 }
417 else if (!strcmp (key, "fallback")) 405 else if (!strcmp (key, "fallback"))
454 442
455 for (reg = first_region; reg != NULL && reg->next != NULL; reg = reg->next) 443 for (reg = first_region; reg != NULL && reg->next != NULL; reg = reg->next)
456 { 444 {
457 if (reg->parent_name != NULL) 445 if (reg->parent_name != NULL)
458 { 446 {
459 reg->parent = get_region_by_name (reg->parent_name); 447 reg->parent = region::find (reg->parent_name);
460 parent_count++; 448 parent_count++;
461 } 449 }
450
462 region_count++; 451 region_count++;
463 } 452 }
453
464 LOG (llevDebug, "Assigned %u regions with %u parents.", region_count, parent_count); 454 LOG (llevDebug, "Assigned %u regions with %u parents.\n", region_count, parent_count);
465} 455}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines