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.2 by root, Thu Aug 24 13:13:49 2006 UTC vs.
Revision 1.34 by root, Mon Feb 5 01:24:46 2007 UTC

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

Diff Legend

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