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.13 by root, Fri Sep 15 23:31:34 2006 UTC vs.
Revision 1.23 by root, Thu Dec 14 04:30:32 2006 UTC

… …
76 } 76 }
77 return pl; 77 return pl;
78} 78}
79 79
80/** 80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 }
111 }
112
113 return 0;
114}
115
116/**
117 * Actually hides specified player (obviously a DM). 81 * Actually hides specified player (obviously a DM).
118 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 82 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
119 * else they just think someone left/entered. 83 * else they just think someone left/entered.
120 */ 84 */
121void 85void
… …
252 now = time (NULL); 216 now = time (NULL);
253 /* 217 /*
254 * Record this as a comment - then we don't have to worry about changing 218 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code. 219 * the parsing code.
256 */ 220 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket->host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host); 222 fprintf (banishfile, "*@%s\n", pl->socket->host);
259 fclose (banishfile); 223 fclose (banishfile);
260 224
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket->host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name); 226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name); 227 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name); 228 command_kick (op, (char *) &pl->ob->name);
265 return 1; 229 return 1;
266} 230}
267 231
268int 232int
269command_kick (object *op, char *params) 233command_kick (object *op, char *params)
270{ 234{
271 struct pl *pl;
272
273 for (pl = first_player; pl != NULL; pl = pl->next) 235 for (player *pl = first_player; pl; pl = pl->next)
274 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 236 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
275 { 237 {
276 object *op = pl->ob; 238 object *op = pl->ob;
277 239
278 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 240 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
279 { 241 {
280 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
281 strcpy (op->contr->killer, "kicked"); 243 strcpy (op->contr->killer, "kicked");
282 } 244 }
283 245
284 pl->socket.status = Ns_Dead; 246 pl->socket->status = Ns_Dead;
285 } 247 }
286 248
287 return 1; 249 return 1;
288} 250}
289 251
… …
309} 271}
310 272
311int 273int
312command_shutdown (object *op, char *params) 274command_shutdown (object *op, char *params)
313{ 275{
314 struct pl *pl;
315
316 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
317 { 277 {
318 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 278 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
319 return 1; 279 return 1;
320 } 280 }
321 281
322 cleanup (); 282 cleanup ();
323 /* not reached */ 283 /* not reached */
324 return 1;
325}
326
327int
328command_goto (object *op, char *params)
329{
330 char *name;
331 object *dummy;
332
333 if (!op)
334 return 0;
335
336 if (params == NULL)
337 {
338 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
339 return 1;
340 }
341
342 name = params;
343 dummy = get_object ();
344 dummy->map = op->map;
345 EXIT_PATH (dummy) = name;
346 dummy->name = name;
347
348 enter_exit (op, dummy);
349 free_object (dummy);
350 if (op->contr->loading == NULL)
351 {
352 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
353 }
354
355 return 1;
356}
357
358/* is this function called from somewhere ? -Tero */
359int
360command_generate (object *op, char *params)
361{
362 object *tmp;
363 int nr = 1, i, retry;
364
365 if (!op)
366 return 0;
367
368 if (params != NULL)
369 sscanf (params, "%d", &nr);
370 for (i = 0; i < nr; i++)
371 {
372 retry = 50;
373 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
374 ;
375 if (tmp != NULL)
376 {
377 tmp = insert_ob_in_ob (tmp, op);
378 if (op->type == PLAYER)
379 esrv_send_item (op, tmp);
380 }
381 }
382
383 return 1; 284 return 1;
384} 285}
385 286
386int 287int
387command_freeze (object *op, char *params) 288command_freeze (object *op, char *params)
… …
441 /* we have nowhere to send the prisoner.... */ 342 /* we have nowhere to send the prisoner.... */
442 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 343 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
443 return 0; 344 return 0;
444 } 345 }
445 enter_exit (pl->ob, dummy); 346 enter_exit (pl->ob, dummy);
446 free_object (dummy); 347 dummy->destroy ();
447 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 348 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
448 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 349 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
449 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 350 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
450 return 1; 351 return 1;
451} 352}
… …
475 { 376 {
476 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 377 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
477 return 1; 378 return 1;
478 } 379 }
479 380
480 dummy = get_object (); 381 dummy = object::create ();
481 EXIT_PATH (dummy) = op->map->path; 382 EXIT_PATH (dummy) = op->map->path;
482 EXIT_X (dummy) = op->x + freearr_x[i]; 383 EXIT_X (dummy) = op->x + freearr_x[i];
483 EXIT_Y (dummy) = op->y + freearr_y[i]; 384 EXIT_Y (dummy) = op->y + freearr_y[i];
484 enter_exit (pl->ob, dummy); 385 enter_exit (pl->ob, dummy);
485 free_object (dummy); 386 dummy->destroy ();
486 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 387 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
487 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 388 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
488 389
489 return 1; 390 return 1;
490} 391}
… …
519 { 420 {
520 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to."); 421 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
521 return 1; 422 return 1;
522 } 423 }
523 424
524 dummy = get_object (); 425 dummy = object::create ();
525 EXIT_PATH (dummy) = pl->ob->map->path; 426 EXIT_PATH (dummy) = pl->ob->map->path;
526 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 427 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
527 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 428 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
528 enter_exit (op, dummy); 429 enter_exit (op, dummy);
529 free_object (dummy); 430 dummy->destroy ();
530 if (!op->contr->hidden) 431 if (!op->contr->hidden)
531 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open."); 432 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
532 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 433 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
533 return 1; 434 return 1;
534} 435}
… …
821 * so just copying it over should be fine. 722 * so just copying it over should be fine.
822 */ 723 */
823 if (!head) 724 if (!head)
824 { 725 {
825 head = dup; 726 head = dup;
826 copy_object (tmp, dup); 727 tmp->copy_to (dup);
827 } 728 }
828 729
829 if (settings.real_wiz == FALSE) 730 if (settings.real_wiz == FALSE)
830 SET_FLAG (dup, FLAG_WAS_WIZ); 731 SET_FLAG (dup, FLAG_WAS_WIZ);
831 732
… …
858 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 759 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
859 { 760 {
860 if (head->x < size_x || head->y < size_y) 761 if (head->x < size_x || head->y < size_y)
861 { 762 {
862 dm_stack_pop (op->contr); 763 dm_stack_pop (op->contr);
863 free_object (head); 764 head->destroy ();
864 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 765 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
865 free_object (tmp); 766 tmp->destroy ();
866 return 1; 767 return 1;
867 } 768 }
868 769
869 check = head; 770 check = head;
870 771
… …
892 793
893 esrv_send_item (op, head); 794 esrv_send_item (op, head);
894 } 795 }
895 796
896 /* free the one we used to copy */ 797 /* free the one we used to copy */
897 free_object (tmp); 798 tmp->destroy ();
898 } 799 }
899 800
900 return 1; 801 return 1;
901} 802}
902 803
… …
944 845
945 tmp = get_dm_object (op->contr, &params, NULL); 846 tmp = get_dm_object (op->contr, &params, NULL);
946 if (!tmp) 847 if (!tmp)
947 return 1; 848 return 1;
948 849
949 dump_object (tmp); 850 char *dump = dump_object (tmp);
950 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 851 new_draw_info (NDI_UNIQUE, 0, op, dump);
852 free (dump);
853
951 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
952 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
856
953 return 1; 857 return 1;
954} 858}
955 859
956/** 860/**
957 * When DM is possessing a monster, flip aggression on and off, to allow 861 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1119 dm_stack_pop (op->contr); 1023 dm_stack_pop (op->contr);
1120 1024
1121 /* Always work on the head - otherwise object will get in odd state */ 1025 /* Always work on the head - otherwise object will get in odd state */
1122 if (tmp->head) 1026 if (tmp->head)
1123 tmp = tmp->head; 1027 tmp = tmp->head;
1124 remove_ob (tmp); 1028 tmp->remove ();
1125 return 1; 1029 return 1;
1126} 1030}
1127 1031
1128int 1032int
1129command_free (object *op, char *params) 1033command_free (object *op, char *params)
… …
1144 dm_stack_pop (op->contr); 1048 dm_stack_pop (op->contr);
1145 1049
1146 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1050 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1147 { 1051 {
1148 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); 1052 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1149 remove_ob (tmp); 1053 tmp->remove ();
1150 } 1054 }
1151 1055
1152 if (tmp->head) 1056 if (tmp->head)
1153 tmp = tmp->head; 1057 tmp = tmp->head;
1154 free_object (tmp); 1058
1059 tmp->destroy ();
1155 return 1; 1060 return 1;
1156} 1061}
1157 1062
1158/** 1063/**
1159 * This adds exp to a player. We now allow adding to a specific skill. 1064 * This adds exp to a player. We now allow adding to a specific skill.
… …
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1143 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1144 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1146 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1147 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1148 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1149 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1150 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1151 new_draw_info (NDI_UNIQUE, 0, op, buf);
1247 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1152 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1248 new_draw_info (NDI_UNIQUE, 0, op, buf); 1153 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1314} 1219}
1315 1220
1316int 1221int
1317command_reset (object *op, char *params) 1222command_reset (object *op, char *params)
1318{ 1223{
1319 mapstruct *m; 1224 maptile *m;
1320 object *dummy = NULL, *tmp = NULL; 1225 object *dummy = NULL, *tmp = NULL;
1321 1226
1322 if (params == NULL) 1227 if (params == NULL)
1323 { 1228 {
1324 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?"); 1229 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1325 return 1; 1230 return 1;
1326 } 1231 }
1327 1232
1328 if (strcmp (params, ".") == 0) 1233 if (strcmp (params, ".") == 0)
1329 params = op->map->path; 1234 params = op->map->path;
1235
1330 m = has_been_loaded (params); 1236 m = has_been_loaded (params);
1331 if (m == NULL) 1237 if (m == NULL)
1332 { 1238 {
1333 new_draw_info (NDI_UNIQUE, 0, op, "No such map."); 1239 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1334 return 1; 1240 return 1;
… …
1346 * Only attempt to remove the player that is doing the reset, and not other 1252 * Only attempt to remove the player that is doing the reset, and not other
1347 * players or wiz's. 1253 * players or wiz's.
1348 */ 1254 */
1349 if (op->map == m) 1255 if (op->map == m)
1350 { 1256 {
1351 dummy = get_object (); 1257 dummy = object::create ();
1352 dummy->map = NULL; 1258 dummy->map = NULL;
1353 EXIT_X (dummy) = op->x; 1259 EXIT_X (dummy) = op->x;
1354 EXIT_Y (dummy) = op->y; 1260 EXIT_Y (dummy) = op->y;
1355 EXIT_PATH (dummy) = op->map->path; 1261 EXIT_PATH (dummy) = op->map->path;
1356 remove_ob (op); 1262 op->remove ();
1357 op->map = NULL; 1263 op->map = NULL;
1358 tmp = op; 1264 tmp = op;
1359 } 1265 }
1360 swap_map (m); 1266 swap_map (m);
1361 } 1267 }
… …
1366 1272
1367 /* setting this effectively causes an immediate reload */ 1273 /* setting this effectively causes an immediate reload */
1368 m->reset_time = 1; 1274 m->reset_time = 1;
1369 flush_old_maps (); 1275 flush_old_maps ();
1370 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 1276 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1277
1371 if (tmp) 1278 if (tmp)
1372 { 1279 {
1373 enter_exit (tmp, dummy); 1280 enter_exit (tmp, dummy);
1374 free_object (dummy); 1281 dummy->destroy ();
1375 } 1282 }
1283
1376 return 1; 1284 return 1;
1377 } 1285 }
1378 else 1286 else
1379 { 1287 {
1380 player *pl; 1288 player *pl;
… …
1382 1290
1383 /* Need to re-insert player if swap failed for some reason */ 1291 /* Need to re-insert player if swap failed for some reason */
1384 if (tmp) 1292 if (tmp)
1385 { 1293 {
1386 insert_ob_in_map (op, m, NULL, 0); 1294 insert_ob_in_map (op, m, NULL, 0);
1387 free_object (dummy); 1295 dummy->destroy ();
1388 } 1296 }
1389 1297
1390 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:"); 1298 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1391 for (pl = first_player; pl != NULL; pl = pl->next) 1299 for (pl = first_player; pl != NULL; pl = pl->next)
1392 { 1300 {
… …
1477 { 1385 {
1478 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1386 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1479 return 0; 1387 return 0;
1480 } 1388 }
1481 1389
1482 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1390 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket->host))
1483 { 1391 {
1484 SET_FLAG (op, FLAG_WIZ); 1392 SET_FLAG (op, FLAG_WIZ);
1485 SET_FLAG (op, FLAG_WAS_WIZ); 1393 SET_FLAG (op, FLAG_WAS_WIZ);
1486 SET_FLAG (op, FLAG_WIZPASS); 1394 SET_FLAG (op, FLAG_WIZPASS);
1487 SET_FLAG (op, FLAG_WIZCAST); 1395 SET_FLAG (op, FLAG_WIZCAST);
… …
1658 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1566 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1659 return 0; 1567 return 0;
1660 } 1568 }
1661 1569
1662 do_learn_spell (op, tmp, special_prayer); 1570 do_learn_spell (op, tmp, special_prayer);
1663 free_object (tmp); 1571 tmp->destroy ();
1664 return 1; 1572 return 1;
1665} 1573}
1666 1574
1667int 1575int
1668command_learn_spell (object *op, char *params) 1576command_learn_spell (object *op, char *params)
… …
2080 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1988 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2081 return 0; 1989 return 0;
2082 } 1990 }
2083 1991
2084 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1992 if (!QUERY_FLAG (right, FLAG_REMOVED))
2085 remove_ob (right); 1993 right->remove ();
2086 inserted = insert_ob_in_ob (right, left); 1994 inserted = insert_ob_in_ob (right, left);
2087 if (left->type == PLAYER) 1995 if (left->type == PLAYER)
2088 if (inserted == right) 1996 if (inserted == right)
2089 esrv_send_item (left, right); 1997 esrv_send_item (left, right);
2090 else 1998 else

Diff Legend

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