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.6 by root, Mon Dec 11 02:54:57 2006 UTC vs.
Revision 1.11 by pippijn, Sat Jan 6 14:42:30 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program 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
… …
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 55
… …
68 while ((cp >= command) && (*cp == ' ')) 62 while ((cp >= command) && (*cp == ' '))
69 { 63 {
70 *cp = '\0'; 64 *cp = '\0';
71 cp--; 65 cp--;
72 } 66 }
67
73 cp = strchr (command, ' '); 68 cp = strchr (command, ' ');
74 if (cp) 69 if (cp)
75 { 70 {
76 *(cp++) = '\0'; 71 *(cp++) = '\0';
77 while (*cp == ' ') 72 while (*cp == ' ')
78 cp++; 73 cp++;
79 } 74 }
80 75
81 csp = find_plugin_command (command, pl); 76 if (!INVOKE_PLAYER (COMMAND, pl->contr, ARG_STRING (command), ARG_STRING (cp)))
77 {
78 csp = find_command_element (command, NewServerCommands, NewServerCommandSize);
79 if (!csp) csp = find_command_element (command, Commands, CommandsSize);
80 if (!csp) csp = find_command_element (command, CommunicationCommands, CommunicationCommandSize);
81 if (!csp && QUERY_FLAG (pl, FLAG_WIZ))
82 csp = find_command_element (command, WizCommands, WizCommandsSize);
82 83
83 if (!csp) csp = find_command_element (command, NewServerCommands, NewServerCommandSize); 84 if (!csp)
84 if (!csp) csp = find_command_element (command, Commands, CommandsSize); 85 {
85 if (!csp) csp = find_command_element (command, CommunicationCommands, CommunicationCommandSize); 86 new_draw_info_format (NDI_UNIQUE, 0, pl, "'%s' is not a valid command.", command);
86 if (!csp && QUERY_FLAG (pl, FLAG_WIZ)) 87 return;
87 csp = find_command_element (command, WizCommands, WizCommandsSize); 88 }
88 89
89 if (csp == NULL) 90 pl->speed_left -= csp->time;
90 { 91
91 new_draw_info_format (NDI_UNIQUE, 0, pl, "'%s' is not a valid command.", command); 92 csp->func (pl, cp);
92 return 0;
93 } 93 }
94
95 pl->speed_left -= csp->time;
96
97 /* A character time can never exceed his speed (which in many cases,
98 * if wearing armor, is less than one.) Thus, in most cases, if
99 * the command takes 1.0, the player's speed will be less than zero.
100 * it is only really an issue if time goes below -1
101 * Due to various reasons that are too long to go into here, we will
102 * actually still execute player even if his time is less than 0,
103 * but greater than -1. This is to improve the performance of the
104 * new client/server. In theory, it shouldn't make much difference.
105 */
106
107 if (csp->time && pl->speed_left < -2.0)
108 LOG (llevDebug, "execute_newclient_command: Player issued command that takes more time than he has left.\n");
109
110 return csp->func (pl, cp);
111} 94}
112 95
113int 96int
114command_run (object *op, char *params) 97command_run (object *op, char *params)
115{ 98{
… …
119 if (dir < 0 || dir >= 9) 102 if (dir < 0 || dir >= 9)
120 { 103 {
121 new_draw_info (NDI_UNIQUE, 0, op, "Can't run into a non adjacent square."); 104 new_draw_info (NDI_UNIQUE, 0, op, "Can't run into a non adjacent square.");
122 return 0; 105 return 0;
123 } 106 }
107
124 op->contr->run_on = 1; 108 op->contr->run_on = 1;
125 return move_player (op, dir); 109 return move_player (op, dir);
126} 110}
127 111
128int 112int

Diff Legend

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