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.57 by root, Mon Oct 12 21:27:54 2009 UTC vs.
Revision 1.64 by root, Fri Mar 26 00:59:20 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 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
84 break; 84 break;
85 85
86 case SIGN: 86 case SIGN:
87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food) 87 if (!tmp->stats.food || tmp->last_eat < tmp->stats.food)
88 { 88 {
89 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
90 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
91 if (tmp->stats.food) 96 if (tmp->stats.food)
92 tmp->last_eat++; 97 tmp->last_eat++;
93 } 98 }
94 break; 99 break;
95 100
… …
271 } 276 }
272 } 277 }
273 278
274 any_down = any_down || tmp->value; 279 any_down = any_down || tmp->value;
275 } 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 }
296 }
297
298 any_down = any_down || tmp->value;
299 }
276 } 300 }
277 301
278 if (any_down) /* If any other buttons were down, force this to remain down */ 302 if (any_down) /* If any other buttons were down, force this to remain down */
279 op->value = 1; 303 op->value = 1;
280 304
… …
322 * 346 *
323 * 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
324 * 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
325 * objects on the same space that take the same sacrifice. 349 * objects on the same space that take the same sacrifice.
326 */ 350 */
327
328int 351int
329check_altar_sacrifice (object *altar, object *sacrifice, object *originator) 352check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
330{ 353{
331 if (sacrifice->flag [FLAG_UNPAID]) 354 if (sacrifice->flag [FLAG_UNPAID])
332 return 0; 355 return 0;
… …
400 new_info_map (NDI_BLACK, altar->map, altar->msg); 423 new_info_map (NDI_BLACK, altar->map, altar->msg);
401 424
402 return 1; 425 return 1;
403} 426}
404 427
405void 428static void
406trigger_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 */
407{ 430{
408 op->stats.wc = state; 431 op->stats.wc = state;
409 432
410 if (state) 433 if (state)
… …
436int 459int
437check_trigger (object *op, object *cause, object *originator) 460check_trigger (object *op, object *cause, object *originator)
438{ 461{
439 object *tmp; 462 object *tmp;
440 int push = 0, tot = 0; 463 int push = 0, tot = 0;
441 int in_movement = op->stats.wc || op->speed; 464 int in_movement = op->stats.wc || op->has_active_speed ();
442 465
443 switch (op->type) 466 switch (op->type)
444 { 467 {
445 case TRIGGER_BUTTON: 468 case TRIGGER_BUTTON:
446 if (op->weight > 0) 469 if (op->weight > 0)

Diff Legend

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