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.2 by root, Tue Aug 29 08:01:37 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.2 2006/08/29 08:01:37 root 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 char *cp;
51 39
52 dummy.name =cmd; 40 dummy.name = cmd;
53 asp =(CommArray_s *)bsearch((void *)&dummy, 41 asp = (CommArray_s *) bsearch ((void *) &dummy, (void *) commarray, commsize, sizeof (CommArray_s), compare_A);
54 (void *)commarray, commsize,
55 sizeof(CommArray_s), compare_A);
56 return asp; 42 return asp;
57} 43}
58 44
59/* This function is called from the new client/server code. 45/* This function is called from the new client/server code.
60 * 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
61 * command. 47 * command.
62 */ 48 */
49void
63int execute_newserver_command(object *pl, char *command) 50execute_newserver_command (object *pl, char *command)
64{ 51{
65 CommArray_s *csp; 52 CommArray_s *csp;
66 char *cp; 53 char *cp;
67 54
68 pl->contr->has_hit=0;
69
70 /* 55 /*
71 * remove trailing spaces from commant 56 * remove trailing spaces from commant
72 */ 57 */
73 cp=command+strlen(command)-1; 58 cp = command + strlen (command) - 1;
74 while ( (cp>=command) && (*cp==' ')){ 59 while ((cp >= command) && (*cp == ' '))
60 {
75 *cp='\0'; 61 *cp = '\0';
76 cp--; 62 cp--;
77 }
78 cp=strchr(command, ' ');
79 if (cp) {
80 *(cp++) ='\0';
81 while (*cp==' ') cp++;
82 } 63 }
83 64
84 csp = find_plugin_command(command,pl); 65 cp = strchr (command, ' ');
85
86 if (!csp) 66 if (cp)
87 csp = find_command_element(command, NewServerCommands, NewServerCommandSize); 67 {
88 if (!csp) 68 *(cp++) = '\0';
89 csp = find_command_element(command, Commands, CommandsSize); 69 while (*cp == ' ')
90 if (!csp) 70 cp++;
91 csp = find_command_element(command, CommunicationCommands, CommunicationCommandSize);
92 if (!csp && QUERY_FLAG(pl, FLAG_WIZ))
93 csp = find_command_element(command, WizCommands, WizCommandsSize);
94
95 if (csp==NULL) {
96 new_draw_info_format(NDI_UNIQUE, 0,pl,
97 "'%s' is not a valid command.", command);
98 return 0;
99 } 71 }
100 72
101 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);
102 76
103 /* A character time can never exceed his speed (which in many cases, 77 if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
104 * if wearing armor, is less than one.) Thus, in most cases, if 78 csp = find_command_element (command, WizCommands, WizCommandsSize);
105 * the command takes 1.0, the player's speed will be less than zero.
106 * it is only really an issue if time goes below -1
107 * Due to various reasons that are too long to go into here, we will
108 * actually still execute player even if his time is less than 0,
109 * but greater than -1. This is to improve the performance of the
110 * new client/server. In theory, it shouldn't make much difference.
111 */
112 79
113 if (csp->time && pl->speed_left<-2.0) { 80 if (!csp)
114 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);
115 } 89 }
116 return csp->func(pl, cp);
117} 90}
118 91
92int
119int command_run(object *op, char *params) 93bad_command (object *op, char *params)
120{ 94{
121 int dir; 95 new_draw_info (NDI_UNIQUE, 0, op, "bind and unbind are no longer handled on the server");
122 dir = params?atoi(params):0; 96 return 1;
123 if ( dir<0 || dir>=9 ){
124 new_draw_info(NDI_UNIQUE, 0,op,"Can't run into a non adjacent square.");
125 return 0;
126 }
127 op->contr->run_on=1;
128 return move_player(op, dir);
129} 97}
130
131int command_run_stop(object *op, char *params)
132{
133 op->contr->run_on=0;
134 return 1;
135}
136
137int command_fire(object *op, char *params)
138{
139 int dir;
140 dir = params?atoi(params):0;
141 if ( dir<0 || dir>=9 ){
142 new_draw_info(NDI_UNIQUE, 0,op,"Can't fire to a non adjacent square.");
143 return 0;
144 };
145 op->contr->fire_on=1;
146 return move_player(op, dir);
147}
148
149int command_fire_stop(object *op, char *params)
150{
151 op->contr->fire_on=0;
152 return 1;
153}
154
155int bad_command(object *op, char *params)
156{
157 new_draw_info(NDI_UNIQUE, 0,op,"bind and unbind are no longer handled on the server");
158 return 1;
159}

Diff Legend

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