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.15 by root, Sun Oct 1 23:44:36 2006 UTC vs.
Revision 1.25 by root, Thu Dec 21 23:37:06 2006 UTC

… …
67 if (pl->ob == op) 67 if (pl->ob == op)
68 { 68 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 70 return NULL;
71 } 71 }
72
72 if (pl->state != ST_PLAYING) 73 if (pl->ns->state != ST_PLAYING)
73 { 74 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 75 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 76 return NULL;
76 } 77 }
78
77 return pl; 79 return pl;
78} 80}
79 81
80/** 82/**
81 * Actually hides specified player (obviously a DM). 83 * Actually hides specified player (obviously a DM).
… …
216 now = time (NULL); 218 now = time (NULL);
217 /* 219 /*
218 * Record this as a comment - then we don't have to worry about changing 220 * Record this as a comment - then we don't have to worry about changing
219 * the parsing code. 221 * the parsing code.
220 */ 222 */
221 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 223 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
222 fprintf (banishfile, "*@%s\n", pl->socket.host); 224 fprintf (banishfile, "*@%s\n", pl->ns->host);
223 fclose (banishfile); 225 fclose (banishfile);
224 226
225 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 227 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
226 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name); 228 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &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); 229 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
228 command_kick (op, (char *) &pl->ob->name); 230 command_kick (op, (char *) &pl->ob->name);
229 return 1; 231 return 1;
230} 232}
… …
241 { 243 {
242 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 244 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
243 strcpy (op->contr->killer, "kicked"); 245 strcpy (op->contr->killer, "kicked");
244 } 246 }
245 247
246 pl->socket.status = Ns_Dead; 248 pl->ns->destroy ();
247 } 249 }
248 250
249 return 1; 251 return 1;
250} 252}
251 253
… …
271} 273}
272 274
273int 275int
274command_shutdown (object *op, char *params) 276command_shutdown (object *op, char *params)
275{ 277{
276 struct pl *pl;
277
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 { 279 {
280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
281 return 1; 281 return 1;
282 } 282 }
… …
344 /* we have nowhere to send the prisoner.... */ 344 /* we have nowhere to send the prisoner.... */
345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 346 return 0;
347 } 347 }
348 enter_exit (pl->ob, dummy); 348 enter_exit (pl->ob, dummy);
349 free_object (dummy); 349 dummy->destroy ();
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 351 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 353 return 1;
354} 354}
… …
378 { 378 {
379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
380 return 1; 380 return 1;
381 } 381 }
382 382
383 dummy = get_object (); 383 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 384 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 385 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 386 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 387 enter_exit (pl->ob, dummy);
388 free_object (dummy); 388 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 390 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 391
392 return 1; 392 return 1;
393} 393}
… …
422 { 422 {
423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to."); 423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
424 return 1; 424 return 1;
425 } 425 }
426 426
427 dummy = get_object (); 427 dummy = object::create ();
428 EXIT_PATH (dummy) = pl->ob->map->path; 428 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy); 431 enter_exit (op, dummy);
432 free_object (dummy); 432 dummy->destroy ();
433 if (!op->contr->hidden) 433 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open."); 434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 436 return 1;
437} 437}
… …
724 * so just copying it over should be fine. 724 * so just copying it over should be fine.
725 */ 725 */
726 if (!head) 726 if (!head)
727 { 727 {
728 head = dup; 728 head = dup;
729 copy_object (tmp, dup); 729 tmp->copy_to (dup);
730 } 730 }
731 731
732 if (settings.real_wiz == FALSE) 732 if (settings.real_wiz == FALSE)
733 SET_FLAG (dup, FLAG_WAS_WIZ); 733 SET_FLAG (dup, FLAG_WAS_WIZ);
734 734
… …
761 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 761 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
762 { 762 {
763 if (head->x < size_x || head->y < size_y) 763 if (head->x < size_x || head->y < size_y)
764 { 764 {
765 dm_stack_pop (op->contr); 765 dm_stack_pop (op->contr);
766 free_object (head); 766 head->destroy ();
767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
768 free_object (tmp); 768 tmp->destroy ();
769 return 1; 769 return 1;
770 } 770 }
771 771
772 check = head; 772 check = head;
773 773
… …
795 795
796 esrv_send_item (op, head); 796 esrv_send_item (op, head);
797 } 797 }
798 798
799 /* free the one we used to copy */ 799 /* free the one we used to copy */
800 free_object (tmp); 800 tmp->destroy ();
801 } 801 }
802 802
803 return 1; 803 return 1;
804} 804}
805 805
… …
847 847
848 tmp = get_dm_object (op->contr, &params, NULL); 848 tmp = get_dm_object (op->contr, &params, NULL);
849 if (!tmp) 849 if (!tmp)
850 return 1; 850 return 1;
851 851
852 dump_object (tmp); 852 char *dump = dump_object (tmp);
853 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 853 new_draw_info (NDI_UNIQUE, 0, op, dump);
854 free (dump);
855
854 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
855 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858
856 return 1; 859 return 1;
857} 860}
858 861
859/** 862/**
860 * When DM is possessing a monster, flip aggression on and off, to allow 863 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1022 dm_stack_pop (op->contr); 1025 dm_stack_pop (op->contr);
1023 1026
1024 /* Always work on the head - otherwise object will get in odd state */ 1027 /* Always work on the head - otherwise object will get in odd state */
1025 if (tmp->head) 1028 if (tmp->head)
1026 tmp = tmp->head; 1029 tmp = tmp->head;
1027 remove_ob (tmp); 1030 tmp->remove ();
1028 return 1; 1031 return 1;
1029} 1032}
1030 1033
1031int 1034int
1032command_free (object *op, char *params) 1035command_free (object *op, char *params)
… …
1047 dm_stack_pop (op->contr); 1050 dm_stack_pop (op->contr);
1048 1051
1049 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1050 { 1053 {
1051 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); 1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1052 remove_ob (tmp); 1055 tmp->remove ();
1053 } 1056 }
1054 1057
1055 if (tmp->head) 1058 if (tmp->head)
1056 tmp = tmp->head; 1059 tmp = tmp->head;
1057 free_object (tmp); 1060
1061 tmp->destroy ();
1058 return 1; 1062 return 1;
1059} 1063}
1060 1064
1061/** 1065/**
1062 * This adds exp to a player. We now allow adding to a specific skill. 1066 * This adds exp to a player. We now allow adding to a specific skill.
… …
1141 new_draw_info (NDI_UNIQUE, 0, op, buf); 1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1142 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1146 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1143 new_draw_info (NDI_UNIQUE, 0, op, buf); 1147 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1148 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1145 new_draw_info (NDI_UNIQUE, 0, op, buf); 1149 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1150 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1147 new_draw_info (NDI_UNIQUE, 0, op, buf); 1151 new_draw_info (NDI_UNIQUE, 0, op, buf);
1148 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1149 new_draw_info (NDI_UNIQUE, 0, op, buf); 1153 new_draw_info (NDI_UNIQUE, 0, op, buf);
1150 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1155 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1228 return 1; 1232 return 1;
1229 } 1233 }
1230 1234
1231 if (strcmp (params, ".") == 0) 1235 if (strcmp (params, ".") == 0)
1232 params = op->map->path; 1236 params = op->map->path;
1237
1233 m = has_been_loaded (params); 1238 m = has_been_loaded (params);
1234 if (m == NULL) 1239 if (m == NULL)
1235 { 1240 {
1236 new_draw_info (NDI_UNIQUE, 0, op, "No such map."); 1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1237 return 1; 1242 return 1;
… …
1249 * Only attempt to remove the player that is doing the reset, and not other 1254 * Only attempt to remove the player that is doing the reset, and not other
1250 * players or wiz's. 1255 * players or wiz's.
1251 */ 1256 */
1252 if (op->map == m) 1257 if (op->map == m)
1253 { 1258 {
1254 dummy = get_object (); 1259 dummy = object::create ();
1255 dummy->map = NULL; 1260 dummy->map = NULL;
1256 EXIT_X (dummy) = op->x; 1261 EXIT_X (dummy) = op->x;
1257 EXIT_Y (dummy) = op->y; 1262 EXIT_Y (dummy) = op->y;
1258 EXIT_PATH (dummy) = op->map->path; 1263 EXIT_PATH (dummy) = op->map->path;
1259 remove_ob (op); 1264 op->remove ();
1260 op->map = NULL; 1265 op->map = NULL;
1261 tmp = op; 1266 tmp = op;
1262 } 1267 }
1263 swap_map (m); 1268 swap_map (m);
1264 } 1269 }
… …
1269 1274
1270 /* setting this effectively causes an immediate reload */ 1275 /* setting this effectively causes an immediate reload */
1271 m->reset_time = 1; 1276 m->reset_time = 1;
1272 flush_old_maps (); 1277 flush_old_maps ();
1273 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1274 if (tmp) 1280 if (tmp)
1275 { 1281 {
1276 enter_exit (tmp, dummy); 1282 enter_exit (tmp, dummy);
1277 free_object (dummy); 1283 dummy->destroy ();
1278 } 1284 }
1285
1279 return 1; 1286 return 1;
1280 } 1287 }
1281 else 1288 else
1282 { 1289 {
1283 player *pl; 1290 player *pl;
… …
1285 1292
1286 /* Need to re-insert player if swap failed for some reason */ 1293 /* Need to re-insert player if swap failed for some reason */
1287 if (tmp) 1294 if (tmp)
1288 { 1295 {
1289 insert_ob_in_map (op, m, NULL, 0); 1296 insert_ob_in_map (op, m, NULL, 0);
1290 free_object (dummy); 1297 dummy->destroy ();
1291 } 1298 }
1292 1299
1293 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:"); 1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1294 for (pl = first_player; pl != NULL; pl = pl->next) 1301 for (pl = first_player; pl != NULL; pl = pl->next)
1295 { 1302 {
… …
1380 { 1387 {
1381 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1388 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1382 return 0; 1389 return 0;
1383 } 1390 }
1384 1391
1385 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1392 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1386 { 1393 {
1387 SET_FLAG (op, FLAG_WIZ); 1394 SET_FLAG (op, FLAG_WIZ);
1388 SET_FLAG (op, FLAG_WAS_WIZ); 1395 SET_FLAG (op, FLAG_WAS_WIZ);
1389 SET_FLAG (op, FLAG_WIZPASS); 1396 SET_FLAG (op, FLAG_WIZPASS);
1390 SET_FLAG (op, FLAG_WIZCAST); 1397 SET_FLAG (op, FLAG_WIZCAST);
… …
1561 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1568 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1562 return 0; 1569 return 0;
1563 } 1570 }
1564 1571
1565 do_learn_spell (op, tmp, special_prayer); 1572 do_learn_spell (op, tmp, special_prayer);
1566 free_object (tmp); 1573 tmp->destroy ();
1567 return 1; 1574 return 1;
1568} 1575}
1569 1576
1570int 1577int
1571command_learn_spell (object *op, char *params) 1578command_learn_spell (object *op, char *params)
… …
1983 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1990 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1984 return 0; 1991 return 0;
1985 } 1992 }
1986 1993
1987 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1994 if (!QUERY_FLAG (right, FLAG_REMOVED))
1988 remove_ob (right); 1995 right->remove ();
1989 inserted = insert_ob_in_ob (right, left); 1996 inserted = insert_ob_in_ob (right, left);
1990 if (left->type == PLAYER) 1997 if (left->type == PLAYER)
1991 if (inserted == right) 1998 if (inserted == right)
1992 esrv_send_item (left, right); 1999 esrv_send_item (left, right);
1993 else 2000 else

Diff Legend

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