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.32 by root, Tue May 6 15:39:19 2008 UTC vs.
Revision 1.44 by root, Fri Apr 2 03:41:24 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 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 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 */
… …
125/* sets up to cast a spell. op is the caster, params is the spell name, 108/* sets up to cast a spell. op is the caster, params is the spell name,
126 * and command is the first letter of the spell type (c=cast, i=invoke, 109 * and command is the first letter of the spell type (c=cast, i=invoke,
127 * p=prepare). Invoke casts a spell immediately, where as cast (and I believe 110 * p=prepare). Invoke casts a spell immediately, where as cast (and I believe
128 * prepare) just set up the range type. 111 * prepare) just set up the range type.
129 */ 112 */
130int 113static int
131command_cast_spell (object *op, char *params, char command) 114command_cast_spell (object *op, char *params, char command)
132{ 115{
133 int castnow = 0; 116 int castnow = 0;
134 char *cp; 117 char *cp;
135 object *spob; 118 object *spob;
… …
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
… …
183 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is a weird spell, please report it to the dungeon master!", &spob->name); 166 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is a weird spell, please report it to the dungeon master!", &spob->name);
184 LOG (llevError, "spell without skill found: %s", spob->debug_desc ()); 167 LOG (llevError, "spell without skill found: %s", spob->debug_desc ());
185 return 1; 168 return 1;
186 } 169 }
187 170
188 object *skill = find_skill_by_name (op, spob->skill);
189
190 if (!skill)
191 {
192 op->failmsg (format ("You need the skill %s to cast %s!", &spob->skill, &spob->name));
193 return 1;
194 }
195
196 splay (spob);
197
198 if (castnow) 171 if (castnow)
199 cast_spell (op, op, op->facing, spob, cp); 172 cast_spell (op, op, op->facing, spob, cp);
200 else 173 else if (op->apply (spob))
201 {
202 if (op->contr->ranged_ob && op->contr->ranged_ob->flag [FLAG_APPLIED])
203 apply_special (op, op->contr->ranged_ob, AP_UNAPPLY);
204
205 if (op->contr->ranged_ob)
206 op->failmsg (format ("You have to unapply the %s first to ready a spell.", &op->contr->ranged_ob->name));
207 else
208 { 174 {
209 op->change_weapon (op->contr->ranged_ob = spob); 175 splay (spob);
210
211 assign (op->contr->spellparam, cp ? cp : ""); 176 assign (op->contr->spellparam, cp ? cp : "");
212 op->statusmsg (format ("You ready the spell %s", &spob->name));
213 }
214 } 177 }
215 178
216 return 0; 179 return 0;
217 } /* else fall through to below and print spells */ 180 } /* else fall through to below and print spells */
218 } /* params supplied */ 181 } /* params supplied */
… …
224 show_matching_spells (op, params); 187 show_matching_spells (op, params);
225 188
226 return 1; 189 return 1;
227} 190}
228 191
192int
193command_invoke (object *op, char *params)
194{
195 return command_cast_spell (op, params, 'i');
196}
197
198int
199command_cast (object *op, char *params)
200{
201 return command_cast_spell (op, params, 'c');
202}
203
204int
205command_prepare (object *op, char *params)
206{
207 return command_cast_spell (op, params, 'p');
208}
209
229/**************************************************************************/ 210/**************************************************************************/
230 211
231void 212static void
232change_spell (object *op, char k) 213change_spell (object *op, char k)
233{ 214{
234 if (op->contr->combat_ob == op->current_weapon) 215 if (op->contr->combat_ob && op->contr->ranged_ob)
235 { 216 op->change_weapon (
217 op->current_weapon == op->contr->combat_ob
236 if (op->contr->ranged_ob) 218 ? op->contr->ranged_ob
237 op->change_weapon (op->contr->ranged_ob);
238 }
239 else if (op->contr->ranged_ob == op->current_weapon)
240 {
241 if (op->contr->combat_ob) 219 : op->contr->combat_ob
242 op->change_weapon (op->contr->combat_ob); 220 );
243 }
244 221
245 //TODO: maybe switch to golem, if any? 222 //TODO: maybe switch to golem, if any?
246} 223}
247 224
248int 225int

Diff Legend

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