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

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.6 by root, Sun Sep 3 00:18:42 2006 UTC vs.
Revision 1.44 by root, Mon May 28 21:28:36 2007 UTC

1/* 1/*
2 * static char *rcsid_c_wiz_c = 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * "$Id: c_wiz.C,v 1.6 2006/09/03 00:18:42 root Exp $"; 3 *
4 */ 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
11 7 *
12 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
13 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
14 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
15 (at your option) any later version. 11 * any later version.
16 12 *
17 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, but
18 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
20 GNU General Public License for more details. 16 * for more details.
21 17 *
22 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 along
23 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
25 21 *
26 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
27*/ 23 */
28 24
29#include <global.h> 25#include <global.h>
30#ifndef __CEXTRACT__
31#include <sproto.h> 26#include <sproto.h>
32#endif
33#include <spells.h> 27#include <spells.h>
34#include <treasure.h> 28#include <treasure.h>
35#include <skills.h> 29#include <skills.h>
36 30
37/** Defines for DM item stack **/ 31/** Defines for DM item stack **/
38#define STACK_SIZE 50 /* Stack size, static */ 32#define STACK_SIZE 50 /* Stack size, static */
33
39/* Values for 'from' field of get_dm_object */ 34/* Values for 'from' field of get_dm_object */
40#define STACK_FROM_NONE 0 /* Item was not found */ 35#define STACK_FROM_NONE 0 /* Item was not found */
41#define STACK_FROM_TOP 1 /* Item is stack top */ 36#define STACK_FROM_TOP 1 /* Item is stack top */
42#define STACK_FROM_STACK 2 /* Item is somewhere in stack */ 37#define STACK_FROM_STACK 2 /* Item is somewhere in stack */
43#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */ 38#define STACK_FROM_NUMBER 3 /* Item is a number (may be top) */
… …
48 * it out to a seperate function. name is the person 43 * it out to a seperate function. name is the person
49 * being saught, rq is who is looking for them. This 44 * being saught, rq is who is looking for them. This
50 * prints diagnostics messages, and returns the 45 * prints diagnostics messages, and returns the
51 * other player, or NULL otherwise. 46 * other player, or NULL otherwise.
52 */ 47 */
48static player *
53static player *get_other_player_from_name(object *op, char *name) { 49get_other_player_from_name (object *op, char *name)
54 player *pl; 50{
55
56 if (!name) 51 if (!name)
57 return NULL; 52 return NULL;
58 53
59 for (pl = first_player; pl != NULL; pl = pl->next) 54 for_all_players (pl)
60 if (!strncmp(pl->ob->name, name, MAX_NAME)) 55 if (!strncmp (pl->ob->name, name, MAX_NAME))
61 break; 56 {
62
63 if (pl == NULL) {
64 new_draw_info(NDI_UNIQUE, 0, op, "No such player.");
65 return NULL;
66 }
67
68 if (pl->ob == op) { 57 if (pl->ob == op)
58 {
69 new_draw_info(NDI_UNIQUE, 0, op, "You can't do that to yourself."); 59 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 60 return NULL;
71 } 61 }
62
72 if (pl->state != ST_PLAYING) { 63 if (pl->ns->state != ST_PLAYING)
64 {
73 new_draw_info(NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 65 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
74 return NULL; 66 return NULL;
75 } 67 }
76 return pl;
77}
78 68
79/**
80 * This command will stress server.
81 */
82int command_loadtest(object *op, char *params) {
83 uint32 x, y;
84 char buf[1024];
85
86 new_draw_info(NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
87 new_draw_info(NDI_UNIQUE, 0, op, "at different map places.");
88 new_draw_info(NDI_UNIQUE, 0, op, "use at your own risks.");
89 new_draw_info(NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
90 new_draw_info(NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
91 new_draw_info_format(NDI_UNIQUE, 0, op, "{%s}", params);
92 if (!params)
93 return 0; 69 return pl;
94 if (strncmp (params, "TRUE", 4))
95 return 0;
96
97 new_draw_info_format(NDI_UNIQUE, 0, op, "gogogo");
98 for (x = 0; x < settings.worldmaptilesx; x++) {
99 for (y = 0; y < settings.worldmaptilesy; y++) {
100 sprintf(buf, "/world/world_%d_%d", x+settings.worldmapstartx, y+settings.worldmapstarty);
101 command_goto(op, buf);
102 } 70 }
103 }
104 71
72 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
105 return 0; 73 return 0;
106} 74}
107 75
108/** 76/**
109 * Actually hides specified player (obviously a DM). 77 * Actually hides specified player (obviously a DM).
110 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 78 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
111 * else they just think someone left/entered. 79 * else they just think someone left/entered.
112 */ 80 */
81void
113void do_wizard_hide(object *op, int silent_dm) { 82do_wizard_hide (object *op, int silent_dm)
83{
114 if (op->contr->hidden) { 84 if (op->contr->hidden)
85 {
115 op->contr->hidden = 0; 86 op->contr->hidden = 0;
116 op->invisible = 1; 87 op->invisible = 1;
117 new_draw_info(NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 88 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
118 op->map->players++; 89 op->map->players++;
119 new_draw_info_format(NDI_UNIQUE|NDI_ALL|NDI_DK_ORANGE, 5, NULL, 90 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
120 "%s has entered the game.", &op->name); 91
121 if (!silent_dm) { 92 if (!silent_dm)
122 new_draw_info(NDI_UNIQUE|NDI_ALL|NDI_LT_GREEN, 1, NULL, 93 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
123 "The Dungeon Master has arrived!"); 94 }
124 } 95 else
125 } else { 96 {
126 op->contr->hidden = 1; 97 op->contr->hidden = 1;
127 new_draw_info(NDI_UNIQUE, 0, op, "Other players will no longer see you."); 98 new_draw_info (NDI_UNIQUE, 0, op, "Other players will no longer see you.");
128 op->map->players--; 99 op->map->players--;
100
129 if (!silent_dm) { 101 if (!silent_dm)
130 new_draw_info(NDI_UNIQUE|NDI_ALL|NDI_LT_GREEN, 1, NULL, 102 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
131 "The Dungeon Master is gone.."); 103
132 } 104 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s leaves the game.", &op->name);
133 new_draw_info_format(NDI_UNIQUE|NDI_ALL|NDI_DK_ORANGE, 5, NULL, 105 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s left the game.", &op->name);
134 "%s leaves the game.", &op->name);
135 new_draw_info_format(NDI_UNIQUE|NDI_ALL|NDI_DK_ORANGE, 5, NULL,
136 "%s left the game.", &op->name);
137 } 106 }
138} 107}
139 108
109int
140int command_hide(object *op, char *params) 110command_hide (object *op, char *params)
141{ 111{
142 do_wizard_hide(op, 0); 112 do_wizard_hide (op, 0);
143 return 1; 113 return 1;
144} 114}
145 115
146/** 116/**
147 * This finds and returns the object which matches the name or 117 * This finds and returns the object which matches the name or
148 * object nubmer (specified via num #whatever). 118 * object nubmer (specified via num #whatever).
149 */ 119 */
120static object *
150static object *find_object_both(char *params) { 121find_object_both (char *params)
122{
151 if (!params) 123 if (!params)
152 return NULL; 124 return NULL;
125
153 if (params[0] == '#') 126 if (params[0] == '#')
154 return find_object(atol(params+1)); 127 return find_object (atol (params + 1));
155 else 128 else
156 return find_object_name(params); 129 return find_object_name (params);
157} 130}
158 131
159/** 132/**
160 * Sets the god for some objects. params should contain two values - 133 * Sets the god for some objects. params should contain two values -
161 * first the object to change, followed by the god to change it to. 134 * first the object to change, followed by the god to change it to.
162 */ 135 */
136int
163int command_setgod(object *op, char *params) { 137command_setgod (object *op, char *params)
138{
164 object *ob, *god; 139 object *ob, *god;
165 char *str; 140 char *str;
166 141
167 if (!params || !(str = strchr(params, ' '))) { 142 if (!params || !(str = strchr (params, ' ')))
143 {
168 new_draw_info(NDI_UNIQUE, 0, op, "Usage: setgod object god"); 144 new_draw_info (NDI_UNIQUE, 0, op, "Usage: setgod object god");
169 return 0; 145 return 0;
170 } 146 }
171 147
172 /* kill the space, and set string to the next param */ 148 /* kill the space, and set string to the next param */
173 *str++ = '\0'; 149 *str++ = '\0';
174 if (!(ob = find_object_both(params))) { 150 if (!(ob = find_object_both (params)))
151 {
175 new_draw_info_format(NDI_UNIQUE, 0, op, "Set whose god - can not find object %s?", params); 152 new_draw_info_format (NDI_UNIQUE, 0, op, "Set whose god - can not find object %s?", params);
176 return 1; 153 return 1;
177 } 154 }
178 155
179 /* 156 /*
180 * Perhaps this is overly restrictive? Should we perhaps be able 157 * Perhaps this is overly restrictive? Should we perhaps be able
181 * to rebless altars and the like? 158 * to rebless altars and the like?
182 */ 159 */
183 if (ob->type != PLAYER) { 160 if (ob->type != PLAYER)
161 {
184 new_draw_info_format(NDI_UNIQUE, 0, op, "%s is not a player - can not change its god", &ob->name); 162 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is not a player - can not change its god", &ob->name);
185 return 1; 163 return 1;
186 } 164 }
187 165
188 god = find_god(str); 166 god = find_god (str);
189 if (god==NULL) { 167 if (god == NULL)
168 {
190 new_draw_info_format(NDI_UNIQUE, 0, op, "No such god %s.", str); 169 new_draw_info_format (NDI_UNIQUE, 0, op, "No such god %s.", str);
191 return 1; 170 return 1;
192 } 171 }
193 172
194 become_follower(ob, god); 173 become_follower (ob, god);
195 return 1; 174 return 1;
196} 175}
197 176
198/** 177// TODO: Rewrite banish in perl and get rid of the following two functions
199 * Add player's IP to ban_file and kick them off the server 178int
200 * I know most people have dynamic IPs but this is more of a short term
201 * solution if they have to get a new IP to play maybe they'll calm down.
202 * This uses the banish_file in the local directory *not* the ban_file
203 * The action is logged with a ! for easy searching. -tm
204 */
205int command_banish(object *op, char *params) {
206 player *pl;
207 FILE *banishfile;
208 char buf[MAX_BUF];
209 time_t now;
210
211 if (!params) {
212 new_draw_info(NDI_UNIQUE, 0, op, "Usage: banish <player>.");
213 return 1;
214 }
215
216 pl = get_other_player_from_name(op, params);
217 if (!pl)
218 return 1;
219
220 sprintf(buf, "%s/%s", settings.localdir, BANISHFILE);
221
222 if ((banishfile = fopen(buf, "a")) == NULL) {
223 LOG (llevDebug, "Could not find file banish_file.\n");
224 new_draw_info(NDI_UNIQUE, 0, op, "Could not find banish_file.");
225 return 0;
226 }
227
228 now = time(NULL);
229 /*
230 * Record this as a comment - then we don't have to worry about changing
231 * the parsing code.
232 */
233 fprintf(banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name,
234 pl->socket.host, &op->name, ctime(&now));
235 fprintf(banishfile, "*@%s\n", pl->socket.host);
236 fclose(banishfile);
237
238 LOG(llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host);
239 new_draw_info_format(NDI_UNIQUE|NDI_RED, 0, op, "You banish %s", &pl->ob->name);
240 new_draw_info_format(NDI_UNIQUE|NDI_ALL|NDI_RED, 5, op,
241 "%s banishes %s from the land!", &op->name, &pl->ob->name);
242 command_kick(op, (char *) &pl->ob->name);
243 return 1;
244}
245
246int command_kick (object *op, char *params) { 179command_kick (object *op, char *params)
247 struct pl *pl; 180{
248 181 for_all_players (pl)
249 for (pl = first_player; pl != NULL; pl = pl->next) 182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
250 if ((params == NULL || !strcmp (&pl->ob->name, params))
251 && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
252 { 183 {
253 object *op = pl->ob; 184 object *op = pl->ob;
254 185
255 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
256 { 187 {
257 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, 188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
258 "%s is kicked out of the game.",
259 &op->name);
260 strcpy (op->contr->killer, "kicked"); 189 strcpy (op->contr->killer, "kicked");
261 } 190 }
262 191
263 pl->socket.status = Ns_Dead; 192 pl->ns->destroy ();
264 } 193 }
265 194
266 return 1; 195 return 1;
267} 196}
268 197
198//TODO
199#if 0
200int
269int command_save_overlay(object *op, char *params) { 201command_save_overlay (object *op, char *params)
202{
270 if (!op) 203 if (!op)
271 return 0; 204 return 0;
272 205
273 if (op != NULL && !QUERY_FLAG(op, FLAG_WIZ)) { 206 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
274 new_draw_info(NDI_UNIQUE, 0, op, 207 {
275 "Sorry, you can't force an overlay save."); 208 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't force an overlay save.");
276 return 1; 209 return 1;
277 } 210 }
278 211
279 new_save_map(op->map, 2); 212 new_save_map (op->map, 2);
280 new_save_map(op->map, 0); 213 new_save_map (op->map, 0);
281 new_draw_info(NDI_UNIQUE, 0, op, "Current map has been saved as an" 214 new_draw_info (NDI_UNIQUE, 0, op, "Current map has been saved as an" " overlay.");
282 " overlay.");
283 215
284 ready_map_name(op->map->path, 0); 216 ready_map_name (op->map->path, 0);
285 217
218 return 1;
219}
220#endif
221
222int
223command_freeze (object *op, char *params)
224{
225 int ticks;
226 player *pl;
227
228 if (!params)
229 {
230 new_draw_info (NDI_UNIQUE, 0, op, "Usage: freeze [ticks] <player>.");
231 return 1;
232 }
233
234 ticks = atoi (params);
235 if (ticks)
236 {
237 while ((isdigit (*params) || isspace (*params)) && *params != 0)
238 params++;
239 if (*params == 0)
240 {
241 new_draw_info (NDI_UNIQUE, 0, op, "Usage: freeze [ticks] <player>.");
242 return 1;
243 }
244 }
245 else
246 ticks = 100;
247
248 pl = get_other_player_from_name (op, params);
249 if (!pl)
286 return 1; 250 return 1;
287}
288 251
289int 252 new_draw_info (NDI_UNIQUE | NDI_RED, 0, pl->ob, "You have been frozen by the DM!");
290command_shutdown (object * op, char *params) 253 new_draw_info_format (NDI_UNIQUE, 0, op, "You freeze %s for %d ticks", &pl->ob->name, ticks);
291{ 254 pl->ob->speed_left = -(pl->ob->speed * ticks);
292 struct pl *pl;
293
294 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
295 {
296 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
297 return 1;
298 }
299
300 for (pl = first_player; pl != NULL; pl = pl->next)
301 save_player (pl->ob, 0);
302
303 for (pl = first_player; pl != NULL; pl = pl->next)
304 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
305 leave_map (pl->ob);
306
307 cleanup ();
308 /* not reached */
309 return 1; 255 return 0;
310} 256}
311 257
258int
312int command_goto(object *op, char *params) 259command_arrest (object *op, char *params)
313{ 260{
314 char *name;
315 object *dummy; 261 object *dummy;
262 player *pl;
316 263
317 if (!op) 264 if (!op)
318 return 0; 265 return 0;
319 266
320 if (params == NULL) { 267 if (params == NULL)
321 new_draw_info(NDI_UNIQUE, 0, op, "Go to what level?"); 268 {
269 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
322 return 1; 270 return 1;
323 } 271 }
324 272
325 name = params; 273 pl = get_other_player_from_name (op, params);
326 dummy=get_object(); 274 if (!pl)
327 dummy->map = op->map;
328 EXIT_PATH(dummy) = name;
329 dummy->name = name;
330
331 enter_exit(op, dummy);
332 free_object(dummy);
333 if (op->contr->loading == NULL) {
334 new_draw_info_format(NDI_UNIQUE, 0, op,
335 "Difficulty: %d.", op->map->difficulty);
336 }
337
338 return 1; 275 return 1;
339}
340 276
341/* is this function called from somewhere ? -Tero */ 277 dummy = get_jail_exit (pl->ob);
342int command_generate (object *op, char *params) 278 if (!dummy)
343{ 279 {
344 object *tmp; 280 /* we have nowhere to send the prisoner.... */
345 int nr = 1, i, retry; 281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346
347 if (!op)
348 return 0; 282 return 0;
283 }
349 284
285 pl->ob->enter_exit (dummy);
286 dummy->destroy ();
287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
290 return 1;
291}
292
293int
294command_summon (object *op, char *params)
295{
296 int i;
297 object *dummy;
298 player *pl;
299
300 if (!op)
301 return 0;
302
350 if (params != NULL) 303 if (params == NULL)
351 sscanf(params, "%d", &nr);
352 for (i = 0; i < nr; i++) {
353 retry = 50;
354 while ((tmp=generate_treasure(0, op->map->difficulty)) == NULL && --retry)
355 ;
356 if (tmp != NULL) {
357 tmp = insert_ob_in_ob(tmp, op);
358 if (op->type == PLAYER)
359 esrv_send_item(op, tmp);
360 }
361 } 304 {
305 new_draw_info (NDI_UNIQUE, 0, op, "Usage: summon <player>.");
306 return 1;
307 }
362 308
309 pl = get_other_player_from_name (op, params);
310 if (!pl)
363 return 1; 311 return 1;
364}
365 312
366int command_freeze(object *op, char *params) {
367 int ticks;
368 player *pl;
369
370 if (!params) {
371 new_draw_info(NDI_UNIQUE, 0, op, "Usage: freeze [ticks] <player>.");
372 return 1;
373 }
374
375 ticks = atoi(params);
376 if (ticks) {
377 while ((isdigit(*params) || isspace(*params)) && *params != 0)
378 params++;
379 if (*params == 0) {
380 new_draw_info(NDI_UNIQUE, 0, op, "Usage: freeze [ticks] <player>.");
381 return 1;
382 }
383 } else
384 ticks = 100;
385
386 pl = get_other_player_from_name(op, params);
387 if (!pl)
388 return 1;
389
390 new_draw_info(NDI_UNIQUE|NDI_RED, 0, pl->ob, "You have been frozen by the DM!");
391 new_draw_info_format(NDI_UNIQUE, 0, op,
392 "You freeze %s for %d ticks", &pl->ob->name, ticks);
393 pl->ob->speed_left = -(pl->ob->speed*ticks);
394 return 0;
395}
396
397int command_arrest(object *op, char *params) {
398 object *dummy;
399 player *pl;
400 if (!op) return 0;
401 if(params==NULL) {
402 new_draw_info(NDI_UNIQUE, 0,op,"Usage: arrest <player>.");
403 return 1;
404 }
405 pl = get_other_player_from_name(op, params);
406 if (!pl) return 1;
407 dummy=get_jail_exit(pl->ob);
408 if (!dummy) {
409 /* we have nowhere to send the prisoner....*/
410 new_draw_info(NDI_UNIQUE, 0,op,"can't jail player, there is no map to hold them");
411 return 0;
412 }
413 enter_exit(pl->ob, dummy);
414 free_object(dummy);
415 new_draw_info(NDI_UNIQUE, 0,pl->ob,"You have been arrested.");
416 new_draw_info(NDI_UNIQUE, 0,op,"OK.");
417 LOG(llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
418 return 1;
419}
420
421int command_summon(object *op, char *params) {
422 int i;
423 object *dummy;
424 player *pl;
425
426 if (!op)
427 return 0;
428
429 if (params == NULL) {
430 new_draw_info(NDI_UNIQUE, 0, op, "Usage: summon <player>.");
431 return 1;
432 }
433
434 pl = get_other_player_from_name(op, params);
435 if (!pl)
436 return 1;
437
438 i = find_free_spot(op, op->map, op->x, op->y, 1, 9); 313 i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
439 if (i == -1) { 314 if (i == -1)
315 {
440 new_draw_info(NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
441 return 1; 317 return 1;
442 } 318 }
443 319
444 dummy = get_object(); 320 dummy = object::create ();
445 EXIT_PATH(dummy) = op->map->path; 321 EXIT_PATH (dummy) = op->map->path;
446 EXIT_X(dummy) = op->x+freearr_x[i]; 322 EXIT_X (dummy) = op->x + freearr_x[i];
447 EXIT_Y(dummy) = op->y+freearr_y[i]; 323 EXIT_Y (dummy) = op->y + freearr_y[i];
448 enter_exit(pl->ob, dummy); 324 pl->ob->enter_exit (dummy);
449 free_object(dummy); 325 dummy->destroy ();
450 new_draw_info(NDI_UNIQUE, 0, pl->ob, "You are summoned."); 326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
451 new_draw_info(NDI_UNIQUE, 0, op, "OK.");
452
453 return 1;
454}
455
456/**
457 * Teleport next to target player.
458 */
459/* mids 01/16/2002 */
460int command_teleport(object *op, char *params) {
461 int i;
462 object *dummy;
463 player *pl;
464
465 if (!op)
466 return 0;
467
468 if (params == NULL) {
469 new_draw_info(NDI_UNIQUE, 0, op, "Usage: teleport <player>.");
470 return 1;
471 }
472
473 pl = get_other_player_from_name(op, params);
474 if (!pl)
475 return 1;
476
477 i = find_free_spot(pl->ob, pl->ob->map, pl->ob->x, pl->ob->y, 1, 9);
478 if (i == -1) {
479 new_draw_info(NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
480 return 1;
481 }
482
483 dummy = get_object();
484 EXIT_PATH(dummy) = pl->ob->map->path;
485 EXIT_X(dummy) = pl->ob->x + freearr_x[i];
486 EXIT_Y(dummy) = pl->ob->y + freearr_y[i];
487 enter_exit(op, dummy);
488 free_object(dummy);
489 if (!op->contr->hidden)
490 new_draw_info(NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
491 new_draw_info(NDI_UNIQUE, 0, op, "OK."); 327 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
328
492 return 1; 329 return 1;
493} 330}
494 331
495/** 332/**
496 * This function is a real mess, because we're stucking getting 333 * This function is a real mess, because we're stucking getting
497 * the entire item description in one block of text, so we just 334 * the entire item description in one block of text, so we just
… …
505 * sp 30 342 * sp 30
506 * Is much easier to parse than 343 * Is much easier to parse than
507 * dragon name "big nasty creature" hp 5 sp 30 344 * dragon name "big nasty creature" hp 5 sp 30
508 * for example. 345 * for example.
509 */ 346 */
347int
510int command_create(object *op, char *params) { 348command_create (object *op, char *params)
349{
511 object *tmp = NULL; 350 object *tmp = NULL;
512 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace; 351 int nrof, i, magic, set_magic = 0, set_nrof = 0, gotquote, gotspace;
513 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline; 352 char buf[MAX_BUF], *cp, *bp = buf, *bp2, *bp3, *bp4, *endline;
514 archetype *at, *at_spell = NULL; 353 archetype *at, *at_spell = NULL;
515 artifact *art = NULL; 354 artifact *art = NULL;
516 355
517 if (!op) 356 if (!op)
518 return 0; 357 return 0;
519 358
520 if (params == NULL) { 359 if (params == NULL)
521 new_draw_info(NDI_UNIQUE, 0, op, 360 {
522 "Usage: create [nr] [magic] <archetype> [ of <artifact>]" 361 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
523 " [variable_to_patch setting]");
524 return 1; 362 return 1;
525 } 363 }
364
526 bp = params; 365 bp = params;
527 366
528 /* We need to know where the line ends */ 367 /* We need to know where the line ends */
529 endline = bp+strlen(bp); 368 endline = bp + strlen (bp);
530 369
531 if (sscanf(bp, "%d ", &nrof)) { 370 if (sscanf (bp, "%d ", &nrof))
371 {
532 if ((bp = strchr(params, ' ')) == NULL) { 372 if ((bp = strchr (params, ' ')) == NULL)
533 new_draw_info(NDI_UNIQUE, 0, op, 373 {
534 "Usage: create [nr] [magic] <archetype> [ of <artifact>]" 374 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
535 " [variable_to_patch setting]");
536 return 1; 375 return 1;
537 } 376 }
538 bp++; 377 bp++;
539 set_nrof = 1; 378 set_nrof = 1;
540 LOG(llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp); 379 LOG (llevDebug, "%s creates: (%d) %s\n", &op->name, nrof, bp);
541 } 380 }
381
542 if (sscanf(bp, "%d ", &magic)) { 382 if (sscanf (bp, "%d ", &magic))
383 {
543 if ((bp = strchr(bp, ' ')) == NULL) { 384 if ((bp = strchr (bp, ' ')) == NULL)
544 new_draw_info(NDI_UNIQUE, 0, op, 385 {
545 "Usage: create [nr] [magic] <archetype> [ of <artifact>]" 386 new_draw_info (NDI_UNIQUE, 0, op, "Usage: create [nr] [magic] <archetype> [ of <artifact>]" " [variable_to_patch setting]");
546 " [variable_to_patch setting]");
547 return 1; 387 return 1;
548 } 388 }
389
549 bp++; 390 bp++;
550 set_magic = 1; 391 set_magic = 1;
551 LOG(llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp); 392 LOG (llevDebug, "%s creates: (%d) (%d) %s\n", &op->name, nrof, magic, bp);
552 } 393 }
394
553 if ((cp = strstr(bp, " of ")) != NULL) { 395 if ((cp = strstr (bp, " of ")) != NULL)
396 {
554 *cp = '\0'; 397 *cp = '\0';
555 cp += 4; 398 cp += 4;
556 } 399 }
400
557 for (bp2 = bp; *bp2; bp2++) { 401 for (bp2 = bp; *bp2; bp2++)
402 {
558 if (*bp2 == ' ') { 403 if (*bp2 == ' ')
404 {
559 *bp2 = '\0'; 405 *bp2 = '\0';
560 bp2++; 406 bp2++;
561 break; 407 break;
562 } 408 }
563 } 409 }
564 410
565 if ((at = find_archetype(bp)) == NULL) { 411 if ((at = archetype::find (bp)) == NULL)
412 {
566 new_draw_info(NDI_UNIQUE, 0, op, "No such archetype."); 413 new_draw_info (NDI_UNIQUE, 0, op, "No such archetype.");
567 return 1; 414 return 1;
568 } 415 }
569 416
570 if (cp) { 417 if (cp)
418 {
571 char spell_name[MAX_BUF], *fsp = NULL; 419 char spell_name[MAX_BUF], *fsp = NULL;
572 420
573 /* 421 /*
574 * Try to find a spell object for this. Note that 422 * Try to find a spell object for this. Note that
575 * we also set up spell_name which is only 423 * we also set up spell_name which is only
576 * the first word. 424 * the first word.
577 */ 425 */
578 426
579 at_spell = find_archetype(cp); 427 at_spell = archetype::find (cp);
580 if (!at_spell || at_spell->clone.type != SPELL) 428 if (!at_spell || at_spell->clone.type != SPELL)
581 at_spell = find_archetype_by_object_name(cp); 429 at_spell = find_archetype_by_object_name (cp);
582 if (!at_spell || at_spell->clone.type != SPELL) { 430 if (!at_spell || at_spell->clone.type != SPELL)
431 {
583 strcpy(spell_name, cp); 432 assign (spell_name, cp);
584 fsp = strchr(spell_name, ' '); 433 fsp = strchr (spell_name, ' ');
585 if (fsp) { 434 if (fsp)
435 {
586 *fsp = 0; 436 *fsp = 0;
587 fsp++; 437 fsp++;
588 at_spell = find_archetype(spell_name); 438 at_spell = archetype::find (spell_name);
589 439
590 /* Got a spell, update the first string pointer */ 440 /* Got a spell, update the first string pointer */
591 if (at_spell && at_spell->clone.type == SPELL) 441 if (at_spell && at_spell->clone.type == SPELL)
592 bp2 = cp+strlen(spell_name)+1; 442 bp2 = cp + strlen (spell_name) + 1;
593 else 443 else
594 at_spell = NULL; 444 at_spell = NULL;
595 } 445 }
596 } 446 }
597 447
598 /* OK - we didn't find a spell - presume the 'of' 448 /* OK - we didn't find a spell - presume the 'of'
599 * in this case means its an artifact. 449 * in this case means its an artifact.
600 */ 450 */
601 if (!at_spell) { 451 if (!at_spell)
452 {
602 if (find_artifactlist(at->clone.type) == NULL) { 453 if (find_artifactlist (at->clone.type) == NULL)
603 new_draw_info_format(NDI_UNIQUE, 0, op, 454 new_draw_info_format (NDI_UNIQUE, 0, op, "No artifact list for type %d\n", at->clone.type);
604 "No artifact list for type %d\n", at->clone.type);
605 } else { 455 else
456 {
606 art = find_artifactlist(at->clone.type)->items; 457 art = find_artifactlist (at->clone.type)->items;
607 458
459 while (art)
608 do { 460 {
609 if (!strcmp(art->item->name, cp)) 461 if (!strcmp (art->item->name, cp))
610 break; 462 break;
463
611 art = art->next; 464 art = art->next;
612 } while (art != NULL); 465 }
466
613 if (!art) { 467 if (!art)
614 new_draw_info_format(NDI_UNIQUE, 0, op, 468 new_draw_info_format (NDI_UNIQUE, 0, op, "No such artifact ([%d] of %s)", at->clone.type, cp);
615 "No such artifact ([%d] of %s)", at->clone.type, cp); 469 }
470
471 LOG (llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp);
472 }
473 } /* if cp */
474
475 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL ||
476 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell)
477 {
478 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find spell %s for object that needs it, or it is of wrong type", cp);
479 return 1;
480 }
481
482 /*
483 * Rather than have two different blocks with a lot of similar code,
484 * just create one object, do all the processing, and then determine
485 * if that one object should be inserted or if we need to make copies.
486 */
487 tmp = arch_to_object (at);
488
489 if (set_magic)
490 set_abs_magic (tmp, magic);
491
492 if (art)
493 give_artifact_abilities (tmp, art->item);
494
495 if (need_identify (tmp))
496 {
497 SET_FLAG (tmp, FLAG_IDENTIFIED);
498 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL);
499 }
500
501 /*
502 * This entire block here tries to find variable pairings,
503 * eg, 'hp 4' or the like. The mess here is that values
504 * can be quoted (eg "my cool sword"); So the basic logic
505 * is we want to find two spaces, but if we got a quote,
506 * any spaces there don't count.
507 */
508 while (*bp2 && bp2 <= endline)
509 {
510 bp4 = NULL;
511 gotspace = 0;
512 gotquote = 0;
513
514 /* find the first quote */
515 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++)
516 {
517
518 /* Found a quote - now lets find the second one */
519 if (*bp3 == '"')
520 {
521 *bp3 = ' ';
522 bp2 = bp3 + 1; /* Update start of string */
523 bp3++;
524 gotquote++;
525 while (*bp3)
526 {
527 if (*bp3 == '"')
528 {
529 *bp3 = '\0';
530 gotquote++;
531 }
532 else
533 bp3++;
616 } 534 }
617 } 535 }
618 LOG(llevDebug, "%s creates: (%d) (%d) (%s) of (%s)\n", &op->name, 536 else if (*bp3 == ' ')
619 set_nrof ? nrof : 0, set_magic ? magic : 0, bp, cp); 537 gotspace++;
538 }
539
540 /*
541 * If we got two spaces, send the second one to null.
542 * if we've reached the end of the line, increase gotspace -
543 * this is perfectly valid for the list entry listed.
544 */
545 if (gotspace == 2 || gotquote == 2)
620 } 546 {
621 } /* if cp */ 547 bp3--; /* Undo the extra increment */
548 *bp3 = '\0';
549 }
550 else if (*bp3 == '\0')
551 gotspace++;
622 552
623 if ((at->clone.type == ROD || at->clone.type == WAND || at->clone.type == SCROLL || 553 if ((gotquote && gotquote != 2) || (gotspace != 2 && gotquote != 2))
624 at->clone.type == HORN || at->clone.type == SPELLBOOK) && !at_spell) { 554 {
625 new_draw_info_format(NDI_UNIQUE, 0, op, 555 /*
626 "Unable to find spell %s for object that needs it, or it is of wrong type", 556 * Unfortunately, we've clobbered lots of values, so printing
557 * out what we have probably isn't useful. Break out, because
558 * trying to recover is probably won't get anything useful
559 * anyways, and we'd be confused about end of line pointers
560 * anyways.
627 cp); 561 */
562 new_draw_info_format (NDI_UNIQUE, 0, op, "Malformed create line: %s", bp2);
563 break;
564 }
565
566 /* bp2 should still point to the start of this line,
567 * with bp3 pointing to the end
568 */
569 if (set_variable (tmp, bp2) == -1)
570 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", bp2);
571 else
572 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
573
574 bp2 = bp3 + 1;
575 }
576
577 if (at->clone.nrof)
578 {
579 if (at_spell)
580 insert_ob_in_ob (arch_to_object (at_spell), tmp);
581
582 tmp->x = op->x;
583 tmp->y = op->y;
584
585 if (set_nrof)
586 tmp->nrof = nrof;
587
588 tmp->map = op->map;
589
590 tmp = insert_ob_in_ob (tmp, op);
591 esrv_send_item (op, tmp);
592
593 /* Let's put this created item on stack so dm can access it easily. */
594 dm_stack_push (op->contr, tmp->count);
595
628 return 1; 596 return 1;
597 }
598 else
629 } 599 {
600 for (i = 0; i < (set_nrof ? nrof : 1); i++)
601 {
602 archetype *atmp;
603 object *prev = 0, *head = 0;
630 604
631 /* 605 for (atmp = at; atmp; atmp = atmp->more)
632 * Rather than have two different blocks with a lot of similar code, 606 {
633 * just create one object, do all the processing, and then determine 607 object *dup = arch_to_object (atmp);
634 * if that one object should be inserted or if we need to make copies.
635 */
636 tmp = arch_to_object(at);
637 if (settings.real_wiz == FALSE)
638 SET_FLAG(tmp, FLAG_WAS_WIZ);
639 if (set_magic)
640 set_abs_magic(tmp, magic);
641 if (art)
642 give_artifact_abilities(tmp, art->item);
643 if (need_identify(tmp)) {
644 SET_FLAG(tmp, FLAG_IDENTIFIED);
645 CLEAR_FLAG(tmp, FLAG_KNOWN_MAGICAL);
646 }
647 608
648 /* 609 if (at_spell)
649 * This entire block here tries to find variable pairings, 610 insert_ob_in_ob (arch_to_object (at_spell), dup);
650 * eg, 'hp 4' or the like. The mess here is that values
651 * can be quoted (eg "my cool sword"); So the basic logic
652 * is we want to find two spaces, but if we got a quote,
653 * any spaces there don't count.
654 */
655 while (*bp2 && bp2 <= endline) {
656 bp4 = NULL;
657 gotspace = 0;
658 gotquote = 0;
659 /* find the first quote */
660 for (bp3 = bp2; *bp3 && gotspace < 2 && gotquote < 2; bp3++) {
661 611
662 /* Found a quote - now lets find the second one */ 612 /*
663 if (*bp3 == '"') { 613 * The head is what contains all the important bits,
664 *bp3 = ' '; 614 * so just copying it over should be fine.
665 bp2 = bp3+1; /* Update start of string */ 615 */
616 if (!head)
666 bp3++; 617 {
667 gotquote++; 618 head = dup;
668 while (*bp3) { 619 tmp->copy_to (dup);
669 if (*bp3 == '"') {
670 *bp3 = '\0';
671 gotquote++;
672 } else
673 bp3++;
674 } 620 }
675 } else if (*bp3==' ') { 621
676 gotspace++; 622 dup->x = op->x + dup->arch->clone.x;
623 dup->y = op->y + dup->arch->clone.y;
624 dup->map = op->map;
625
626 if (head != dup)
627 {
628 dup->head = head;
629 prev->more = dup;
630 }
631
632 prev = dup;
677 } 633 }
678 }
679 634
680 /* 635 if (QUERY_FLAG (head, FLAG_ALIVE))
681 * If we got two spaces, send the second one to null.
682 * if we've reached the end of the line, increase gotspace -
683 * this is perfectly valid for the list entry listed.
684 */
685 if (gotspace == 2 || gotquote == 2) {
686 bp3--; /* Undo the extra increment */
687 *bp3 = '\0';
688 } else if (*bp3=='\0')
689 gotspace++;
690
691 if ((gotquote && gotquote != 2) || (gotspace != 2 && gotquote != 2)) {
692 /* 636 {
693 * Unfortunately, we've clobbered lots of values, so printing 637 object *check = head;
694 * out what we have probably isn't useful. Break out, because 638 int size_x = 0;
695 * trying to recover is probably won't get anything useful 639 int size_y = 0;
696 * anyways, and we'd be confused about end of line pointers
697 * anyways.
698 */
699 new_draw_info_format(NDI_UNIQUE, 0, op,
700 "Malformed create line: %s", bp2);
701 break;
702 }
703 /* bp2 should still point to the start of this line,
704 * with bp3 pointing to the end
705 */
706 if (set_variable(tmp, bp2) == -1)
707 new_draw_info_format(NDI_UNIQUE, 0, op,
708 "Unknown variable %s", bp2);
709 else
710 new_draw_info_format(NDI_UNIQUE, 0, op,
711 "(%s#%d)->%s", &tmp->name, tmp->count, bp2);
712 bp2 = bp3+1;
713 }
714 640
715 if (at->clone.nrof) { 641 while (check)
716 if (at_spell)
717 insert_ob_in_ob(arch_to_object(at_spell), tmp);
718
719 tmp->x = op->x;
720 tmp->y = op->y;
721 if (set_nrof)
722 tmp->nrof = nrof;
723 tmp->map = op->map;
724
725 tmp = insert_ob_in_ob(tmp, op);
726 esrv_send_item(op, tmp);
727
728 /* Let's put this created item on stack so dm can access it easily. */
729 dm_stack_push(op->contr, tmp->count);
730
731 return 1;
732 } else {
733 for (i = 0 ; i < (set_nrof ? nrof : 1); i++) {
734 archetype *atmp;
735 object *prev = NULL, *head = NULL, *dup;
736
737 for (atmp = at; atmp != NULL; atmp = atmp->more) {
738 dup = arch_to_object(atmp);
739
740 if (at_spell)
741 insert_ob_in_ob(arch_to_object(at_spell), dup);
742
743 /* 642 {
744 * The head is what contains all the important bits, 643 size_x = MAX (size_x, check->arch->clone.x);
745 * so just copying it over should be fine. 644 size_y = MAX (size_y, check->arch->clone.y);
746 */ 645 check = check->more;
747 if (head == NULL) {
748 head=dup;
749 copy_object(tmp, dup);
750 } 646 }
751 if (settings.real_wiz == FALSE)
752 SET_FLAG(dup, FLAG_WAS_WIZ);
753 dup->x = op->x+dup->arch->clone.x;
754 dup->y = op->y+dup->arch->clone.y;
755 dup->map = op->map;
756 647
757 if (head != dup) { 648 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
758 dup->head = head;
759 prev->more = dup;
760 } 649 {
761 prev = dup;
762 }
763
764 if (QUERY_FLAG(head, FLAG_ALIVE)) {
765 object *check = head;
766 int size_x = 0;
767 int size_y = 0;
768
769 while (check) {
770 size_x = MAX(size_x, check->arch->clone.x);
771 size_y = MAX(size_y, check->arch->clone.y);
772 check = check->more;
773 }
774
775 if (out_of_map(op->map, head->x+size_x, head->y+size_y)) {
776 if (head->x < size_x || head->y < size_y) { 650 if (head->x < size_x || head->y < size_y)
651 {
777 dm_stack_pop(op->contr); 652 dm_stack_pop (op->contr);
778 free_object(head); 653 head->destroy ();
779 new_draw_info(NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 654 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
780 free_object(tmp); 655 tmp->destroy ();
781 return 1; 656 return 1;
782 } 657 }
783 658
784 check = head; 659 check = head;
660
785 while (check) { 661 while (check)
662 {
786 check->x -= size_x; 663 check->x -= size_x;
787 check->y -= size_y; 664 check->y -= size_y;
788 check = check->more; 665 check = check->more;
789 } 666 }
790 } 667 }
791 668
792 insert_ob_in_map(head, op->map, op, 0); 669 insert_ob_in_map (head, op->map, op, 0);
670 }
793 } else 671 else
794 head = insert_ob_in_ob(head, op); 672 head = insert_ob_in_ob (head, op);
795 673
796 /* Let's put this created item on stack so dm can access it easily. */ 674 /* Let's put this created item on stack so dm can access it easily. */
797 /* Wonder if we really want to push all of these, but since 675 /* Wonder if we really want to push all of these, but since
798 * things like rods have nrof 0, we want to cover those. 676 * things like rods have nrof 0, we want to cover those.
799 */ 677 */
800 dm_stack_push(op->contr, head->count); 678 dm_stack_push (op->contr, head->count);
801 679
802 if (at->clone.randomitems != NULL && !at_spell) 680 if (at->clone.randomitems != NULL && !at_spell)
803 create_treasure(at->clone.randomitems, head, GT_APPLY, 681 create_treasure (at->clone.randomitems, head, GT_APPLY, op->map->difficulty, 0);
804 op->map->difficulty, 0); 682
805 esrv_send_item(op, head); 683 esrv_send_item (op, head);
806 } 684 }
807 685
808 /* free the one we used to copy */ 686 /* free the one we used to copy */
809 free_object(tmp); 687 tmp->destroy ();
810 } 688 }
811 689
812 return 1; 690 return 1;
813} 691}
814 692
815/* 693/*
816 * Now follows dm-commands which are also acceptable from sockets 694 * Now follows dm-commands which are also acceptable from sockets
817 */ 695 */
818 696
697int
819int command_inventory(object *op, char *params) { 698command_inventory (object *op, char *params)
699{
820 object *tmp; 700 object *tmp;
821 int i; 701 int i;
822 702
823 if (!params) { 703 if (!params)
704 {
824 inventory(op, NULL); 705 inventory (op, NULL);
825 return 0; 706 return 0;
826 } 707 }
827 708
828 if (!sscanf(params, "%d", &i) || (tmp = find_object(i)) == NULL) { 709 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
710 {
829 new_draw_info(NDI_UNIQUE, 0, op, "Inventory of what object (nr)?"); 711 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
830 return 1; 712 return 1;
831 } 713 }
832 714
833 inventory(op, tmp); 715 inventory (op, tmp);
834 return 1; 716 return 1;
835} 717}
836 718
837/* just show player's their skills for now. Dm's can 719/* just show player's their skills for now. Dm's can
838 * already see skills w/ inventory command - b.t. 720 * already see skills w/ inventory command - b.t.
839 */ 721 */
840 722
723int
841int command_skills (object *op, char *params) { 724command_skills (object *op, char *params)
725{
842 show_skills(op, params); 726 show_skills (op, params);
843 return 0; 727 return 0;
844} 728}
845 729
730int
846int command_dump (object *op, char *params) { 731command_dump (object *op, char *params)
732{
847 object *tmp; 733 object *tmp;
848 734
849 tmp = get_dm_object(op->contr, &params, NULL); 735 tmp = get_dm_object (op->contr, &params, NULL);
850 if (!tmp) 736 if (!tmp)
737 return 1;
738
739 char *dump = dump_object (tmp);
740 new_draw_info (NDI_UNIQUE, 0, op, dump);
741 free (dump);
742
743 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
744 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
745
746 return 1;
747}
748
749int
750command_patch (object *op, char *params)
751{
752 char *arg, *arg2;
753 object *tmp;
754
755 tmp = get_dm_object (op->contr, &params, NULL);
756 if (!tmp)
757 /* Player already informed of failure */
758 return 1;
759
760 /* params set to first value by get_dm_default */
761 arg = params;
762 if (arg == NULL)
763 {
764 new_draw_info (NDI_UNIQUE, 0, op, "Patch what values?");
765 return 1;
766 }
767
768 if ((arg2 = strchr (arg, ' ')))
769 arg2++;
770
771 if (set_variable (tmp, arg) == -1)
772 new_draw_info_format (NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
773 else
774 new_draw_info_format (NDI_UNIQUE, 0, op, "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
775
776 return 1;
777}
778
779int
780command_remove (object *op, char *params)
781{
782 object *tmp;
783 int from;
784
785 tmp = get_dm_object (op->contr, &params, &from);
786 if (!tmp)
787 {
788 new_draw_info (NDI_UNIQUE, 0, op, "Remove what object (nr)?");
789 return 1;
790 }
791
792 if (tmp->type == PLAYER)
793 {
794 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
795 return 1;
796 }
797
798 if (QUERY_FLAG (tmp, FLAG_REMOVED))
799 {
800 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
801 return 1;
802 }
803
804 if (from != STACK_FROM_STACK)
805 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
806 dm_stack_pop (op->contr);
807
808 /* Always work on the head - otherwise object will get in odd state */
809 if (tmp->head)
810 tmp = tmp->head;
811 tmp->remove ();
812 return 1;
813}
814
815int
816command_free (object *op, char *params)
817{
818 object *tmp;
819 int from;
820
821 tmp = get_dm_object (op->contr, &params, &from);
822
823 if (!tmp)
824 {
825 new_draw_info (NDI_UNIQUE, 0, op, "Free what object (nr)?");
826 return 1;
827 }
828
829 if (from != STACK_FROM_STACK)
830 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
831 dm_stack_pop (op->contr);
832
833 if (tmp->head)
834 tmp = tmp->head;
835
836 tmp->destroy ();
837 return 1;
838}
839
840/**
841 * This adds exp to a player. We now allow adding to a specific skill.
842 */
843int
844command_addexp (object *op, char *params)
845{
846 char buf[MAX_BUF], skill[MAX_BUF];
847 int i, q;
848 object *skillob = NULL;
849
850 skill[0] = '\0';
851 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
852 {
853 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
854 return 1;
855 }
856
857 for_all_players (pl)
858 if (!strncmp (pl->ob->name, buf, MAX_NAME))
859 {
860 if (q >= 3)
861 {
862 skillob = find_skill_by_name (pl->ob, skill);
863 if (!skillob)
864 {
865 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
866 return 1;
867 }
868
869 i = check_exp_adjust (skillob, i);
870 skillob->stats.exp += i;
871 calc_perm_exp (skillob);
872 player_lvl_adj (pl->ob, skillob);
873 }
874
875 pl->ob->stats.exp += i;
876 calc_perm_exp (pl->ob);
877 player_lvl_adj (pl->ob, NULL);
878
851 return 1; 879 return 1;
880 }
852 881
853 dump_object(tmp);
854 new_draw_info(NDI_UNIQUE, 0, op, errmsg); 882 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
855 if (QUERY_FLAG(tmp, FLAG_OBJ_ORIGINAL))
856 new_draw_info(NDI_UNIQUE, 0, op, "Object is marked original");
857 return 1; 883 return 1;
858} 884}
859 885
860/** 886/**************************************************************************/
861 * When DM is possessing a monster, flip aggression on and off, to allow
862 * better motion.
863 */
864int command_mon_aggr(object *op, char *params) {
865 if (op->enemy || !QUERY_FLAG(op, FLAG_UNAGGRESSIVE)) {
866 op->enemy = NULL;
867 SET_FLAG(op, FLAG_UNAGGRESSIVE);
868 new_draw_info(NDI_UNIQUE, 0, op, "Aggression turned OFF");
869 } else {
870 CLEAR_FLAG(op, FLAG_FRIENDLY);
871 CLEAR_FLAG(op, FLAG_UNAGGRESSIVE);
872 new_draw_info(NDI_UNIQUE, 0, op, "Aggression turned ON");
873 }
874 887
875 return 1; 888/* Mods made by Tyler Van Gorder, May 10-13, 1992. */
876}
877 889
878/** DM can possess a monster. Basically, this tricks the client into thinking 890/* CSUChico : tvangod@cscihp.ecst.csuchico.edu */
879 * a given monster, is actually the player it controls. This allows a DM 891
880 * to inhabit a monster's body, and run around the game with it. 892/**************************************************************************/
881 * This function is severely broken - it has tons of hardcoded values, 893
882 */ 894int
883int command_possess(object *op, char *params) { 895command_stats (object *op, char *params)
884 object *victim, *curinv, *nextinv; 896{
885 player *pl; 897 char thing[20];
886 int i;
887 char buf[MAX_BUF]; 898 char buf[MAX_BUF];
888 899
889 victim = NULL; 900 thing[0] = '\0';
890 if (params != NULL) { 901 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
891 if (sscanf(params, "%d", &i))
892 victim = find_object(i);
893 else if (sscanf(params, "%s", buf))
894 victim = find_object_name(buf);
895 } 902 {
896 if (victim == NULL) {
897 new_draw_info(NDI_UNIQUE, 0, op, "Patch what object (nr)?"); 903 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
904 return 1;
905 }
906
907 for_all_players (pl)
908 if (!strcmp (pl->ob->name, thing))
909 {
910 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
911 new_draw_info (NDI_UNIQUE, 0, op, buf);
912 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
913 new_draw_info (NDI_UNIQUE, 0, op, buf);
914 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
915 new_draw_info (NDI_UNIQUE, 0, op, buf);
916 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
917 new_draw_info (NDI_UNIQUE, 0, op, buf);
918 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
919 new_draw_info (NDI_UNIQUE, 0, op, buf);
920 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
921 new_draw_info (NDI_UNIQUE, 0, op, buf);
922 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
923 new_draw_info (NDI_UNIQUE, 0, op, buf);
898 return 1; 924 return 1;
899 } 925 }
900 926
901 if (victim == op) {
902 new_draw_info(NDI_UNIQUE, 0, op, "As insane as you are, I cannot "
903 "allow you to possess yourself.");
904 return 1;
905 }
906
907 /* clear out the old inventory */
908 curinv = op->inv;
909 while (curinv != NULL) {
910 nextinv = curinv->below;
911 esrv_del_item(op->contr, curinv->count);
912 curinv = nextinv;
913 }
914
915 /* make the switch */
916 pl = op->contr;
917 victim->contr = pl;
918 pl->ob = victim;
919 victim->type = PLAYER;
920 SET_FLAG(victim, FLAG_WIZ);
921
922 /* send the inventory to the client */
923 curinv = victim->inv;
924 while (curinv != NULL) {
925 nextinv = curinv->below;
926 esrv_send_item(victim, curinv);
927 curinv = nextinv;
928 }
929 /* basic patchup */
930 /* The use of hard coded values is terrible. Note
931 * that really, to be fair, this shouldn't get changed at
932 * all - if you are possessing a kobold, you should have the
933 * same limitations. As it is, as more body locations are added,
934 * this will give this player more locations than perhaps
935 * they should be allowed.
936 */
937 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
938 if (i == 1 || i == 6 || i == 8 || i == 9)
939 victim->body_info[i] = 2;
940 else
941 victim->body_info[i] = 1;
942
943 esrv_new_player(pl, 80); /* just pick a wieght, we don't care */
944 esrv_send_inventory(victim, victim);
945
946 fix_player(victim);
947
948 do_some_living(victim);
949 return 1;
950}
951
952int command_patch(object *op, char *params) {
953 char *arg, *arg2;
954 object *tmp;
955
956 tmp = get_dm_object(op->contr, &params, NULL);
957 if (!tmp)
958 /* Player already informed of failure */
959 return 1;
960
961 /* params set to first value by get_dm_default */
962 arg = params;
963 if (arg == NULL) {
964 new_draw_info(NDI_UNIQUE, 0, op, "Patch what values?");
965 return 1;
966 }
967
968 if ((arg2 = strchr(arg, ' ')))
969 arg2++;
970 if (settings.real_wiz == FALSE)
971 SET_FLAG(tmp, FLAG_WAS_WIZ); /* To avoid cheating */
972 if (set_variable(tmp, arg) == -1)
973 new_draw_info_format(NDI_UNIQUE, 0, op, "Unknown variable %s", arg);
974 else {
975 new_draw_info_format(NDI_UNIQUE, 0, op,
976 "(%s#%d)->%s=%s", &tmp->name, tmp->count, arg, arg2);
977 }
978
979 return 1;
980 }
981
982int command_remove (object *op, char *params) {
983 object *tmp;
984 int from;
985
986 tmp = get_dm_object(op->contr, &params, &from);
987 if (!tmp) {
988 new_draw_info(NDI_UNIQUE, 0, op, "Remove what object (nr)?");
989 return 1;
990 }
991
992 if (tmp->type == PLAYER) {
993 new_draw_info(NDI_UNIQUE, 0, op, "Unable to remove a player!");
994 return 1;
995 }
996
997 if (QUERY_FLAG(tmp, FLAG_REMOVED)) {
998 new_draw_info_format(NDI_UNIQUE, 0, op, "%s is already removed!",
999 query_name(tmp));
1000 return 1;
1001 }
1002
1003 if (from != STACK_FROM_STACK)
1004 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1005 dm_stack_pop(op->contr);
1006
1007 /* Always work on the head - otherwise object will get in odd state */
1008 if (tmp->head)
1009 tmp = tmp->head;
1010 remove_ob(tmp);
1011 return 1;
1012}
1013
1014int command_free(object *op, char *params) {
1015 object *tmp;
1016 int from;
1017
1018 tmp = get_dm_object(op->contr, &params, &from);
1019
1020 if (!tmp) {
1021 new_draw_info(NDI_UNIQUE, 0, op, "Free what object (nr)?");
1022 return 1;
1023 }
1024
1025 if (from != STACK_FROM_STACK)
1026 /* Item is either stack top, or is a number thus is now stack top, let's remove it */
1027 dm_stack_pop(op->contr);
1028
1029 if (!QUERY_FLAG(tmp, FLAG_REMOVED)) {
1030 new_draw_info(NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1031 remove_ob(tmp);
1032 }
1033
1034 if (tmp->head)
1035 tmp = tmp->head;
1036 free_object(tmp);
1037 return 1;
1038}
1039
1040/**
1041 * This adds exp to a player. We now allow adding to a specific skill.
1042 */
1043int command_addexp(object *op, char *params) {
1044 char buf[MAX_BUF], skill[MAX_BUF];
1045 int i, q;
1046 object *skillob = NULL;
1047 player *pl;
1048
1049 skill[0] = '\0';
1050 if ((params == NULL) || (strlen(params) > MAX_BUF) || ((q = sscanf(params, "%s %d %s", buf, &i, skill)) < 2)) {
1051 new_draw_info(NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1052 return 1;
1053 }
1054
1055 for (pl = first_player; pl != NULL; pl = pl->next)
1056 if (!strncmp(pl->ob->name, buf, MAX_NAME))
1057 break;
1058
1059 if (pl == NULL) {
1060 new_draw_info(NDI_UNIQUE, 0, op, "No such player."); 927 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1061 return 1;
1062 }
1063
1064 if (q >= 3) {
1065 skillob = find_skill_by_name(pl->ob, skill);
1066 if (!skillob) {
1067 new_draw_info_format(NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1068 return 1;
1069 }
1070
1071 i = check_exp_adjust(skillob, i);
1072 skillob->stats.exp += i;
1073 calc_perm_exp(skillob);
1074 player_lvl_adj(pl->ob, skillob);
1075 }
1076
1077 pl->ob->stats.exp += i;
1078 calc_perm_exp(pl->ob);
1079 player_lvl_adj(pl->ob, NULL);
1080
1081 if (settings.real_wiz == FALSE)
1082 SET_FLAG(pl->ob, FLAG_WAS_WIZ);
1083 return 1; 928 return 1;
1084} 929}
1085 930
1086/**************************************************************************/ 931int
1087/* Mods made by Tyler Van Gorder, May 10-13, 1992. */
1088/* CSUChico : tvangod@cscihp.ecst.csuchico.edu */
1089/**************************************************************************/
1090
1091int command_stats(object *op, char *params) { 932command_abil (object *op, char *params)
1092 char thing[20]; 933{
1093 player *pl; 934 char thing[20], thing2[20];
935 int iii;
1094 char buf[MAX_BUF]; 936 char buf[MAX_BUF];
1095 937
938 iii = 0;
1096 thing[0] = '\0'; 939 thing[0] = '\0';
940 thing2[0] = '\0';
1097 if (params == NULL || !sscanf(params, "%s", thing) || thing == NULL) { 941 if (params == NULL || !sscanf (params, "%s %s %d", thing, thing2, &iii) || thing == NULL)
942 {
1098 new_draw_info(NDI_UNIQUE, 0, op, "Who?"); 943 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1099 return 1; 944 return 1;
1100 } 945 }
1101 946
1102 for (pl = first_player; pl != NULL; pl = pl->next)
1103 if (!strcmp(pl->ob->name, thing)) {
1104 sprintf(buf, "Str : %-2d H.P. : %-4d MAX : %d",
1105 pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1106 new_draw_info(NDI_UNIQUE, 0, op, buf);
1107 sprintf(buf, "Dex : %-2d S.P. : %-4d MAX : %d",
1108 pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
1109 new_draw_info(NDI_UNIQUE, 0, op, buf);
1110 sprintf(buf, "Con : %-2d AC : %-4d WC : %d",
1111 pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc) ;
1112 new_draw_info(NDI_UNIQUE, 0, op, buf);
1113 sprintf(buf, "Int : %-2d Damage : %d",
1114 pl->ob->stats.Int, pl->ob->stats.dam);
1115 new_draw_info(NDI_UNIQUE, 0, op, buf);
1116 sprintf(buf, "Wis : %-2d EXP : %lld",
1117 pl->ob->stats.Wis, (long long)pl->ob->stats.exp);
1118 new_draw_info(NDI_UNIQUE, 0, op, buf);
1119 sprintf(buf, "Pow : %-2d Grace : %d",
1120 pl->ob->stats.Pow, pl->ob->stats.grace);
1121 new_draw_info(NDI_UNIQUE, 0, op, buf);
1122 sprintf(buf, "Cha : %-2d Food : %d",
1123 pl->ob->stats.Cha, pl->ob->stats.food);
1124 new_draw_info(NDI_UNIQUE, 0, op, buf);
1125 break;
1126 }
1127 if (pl == NULL)
1128 new_draw_info(NDI_UNIQUE, 0, op, "No such player.");
1129 return 1;
1130}
1131
1132int command_abil(object *op, char *params) {
1133 char thing[20], thing2[20];
1134 int iii;
1135 player *pl;
1136 char buf[MAX_BUF];
1137
1138 iii = 0;
1139 thing[0] = '\0';
1140 thing2[0] = '\0';
1141 if (params == NULL || !sscanf(params, "%s %s %d", thing, thing2, &iii) ||
1142 thing==NULL) {
1143 new_draw_info(NDI_UNIQUE, 0, op, "Who?");
1144 return 1;
1145 }
1146
1147 if (thing2 == NULL){ 947 if (thing2 == NULL)
948 {
1148 new_draw_info(NDI_UNIQUE, 0, op, "You can't change that."); 949 new_draw_info (NDI_UNIQUE, 0, op, "You can't change that.");
1149 return 1; 950 return 1;
1150 } 951 }
1151 952
1152 if (iii < MIN_STAT || iii > MAX_STAT) { 953 if (iii < MIN_STAT || iii > MAX_STAT)
954 {
1153 new_draw_info(NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 955 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1154 return 1; 956 return 1;
957 }
958
959 for_all_players (pl)
1155 } 960 {
1156
1157 for (pl = first_player; pl != NULL; pl = pl->next) {
1158 if (!strcmp(pl->ob->name, thing)) { 961 if (!strcmp (pl->ob->name, thing))
1159 if (settings.real_wiz == FALSE) 962 {
1160 SET_FLAG(pl->ob, FLAG_WAS_WIZ);
1161 if (!strcmp("str", thing2))
1162 pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 963 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
1163 if (!strcmp("dex", thing2))
1164 pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 964 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
1165 if (!strcmp("con", thing2))
1166 pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 965 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
1167 if (!strcmp("wis", thing2))
1168 pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 966 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
1169 if (!strcmp("cha", thing2))
1170 pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii; 967 if (!strcmp ("cha", thing2)) pl->ob->stats.Cha = iii, pl->orig_stats.Cha = iii;
1171 if (!strcmp("int", thing2))
1172 pl->ob->stats.Int = iii, pl->orig_stats.Int = iii; 968 if (!strcmp ("int", thing2)) pl->ob->stats.Int = iii, pl->orig_stats.Int = iii;
1173 if (!strcmp("pow", thing2))
1174 pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii; 969 if (!strcmp ("pow", thing2)) pl->ob->stats.Pow = iii, pl->orig_stats.Pow = iii;
970
1175 sprintf(buf, "%s has been altered.", &pl->ob->name); 971 sprintf (buf, "%s has been altered.", &pl->ob->name);
1176 new_draw_info(NDI_UNIQUE, 0, op, buf); 972 new_draw_info (NDI_UNIQUE, 0, op, buf);
1177 fix_player(pl->ob); 973 pl->ob->update_stats ();
1178 return 1; 974 return 1;
1179 } 975 }
1180 } 976 }
1181 977
1182 new_draw_info(NDI_UNIQUE, 0, op, "No such player."); 978 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1183 return 1; 979 return 1;
1184} 980}
1185 981
982int
1186int command_reset (object *op, char *params) { 983command_nowiz (object *op, char *params)
1187 mapstruct *m; 984{ /* 'nodm' is alias */
1188 object *dummy = NULL, *tmp = NULL;
1189
1190 if (params == NULL) {
1191 new_draw_info(NDI_UNIQUE, 0, op, "Reset what map [name]?");
1192 return 1;
1193 }
1194
1195 if (strcmp(params, ".") == 0)
1196 params = op->map->path;
1197 m = has_been_loaded(params);
1198 if (m == NULL) {
1199 new_draw_info(NDI_UNIQUE, 0, op, "No such map.");
1200 return 1;
1201 }
1202
1203 if (m->in_memory != MAP_SWAPPED) {
1204 if (m->in_memory != MAP_IN_MEMORY) {
1205 LOG(llevError, "Tried to swap out map which was not in memory.\n");
1206 return 0;
1207 }
1208
1209 /*
1210 * Only attempt to remove the player that is doing the reset, and not other
1211 * players or wiz's.
1212 */
1213 if (op->map == m) {
1214 dummy = get_object();
1215 dummy->map = NULL;
1216 EXIT_X(dummy) = op->x;
1217 EXIT_Y(dummy) = op->y;
1218 EXIT_PATH(dummy) = op->map->path;
1219 remove_ob(op);
1220 op->map = NULL;
1221 tmp = op;
1222 }
1223 swap_map(m);
1224 }
1225
1226 if (m->in_memory == MAP_SWAPPED) {
1227 LOG(llevDebug, "Resetting map %s.\n", m->path);
1228
1229 /* setting this effectively causes an immediate reload */
1230 m->reset_time = 1;
1231 flush_old_maps();
1232 new_draw_info(NDI_UNIQUE, 0, op, "OK.");
1233 if (tmp) {
1234 enter_exit(tmp, dummy);
1235 free_object(dummy);
1236 }
1237 return 1;
1238 } else {
1239 player *pl;
1240 int playercount = 0;
1241
1242 /* Need to re-insert player if swap failed for some reason */
1243 if (tmp) {
1244 insert_ob_in_map(op, m, NULL, 0);
1245 free_object(dummy);
1246 }
1247
1248 new_draw_info(NDI_UNIQUE, 0, op,
1249 "Reset failed, couldn't swap map, the following players are on it:");
1250 for (pl = first_player; pl != NULL; pl = pl->next) {
1251 if (pl->ob->map == m && pl->ob != op) {
1252 new_draw_info_format(NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1253 playercount++;
1254 }
1255 }
1256 if (!playercount)
1257 new_draw_info(NDI_UNIQUE, 0, op,
1258 "hmm, I don't see any other players on this map, something else is the problem.");
1259 return 1;
1260 }
1261}
1262
1263int command_nowiz(object *op, char *params) { /* 'noadm' is alias */
1264 CLEAR_FLAG(op, FLAG_WIZ); 985 CLEAR_FLAG (op, FLAG_WIZ);
1265 CLEAR_FLAG(op, FLAG_WIZPASS); 986 CLEAR_FLAG (op, FLAG_WIZPASS);
1266 CLEAR_FLAG(op, FLAG_WIZCAST); 987 CLEAR_FLAG (op, FLAG_WIZCAST);
1267 988
1268 if (settings.real_wiz == TRUE)
1269 CLEAR_FLAG(op, FLAG_WAS_WIZ);
1270 if (op->contr->hidden) { 989 if (op->contr->hidden)
990 {
1271 new_draw_info(NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 991 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1272 op->map->players++; 992 op->map->players++;
1273 new_draw_info_format(NDI_UNIQUE|NDI_ALL|NDI_DK_ORANGE, 5, NULL, 993 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &op->name);
1274 "%s has entered the game.", &op->name);
1275 op->contr->hidden = 0; 994 op->contr->hidden = 0;
1276 op->invisible = 1; 995 op->invisible = 1;
996 }
1277 } else 997 else
1278 new_draw_info(NDI_UNIQUE|NDI_ALL|NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 998 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
1279 return 1; 999 return 1;
1280} 1000}
1281 1001
1282/** 1002/**
1283 * object *op is trying to become dm. 1003 * object *op is trying to become dm.
1284 * pl_name is name supplied by player. Restrictive DM will make it harder 1004 * pl_name is name supplied by player. Restrictive DM will make it harder
1285 * for socket users to become DM - in that case, it will check for the players 1005 * for socket users to become DM - in that case, it will check for the players
1286 * character name. 1006 * character name.
1287 */ 1007 */
1008static int
1288static int checkdm(object *op, const char *pl_name, const char *pl_passwd, const char *pl_host) 1009checkdm (object *op, const char *pl_name, const char *pl_passwd, const char *pl_host)
1289{ 1010{
1290 FILE *dmfile; 1011 FILE *dmfile;
1291 char buf[MAX_BUF]; 1012 char buf[MAX_BUF];
1292 char line_buf[160], name[160], passwd[160], host[160]; 1013 char line_buf[160], name[160], passwd[160], host[160];
1293 1014
1294#ifdef RESTRICTIVE_DM 1015#ifdef RESTRICTIVE_DM
1295 *pl_name = op->name ? op->name : "*"; 1016 *pl_name = op->name ? op->name : "*";
1296#endif 1017#endif
1297 1018
1298 sprintf(buf, "%s/%s", settings.confdir, DMFILE); 1019 sprintf (buf, "%s/%s", settings.confdir, DMFILE);
1299 if ((dmfile = fopen(buf, "r")) == NULL) { 1020 if ((dmfile = fopen (buf, "r")) == NULL)
1021 {
1300 LOG(llevDebug, "Could not find DM file.\n"); 1022 LOG (llevDebug, "Could not find DM file.\n");
1301 return 0; 1023 return 0;
1302 } 1024 }
1303 1025
1304 while (fgets(line_buf, 160, dmfile) != NULL) { 1026 while (fgets (line_buf, 160, dmfile) != NULL)
1027 {
1305 if (line_buf[0] == '#') 1028 if (line_buf[0] == '#')
1306 continue; 1029 continue;
1307 if (sscanf(line_buf, "%[^:]:%[^:]:%s\n", name, passwd, host) != 3) { 1030 if (sscanf (line_buf, "%[^:]:%[^:]:%s\n", name, passwd, host) != 3)
1031 {
1308 LOG(llevError, "Warning - malformed dm file entry: %s\n", line_buf); 1032 LOG (llevError, "Warning - malformed dm file entry: %s\n", line_buf);
1033 }
1309 } else if ((!strcmp(name, "*") || (pl_name && !strcmp(pl_name, name))) 1034 else if ((!strcmp (name, "*") || (pl_name && !strcmp (pl_name, name)))
1310 && (!strcmp(passwd, "*") || !strcmp(passwd, pl_passwd)) && 1035 && (!strcmp (passwd, "*") || !strcmp (passwd, pl_passwd)) && (!strcmp (host, "*") || !strcmp (host, pl_host)))
1311 (!strcmp(host, "*") || !strcmp(host, pl_host))) { 1036 {
1312 fclose(dmfile); 1037 fclose (dmfile);
1313 return (1); 1038 return (1);
1314 } 1039 }
1315 } 1040 }
1316 fclose(dmfile); 1041 fclose (dmfile);
1317 return (0); 1042 return (0);
1318} 1043}
1319 1044
1045int
1320int do_wizard_dm(object *op, char *params, int silent) { 1046do_wizard_dm (object *op, char *params, int silent)
1047{
1321 if (!op->contr) 1048 if (!op->contr)
1322 return 0; 1049 return 0;
1323 1050
1324 if (QUERY_FLAG(op, FLAG_WIZ)) { 1051 if (QUERY_FLAG (op, FLAG_WIZ))
1052 {
1325 new_draw_info(NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1053 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1326 return 0; 1054 return 0;
1055 }
1056
1057 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1327 } 1058 {
1328
1329 if (checkdm(op, op->name,
1330 (params ? params : "*"), op->contr->socket.host)) {
1331 SET_FLAG(op, FLAG_WIZ); 1059 SET_FLAG (op, FLAG_WIZ);
1332 SET_FLAG(op, FLAG_WAS_WIZ);
1333 SET_FLAG(op, FLAG_WIZPASS); 1060 SET_FLAG (op, FLAG_WIZPASS);
1334 SET_FLAG(op, FLAG_WIZCAST); 1061 SET_FLAG (op, FLAG_WIZCAST);
1062
1335 new_draw_info(NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1063 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1336 /* 1064 /*
1337 * Remove setting flying here - that won't work, because next 1065 * Remove setting flying here - that won't work, because next
1338 * fix_player() is called that will get cleared - proper solution 1066 * fix_player() is called that will get cleared - proper solution
1339 * is probably something like a wiz_force which gives that and any 1067 * is probably something like a wiz_force which gives that and any
1340 * other desired abilities. 1068 * other desired abilities.
1341 */ 1069 */
1342 clear_los(op); 1070 clear_los (op);
1343 op->contr->write_buf[0] ='\0'; 1071 op->contr->write_buf[0] = '\0';
1344 1072
1345 if (!silent) 1073 if (!silent)
1346 new_draw_info(NDI_UNIQUE|NDI_ALL|NDI_LT_GREEN, 1, NULL, 1074 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1347 "The Dungeon Master has arrived!");
1348 1075
1349 return 1; 1076 return 1;
1350 } else { 1077 }
1078 else
1079 {
1351 new_draw_info(NDI_UNIQUE, 0, op, "Sorry Pal, I don't think so."); 1080 new_draw_info (NDI_UNIQUE, 0, op, "Sorry Pal, I don't think so.");
1352 op->contr->write_buf[0] ='\0'; 1081 op->contr->write_buf[0] = '\0';
1353 return 0; 1082 return 0;
1354 } 1083 }
1355} 1084}
1356 1085
1357/* 1086/*
1358 * Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2 1087 * Actual command to perhaps become dm. Changed aroun a bit in version 0.92.2
1359 * - allow people on sockets to become dm, and allow better dm file 1088 * - allow people on sockets to become dm, and allow better dm file
1360 */ 1089 */
1090int
1361int command_dm(object *op, char *params) { 1091command_dm (object *op, char *params)
1092{
1362 if (!op->contr) 1093 if (!op->contr)
1363 return 0;
1364
1365 do_wizard_dm(op, params, 0);
1366
1367 return 1;
1368}
1369
1370int command_invisible(object *op, char *params) {
1371 if (op) {
1372 op->invisible += 100;
1373 update_object(op, UP_OBJ_FACE);
1374 new_draw_info(NDI_UNIQUE, 0, op, "You turn invisible.");
1375 }
1376
1377 return 0; 1094 return 0;
1095
1096 do_wizard_dm (op, params, 0);
1097
1098 return 1;
1099}
1100
1101int
1102command_invisible (object *op, char *params)
1103{
1104 if (op)
1105 {
1106 op->invisible += 100;
1107 update_object (op, UP_OBJ_CHANGE);
1108 new_draw_info (NDI_UNIQUE, 0, op, "You turn invisible.");
1109 }
1110
1111 return 0;
1378} 1112}
1379 1113
1380/** 1114/**
1381 * Returns spell object (from archetypes) by name. 1115 * Returns spell object (from archetypes) by name.
1382 * Returns NULL if 0 or more than one spell matches. 1116 * Returns NULL if 0 or more than one spell matches.
… …
1387 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used 1121 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1388 * anymore (but may still be present in some player's inventories and thus 1122 * anymore (but may still be present in some player's inventories and thus
1389 * cannot be removed). We have to ignore them here since they have the same 1123 * cannot be removed). We have to ignore them here since they have the same
1390 * name than other "spell_xxx" archetypes and would always conflict. 1124 * name than other "spell_xxx" archetypes and would always conflict.
1391 */ 1125 */
1126static object *
1392static object *get_spell_by_name(object *op, const char *spell_name) { 1127get_spell_by_name (object *op, const char *spell_name)
1128{
1393 archetype *ar; 1129 archetype *ar;
1394 archetype *found; 1130 archetype *found;
1395 int conflict_found; 1131 int conflict_found;
1396 size_t spell_name_length; 1132 size_t spell_name_length;
1397 1133
1398 /* First check for full name matches. */ 1134 /* First check for full name matches. */
1399 conflict_found = 0; 1135 conflict_found = 0;
1400 found = NULL; 1136 found = NULL;
1401 for (ar = first_archetype; ar != NULL; ar = ar->next) { 1137 for (ar = first_archetype; ar != NULL; ar = ar->next)
1138 {
1402 if (ar->clone.type != SPELL) 1139 if (ar->clone.type != SPELL)
1403 continue; 1140 continue;
1404 1141
1405 if (strncmp(ar->name, "spelldirect_", 12) == 0) 1142 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1406 continue; 1143 continue;
1407 1144
1408 if (strcmp(ar->clone.name, spell_name) != 0) 1145 if (strcmp (ar->clone.name, spell_name) != 0)
1409 continue; 1146 continue;
1410 1147
1411 if (found != NULL) { 1148 if (found != NULL)
1149 {
1412 if (!conflict_found) { 1150 if (!conflict_found)
1151 {
1413 conflict_found = 1; 1152 conflict_found = 1;
1414 new_draw_info_format(NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1153 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
1415 new_draw_info_format(NDI_UNIQUE, 0, op, "- %s", &found->name); 1154 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->name);
1416 } 1155 }
1417 new_draw_info_format(NDI_UNIQUE, 0, op, "- %s", &ar->name); 1156 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->name);
1418 continue; 1157 continue;
1419 } 1158 }
1420 1159
1421 found = ar; 1160 found = ar;
1422 } 1161 }
1423 1162
1424 /* No match if more more than one archetype matches. */ 1163 /* No match if more more than one archetype matches. */
1425 if (conflict_found) 1164 if (conflict_found)
1426 return NULL; 1165 return NULL;
1427 1166
1428 /* Return if exactly one archetype matches. */ 1167 /* Return if exactly one archetype matches. */
1429 if (found != NULL) 1168 if (found != NULL)
1430 return arch_to_object(found); 1169 return arch_to_object (found);
1431 1170
1432 /* No full match found: now check for partial matches. */ 1171 /* No full match found: now check for partial matches. */
1433 spell_name_length = strlen(spell_name); 1172 spell_name_length = strlen (spell_name);
1434 conflict_found = 0; 1173 conflict_found = 0;
1435 found = NULL; 1174 found = NULL;
1436 for (ar = first_archetype; ar != NULL; ar = ar->next) { 1175 for (ar = first_archetype; ar != NULL; ar = ar->next)
1176 {
1437 if (ar->clone.type != SPELL) 1177 if (ar->clone.type != SPELL)
1438 continue; 1178 continue;
1439 1179
1440 if (strncmp(ar->name, "spelldirect_", 12) == 0) 1180 if (strncmp (ar->name, "spelldirect_", 12) == 0)
1441 continue; 1181 continue;
1442 1182
1443 if (strncmp(ar->clone.name, spell_name, spell_name_length) != 0) 1183 if (strncmp (ar->clone.name, spell_name, spell_name_length) != 0)
1444 continue; 1184 continue;
1445 1185
1446 if (found != NULL) { 1186 if (found != NULL)
1187 {
1447 if (!conflict_found) { 1188 if (!conflict_found)
1189 {
1448 conflict_found = 1; 1190 conflict_found = 1;
1449 new_draw_info_format(NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name); 1191 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one spell matches %s:", spell_name);
1450 new_draw_info_format(NDI_UNIQUE, 0, op, "- %s", &found->clone.name); 1192 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &found->clone.name);
1451 } 1193 }
1452 new_draw_info_format(NDI_UNIQUE, 0, op, "- %s", &ar->clone.name); 1194 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s", &ar->clone.name);
1453 continue; 1195 continue;
1454 } 1196 }
1455 1197
1456 found = ar; 1198 found = ar;
1457 } 1199 }
1458 1200
1459 /* No match if more more than one archetype matches. */ 1201 /* No match if more more than one archetype matches. */
1460 if (conflict_found) 1202 if (conflict_found)
1461 return NULL;
1462
1463 /* Return if exactly one archetype matches. */
1464 if (found != NULL)
1465 return arch_to_object(found);
1466
1467 /* No spell found: just print an error message. */
1468 new_draw_info_format(NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name);
1469 return NULL; 1203 return NULL;
1470}
1471 1204
1205 /* Return if exactly one archetype matches. */
1206 if (found != NULL)
1207 return arch_to_object (found);
1208
1209 /* No spell found: just print an error message. */
1210 new_draw_info_format (NDI_UNIQUE, 0, op, "The spell %s does not exist.", spell_name);
1211 return NULL;
1212}
1213
1214static int
1472static int command_learn_spell_or_prayer(object *op, char *params, 1215command_learn_spell_or_prayer (object *op, char *params, int special_prayer)
1473 int special_prayer) { 1216{
1474 object *tmp; 1217 object *tmp;
1475 1218
1476 if (op->contr == NULL || params == NULL) { 1219 if (op->contr == NULL || params == NULL)
1220 {
1477 new_draw_info(NDI_UNIQUE, 0, op, "Which spell do you want to learn?"); 1221 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to learn?");
1478 return 0; 1222 return 0;
1479 } 1223 }
1480 1224
1481 tmp = get_spell_by_name(op, params); 1225 tmp = get_spell_by_name (op, params);
1482 if (tmp == NULL) { 1226 if (tmp == NULL)
1227 {
1483 return 0; 1228 return 0;
1484 } 1229 }
1485 1230
1486 if (check_spell_known(op, tmp->name)) { 1231 if (check_spell_known (op, tmp->name))
1232 {
1487 new_draw_info_format(NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1233 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1488 return 0; 1234 return 0;
1489 } 1235 }
1490 1236
1491 do_learn_spell(op, tmp, special_prayer); 1237 do_learn_spell (op, tmp, special_prayer);
1492 free_object(tmp); 1238 tmp->destroy ();
1493 return 1; 1239 return 1;
1494} 1240}
1495 1241
1242int
1496int command_learn_spell(object *op, char *params) { 1243command_learn_spell (object *op, char *params)
1244{
1497 return command_learn_spell_or_prayer(op, params, 0); 1245 return command_learn_spell_or_prayer (op, params, 0);
1498} 1246}
1499 1247
1248int
1500int command_learn_special_prayer(object *op, char *params) 1249command_learn_special_prayer (object *op, char *params)
1501{ 1250{
1502 return command_learn_spell_or_prayer(op, params, 1); 1251 return command_learn_spell_or_prayer (op, params, 1);
1503} 1252}
1504 1253
1254int
1505int command_forget_spell(object *op, char *params) 1255command_forget_spell (object *op, char *params)
1506{ 1256{
1507 object *spell; 1257 object *spell;
1508 1258
1509 if (op->contr == NULL || params == NULL) { 1259 if (op->contr == NULL || params == NULL)
1260 {
1510 new_draw_info(NDI_UNIQUE, 0, op, "Which spell do you want to forget?"); 1261 new_draw_info (NDI_UNIQUE, 0, op, "Which spell do you want to forget?");
1511 return 0; 1262 return 0;
1512 } 1263 }
1513 1264
1514 spell = lookup_spell_by_name(op, params); 1265 spell = lookup_spell_by_name (op, params);
1515 if (spell == NULL) { 1266 if (spell == NULL)
1267 {
1516 new_draw_info_format(NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1268 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1517 return 0; 1269 return 0;
1518 } 1270 }
1519 1271
1520 do_forget_spell(op, spell->name); 1272 do_forget_spell (op, spell->name);
1521 return 1; 1273 return 1;
1522} 1274}
1523 1275
1524/** 1276/**
1525 * Lists all plugins currently loaded with their IDs and full names. 1277 * Lists all plugins currently loaded with their IDs and full names.
1526 */ 1278 */
1279int
1527int command_listplugins(object *op, char *params) 1280command_listplugins (object *op, char *params)
1528{ 1281{
1529 plugins_display_list(op); 1282 plugins_display_list (op);
1530 return 1; 1283 return 1;
1531} 1284}
1532 1285
1533/** 1286/**
1534 * Loads the given plugin. The DM specifies the name of the library to load (no 1287 * Loads the given plugin. The DM specifies the name of the library to load (no
1535 * pathname is needed). Do not ever attempt to load the same plugin more than 1288 * pathname is needed). Do not ever attempt to load the same plugin more than
1536 * once at a time, or bad things could happen. 1289 * once at a time, or bad things could happen.
1537 */ 1290 */
1291int
1538int command_loadplugin(object *op, char *params) { 1292command_loadplugin (object *op, char *params)
1293{
1539 char buf[MAX_BUF]; 1294 char buf[MAX_BUF];
1540 1295
1541 if (params == NULL) { 1296 if (params == NULL)
1297 {
1542 new_draw_info(NDI_UNIQUE, 0, op, "Load which plugin?"); 1298 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1543 return 1; 1299 return 1;
1544 } 1300 }
1545 1301
1546 strcpy(buf, LIBDIR); 1302 strcpy (buf, LIBDIR);
1547 strcat(buf, "/plugins/"); 1303 strcat (buf, "/plugins/");
1548 strcat(buf, params); 1304 strcat (buf, params);
1549 LOG(llevDebug, "Requested plugin file is %s\n", buf); 1305 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1550 if (plugins_init_plugin(buf) == 0) 1306 if (plugins_init_plugin (buf) == 0)
1551 new_draw_info(NDI_UNIQUE, 0, op, "Plugin successfully loaded."); 1307 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1552 else 1308 else
1553 new_draw_info(NDI_UNIQUE, 0, op, "Could not load plugin."); 1309 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1554 return 1; 1310 return 1;
1555} 1311}
1556 1312
1557/** 1313/**
1558 * Unloads the given plugin. The DM specified the ID of the library to unload. 1314 * Unloads the given plugin. The DM specified the ID of the library to unload.
1559 * Note that some things may behave strangely if the correct plugins are not 1315 * Note that some things may behave strangely if the correct plugins are not
1560 * loaded. 1316 * loaded.
1561 */ 1317 */
1318int
1562int command_unloadplugin(object *op, char *params) 1319command_unloadplugin (object *op, char *params)
1563{ 1320{
1564 if (params == NULL) { 1321 if (params == NULL)
1322 {
1565 new_draw_info(NDI_UNIQUE, 0, op, "Remove which plugin?"); 1323 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1566 return 1; 1324 return 1;
1567 } 1325 }
1568 1326
1569 if (plugins_remove_plugin(params) == 0) 1327 if (plugins_remove_plugin (params) == 0)
1570 new_draw_info(NDI_UNIQUE, 0, op, "Plugin successfully removed."); 1328 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1571 else 1329 else
1572 new_draw_info(NDI_UNIQUE, 0, op, "Could not remove plugin."); 1330 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1573 return 1; 1331 return 1;
1574} 1332}
1575 1333
1576/** 1334/**
1577 * A players wants to become DM and hide. 1335 * A players wants to become DM and hide.
1578 * Let's see if that's authorized. 1336 * Let's see if that's authorized.
1579 * Make sure to not tell anything to anyone. 1337 * Make sure to not tell anything to anyone.
1580 */ 1338 */
1339int
1581int command_dmhide(object *op, char *params) { 1340command_dmhide (object *op, char *params)
1341{
1582 if (!do_wizard_dm(op, params, 1)) 1342 if (!do_wizard_dm (op, params, 1))
1583 return 0; 1343 return 0;
1584 1344
1585 do_wizard_hide(op, 1); 1345 do_wizard_hide (op, 1);
1586 1346
1587 return 1; 1347 return 1;
1588} 1348}
1589 1349
1350void
1590void dm_stack_pop(player *pl) { 1351dm_stack_pop (player *pl)
1352{
1591 if (!pl->stack_items || !pl->stack_position) { 1353 if (!pl->stack_items || !pl->stack_position)
1354 {
1592 new_draw_info(NDI_UNIQUE, 0, pl->ob, "Empty stack!"); 1355 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1593 return; 1356 return;
1594 } 1357 }
1595 1358
1596 pl->stack_position--; 1359 pl->stack_position--;
1597 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position); 1360 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Popped item from stack, %d left.", pl->stack_position);
1598} 1361}
1599 1362
1600/** 1363/**
1601 * Get current stack top item for player. 1364 * Get current stack top item for player.
1602 * Returns NULL if no stacked item. 1365 * Returns NULL if no stacked item.
1603 * If stacked item disappeared (freed), remove it. 1366 * If stacked item disappeared (freed), remove it.
1604 * 1367 *
1605 * Ryo, august 2004 1368 * Ryo, august 2004
1606 */ 1369 */
1370object *
1607object *dm_stack_peek(player *pl) { 1371dm_stack_peek (player *pl)
1372{
1608 object* ob; 1373 object *ob;
1609 1374
1610 if (!pl->stack_position) { 1375 if (!pl->stack_position)
1376 {
1611 new_draw_info(NDI_UNIQUE, 0, pl->ob, "Empty stack!"); 1377 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Empty stack!");
1612 return NULL; 1378 return NULL;
1613 } 1379 }
1614 1380
1615 ob = find_object(pl->stack_items[pl->stack_position-1]); 1381 ob = find_object (pl->stack_items[pl->stack_position - 1]);
1616 if (!ob) { 1382 if (!ob)
1383 {
1617 new_draw_info(NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!"); 1384 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Stacked item was removed!");
1618 dm_stack_pop(pl); 1385 dm_stack_pop (pl);
1619 return NULL; 1386 return NULL;
1620 } 1387 }
1621 1388
1622 return ob; 1389 return ob;
1623} 1390}
1624 1391
1625/** 1392/**
1626 * Push specified item on player stack. 1393 * Push specified item on player stack.
1627 * Inform player of position. 1394 * Inform player of position.
1628 * Initializes variables if needed. 1395 * Initializes variables if needed.
1629 */ 1396 */
1397void
1630void dm_stack_push(player *pl, tag_t item) { 1398dm_stack_push (player *pl, tag_t item)
1399{
1631 if (!pl->stack_items) { 1400 if (!pl->stack_items)
1401 {
1632 pl->stack_items = (tag_t *)malloc(sizeof(tag_t)*STACK_SIZE); 1402 pl->stack_items = (tag_t *) malloc (sizeof (tag_t) * STACK_SIZE);
1633 memset(pl->stack_items, 0, sizeof(tag_t)*STACK_SIZE); 1403 memset (pl->stack_items, 0, sizeof (tag_t) * STACK_SIZE);
1634 } 1404 }
1635 1405
1636 if (pl->stack_position == STACK_SIZE) { 1406 if (pl->stack_position == STACK_SIZE)
1407 {
1637 new_draw_info(NDI_UNIQUE, 0, pl->ob, "Item stack full!"); 1408 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Item stack full!");
1638 return; 1409 return;
1639 } 1410 }
1640 1411
1641 pl->stack_items[pl->stack_position] = item; 1412 pl->stack_items[pl->stack_position] = item;
1642 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position); 1413 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Item stacked as %d.", pl->stack_position);
1643 pl->stack_position++; 1414 pl->stack_position++;
1644} 1415}
1645 1416
1646/** 1417/**
1647 * Checks 'params' for object code. 1418 * Checks 'params' for object code.
1648 * 1419 *
… …
1660 * * STACK_FROM_STACK => item from somewhere in the stack 1431 * * STACK_FROM_STACK => item from somewhere in the stack
1661 * * STACK_FROM_NUMBER => item by number, pushed on stack 1432 * * STACK_FROM_NUMBER => item by number, pushed on stack
1662 * 1433 *
1663 * Ryo, august 2004 1434 * Ryo, august 2004
1664 */ 1435 */
1436object *
1665object *get_dm_object(player *pl, char **params, int *from) { 1437get_dm_object (player *pl, char **params, int *from)
1438{
1666 int item_tag, item_position; 1439 int item_tag, item_position;
1667 object *ob; 1440 object *ob;
1668 1441
1669 if (!pl) 1442 if (!pl)
1670 return NULL; 1443 return NULL;
1671 1444
1672 if (!params || !*params || **params == '\0') { 1445 if (!params || !*params || **params == '\0')
1446 {
1673 if (from) 1447 if (from)
1674 *from = STACK_FROM_TOP; 1448 *from = STACK_FROM_TOP;
1675 /* No parameter => get stack item */ 1449 /* No parameter => get stack item */
1676 return dm_stack_peek(pl); 1450 return dm_stack_peek (pl);
1677 } 1451 }
1678 1452
1679 /* Let's clean white spaces */ 1453 /* Let's clean white spaces */
1680 while (**params == ' ') 1454 while (**params == ' ')
1455 (*params)++;
1456
1457 /* Next case: number => item tag */
1458 if (sscanf (*params, "%d", &item_tag))
1459 {
1460 /* Move parameter to next item */
1461 while (isdigit (**params))
1681 (*params)++; 1462 (*params)++;
1682 1463
1683 /* Next case: number => item tag */
1684 if (sscanf(*params, "%d", &item_tag)) {
1685 /* Move parameter to next item */
1686 while (isdigit(**params))
1687 (*params)++;
1688
1689 /* And skip blanks, too */ 1464 /* And skip blanks, too */
1690 while (**params == ' ') 1465 while (**params == ' ')
1691 (*params)++;
1692
1693 /* Get item */
1694 ob = find_object(item_tag);
1695 if (!ob) {
1696 if (from)
1697 *from = STACK_FROM_NONE;
1698 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1699 return NULL;
1700 }
1701
1702 /* Got one, let's push it on stack */
1703 dm_stack_push(pl, item_tag);
1704 if (from)
1705 *from = STACK_FROM_NUMBER;
1706 return ob;
1707 }
1708
1709 /* Next case: $number => stack item */
1710 if (sscanf(*params, "$%d", &item_position)) {
1711 /* Move parameter to next item */
1712 (*params)++; 1466 (*params)++;
1713 1467
1468 /* Get item */
1469 ob = find_object (item_tag);
1470 if (!ob)
1471 {
1472 if (from)
1473 *from = STACK_FROM_NONE;
1474 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such item %d!", item_tag);
1475 return NULL;
1476 }
1477
1478 /* Got one, let's push it on stack */
1479 dm_stack_push (pl, item_tag);
1480 if (from)
1481 *from = STACK_FROM_NUMBER;
1482 return ob;
1483 }
1484
1485 /* Next case: $number => stack item */
1486 if (sscanf (*params, "$%d", &item_position))
1487 {
1488 /* Move parameter to next item */
1489 (*params)++;
1490
1714 while (isdigit(**params)) 1491 while (isdigit (**params))
1715 (*params)++; 1492 (*params)++;
1716 while (**params == ' ') 1493 while (**params == ' ')
1717 (*params)++; 1494 (*params)++;
1718 1495
1719 if (item_position >= pl->stack_position) { 1496 if (item_position >= pl->stack_position)
1497 {
1720 if (from) 1498 if (from)
1721 *from = STACK_FROM_NONE; 1499 *from = STACK_FROM_NONE;
1722 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position); 1500 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "No such stack item %d!", item_position);
1723 return NULL; 1501 return NULL;
1724 } 1502 }
1725 1503
1726 ob = find_object(pl->stack_items[item_position]); 1504 ob = find_object (pl->stack_items[item_position]);
1727 if (!ob) { 1505 if (!ob)
1506 {
1728 if (from) 1507 if (from)
1729 *from = STACK_FROM_NONE; 1508 *from = STACK_FROM_NONE;
1730 new_draw_info_format(NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position); 1509 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Stack item %d was removed.", item_position);
1731 return NULL; 1510 return NULL;
1732 } 1511 }
1733 1512
1734 if (from) 1513 if (from)
1735 *from = item_position < pl->stack_position-1 ? STACK_FROM_STACK : STACK_FROM_TOP; 1514 *from = item_position < pl->stack_position - 1 ? STACK_FROM_STACK : STACK_FROM_TOP;
1736 return ob; 1515 return ob;
1737 } 1516 }
1738 1517
1739 /* Next case: 'me' => return pl->ob */ 1518 /* Next case: 'me' => return pl->ob */
1740 if (!strncmp(*params, "me", 2)) { 1519 if (!strncmp (*params, "me", 2))
1520 {
1741 if (from) 1521 if (from)
1742 *from = STACK_FROM_NUMBER; 1522 *from = STACK_FROM_NUMBER;
1743 dm_stack_push(pl, pl->ob->count); 1523 dm_stack_push (pl, pl->ob->count);
1744 1524
1745 /* Skip to next token */ 1525 /* Skip to next token */
1746 (*params) += 2; 1526 (*params) += 2;
1747 while (**params == ' ') 1527 while (**params == ' ')
1748 (*params)++; 1528 (*params)++;
1749 1529
1750 return pl->ob; 1530 return pl->ob;
1751 } 1531 }
1752 1532
1753 /* Last case: get stack top */ 1533 /* Last case: get stack top */
1754 if (from) 1534 if (from)
1755 *from = STACK_FROM_TOP; 1535 *from = STACK_FROM_TOP;
1756 return dm_stack_peek(pl); 1536 return dm_stack_peek (pl);
1757} 1537}
1758 1538
1759/** 1539/**
1760 * Pop the stack top. 1540 * Pop the stack top.
1761 */ 1541 */
1542int
1762int command_stack_pop(object *op, char *params) { 1543command_stack_pop (object *op, char *params)
1544{
1763 dm_stack_pop(op->contr); 1545 dm_stack_pop (op->contr);
1764 return 0; 1546 return 0;
1765} 1547}
1766 1548
1767/** 1549/**
1768 * Push specified item on stack. 1550 * Push specified item on stack.
1769 */ 1551 */
1552int
1770int command_stack_push(object *op, char *params) { 1553command_stack_push (object *op, char *params)
1554{
1771 object *ob; 1555 object *ob;
1772 int from; 1556 int from;
1557
1773 ob = get_dm_object(op->contr, &params, &from); 1558 ob = get_dm_object (op->contr, &params, &from);
1774 1559
1775 if (ob && from != STACK_FROM_NUMBER) 1560 if (ob && from != STACK_FROM_NUMBER)
1776 /* Object was from stack, need to push it again */ 1561 /* Object was from stack, need to push it again */
1777 dm_stack_push(op->contr, ob->count); 1562 dm_stack_push (op->contr, ob->count);
1778 1563
1779 return 0; 1564 return 0;
1780} 1565}
1781 1566
1782/** 1567/**
1783 * Displays stack contents. 1568 * Displays stack contents.
1784 */ 1569 */
1570int
1785int command_stack_list(object *op, char *params) { 1571command_stack_list (object *op, char *params)
1572{
1786 int item; 1573 int item;
1787 object *display; 1574 object *display;
1788 player *pl = op->contr; 1575 player *pl = op->contr;
1789 1576
1790 new_draw_info(NDI_UNIQUE, 0, op, "Item stack contents:"); 1577 new_draw_info (NDI_UNIQUE, 0, op, "Item stack contents:");
1791 1578
1792 for (item = 0; item < pl->stack_position; item++) { 1579 for (item = 0; item < pl->stack_position; item++)
1580 {
1793 display = find_object(pl->stack_items[item]); 1581 display = find_object (pl->stack_items[item]);
1794 if (display) 1582 if (display)
1795 new_draw_info_format(NDI_UNIQUE, 0, op, " %d : %s [%d]", item, &display->name, display->count); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, " %d : %s [%d]", item, &display->name, display->count);
1796 else 1584 else
1797 /* Item was freed */ 1585 /* Item was freed */
1798 new_draw_info_format(NDI_UNIQUE, 0, op, " %d : (lost item: %d)", item, pl->stack_items[item]); 1586 new_draw_info_format (NDI_UNIQUE, 0, op, " %d : (lost item: %d)", item, pl->stack_items[item]);
1799 } 1587 }
1800 1588
1801 return 0; 1589 return 0;
1802} 1590}
1803 1591
1804/** 1592/**
1805 * Empty DM item stack. 1593 * Empty DM item stack.
1806 */ 1594 */
1595int
1807int command_stack_clear(object *op, char *params) { 1596command_stack_clear (object *op, char *params)
1597{
1808 op->contr->stack_position = 0; 1598 op->contr->stack_position = 0;
1809 new_draw_info(NDI_UNIQUE, 0, op, "Item stack cleared."); 1599 new_draw_info (NDI_UNIQUE, 0, op, "Item stack cleared.");
1810 return 0; 1600 return 0;
1811} 1601}
1812 1602
1603int
1813int command_insert_into(object* op, char *params) 1604command_insert_into (object *op, char *params)
1814{ 1605{
1815 object *left, *right, *inserted; 1606 object *left, *right, *inserted;
1816 const char *diff;
1817 int left_from, right_from; 1607 int left_from, right_from;
1818 1608
1819 left = get_dm_object(op->contr, &params, &left_from); 1609 left = get_dm_object (op->contr, &params, &left_from);
1820 if (!left) { 1610 if (!left)
1611 {
1821 new_draw_info(NDI_UNIQUE, 0, op, "Insert into what object?"); 1612 new_draw_info (NDI_UNIQUE, 0, op, "Insert into what object?");
1822 return 0; 1613 return 0;
1823 } 1614 }
1824 1615
1825 if (left_from == STACK_FROM_NUMBER) 1616 if (left_from == STACK_FROM_NUMBER)
1826 /* Item was stacked, remove it else right will be the same... */ 1617 /* Item was stacked, remove it else right will be the same... */
1827 dm_stack_pop(op->contr); 1618 dm_stack_pop (op->contr);
1828 1619
1829 right = get_dm_object(op->contr, &params, &right_from); 1620 right = get_dm_object (op->contr, &params, &right_from);
1830 1621
1831 if (!right) { 1622 if (!right)
1623 {
1832 new_draw_info(NDI_UNIQUE, 0, op, "Insert what item?"); 1624 new_draw_info (NDI_UNIQUE, 0, op, "Insert what item?");
1833 return 0; 1625 return 0;
1834 } 1626 }
1835 1627
1836 if (left_from == STACK_FROM_TOP && right_from == STACK_FROM_TOP) { 1628 if (left_from == STACK_FROM_TOP && right_from == STACK_FROM_TOP)
1629 {
1837 /* 1630 /*
1838 * Special case: both items were taken from stack top. 1631 * Special case: both items were taken from stack top.
1839 * Override the behaviour, taking left as item just below top, if exists. 1632 * Override the behaviour, taking left as item just below top, if exists.
1840 * See function description for why. 1633 * See function description for why.
1841 * Besides, can't insert an item into itself. 1634 * Besides, can't insert an item into itself.
1842 */ 1635 */
1843 if (op->contr->stack_position > 1) { 1636 if (op->contr->stack_position > 1)
1637 {
1844 left = find_object(op->contr->stack_items[op->contr->stack_position-2]); 1638 left = find_object (op->contr->stack_items[op->contr->stack_position - 2]);
1845 if (left) 1639 if (left)
1846 new_draw_info(NDI_UNIQUE, 0, op, "(Note: item to insert into taken from undertop)"); 1640 new_draw_info (NDI_UNIQUE, 0, op, "(Note: item to insert into taken from undertop)");
1847 else 1641 else
1848 /* Stupid case: item under top was freed, fallback to stack top */ 1642 /* Stupid case: item under top was freed, fallback to stack top */
1849 left = right; 1643 left = right;
1850 } 1644 }
1851 } 1645 }
1852 1646
1853 if (left == right) 1647 if (left == right)
1854 { 1648 {
1855 new_draw_info(NDI_UNIQUE, 0, op, "Can't insert an object into itself!"); 1649 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert an object into itself!");
1856 return 0; 1650 return 0;
1857 } 1651 }
1858 1652
1859 if (right->type == PLAYER) 1653 if (right->type == PLAYER)
1860 { 1654 {
1861 new_draw_info(NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1655 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1862 return 0; 1656 return 0;
1863 } 1657 }
1864 1658
1865 if (!QUERY_FLAG(right,FLAG_REMOVED)) 1659 if (!QUERY_FLAG (right, FLAG_REMOVED))
1866 remove_ob(right); 1660 right->remove ();
1867 inserted = insert_ob_in_ob(right,left); 1661 inserted = insert_ob_in_ob (right, left);
1868 if (left->type == PLAYER) 1662 if (left->type == PLAYER)
1869 if (inserted == right) 1663 if (inserted == right)
1870 esrv_send_item(left,right); 1664 esrv_send_item (left, right);
1871 else 1665 else
1872 esrv_update_item(UPD_WEIGHT|UPD_NAME|UPD_NROF,left,inserted); 1666 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1873 1667
1874 new_draw_info_format(NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name(inserted),query_name(left)); 1668 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1875 1669
1876 return 0; 1670 return 0;
1877 1671
1878} 1672}

Diff Legend

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