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

Comparing deliantra/server/common/button.C (file contents):
Revision 1.39 by root, Mon Aug 27 01:13:48 2007 UTC vs.
Revision 1.41 by root, Wed Apr 9 14:36:47 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 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 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra 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 3 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,
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <funcpoint.h> 25#include <funcpoint.h>
26 26
328{ 328{
329 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 329 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
330 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 330 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
331 && sacrifice->type != PLAYER) 331 && sacrifice->type != PLAYER)
332 { 332 {
333 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0 333 if (ARCH_SACRIFICE (altar) == shstr_money
334 && sacrifice->type == MONEY 334 && sacrifice->type == MONEY
335 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar)) 335 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
336 return 1; 336 return 1;
337 337
338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname 338 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
371 return 0; 371 return 0;
372 372
373 /* check_altar_sacrifice should have already verified that enough money 373 /* check_altar_sacrifice should have already verified that enough money
374 * has been dropped. 374 * has been dropped.
375 */ 375 */
376 if (!strcmp (ARCH_SACRIFICE (altar), "money")) 376 if (ARCH_SACRIFICE (altar) == shstr_money)
377 { 377 {
378 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; 378 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
379 379
380 /* Round up any sacrifices. Altars don't make change either */ 380 /* Round up any sacrifices. Altars don't make change either */
381 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 381 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines