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.4 by root, Tue Aug 29 08:01:37 2006 UTC vs.
Revision 1.62 by root, Fri Dec 26 10:14:01 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines