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

Comparing deliantra/server/server/build_map.C (file contents):
Revision 1.24 by root, Mon Feb 5 02:07:40 2007 UTC vs.
Revision 1.27 by root, Mon Jun 4 12:19:09 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 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
39 39
40 ob = GET_MAP_OB (map, x, y); 40 ob = GET_MAP_OB (map, x, y);
41 while (ob) 41 while (ob)
42 { 42 {
43 /* if ob is not a marking rune or floor, then check special cases */ 43 /* if ob is not a marking rune or floor, then check special cases */
44 if (strcmp (ob->arch->name, "rune_mark") && ob->type != FLOOR) 44 if (strcmp (ob->arch->archname, "rune_mark") && ob->type != FLOOR)
45 { 45 {
46 switch (tmp->type) 46 switch (tmp->type)
47 { 47 {
48 case SIGN: 48 case SIGN:
49 case MAGIC_EAR: 49 case MAGIC_EAR:
84 rune = GET_MAP_OB (map, x, y); 84 rune = GET_MAP_OB (map, x, y);
85 while (rune) 85 while (rune)
86 { 86 {
87 next = rune->above; 87 next = rune->above;
88 88
89 if ((rune->type == SIGN) && (!strcmp (rune->arch->name, "rune_mark"))) 89 if ((rune->type == SIGN) && (!strcmp (rune->arch->archname, "rune_mark")))
90 rune->destroy (); 90 rune->destroy ();
91 91
92 rune = next; 92 rune = next;
93 } 93 }
94} 94}
184get_connection_rune (object *pl, short x, short y) 184get_connection_rune (object *pl, short x, short y)
185{ 185{
186 object *rune; 186 object *rune;
187 187
188 rune = GET_MAP_OB (pl->map, x, y); 188 rune = GET_MAP_OB (pl->map, x, y);
189 while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->name, "rune_mark")))) 189 while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->archname, "rune_mark"))))
190 rune = rune->above; 190 rune = rune->above;
191 return rune; 191 return rune;
192} 192}
193 193
194/** 194/**
245 if (!wall) 245 if (!wall)
246 /* Nothing -> bail out */ 246 /* Nothing -> bail out */
247 return; 247 return;
248 248
249 /* Find base name */ 249 /* Find base name */
250 assign (archetype, wall->arch->name); 250 assign (archetype, wall->arch->archname);
251 underscore = strchr (archetype, '_'); 251 underscore = strchr (archetype, '_');
252 252
253 /* search for the first _ before a number */ 253 /* search for the first _ before a number */
254 while (underscore && !isdigit (*(underscore + 1))) 254 while (underscore && !isdigit (*(underscore + 1)))
255 underscore = strchr (underscore + 1, '_'); 255 underscore = strchr (underscore + 1, '_');
639 case PEDESTAL: 639 case PEDESTAL:
640 case CF_HANDLE: 640 case CF_HANDLE:
641 case MAGIC_EAR: 641 case MAGIC_EAR:
642 case SIGN: 642 case SIGN:
643 /* Signs don't need a connection, but but magic mouths do. */ 643 /* Signs don't need a connection, but but magic mouths do. */
644 if (tmp->type == SIGN && strcmp (tmp->arch->name, "magic_mouth")) 644 if (tmp->type == SIGN && strcmp (tmp->arch->archname, "magic_mouth"))
645 break; 645 break;
646 con_rune = get_connection_rune (pl, x, y); 646 con_rune = get_connection_rune (pl, x, y);
647 connected = find_or_create_connection_for_map (pl, x, y, con_rune); 647 connected = find_or_create_connection_for_map (pl, x, y, con_rune);
648 if (connected == -1) 648 if (connected == -1)
649 { 649 {
764 /* Nothing, meaning player is standing next to an undefined square... */ 764 /* Nothing, meaning player is standing next to an undefined square... */
765 LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, &pl->map->path); 765 LOG (llevError, "apply_map_builder: undefined square at (%d, %d, %s)\n", x, y, &pl->map->path);
766 new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird."); 766 new_draw_info (NDI_UNIQUE, 0, pl, "You'd better not build here, it looks weird.");
767 return; 767 return;
768 } 768 }
769
769 tmp2 = find_marked_object (pl); 770 tmp2 = find_marked_object (pl);
770 while (tmp) 771 while (tmp)
771 { 772 {
772 if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->name, "rune_mark")))) 773 if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->archname, "rune_mark"))))
773 { 774 {
774 /* The item building function already has it's own special 775 /* The item building function already has it's own special
775 * checks for this 776 * checks for this
776 */ 777 */
777 if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM)) 778 if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM))
782 } 783 }
783 tmp = tmp->above; 784 tmp = tmp->above;
784 } 785 }
785 786
786 /* Now we know the square is ok */ 787 /* Now we know the square is ok */
787 builder = pl->contr->ranges[range_builder]; 788 builder = pl->contr->ranged_ob;
788 789
789 if (builder->subtype == ST_BD_REMOVE) 790 if (builder->subtype == ST_BD_REMOVE)
790 /* Remover -> call specific function and bail out */ 791 /* Remover -> call specific function and bail out */
791 { 792 {
792 apply_builder_remove (pl, dir); 793 apply_builder_remove (pl, dir);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines