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.7 by root, Mon Dec 11 22:56:57 2006 UTC vs.
Revision 1.19 by root, Fri Dec 19 22:47:30 2008 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your 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 GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/* This file deals with administrative commands from the client. */ 24/* This file deals with administrative commands from the client. */
25#include <global.h> 25#include <global.h>
26#include <commands.h> 26#include <commands.h>
27#ifndef __CEXTRACT__
28# include <sproto.h> 27#include <sproto.h>
29#endif
30 28
31static int 29static int
32compare_A (const void *a, const void *b) 30compare_A (const void *a, const void *b)
33{ 31{
34 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name); 32 return strcmp (((CommArray_s *)a)->name, ((CommArray_s *)b)->name);
… …
52execute_newserver_command (object *pl, char *command) 50execute_newserver_command (object *pl, char *command)
53{ 51{
54 CommArray_s *csp; 52 CommArray_s *csp;
55 char *cp; 53 char *cp;
56 54
57 pl->contr->has_hit = 0;
58
59 /* 55 /*
60 * remove trailing spaces from commant 56 * remove trailing spaces from commant
61 */ 57 */
62 cp = command + strlen (command) - 1; 58 cp = command + strlen (command) - 1;
63 while ((cp >= command) && (*cp == ' ')) 59 while ((cp >= command) && (*cp == ' '))
… …
74 cp++; 70 cp++;
75 } 71 }
76 72
77 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp))) 73 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
78 { 74 {
79 csp = find_command_element (command, NewServerCommands, NewServerCommandSize);
80 if (!csp) csp = find_command_element (command, Commands, CommandsSize); 75 csp = find_command_element (command, Commands, CommandsSize);
81 if (!csp) csp = find_command_element (command, CommunicationCommands, CommunicationCommandSize); 76
82 if (!csp && QUERY_FLAG (pl, FLAG_WIZ)) 77 if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
83 csp = find_command_element (command, WizCommands, WizCommandsSize); 78 csp = find_command_element (command, WizCommands, WizCommandsSize);
84 79
85 if (!csp) 80 if (!csp)
86 { 81 {
… …
90 85
91 pl->speed_left -= csp->time; 86 pl->speed_left -= csp->time;
92 87
93 csp->func (pl, cp); 88 csp->func (pl, cp);
94 } 89 }
95
96 /* A character time can never exceed his speed (which in many cases,
97 * if wearing armor, is less than one.) Thus, in most cases, if
98 * the command takes 1.0, the player's speed will be less than zero.
99 * it is only really an issue if time goes below -1
100 * Due to various reasons that are too long to go into here, we will
101 * actually still execute player even if his time is less than 0,
102 * but greater than -1. This is to improve the performance of the
103 * new client/server. In theory, it shouldn't make much difference.
104 */
105
106 if (csp->time && pl->speed_left < -2.0)
107 LOG (llevDebug, "execute_newclient_command: Player issued command that takes more time than he has left.\n");
108}
109
110int
111command_run (object *op, char *params)
112{
113 int dir;
114
115 dir = params ? atoi (params) : 0;
116 if (dir < 0 || dir >= 9)
117 {
118 new_draw_info (NDI_UNIQUE, 0, op, "Can't run into a non adjacent square.");
119 return 0;
120 }
121 op->contr->run_on = 1;
122 return move_player (op, dir);
123}
124
125int
126command_run_stop (object *op, char *params)
127{
128 op->contr->run_on = 0;
129 return 1;
130}
131
132int
133command_fire (object *op, char *params)
134{
135 int dir;
136
137 dir = params ? atoi (params) : 0;
138 if (dir < 0 || dir >= 9)
139 {
140 new_draw_info (NDI_UNIQUE, 0, op, "Can't fire to a non adjacent square.");
141 return 0;
142 };
143 op->contr->fire_on = 1;
144 return move_player (op, dir);
145}
146
147int
148command_fire_stop (object *op, char *params)
149{
150 op->contr->fire_on = 0;
151 return 1;
152} 90}
153 91
154int 92int
155bad_command (object *op, char *params) 93bad_command (object *op, char *params)
156{ 94{

Diff Legend

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