ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_misc.C
(Generate patch)

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.24 by root, Mon Dec 18 02:35:01 2006 UTC vs.
Revision 1.30 by root, Mon Dec 25 14:54:44 2006 UTC

… …
53 else 53 else
54 strcpy (map_path, m->path + strlen (m->path) - 18); 54 strcpy (map_path, m->path + strlen (m->path) - 18);
55 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d", 55 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players, players_on_map (m, FALSE), 56 map_path, m->players, players_on_map (m, FALSE),
57 m->in_memory, m->timeout, m->difficulty, 57 m->in_memory, m->timeout, m->difficulty,
58 (MAP_WHEN_RESET (m) % 86400) / 3600, (MAP_WHEN_RESET (m) % 3600) / 60, MAP_WHEN_RESET (m) % 60); 58 (m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
59 new_draw_info (NDI_UNIQUE, 0, op, buf); 59 new_draw_info (NDI_UNIQUE, 0, op, buf);
60 } 60 }
61} 61}
62 62
63/* This command dumps the body information for object *op. 63/* This command dumps the body information for object *op.
… …
155 155
156 if (QUERY_FLAG (op, FLAG_WIZ)) 156 if (QUERY_FLAG (op, FLAG_WIZ))
157 { 157 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 158 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
160 m->players, m->difficulty, MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m), MAP_TIMEOUT (m)); 160 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 161
162 } 162 }
163 if (m->msg) 163 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 165}
… …
192 */ 192 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 193 for (reg = first_region; reg != NULL; reg = reg->next)
194 { 194 {
195 reg->counter = 0; 195 reg->counter = 0;
196 } 196 }
197 for (pl = first_player; pl != NULL; pl = pl->next) 197 for_all_players (pl)
198 if (pl->ob->map != NULL) 198 if (pl->ob->map != NULL)
199 get_region_by_map (pl->ob->map)->counter++; 199 get_region_by_map (pl->ob->map)->counter++;
200 200
201 /* we only want to print out by places with a 'longname' field... */ 201 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 202 for (reg = first_region; reg != NULL; reg = reg->next)
… …
226} chars_names; 226} chars_names;
227 227
228int 228int
229command_afk (object *op, char *params) 229command_afk (object *op, char *params)
230{ 230{
231 if (QUERY_FLAG (op, FLAG_AFK)) 231 if ((op->contr->ns->afk = !op->contr->ns->afk))
232 {
233 CLEAR_FLAG (op, FLAG_AFK);
234 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK"); 232 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
235 }
236 else 233 else
237 {
238 SET_FLAG (op, FLAG_AFK);
239 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
240 }
241 235
242 return 1; 236 return 1;
243} 237}
244 238
245int 239int
… …
610 604
611int 605int
612command_fix_me (object *op, char *params) 606command_fix_me (object *op, char *params)
613{ 607{
614 sum_weight (op); 608 sum_weight (op);
615 fix_player (op); 609 op->update_stats ();
616 return 1; 610 return 1;
617} 611}
618 612
619int 613int
620command_players (object *op, char *paramss) 614command_players (object *op, char *paramss)
… …
1147} 1141}
1148 1142
1149int 1143int
1150command_real_quit (object *op, char *params) 1144command_real_quit (object *op, char *params)
1151{ 1145{
1152 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):"); 1146 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1153 1147
1154 op->contr->state = ST_CONFIRM_QUIT; 1148 op->contr->ns->state = ST_CONFIRM_QUIT;
1155 return 1; 1149 return 1;
1156} 1150}
1157 1151
1158/* 1152/*
1159 * don't allow people to exit explore mode. It otherwise becomes 1153 * don't allow people to exit explore mode. It otherwise becomes
… …
1183} 1177}
1184 1178
1185int 1179int
1186command_sound (object *op, char *params) 1180command_sound (object *op, char *params)
1187{ 1181{
1188 if (op->contr->socket->sound) 1182 if (op->contr->ns->sound)
1189 { 1183 {
1190 op->contr->socket->sound = 0; 1184 op->contr->ns->sound = 0;
1191 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1185 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1192 } 1186 }
1193 else 1187 else
1194 { 1188 {
1195 op->contr->socket->sound = 1; 1189 op->contr->ns->sound = 1;
1196 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1197 } 1191 }
1198 1192
1199 return 1; 1193 return 1;
1200} 1194}
1201
1202/* Perhaps these should be in player.c, but that file is
1203 * already a bit big.
1204 */
1205
1206void
1207receive_player_name (object *op, char k)
1208{
1209
1210 if (!check_name (op->contr, op->contr->write_buf + 1))
1211 {
1212 get_name (op);
1213 return;
1214 }
1215 op->name = op->contr->write_buf + 1;
1216 op->name_pl = op->contr->write_buf + 1;
1217 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1218 op->contr->name_changed = 1;
1219 get_password (op);
1220}
1221
1222void
1223receive_player_password (object *op, char k)
1224{
1225
1226 unsigned int pwd_len = strlen (op->contr->write_buf);
1227
1228 if (pwd_len <= 1 || pwd_len > 17)
1229 {
1230 get_name (op);
1231 return;
1232 }
1233 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1234
1235 if (checkbanned (op->name, op->contr->socket->host))
1236 {
1237 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket->host);
1238 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1239 get_name (op);
1240 return;
1241 }
1242
1243 if (op->contr->state == ST_CONFIRM_PASSWORD)
1244 {
1245 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1246 {
1247 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1248 get_name (op);
1249 return;
1250 }
1251 clear_win_info (op);
1252 display_motd (op);
1253 new_draw_info (NDI_UNIQUE, 0, op, " ");
1254 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1255 new_draw_info (NDI_UNIQUE, 0, op, " ");
1256 Roll_Again (op);
1257 op->contr->state = ST_ROLL_STAT;
1258 return;
1259 }
1260 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1261 op->contr->state = ST_ROLL_STAT;
1262 check_login (op);
1263 return;
1264}
1265
1266 1195
1267int 1196int
1268explore_mode (void) 1197explore_mode (void)
1269{ 1198{
1270 player *pl; 1199 player *pl;
… …
1275 if (pl->explore) 1204 if (pl->explore)
1276 return 1; 1205 return 1;
1277 } 1206 }
1278 return 0; 1207 return 0;
1279} 1208}
1280
1281 1209
1282int 1210int
1283command_title (object *op, char *params) 1211command_title (object *op, char *params)
1284{ 1212{
1285 char buf[MAX_BUF]; 1213 char buf[MAX_BUF];
… …
1326} 1254}
1327 1255
1328int 1256int
1329command_save (object *op, char *params) 1257command_save (object *op, char *params)
1330{ 1258{
1331// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1332// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1333// } else
1334 if (!op->stats.exp) 1259 if (!op->stats.exp)
1335 {
1336 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1260 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1261 else
1337 } 1262 {
1338 else 1263 op->contr->save ();
1339 {
1340 if (save_player (op, 1))
1341 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1264 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1342 else
1343 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1344 } 1265 }
1345 return 1;
1346}
1347 1266
1267 return 1;
1268}
1348 1269
1349int 1270int
1350command_peaceful (object *op, char *params) 1271command_peaceful (object *op, char *params)
1351{ 1272{
1352 new_draw_info (NDI_UNIQUE, 0, op, 1273 new_draw_info (NDI_UNIQUE, 0, op,
… …
1361 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1282 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1362*/ 1283*/
1363 return 1; 1284 return 1;
1364} 1285}
1365 1286
1366
1367
1368int 1287int
1369command_wimpy (object *op, char *params) 1288command_wimpy (object *op, char *params)
1370{ 1289{
1371 int i; 1290 int i;
1372 char buf[MAX_BUF]; 1291 char buf[MAX_BUF];
… …
1381 new_draw_info (NDI_UNIQUE, 0, op, buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1382 op->run_away = i; 1301 op->run_away = i;
1383 return 1; 1302 return 1;
1384} 1303}
1385 1304
1386
1387int 1305int
1388command_brace (object *op, char *params) 1306command_brace (object *op, char *params)
1389{ 1307{
1390 if (!params) 1308 if (!params)
1391 op->contr->braced = !op->contr->braced; 1309 op->contr->braced = !op->contr->braced;
… …
1395 if (op->contr->braced) 1313 if (op->contr->braced)
1396 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1314 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1397 else 1315 else
1398 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1399 1317
1400 fix_player (op); 1318 op->update_stats ();
1401 return 0; 1319 return 0;
1402} 1320}
1403 1321
1404int 1322int
1405command_style_map_info (object *op, char *params) 1323command_style_map_info (object *op, char *params)
… …
1410 object *tmp; 1328 object *tmp;
1411 1329
1412 for (mp = styles; mp != NULL; mp = mp->next) 1330 for (mp = styles; mp != NULL; mp = mp->next)
1413 { 1331 {
1414 maps_used++; 1332 maps_used++;
1415 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile); 1333 mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
1416 for (x = 0; x < MAP_WIDTH (mp); x++) 1334 for (x = 0; x < mp->width; x++)
1417 { 1335 {
1418 for (y = 0; y < MAP_HEIGHT (mp); y++) 1336 for (y = 0; y < mp->height; y++)
1419 { 1337 {
1420 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 1338 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
1421 objects_used++; 1339 objects_used++;
1422 } 1340 }
1423 } 1341 }
1424 } 1342 }
1425 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1343 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);

Diff Legend

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