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.45 by root, Tue Apr 22 01:06:22 2008 UTC vs.
Revision 1.50 by root, Thu Jan 1 11:41:17 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 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
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
474 { 474 {
475 object *head = tmp->head_ (); 475 object *head = tmp->head_ ();
476 476
477 /* See comment in TRIGGER_BUTTON about move_types */ 477 /* See comment in TRIGGER_BUTTON about move_types */
478 if (((head->move_type & op->move_on) || head->move_type == 0) 478 if (((head->move_type & op->move_on) || head->move_type == 0)
479 && (head->race == op->slaying || (!strcmp (op->slaying, "player") && head->type == PLAYER))) 479 && (head->race == op->slaying || (op->slaying == shstr_player && head->type == PLAYER)))
480 { 480 {
481 push = 1; 481 push = 1;
482 break; 482 break;
483 } 483 }
484 } 484 }
810 810
811 // FALL THROUGH 811 // FALL THROUGH
812 case 5: // kill all alives 812 case 5: // kill all alives
813 if (!tmp->flag [FLAG_PRECIOUS]) 813 if (!tmp->flag [FLAG_PRECIOUS])
814 { 814 {
815 get_archetype ("burnout")->insert_at (tmp, source); 815 archetype::get (shstr_burnout)->insert_at (tmp, source);
816 tmp->destroy (); 816 tmp->destroy ();
817 } 817 }
818 break; 818 break;
819 819
820 default: 820 default:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines