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

Comparing deliantra/server/server/c_new.C (file contents):
Revision 1.5 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.20 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22*/ 23 */
23 24
24/* This file deals with administrative commands from the client. */ 25/* This file deals with administrative commands from the client. */
25#include <global.h> 26#include <global.h>
26#include <commands.h> 27#include <commands.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 28#include <sproto.h>
29#endif
30
31#ifndef tolower
32# define tolower(C) (((C) >= 'A' && (C) <= 'Z')? (C) - 'A' + 'a': (C))
33#endif
34
35 29
36static int 30static int
37compare_A (const void *a, const void *b) 31compare_A (const void *a, const void *b)
38{ 32{
39 return strcmp (((CommArray_s *) a)->name, ((CommArray_s *) b)->name); 33 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
40} 34}
41 35
42static CommArray_s * 36static CommArray_s *
43find_command_element (char *cmd, CommArray_s * commarray, int commsize) 37find_command_element (char *cmd, CommArray_s *commarray, int commsize)
44{ 38{
45 CommArray_s *asp, dummy; 39 CommArray_s *asp, dummy;
46 40
47 dummy.name = cmd; 41 dummy.name = cmd;
48 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) commarray, commsize, sizeof (CommArray_s), compare_A); 42 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) commarray, commsize, sizeof (CommArray_s), compare_A);
… …
51 45
52/* This function is called from the new client/server code. 46/* This function is called from the new client/server code.
53 * pl is the player who is issuing the command, command is the 47 * pl is the player who is issuing the command, command is the
54 * command. 48 * command.
55 */ 49 */
56int 50void
57execute_newserver_command (object *pl, char *command) 51execute_newserver_command (object *pl, char *command)
58{ 52{
59 CommArray_s *csp; 53 CommArray_s *csp;
60 char *cp; 54 char *cp;
61
62 pl->contr->has_hit = 0;
63 55
64 /* 56 /*
65 * remove trailing spaces from commant 57 * remove trailing spaces from commant
66 */ 58 */
67 cp = command + strlen (command) - 1; 59 cp = command + strlen (command) - 1;
68 while ((cp >= command) && (*cp == ' ')) 60 while ((cp >= command) && (*cp == ' '))
69 { 61 {
70 *cp = '\0'; 62 *cp = '\0';
71 cp--; 63 cp--;
72 } 64 }
65
73 cp = strchr (command, ' '); 66 cp = strchr (command, ' ');
74 if (cp) 67 if (cp)
75 { 68 {
76 *(cp++) = '\0'; 69 *(cp++) = '\0';
77 while (*cp == ' ') 70 while (*cp == ' ')
78 cp++; 71 cp++;
79 } 72 }
80 73
81 csp = find_plugin_command (command, pl); 74 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
75 {
76 csp = find_command_element (command, Commands, CommandsSize);
82 77
83 if (!csp)
84 csp = find_command_element (command, NewServerCommands, NewServerCommandSize);
85 if (!csp)
86 csp = find_command_element (command, Commands, CommandsSize);
87 if (!csp)
88 csp = find_command_element (command, CommunicationCommands, CommunicationCommandSize);
89 if (!csp && QUERY_FLAG (pl, FLAG_WIZ)) 78 if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
90 csp = find_command_element (command, WizCommands, WizCommandsSize); 79 csp = find_command_element (command, WizCommands, WizCommandsSize);
91 80
92 if (csp == NULL) 81 if (!csp)
93 { 82 {
94 new_draw_info_format (NDI_UNIQUE, 0, pl, "'%s' is not a valid command.", command); 83 new_draw_info_format (NDI_UNIQUE, 0, pl, "'%s' is not a valid command.", command);
95 return 0; 84 return;
85 }
86
87 pl->speed_left -= csp->time;
88
89 csp->func (pl, cp);
96 } 90 }
97
98 pl->speed_left -= csp->time;
99
100 /* A character time can never exceed his speed (which in many cases,
101 * if wearing armor, is less than one.) Thus, in most cases, if
102 * the command takes 1.0, the player's speed will be less than zero.
103 * it is only really an issue if time goes below -1
104 * Due to various reasons that are too long to go into here, we will
105 * actually still execute player even if his time is less than 0,
106 * but greater than -1. This is to improve the performance of the
107 * new client/server. In theory, it shouldn't make much difference.
108 */
109
110 if (csp->time && pl->speed_left < -2.0)
111 {
112 LOG (llevDebug, "execute_newclient_command: Player issued command that takes more time than he has left.\n");
113 }
114 return csp->func (pl, cp);
115}
116
117int
118command_run (object *op, char *params)
119{
120 int dir;
121
122 dir = params ? atoi (params) : 0;
123 if (dir < 0 || dir >= 9)
124 {
125 new_draw_info (NDI_UNIQUE, 0, op, "Can't run into a non adjacent square.");
126 return 0;
127 }
128 op->contr->run_on = 1;
129 return move_player (op, dir);
130}
131
132int
133command_run_stop (object *op, char *params)
134{
135 op->contr->run_on = 0;
136 return 1;
137}
138
139int
140command_fire (object *op, char *params)
141{
142 int dir;
143
144 dir = params ? atoi (params) : 0;
145 if (dir < 0 || dir >= 9)
146 {
147 new_draw_info (NDI_UNIQUE, 0, op, "Can't fire to a non adjacent square.");
148 return 0;
149 };
150 op->contr->fire_on = 1;
151 return move_player (op, dir);
152}
153
154int
155command_fire_stop (object *op, char *params)
156{
157 op->contr->fire_on = 0;
158 return 1;
159} 91}
160 92
161int 93int
162bad_command (object *op, char *params) 94bad_command (object *op, char *params)
163{ 95{

Diff Legend

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