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.3 by pippijn, Thu Sep 7 10:01:57 2006 UTC vs.
Revision 1.19 by root, Fri Dec 19 22:47:30 2008 UTC

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

Diff Legend

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