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.34 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.42 by root, Sun Apr 20 22:03:21 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * 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>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <funcpoint.h> 25#include <funcpoint.h>
27 26
… …
60 object *tmp = ol->ob; 59 object *tmp = ol->ob;
61 60
62 /* if the criteria isn't appropriate, don't do anything */ 61 /* if the criteria isn't appropriate, don't do anything */
63 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH)) 62 if (state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_PUSH))
64 continue; 63 continue;
64
65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE)) 65 if (!state && !QUERY_FLAG (tmp, FLAG_ACTIVATE_ON_RELEASE))
66 continue; 66 continue;
67 67
68 switch (tmp->type) 68 switch (tmp->type)
69 { 69 {
70 case GATE: 70 case GATE:
71 case HOLE: 71 case HOLE:
72 if (!tmp->active)
73 tmp->play_sound (tmp->sound
74 ? tmp->sound
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
72 tmp->value = tmp->stats.maxsp ? !state : state; 76 tmp->value = tmp->stats.maxsp ? !state : state;
73 tmp->set_speed (0.5); 77 tmp->set_speed (0.5);
74 break; 78 break;
75 79
76 case CF_HANDLE: 80 case CF_HANDLE:
… …
79 break; 83 break;
80 84
81 case SIGN: 85 case SIGN:
82 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
83 { 87 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign"));
84 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg);
85 if (tmp->stats.food) 90 if (tmp->stats.food)
86 tmp->last_eat++; 91 tmp->last_eat++;
87 } 92 }
88 break; 93 break;
89 94
90 case ALTAR: 95 case ALTAR:
96 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_altar"));
91 tmp->value = 1; 97 tmp->value = 1;
92 SET_ANIMATION (tmp, tmp->value); 98 SET_ANIMATION (tmp, tmp->value);
93 update_object (tmp, UP_OBJ_FACE); 99 update_object (tmp, UP_OBJ_FACE);
94 break; 100 break;
95 101
96 case BUTTON: 102 case BUTTON:
97 case PEDESTAL: 103 case PEDESTAL:
104 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_button"));
98 tmp->value = state; 105 tmp->value = state;
99 SET_ANIMATION (tmp, tmp->value); 106 SET_ANIMATION (tmp, tmp->value);
100 update_object (tmp, UP_OBJ_FACE); 107 update_object (tmp, UP_OBJ_FACE);
101 break; 108 break;
102 109
103 case MOOD_FLOOR: 110 case MOOD_FLOOR:
104 do_mood_floor (tmp, source); 111 do_mood_floor (tmp, source);
105 break; 112 break;
106 113
107 case TIMED_GATE: 114 case TIMED_GATE:
115 if (!tmp->active)
116 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_gate"));
108 tmp->set_speed (tmp->arch->clone.speed); 117 tmp->set_speed (tmp->arch->speed);
109 tmp->value = tmp->arch->clone.value; 118 tmp->value = tmp->arch->value;
110 tmp->stats.sp = 1; 119 tmp->stats.sp = 1;
111 tmp->stats.hp = tmp->stats.maxhp; 120 tmp->stats.hp = tmp->stats.maxhp;
112 /* Handle multipart gates. We copy the value for the other parts 121 /* Handle multipart gates. We copy the value for the other parts
113 * from the head - this ensures that the data will consistent 122 * from the head - this ensures that the data will consistent
114 */ 123 */
… …
141 case CREATOR: 150 case CREATOR:
142 move_creator (tmp); 151 move_creator (tmp);
143 break; 152 break;
144 153
145 case TRIGGER_MARKER: 154 case TRIGGER_MARKER:
155 //tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_marker"));
146 move_marker (tmp); 156 move_marker (tmp);
147 break; 157 break;
148 158
149 case DUPLICATOR: 159 case DUPLICATOR:
150 move_duplicator (tmp); 160 move_duplicator (tmp);
… …
225 } 235 }
226 236
227 tmp = ol->ob; 237 tmp = ol->ob;
228 if (tmp->type == BUTTON) 238 if (tmp->type == BUTTON)
229 { 239 {
230 for (ab = tmp->above, tot = 0; ab != NULL; ab = ab->above) 240 for (ab = tmp->above, tot = 0; ab; ab = ab->above)
231 /* Bug? The pedestal code below looks for the head of
232 * the object, this bit doesn't. I'd think we should check
233 * for head here also. Maybe it also makese sense to
234 * make the for ab=tmp->above loop common, and alter
235 * behaviour based on object within that loop?
236 */ 241 {
242 head = ab->head_ ();
237 243
238 /* Basically, if the move_type matches that on what the 244 /* Basically, if the move_type matches that on what the
239 * button wants, we count it. The second check is so that 245 * button wants, we count it. The second check is so that
240 * objects don't move (swords, etc) will count. Note that 246 * objects who don't move (swords, etc) will count. Note that
241 * this means that more work is needed to make buttons 247 * this means that more work is needed to make buttons
242 * that are only triggered by flying objects. 248 * that are only triggered by flying objects.
243 */ 249 */
244 if ((ab->move_type & tmp->move_on) || ab->move_type == 0) 250 if ((head->move_type & tmp->move_on) || head->move_type == 0)
245 tot += ab->weight * (ab->nrof ? ab->nrof : 1) + ab->carrying; 251 tot += head->total_weight ();
252 }
246 253
247 tmp->value = (tot >= tmp->weight) ? 1 : 0; 254 tmp->value = tot >= tmp->weight ? 1 : 0;
248 if (tmp->value)
249 any_down = 1;
250 } 255 }
251 else if (tmp->type == PEDESTAL) 256 else if (tmp->type == PEDESTAL)
252 { 257 {
253 tmp->value = 0; 258 tmp->value = 0;
259
254 for (ab = tmp->above; ab != NULL; ab = ab->above) 260 for (ab = tmp->above; ab; ab = ab->above)
255 { 261 {
256 head = ab->head_ (); 262 head = ab->head_ ();
263
257 /* Same note regarding move_type for buttons above apply here. */ 264 /* Same note regarding move_type for buttons above apply here. */
258 if (((head->move_type & tmp->move_on) || ab->move_type == 0) && 265 if (((head->move_type & tmp->move_on) || ab->move_type == 0) &&
259 (head->race == tmp->slaying || 266 (head->race == tmp->slaying ||
260 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) || 267 ((head->type == SPECIAL_KEY) && (head->slaying == tmp->slaying)) ||
261 (!strcmp (tmp->slaying, "player") && head->type == PLAYER))) 268 (!strcmp (tmp->slaying, "player") && head->type == PLAYER)))
262 tmp->value = 1; 269 tmp->value = 1;
263 } 270 }
264
265 if (tmp->value)
266 any_down = 1;
267 } 271 }
272
273 any_down = any_down || tmp->value;
268 } 274 }
275
269 if (any_down) /* If any other buttons were down, force this to remain down */ 276 if (any_down) /* If any other buttons were down, force this to remain down */
270 op->value = 1; 277 op->value = 1;
271 278
272 /* If this button hasn't changed, don't do anything */ 279 /* If this button hasn't changed, don't do anything */
273 if (op->value != old_value) 280 if (op->value != old_value)
… …
314 */ 321 */
315 322
316int 323int
317check_altar_sacrifice (const object *altar, const object *sacrifice) 324check_altar_sacrifice (const object *altar, const object *sacrifice)
318{ 325{
319 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) && sacrifice->type != PLAYER) 326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
328 && sacrifice->type != PLAYER)
320 { 329 {
330 if (ARCH_SACRIFICE (altar) == shstr_money
331 && sacrifice->type == MONEY
332 && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
333 return 1;
334
321 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname 335 if ((ARCH_SACRIFICE (altar) == sacrifice->arch->archname
322 || ARCH_SACRIFICE (altar) == sacrifice->name 336 || ARCH_SACRIFICE (altar) == sacrifice->name
323 || ARCH_SACRIFICE (altar) == sacrifice->slaying 337 || ARCH_SACRIFICE (altar) == sacrifice->slaying
324 || (!strcmp (ARCH_SACRIFICE (altar), query_base_name (sacrifice, 0)))) 338 || strstr (query_base_name (sacrifice, 0), ARCH_SACRIFICE (altar)))
325 && NROF_SACRIFICE (altar) <= (sacrifice->nrof ? sacrifice->nrof : 1)) 339 && NROF_SACRIFICE (altar) <= sacrifice->number_of ())
326 return 1;
327
328 if (strcmp (ARCH_SACRIFICE (altar), "money") == 0
329 && sacrifice->type == MONEY && sacrifice->nrof * sacrifice->value >= NROF_SACRIFICE (altar))
330 return 1; 340 return 1;
331 } 341 }
332 342
333 return 0; 343 return 0;
334} 344}
… …
358 return 0; 368 return 0;
359 369
360 /* check_altar_sacrifice should have already verified that enough money 370 /* check_altar_sacrifice should have already verified that enough money
361 * has been dropped. 371 * has been dropped.
362 */ 372 */
363 if (!strcmp (ARCH_SACRIFICE (altar), "money")) 373 if (ARCH_SACRIFICE (altar) == shstr_money)
364 { 374 {
365 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value; 375 int number = NROF_SACRIFICE (altar) / (*sacrifice)->value;
366 376
367 /* Round up any sacrifices. Altars don't make change either */ 377 /* Round up any sacrifices. Altars don't make change either */
368 if (NROF_SACRIFICE (altar) % (*sacrifice)->value) 378 if (NROF_SACRIFICE (altar) % (*sacrifice)->value)
… …
429 * button wants, we count it. The second check is so that 439 * button wants, we count it. The second check is so that
430 * objects that don't move (swords, etc) will count. Note that 440 * objects that don't move (swords, etc) will count. Note that
431 * this means that more work is needed to make buttons 441 * this means that more work is needed to make buttons
432 * that are only triggered by flying objects. 442 * that are only triggered by flying objects.
433 */ 443 */
434
435 if ((tmp->move_type & op->move_on) || tmp->move_type == 0) 444 if ((tmp->move_type & op->move_on) || tmp->move_type == 0)
436 { 445 tot += tmp->head_ ()->total_weight ();
437 tot += tmp->weight * (tmp->nrof ? tmp->nrof : 1) + tmp->carrying; 446
438 }
439 if (tot >= op->weight) 447 if (tot >= op->weight)
440 push = 1; 448 push = 1;
449
441 if (op->stats.ac == push) 450 if (op->stats.ac == push)
442 return 0; 451 return 0;
452
443 op->stats.ac = push; 453 op->stats.ac = push;
444 if (NUM_ANIMATIONS (op) > 1) 454 if (NUM_ANIMATIONS (op) > 1)
445 { 455 {
446 SET_ANIMATION (op, push); 456 SET_ANIMATION (op, push);
447 update_object (op, UP_OBJ_FACE); 457 update_object (op, UP_OBJ_FACE);
448 } 458 }
459
449 if (in_movement || !push) 460 if (in_movement || !push)
450 return 0; 461 return 0;
451 } 462 }
452 trigger_move (op, push); 463 trigger_move (op, push);
453 } 464 }
465
454 return 0; 466 return 0;
455 467
456 case TRIGGER_PEDESTAL: 468 case TRIGGER_PEDESTAL:
457 if (cause) 469 if (cause)
458 { 470 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines