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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.182 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.183 by root, Thu Jan 8 04:35:04 2009 UTC

1117/* push_button (altar);*/ 1117/* push_button (altar);*/
1118 } 1118 }
1119 else 1119 else
1120 { 1120 {
1121 altar->value = 1; /* works only once */ 1121 altar->value = 1; /* works only once */
1122 push_button (altar); 1122 push_button (altar, originator);
1123 } 1123 }
1124 1124
1125 return !sacrifice; 1125 return !sacrifice;
1126 } 1126 }
1127 else 1127 else
1423 } 1423 }
1424 goto leave; 1424 goto leave;
1425 1425
1426 case BUTTON: 1426 case BUTTON:
1427 case PEDESTAL: 1427 case PEDESTAL:
1428 update_button (trap); 1428 update_button (trap, originator);
1429 goto leave; 1429 goto leave;
1430 1430
1431 case ALTAR: 1431 case ALTAR:
1432 /* sacrifice victim on trap */ 1432 /* sacrifice victim on trap */
1433 apply_altar (trap, victim, originator); 1433 apply_altar (trap, victim, originator);
2384 op->play_sound (sound_find ("turn_handle")); 2384 op->play_sound (sound_find ("turn_handle"));
2385 op->statusmsg ("You turn the handle."); 2385 op->statusmsg ("You turn the handle.");
2386 tmp->value = tmp->value ? 0 : 1; 2386 tmp->value = tmp->value ? 0 : 1;
2387 SET_ANIMATION (tmp, tmp->value); 2387 SET_ANIMATION (tmp, tmp->value);
2388 update_object (tmp, UP_OBJ_FACE); 2388 update_object (tmp, UP_OBJ_FACE);
2389 push_button (tmp); 2389 push_button (tmp, op);
2390 return 1; 2390 return 1;
2391 2391
2392 case TRIGGER: 2392 case TRIGGER:
2393 if (check_trigger (tmp, op)) 2393 if (check_trigger (tmp, op))
2394 { 2394 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines