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.26 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.28 by root, Sat Dec 30 10:16:11 2006 UTC

… …
47 * other player, or NULL otherwise. 47 * other player, or NULL otherwise.
48 */ 48 */
49static player * 49static player *
50get_other_player_from_name (object *op, char *name) 50get_other_player_from_name (object *op, char *name)
51{ 51{
52 player *pl;
53
54 if (!name) 52 if (!name)
55 return NULL; 53 return NULL;
56 54
57 for (pl = first_player; pl != NULL; pl = pl->next) 55 for_all_players (pl)
58 if (!strncmp (pl->ob->name, name, MAX_NAME)) 56 if (!strncmp (pl->ob->name, name, MAX_NAME))
59 break;
60
61 if (pl == NULL)
62 { 57 {
63 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
64 return NULL;
65 }
66
67 if (pl->ob == op) 58 if (pl->ob == op)
68 { 59 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 60 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 61 return NULL;
71 } 62 }
72 63
73 if (pl->ns->state != ST_PLAYING) 64 if (pl->ns->state != ST_PLAYING)
74 { 65 {
75 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 66 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
76 return NULL; 67 return NULL;
68 }
69
70 return pl;
77 } 71 }
78 72
73 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
79 return pl; 74 return 0;
80} 75}
81 76
82/** 77/**
83 * Actually hides specified player (obviously a DM). 78 * Actually hides specified player (obviously a DM).
84 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 79 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
232} 227}
233 228
234int 229int
235command_kick (object *op, char *params) 230command_kick (object *op, char *params)
236{ 231{
237 for (player *pl = first_player; pl; pl = pl->next) 232 for_all_players (pl)
238 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 233 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
239 { 234 {
240 object *op = pl->ob; 235 object *op = pl->ob;
241 236
242 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 237 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED))
… …
249 } 244 }
250 245
251 return 1; 246 return 1;
252} 247}
253 248
249//TODO
250#if 0
254int 251int
255command_save_overlay (object *op, char *params) 252command_save_overlay (object *op, char *params)
256{ 253{
257 if (!op) 254 if (!op)
258 return 0; 255 return 0;
… …
269 266
270 ready_map_name (op->map->path, 0); 267 ready_map_name (op->map->path, 0);
271 268
272 return 1; 269 return 1;
273} 270}
271#endif
274 272
275int 273int
276command_shutdown (object *op, char *params) 274command_shutdown (object *op, char *params)
277{ 275{
278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 276 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
279 { 277 {
280 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.");
281 return 1; 279 return 1;
282 } 280 }
283 281
284 cleanup (); 282 cleanup (0);
283
285 /* not reached */ 284 /* not reached */
286 return 1; 285 return 1;
287} 286}
288 287
289int 288int
… …
328 object *dummy; 327 object *dummy;
329 player *pl; 328 player *pl;
330 329
331 if (!op) 330 if (!op)
332 return 0; 331 return 0;
332
333 if (params == NULL) 333 if (params == NULL)
334 { 334 {
335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>."); 335 new_draw_info (NDI_UNIQUE, 0, op, "Usage: arrest <player>.");
336 return 1; 336 return 1;
337 } 337 }
338
338 pl = get_other_player_from_name (op, params); 339 pl = get_other_player_from_name (op, params);
339 if (!pl) 340 if (!pl)
340 return 1; 341 return 1;
342
341 dummy = get_jail_exit (pl->ob); 343 dummy = get_jail_exit (pl->ob);
342 if (!dummy) 344 if (!dummy)
343 { 345 {
344 /* we have nowhere to send the prisoner.... */ 346 /* 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"); 347 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
346 return 0; 348 return 0;
347 } 349 }
348 enter_exit (pl->ob, dummy); 350
351 pl->ob->enter_exit (dummy);
349 dummy->destroy (); 352 dummy->destroy ();
350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 353 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
351 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 354 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 355 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
353 return 1; 356 return 1;
… …
382 385
383 dummy = object::create (); 386 dummy = object::create ();
384 EXIT_PATH (dummy) = op->map->path; 387 EXIT_PATH (dummy) = op->map->path;
385 EXIT_X (dummy) = op->x + freearr_x[i]; 388 EXIT_X (dummy) = op->x + freearr_x[i];
386 EXIT_Y (dummy) = op->y + freearr_y[i]; 389 EXIT_Y (dummy) = op->y + freearr_y[i];
387 enter_exit (pl->ob, dummy); 390 pl->ob->enter_exit (dummy);
388 dummy->destroy (); 391 dummy->destroy ();
389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 392 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
390 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 393 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
391 394
392 return 1; 395 return 1;
… …
426 429
427 dummy = object::create (); 430 dummy = object::create ();
428 EXIT_PATH (dummy) = pl->ob->map->path; 431 EXIT_PATH (dummy) = pl->ob->map->path;
429 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 432 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 433 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
431 enter_exit (op, dummy); 434 op->enter_exit (dummy);
432 dummy->destroy (); 435 dummy->destroy ();
433 if (!op->contr->hidden) 436 if (!op->contr->hidden)
434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open."); 437 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
435 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 438 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
436 return 1; 439 return 1;
… …
1069command_addexp (object *op, char *params) 1072command_addexp (object *op, char *params)
1070{ 1073{
1071 char buf[MAX_BUF], skill[MAX_BUF]; 1074 char buf[MAX_BUF], skill[MAX_BUF];
1072 int i, q; 1075 int i, q;
1073 object *skillob = NULL; 1076 object *skillob = NULL;
1074 player *pl;
1075 1077
1076 skill[0] = '\0'; 1078 skill[0] = '\0';
1077 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 1079 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2))
1078 { 1080 {
1079 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 1081 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
1080 return 1; 1082 return 1;
1081 } 1083 }
1082 1084
1083 for (pl = first_player; pl != NULL; pl = pl->next) 1085 for_all_players (pl)
1084 if (!strncmp (pl->ob->name, buf, MAX_NAME)) 1086 if (!strncmp (pl->ob->name, buf, MAX_NAME))
1085 break;
1086
1087 if (pl == NULL)
1088 { 1087 {
1089 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1090 return 1;
1091 }
1092
1093 if (q >= 3) 1088 if (q >= 3)
1094 { 1089 {
1095 skillob = find_skill_by_name (pl->ob, skill); 1090 skillob = find_skill_by_name (pl->ob, skill);
1096 if (!skillob) 1091 if (!skillob)
1097 { 1092 {
1098 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf); 1093 new_draw_info_format (NDI_UNIQUE, 0, op, "Unable to find skill %s in %s", skill, buf);
1094 return 1;
1095 }
1096
1097 i = check_exp_adjust (skillob, i);
1098 skillob->stats.exp += i;
1099 calc_perm_exp (skillob);
1100 player_lvl_adj (pl->ob, skillob);
1101 }
1102
1103 pl->ob->stats.exp += i;
1104 calc_perm_exp (pl->ob);
1105 player_lvl_adj (pl->ob, NULL);
1106
1107 if (settings.real_wiz == FALSE)
1108 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1109
1099 return 1; 1110 return 1;
1100 } 1111 }
1101 1112
1102 i = check_exp_adjust (skillob, i); 1113 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1103 skillob->stats.exp += i;
1104 calc_perm_exp (skillob);
1105 player_lvl_adj (pl->ob, skillob);
1106 }
1107
1108 pl->ob->stats.exp += i;
1109 calc_perm_exp (pl->ob);
1110 player_lvl_adj (pl->ob, NULL);
1111
1112 if (settings.real_wiz == FALSE)
1113 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
1114 return 1; 1114 return 1;
1115} 1115}
1116 1116
1117/**************************************************************************/ 1117/**************************************************************************/
1118 1118
… …
1124 1124
1125int 1125int
1126command_stats (object *op, char *params) 1126command_stats (object *op, char *params)
1127{ 1127{
1128 char thing[20]; 1128 char thing[20];
1129 player *pl;
1130 char buf[MAX_BUF]; 1129 char buf[MAX_BUF];
1131 1130
1132 thing[0] = '\0'; 1131 thing[0] = '\0';
1133 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL) 1132 if (params == NULL || !sscanf (params, "%s", thing) || thing == NULL)
1134 { 1133 {
1135 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 1134 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
1136 return 1; 1135 return 1;
1137 } 1136 }
1138 1137
1139 for (pl = first_player; pl != NULL; pl = pl->next) 1138 for_all_players (pl)
1140 if (!strcmp (pl->ob->name, thing)) 1139 if (!strcmp (pl->ob->name, thing))
1141 { 1140 {
1142 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 1141 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
1143 new_draw_info (NDI_UNIQUE, 0, op, buf); 1142 new_draw_info (NDI_UNIQUE, 0, op, buf);
1144 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 1143 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
… …
1151 new_draw_info (NDI_UNIQUE, 0, op, buf); 1150 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1151 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1153 new_draw_info (NDI_UNIQUE, 0, op, buf); 1152 new_draw_info (NDI_UNIQUE, 0, op, buf);
1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1153 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1155 new_draw_info (NDI_UNIQUE, 0, op, buf); 1154 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 break; 1155 return 1;
1157 } 1156 }
1158 if (pl == NULL) 1157
1159 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1158 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1160 return 1; 1159 return 1;
1161} 1160}
1162 1161
1163int 1162int
1164command_abil (object *op, char *params) 1163command_abil (object *op, char *params)
… …
1187 { 1186 {
1188 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n"); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Illegal range of stat.\n");
1189 return 1; 1188 return 1;
1190 } 1189 }
1191 1190
1192 for (pl = first_player; pl != NULL; pl = pl->next) 1191 for_all_players (pl)
1193 { 1192 {
1194 if (!strcmp (pl->ob->name, thing)) 1193 if (!strcmp (pl->ob->name, thing))
1195 { 1194 {
1196 if (settings.real_wiz == FALSE) 1195 if (settings.real_wiz == FALSE)
1197 SET_FLAG (pl->ob, FLAG_WAS_WIZ); 1196 SET_FLAG (pl->ob, FLAG_WAS_WIZ);
… …
1219 new_draw_info (NDI_UNIQUE, 0, op, "No such player."); 1218 new_draw_info (NDI_UNIQUE, 0, op, "No such player.");
1220 return 1; 1219 return 1;
1221} 1220}
1222 1221
1223int 1222int
1224command_reset (object *op, char *params)
1225{
1226 maptile *m;
1227 object *dummy = NULL, *tmp = NULL;
1228
1229 if (params == NULL)
1230 {
1231 new_draw_info (NDI_UNIQUE, 0, op, "Reset what map [name]?");
1232 return 1;
1233 }
1234
1235 if (strcmp (params, ".") == 0)
1236 params = op->map->path;
1237
1238 m = has_been_loaded (params);
1239 if (m == NULL)
1240 {
1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1242 return 1;
1243 }
1244
1245 if (m->in_memory != MAP_SWAPPED)
1246 {
1247 if (m->in_memory != MAP_IN_MEMORY)
1248 {
1249 LOG (llevError, "Tried to swap out map which was not in memory.\n");
1250 return 0;
1251 }
1252
1253 /*
1254 * Only attempt to remove the player that is doing the reset, and not other
1255 * players or wiz's.
1256 */
1257 if (op->map == m)
1258 {
1259 dummy = object::create ();
1260 dummy->map = NULL;
1261 EXIT_X (dummy) = op->x;
1262 EXIT_Y (dummy) = op->y;
1263 EXIT_PATH (dummy) = op->map->path;
1264 op->remove ();
1265 op->map = NULL;
1266 tmp = op;
1267 }
1268 swap_map (m);
1269 }
1270
1271 if (m->in_memory == MAP_SWAPPED)
1272 {
1273 LOG (llevDebug, "Resetting map %s.\n", m->path);
1274
1275 /* setting this effectively causes an immediate reload */
1276 m->reset_time = 1;
1277 flush_old_maps ();
1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1280 if (tmp)
1281 {
1282 enter_exit (tmp, dummy);
1283 dummy->destroy ();
1284 }
1285
1286 return 1;
1287 }
1288 else
1289 {
1290 player *pl;
1291 int playercount = 0;
1292
1293 /* Need to re-insert player if swap failed for some reason */
1294 if (tmp)
1295 {
1296 insert_ob_in_map (op, m, NULL, 0);
1297 dummy->destroy ();
1298 }
1299
1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1301 for (pl = first_player; pl != NULL; pl = pl->next)
1302 {
1303 if (pl->ob->map == m && pl->ob != op)
1304 {
1305 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", &pl->ob->name);
1306 playercount++;
1307 }
1308 }
1309 if (!playercount)
1310 new_draw_info (NDI_UNIQUE, 0, op, "hmm, I don't see any other players on this map, something else is the problem.");
1311 return 1;
1312 }
1313}
1314
1315int
1316command_nowiz (object *op, char *params) 1223command_nowiz (object *op, char *params)
1317{ /* 'noadm' is alias */ 1224{ /* 'noadm' is alias */
1318 CLEAR_FLAG (op, FLAG_WIZ); 1225 CLEAR_FLAG (op, FLAG_WIZ);
1319 CLEAR_FLAG (op, FLAG_WIZPASS); 1226 CLEAR_FLAG (op, FLAG_WIZPASS);
1320 CLEAR_FLAG (op, FLAG_WIZCAST); 1227 CLEAR_FLAG (op, FLAG_WIZCAST);

Diff Legend

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