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.52 by root, Thu Jan 8 04:35:03 2009 UTC vs.
Revision 1.58 by root, Thu Oct 15 21:40:42 2009 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,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#include <global.h> 25#include <global.h>
… …
33 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set. 34 * state is a true/false flag that will actiavte objects that have FLAG_ACTIVATE_ON_PUSH/RELEASE set.
34 * The activator argument can be 0 or the source object for this activation. 35 * The activator argument can be 0 or the source object for this activation.
35 * the originator is the player or monster who did something. 36 * the originator is the player or monster who did something.
36 */ 37 */
37static void 38static void
38activate_connection_link (objectlink *ol, bool state, object *activator, object *originator) 39activate_connection_link (objectlink *ol, int state, object *activator, object *originator)
39{ 40{
40 for (; ol; ol = ol->next) 41 for (; ol; ol = ol->next)
41 { 42 {
42 if (!ol->ob) 43 if (!ol->ob)
43 { 44 {
… …
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:
… …
135 case FIREWALL: 136 case FIREWALL:
136 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL) 137 if (!QUERY_FLAG (tmp, FLAG_ANIMATE) && tmp->type == FIREWALL)
137 move_firewall (tmp); 138 move_firewall (tmp);
138 else 139 else
139 { 140 {
140 if ((tmp->stats.sp += tmp->stats.maxsp) > 8) /* next direction */ 141 tmp->stats.sp = absdir (tmp->stats.sp + tmp->stats.maxsp); /* next direction */
141 tmp->stats.sp = ((tmp->stats.sp - 1) % 8) + 1;
142
143 animate_turning (tmp); 142 animate_turning (tmp);
144 } 143 }
145 break; 144 break;
146 145
147 case TELEPORTER: 146 case TELEPORTER:
… …
199 * the connection was 'state' or 'released'. So that you can activate objects 198 * the connection was 'state' or 'released'. So that you can activate objects
200 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly. 199 * who have FLAG_ACTIVATE_ON_PUSH/RELEASE set properly.
201 * 200 *
202 */ 201 */
203void 202void
204maptile::trigger (shstr_tmp id, bool state, object *activator, object *originator) 203maptile::trigger (shstr_tmp id, int state, object *activator, object *originator)
205{ 204{
206 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator))) 205 if (INVOKE_MAP (TRIGGER, this, ARG_STRING (&id), ARG_INT (state), ARG_OBJECT (originator)))
207 return; 206 return;
208 207
209 if (oblinkpt *obp = find_link (id)) 208 if (oblinkpt *obp = find_link (id))
… …
250 249
251 any_down = any_down || tmp->value; 250 any_down = any_down || tmp->value;
252 } 251 }
253 else if (tmp->type == PEDESTAL) 252 else if (tmp->type == PEDESTAL)
254 { 253 {
254 bool is_match = is_match_expr (tmp->slaying);
255 tmp->value = 0; 255 tmp->value = 0;
256 256
257 for (object *ab = tmp->above; ab; ab = ab->above) 257 for (object *ab = tmp->above; ab; ab = ab->above)
258 { 258 {
259 object *head = ab->head_ (); 259 object *head = ab->head_ ();
260 260
261 /* Same note regarding move_type for buttons above apply here. */ 261 /* Same note regarding move_type for buttons above apply here. */
262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0) 262 if (((ab->move_type & tmp->move_on) || ab->move_type == 0))
263 if (is_match
264 ? match (tmp->slaying, head, tmp, originator)
263 && (head->race == tmp->slaying 265 : (head->race == tmp->slaying
264 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying) 266 || (head->type == SPECIAL_KEY && head->slaying == tmp->slaying)
265 || (tmp->slaying == shstr_player && head->type == PLAYER))) 267 || (tmp->slaying == shstr_player && head->type == PLAYER)))
268 {
266 tmp->value = 1; 269 tmp->value = 1;
270 break;
271 }
267 } 272 }
268 273
269 any_down = any_down || tmp->value; 274 any_down = any_down || tmp->value;
270 } 275 }
271 } 276 }
… …
319 * sacrificed. This fixes a bug of trying to put multiple altars/related 324 * sacrificed. This fixes a bug of trying to put multiple altars/related
320 * objects on the same space that take the same sacrifice. 325 * objects on the same space that take the same sacrifice.
321 */ 326 */
322 327
323int 328int
324check_altar_sacrifice (const object *altar, const object *sacrifice) 329check_altar_sacrifice (object *altar, object *sacrifice, object *originator)
325{ 330{
331 if (sacrifice->flag [FLAG_UNPAID])
332 return 0;
333
334 if (is_match_expr (ARCH_SACRIFICE (altar)))
335 return match (ARCH_SACRIFICE (altar), altar, originator);
336
326 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE) 337 if (!QUERY_FLAG (sacrifice, FLAG_ALIVE)
327 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED) 338 && !QUERY_FLAG (sacrifice, FLAG_IS_LINKED)
328 && sacrifice->type != PLAYER) 339 && sacrifice->type != PLAYER)
329 { 340 {
330 if (ARCH_SACRIFICE (altar) == shstr_money 341 if (ARCH_SACRIFICE (altar) == shstr_money
… …
351 * 362 *
352 * If this function returns 1, '*sacrifice' is modified to point to the 363 * If this function returns 1, '*sacrifice' is modified to point to the
353 * remaining sacrifice, or is set to NULL if the sacrifice was used up. 364 * remaining sacrifice, or is set to NULL if the sacrifice was used up.
354 */ 365 */
355int 366int
356operate_altar (object *altar, object **sacrifice) 367operate_altar (object *altar, object **sacrifice, object *originator)
357{ 368{
358 if (!altar->map) 369 if (!altar->map)
359 { 370 {
360 LOG (llevError, "BUG: operate_altar(): altar has no map\n"); 371 LOG (llevError, "BUG: operate_altar(): altar has no map\n");
361 return 0; 372 return 0;
362 } 373 }
363 374
364 if (!altar->slaying || altar->value) 375 if (!altar->slaying || altar->value)
365 return 0; 376 return 0;
366 377
367 if (!check_altar_sacrifice (altar, *sacrifice)) 378 if (!check_altar_sacrifice (altar, *sacrifice, originator))
368 return 0; 379 return 0;
369 380
370 /* check_altar_sacrifice should have already verified that enough money 381 /* check_altar_sacrifice should have already verified that enough money
371 * has been dropped. 382 * has been dropped.
372 */ 383 */
… …
421 * TRIGGER: Returns 1 if handle could be moved, 0 if not. 432 * TRIGGER: Returns 1 if handle could be moved, 0 if not.
422 * 433 *
423 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0. 434 * TRIGGER_BUTTON, TRIGGER_PEDESTAL: Returns 0.
424 */ 435 */
425int 436int
426check_trigger (object *op, object *cause) 437check_trigger (object *op, object *cause, object *originator)
427{ 438{
428 object *tmp; 439 object *tmp;
429 int push = 0, tot = 0; 440 int push = 0, tot = 0;
430 int in_movement = op->stats.wc || op->speed; 441 int in_movement = op->stats.wc || op->speed;
431 442
… …
509 if (cause) 520 if (cause)
510 { 521 {
511 if (in_movement) 522 if (in_movement)
512 return 0; 523 return 0;
513 524
514 if (operate_altar (op, &cause)) 525 if (operate_altar (op, &cause)) /* TODO: originator? */
515 { 526 {
516 if (NUM_ANIMATIONS (op) > 1) 527 if (NUM_ANIMATIONS (op) > 1)
517 { 528 {
518 SET_ANIMATION (op, 1); 529 SET_ANIMATION (op, 1);
519 update_object (op, UP_OBJ_FACE); 530 update_object (op, UP_OBJ_FACE);

Diff Legend

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