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.20 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.34 by root, Tue May 6 16:55:26 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* This file deals with range related commands (casting, shooting, 24/* This file deals with range related commands (casting, shooting,
26 * throwing, etc. 25 * throwing, etc.
27 */ 26 */
… …
188 187
189 object *skill = find_skill_by_name (op, spob->skill); 188 object *skill = find_skill_by_name (op, spob->skill);
190 189
191 if (!skill) 190 if (!skill)
192 { 191 {
193 new_draw_info_format (NDI_UNIQUE, 0, op, "You need the skill %s to cast %s!", &spob->skill, &spob->name); 192 op->failmsg (format ("You need the skill %s to cast %s!", &spob->skill, &spob->name));
194 return 1; 193 return 1;
195 } 194 }
195
196 splay (spob);
196 197
197 if (castnow) 198 if (castnow)
198 cast_spell (op, op, op->facing, spob, cp); 199 cast_spell (op, op, op->facing, spob, cp);
199 else 200 else
200 { 201 {
201 op->contr->ranged_skill = skill; 202 if (op->contr->ranged_ob)
203 if (op->contr->ranged_ob->flag [FLAG_APPLIED])
204 apply_special (op, op->contr->ranged_ob, AP_UNAPPLY);
205 else
202 op->contr->ranged_ob = spob; 206 op->contr->ranged_ob = 0;
203 207
208 if (op->contr->ranged_ob)
209 op->failmsg (format ("You have to unapply the %s first to ready a spell.", &op->contr->ranged_ob->name));
210 else
211 {
212 op->change_weapon (op->contr->ranged_ob = spob);
213
204 assign (op->contr->spellparam, cp ? cp : ""); 214 assign (op->contr->spellparam, cp ? cp : "");
205 new_draw_info_format (NDI_UNIQUE, 0, op, "You ready the spell %s", &spob->name); 215 op->statusmsg (format ("You ready the spell %s", &spob->name));
216 }
206 } 217 }
207 218
208 return 0; 219 return 0;
209 } /* else fall through to below and print spells */ 220 } /* else fall through to below and print spells */
210 } /* params supplied */ 221 } /* params supplied */
211 222
212 /* We get here if cast was given without options or we could not find 223 /* We get here if cast was given without options or we could not find
213 * the requested spell. List all the spells the player knows. 224 * the requested spell. List all the spells the player knows.
214 */ 225 */
215 new_draw_info (NDI_UNIQUE, 0, op, "Cast what spell? Choose one of:"); 226 new_draw_info (NDI_UNIQUE, 0, op, "Cast what spell? Choose one of:");
216 show_matching_spells (op, params); 227 show_matching_spells (op, params);
228
217 return 1; 229 return 1;
218} 230}
219 231
220/**************************************************************************/ 232/**************************************************************************/
221 233
222void 234void
223change_spell (object *op, char k) 235change_spell (object *op, char k)
224{ 236{
237 if (op->contr->combat_ob == op->current_weapon)
238 {
239 if (op->contr->ranged_ob)
240 op->change_weapon (op->contr->ranged_ob);
241 }
242 else if (op->contr->ranged_ob == op->current_weapon)
243 {
244 if (op->contr->combat_ob)
245 op->change_weapon (op->contr->combat_ob);
246 }
247
225 //TODO: maybe switch to golem, if any? 248 //TODO: maybe switch to golem, if any?
226 // does nothing
227} 249}
228 250
229int 251int
230command_rotateshoottype (object *op, char *params) 252command_rotateshoottype (object *op, char *params)
231{ 253{

Diff Legend

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