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

Comparing deliantra/server/server/commands.C (file contents):
Revision 1.65 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.69 by root, Sat Apr 23 04:56:55 2011 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,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
91 {"run" , command_run , 0.0}, 91 {"run" , command_run , 0.0},
92 {"run_stop" , command_run_stop , 0.0}, 92 {"run_stop" , command_run_stop , 0.0},
93 {"fire" , command_fire , 0.0}, 93 {"fire" , command_fire , 0.0},
94 {"fire_stop", command_fire_stop, 0.0}, 94 {"fire_stop", command_fire_stop, 0.0},
95}; 95};
96static const int CommandsSize = sizeof (Commands) / sizeof (CommArray_s); 96static const int CommandsSize = array_length (Commands);
97 97
98/* 98/*
99 * Wizard commands (for both) 99 * Wizard commands (for both)
100 */ 100 */
101static CommArray_s WizCommands[] = { 101static CommArray_s WizCommands[] = {
126 {"stack_push", command_stack_push, 0.0}, 126 {"stack_push", command_stack_push, 0.0},
127 {"stats", command_stats, 0.0}, 127 {"stats", command_stats, 0.0},
128 {"summon", command_summon, 0.0}, 128 {"summon", command_summon, 0.0},
129 //{"overlay_save", command_save_overlay, 0.0}, 129 //{"overlay_save", command_save_overlay, 0.0},
130}; 130};
131static const int WizCommandsSize = sizeof (WizCommands) / sizeof (CommArray_s); 131static const int WizCommandsSize = array_length (WizCommands);
132 132
133static int 133static int
134compare_A (const void *a, const void *b) 134compare_A (const void *a, const void *b)
135{ 135{
136 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name); 136 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
185 185
186 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp))) 186 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
187 { 187 {
188 csp = find_command_element (command, Commands, CommandsSize); 188 csp = find_command_element (command, Commands, CommandsSize);
189 189
190 if (!csp && QUERY_FLAG (pl, FLAG_WIZ)) 190 if (!csp && pl->flag [FLAG_WIZ])
191 csp = find_command_element (command, WizCommands, WizCommandsSize); 191 csp = find_command_element (command, WizCommands, WizCommandsSize);
192 192
193 if (csp) 193 if (csp)
194 { 194 {
195 pl->speed_left -= csp->time; 195 pl->speed_left -= csp->time;
196 csp->func (pl, cp); 196 csp->func (pl, cp);
197 } 197 }
198 else if (!INVOKE_PLAYER (UNKNOWN_COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp))) 198 else if (!INVOKE_PLAYER (UNKNOWN_COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
199 pl->failmsg (format ("'%s' is not a valid command.", command)); 199 pl->failmsgf ("'%s' is not a valid command.", command);
200 } 200 }
201} 201}
202 202

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines