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

Comparing deliantra/server/random_maps/special.C (file contents):
Revision 1.35 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.38 by root, Tue Nov 10 04:38:45 2009 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* Specials in this file: 25/* Specials in this file:
76 continue; 77 continue;
77 78
78 object *new_ob = tmp->deep_clone (); 79 object *new_ob = tmp->deep_clone ();
79 80
80 if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) 81 if (QUERY_FLAG (tmp, FLAG_IS_LINKED))
81 add_button_link (new_ob, dest_map, tmp->path_attuned); 82 new_ob->add_link (dest_map, tmp->find_link ()->id);
82 83
83 dest_map->insert (new_ob, x + i, y + j, 0, INS_NO_MERGE | INS_NO_WALK_ON); 84 dest_map->insert (new_ob, x + i, y + j, 0, INS_NO_MERGE | INS_NO_WALK_ON);
84 } 85 }
85} 86}
86 87
177 ix += freearr_x[i]; 178 ix += freearr_x[i];
178 iy += freearr_y[i]; 179 iy += freearr_y[i];
179 potion->face = fountain->face; 180 potion->face = fountain->face;
180 SET_FLAG (potion, FLAG_NO_PICK); 181 SET_FLAG (potion, FLAG_NO_PICK);
181 SET_FLAG (potion, FLAG_IDENTIFIED); 182 SET_FLAG (potion, FLAG_IDENTIFIED);
182 potion->name = potion->name_pl = "fountain"; 183 potion->name = potion->name_pl = shstr_fountain;
183 potion->x = ix; 184 potion->x = ix;
184 potion->y = iy; 185 potion->y = iy;
185 potion->materialname = "adamantium"; 186 potion->material = name_to_material (shstr_adamantium);
186 fountain->x = ix; 187 fountain->x = ix;
187 fountain->y = iy; 188 fountain->y = iy;
188 insert_ob_in_map (fountain, map, NULL, 0); 189 insert_ob_in_map (fountain, map, NULL, 0);
189 insert_ob_in_map (potion, map, NULL, 0); 190 insert_ob_in_map (potion, map, NULL, 0);
190} 191}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines