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.53 by root, Thu Jan 8 19:23:43 2009 UTC vs.
Revision 1.65 by root, Fri Mar 26 01:04:43 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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#include <global.h> 25#include <global.h>
… …
75 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole")); 76 : sound_find (tmp->type == GATE ? "trigger_gate" : "trigger_hole"));
76 tmp->value = tmp->stats.maxsp ? !state : state; 77 tmp->value = tmp->stats.maxsp ? !state : state;
77 tmp->set_speed (0.5); 78 tmp->set_speed (0.5);
78 break; 79 break;
79 80
80 case CF_HANDLE: 81 case T_HANDLE:
81 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state)); 82 SET_ANIMATION (tmp, (tmp->value = tmp->stats.maxsp ? !state : state));
82 update_object (tmp, UP_OBJ_FACE); 83 update_object (tmp, UP_OBJ_FACE);
83 break; 84 break;
84 85
85 case SIGN: 86 case SIGN:
86 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
87 { 88 {
88 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("trigger_sign")); 89 tmp->play_sound (tmp->sound ? tmp->sound : sound_find ("msg_voice"));
90
91 if (originator && originator->contr)
92 originator->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &tmp->name, &tmp->msg));
93
89 new_info_map (NDI_UNIQUE | NDI_NAVY, tmp->map, tmp->msg); 94 new_info_map_except (NDI_UNIQUE | NDI_NAVY, tmp->map, originator, tmp->msg);
95
90 if (tmp->stats.food) 96 if (tmp->stats.food)
91 tmp->last_eat++; 97 tmp->last_eat++;
92 } 98 }
93 break; 99 break;
94 100
… …
248 254
249 any_down = any_down || tmp->value; 255 any_down = any_down || tmp->value;
250 } 256 }
251 else if (tmp->type == PEDESTAL) 257 else if (tmp->type == PEDESTAL)
252 { 258 {
259 bool is_match = is_match_expr (tmp->slaying);
253 tmp->value = 0; 260 tmp->value = 0;
254 261
255 for (object *ab = tmp->above; ab; ab = ab->above) 262 for (object *ab = tmp->above; ab; ab = ab->above)
256 { 263 {
257 object *head = ab->head_ (); 264 object *head = ab->head_ ();
258 265
259 /* Same note regarding move_type for buttons above apply here. */ 266 /* Same note regarding move_type for buttons above apply here. */
260 if (((ab->move_type & tmp->move_on) || ab->move_type == 0) 267 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
268 if (is_match
269 ? match (tmp->slaying, head, tmp, originator)
261 && (head->race == tmp->slaying 270 : (head->race == tmp->slaying
262 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 271 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
263 || (tmp->slaying == shstr_player && head->type == PLAYER))) 272 || (tmp->slaying == shstr_player && head->type == PLAYER)))
273 {
264 tmp->value = 1; 274 tmp->value = 1;
275 break;
276 }
277 }
278
279 any_down = any_down || tmp->value;
280 }
281 else if (tmp->type == T_MATCH)
282 {
283 tmp->value = 0;
284
285 for (object *ab = tmp->above; ab; ab = ab->above)
286 {
287 object *head = ab->head_ ();
288
289 /* Same note regarding move_type for buttons above apply here. */
290 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
291 if (match (tmp->slaying, head, tmp, originator))
292 {
293 tmp->value = 1;
294 break;
295 }
265 } 296 }
266 297
267 any_down = any_down || tmp->value; 298 any_down = any_down || tmp->value;
268 } 299 }
269 } 300 }
… …
315 * 346 *
316 * 0.93.4: Linked objects (ie, objects that are connected) can not be 347 * 0.93.4: Linked objects (ie, objects that are connected) can not be
317 * sacrificed. This fixes a bug of trying to put multiple altars/related 348 * sacrificed. This fixes a bug of trying to put multiple altars/related
318 * objects on the same space that take the same sacrifice. 349 * objects on the same space that take the same sacrifice.
319 */ 350 */
320
321int 351int
322check_altar_sacrifice (const object *altar, const object *sacrifice) 352check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
323{ 353{
354 if (sacrifice->flag [FLAG_UNPAID])
355 return 0;
356
357 if (is_match_expr (ARCH_SACRIFICE (altar)))
358 return match (ARCH_SACRIFICE (altar), altar, originator);
359
324 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 360 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
325 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 361 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
326 && sacrifice->type != PLAYER) 362 && sacrifice->type != PLAYER)
327 { 363 {
328 if (ARCH_SACRIFICE (altar) == shstr_money 364 if (ARCH_SACRIFICE (altar) == shstr_money
… …
349 * 385 *
350 * If this function returns 1, '*sacrifice' is modified to point to the 386 * If this function returns 1, '*sacrifice' is modified to point to the
351 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 387 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
352 */ 388 */
353int 389int
354operate_altar (object *altar, object **sacrifice) 390operate_altar (object *altar, object **sacrifice, object *originator)
355{ 391{
356 if (!altar->map) 392 if (!altar->map)
357 { 393 {
358 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 394 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
359 return 0; 395 return 0;
360 } 396 }
361 397
362 if (!altar->slaying || altar->value) 398 if (!altar->slaying || altar->value)
363 return 0; 399 return 0;
364 400
365 if (!check_altar_sacrifice (altar, *sacrifice)) 401 if (!check_altar_sacrifice (altar, *sacrifice, originator))
366 return 0; 402 return 0;
367 403
368 /* check_altar_sacrifice should have already verified that enough money 404 /* check_altar_sacrifice should have already verified that enough money
369 * has been dropped. 405 * has been dropped.
370 */ 406 */
… …
387 new_info_map (NDI_BLACK, altar->map, altar->msg); 423 new_info_map (NDI_BLACK, altar->map, altar->msg);
388 424
389 return 1; 425 return 1;
390} 426}
391 427
392void 428static void
393trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */ 429trigger_move (object *op, int state, object *originator) /* 1 down and 0 up */
394{ 430{
395 op->stats.wc = state; 431 op->stats.wc = state;
396 432
397 if (state) 433 if (state)
… …
419 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 455 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
420 * 456 *
421 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 457 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
422 */ 458 */
423int 459int
424check_trigger (object *op, object *cause) 460check_trigger (object *op, object *cause, object *originator)
425{ 461{
426 object *tmp; 462 object *tmp;
427 int push = 0, tot = 0; 463 int push = 0, tot = 0;
428 int in_movement = op->stats.wc || op->speed; 464 int in_movement = op->stats.wc || op->has_active_speed ();
429 465
430 switch (op->type) 466 switch (op->type)
431 { 467 {
432 case TRIGGER_BUTTON: 468 case TRIGGER_BUTTON:
433 if (op->weight > 0) 469 if (op->weight > 0)
… …
507 if (cause) 543 if (cause)
508 { 544 {
509 if (in_movement) 545 if (in_movement)
510 return 0; 546 return 0;
511 547
512 if (operate_altar (op, &cause)) 548 if (operate_altar (op, &cause)) /* TODO: originator? */
513 { 549 {
514 if (NUM_ANIMATIONS (op) > 1) 550 if (NUM_ANIMATIONS (op) > 1)
515 { 551 {
516 SET_ANIMATION (op, 1); 552 SET_ANIMATION (op, 1);
517 update_object (op, UP_OBJ_FACE); 553 update_object (op, UP_OBJ_FACE);

Diff Legend

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