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

Comparing deliantra/server/server/c_range.C (file contents):
Revision 1.35 by root, Mon May 12 18:27:08 2008 UTC vs.
Revision 1.40 by root, Fri Nov 6 12:27:06 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 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 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/* This file deals with range related commands (casting, shooting, 25/* This file deals with range related commands (casting, shooting,
… …
28#include <global.h> 29#include <global.h>
29#include <sproto.h> 30#include <sproto.h>
30#include <spells.h> 31#include <spells.h>
31#include <skills.h> 32#include <skills.h>
32#include <commands.h> 33#include <commands.h>
33
34int
35command_invoke (object *op, char *params)
36{
37 return command_cast_spell (op, params, 'i');
38}
39
40int
41command_cast (object *op, char *params)
42{
43 return command_cast_spell (op, params, 'c');
44}
45
46int
47command_prepare (object *op, char *params)
48{
49 return command_cast_spell (op, params, 'p');
50}
51 34
52/* Shows all spells that op knows. If params is supplied, the must match 35/* Shows all spells that op knows. If params is supplied, the must match
53 * that. Given there is more than one skill, we can't supply break 36 * that. Given there is more than one skill, we can't supply break
54 * them down to cleric/wizardry. 37 * them down to cleric/wizardry.
55 */ 38 */
… …
137 if (command == 'i') 120 if (command == 'i')
138 castnow = 1; 121 castnow = 1;
139 122
140 /* Remove control of the golem */ 123 /* Remove control of the golem */
141 if (object *golem = op->contr->golem) 124 if (object *golem = op->contr->golem)
142 golem->destroy (); 125 golem->drop_and_destroy ();
143 126
144 if (params) 127 if (params)
145 { 128 {
146 int spellnumber = 0; 129 int spellnumber = 0;
147 130
… …
197 180
198 if (castnow) 181 if (castnow)
199 cast_spell (op, op, op->facing, spob, cp); 182 cast_spell (op, op, op->facing, spob, cp);
200 else 183 else
201 { 184 {
202 if (op->contr->ranged_ob) LOG (llevError, "%s", op->contr->ranged_ob->debug_desc ());//D
203 if (op->contr->ranged_ob) 185 if (op->contr->ranged_ob)
204 if (op->contr->ranged_ob->flag [FLAG_APPLIED]) 186 if (op->contr->ranged_ob->flag [FLAG_APPLIED])
205 apply_special (op, op->contr->ranged_ob, AP_UNAPPLY); 187 apply_special (op, op->contr->ranged_ob, AP_UNAPPLY);
206 else 188 else
207 op->contr->ranged_ob = 0; 189 op->contr->ranged_ob = 0;
208 190
209 if (op->contr->ranged_ob) LOG (llevError, "%s", op->contr->ranged_ob->debug_desc ());//D
210
211 if (op->contr->ranged_ob) 191 if (op->contr->ranged_ob)
212 op->failmsg (format ("You have to unapply the %s first to ready a spell.", &op->contr->ranged_ob->name)); 192 op->failmsg (format ("You have to unapply the %s first to ready a spell.", &op->contr->ranged_ob->name));
213 else 193 else
214 { 194 {
215 op->change_weapon (op->contr->ranged_ob = spob); 195 op->change_weapon (op->contr->ranged_ob = spob);
… …
230 show_matching_spells (op, params); 210 show_matching_spells (op, params);
231 211
232 return 1; 212 return 1;
233} 213}
234 214
215int
216command_invoke (object *op, char *params)
217{
218 return command_cast_spell (op, params, 'i');
219}
220
221int
222command_cast (object *op, char *params)
223{
224 return command_cast_spell (op, params, 'c');
225}
226
227int
228command_prepare (object *op, char *params)
229{
230 return command_cast_spell (op, params, 'p');
231}
232
235/**************************************************************************/ 233/**************************************************************************/
236 234
237void 235void
238change_spell (object *op, char k) 236change_spell (object *op, char k)
239{ 237{

Diff Legend

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