Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-09-22 05:50:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor bug fixes and ZONE_WORLDMAP flag

Browse source
This commit is contained in:
JamDog 2010-12-16 00:32:58 +00:00
parent d38117ead2
commit ba83b532b1
6 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -35,6 +35,10 @@ export (QQ's a zone into a tarball)
Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
(lots of major bugfixes too) (lots of major bugfixes too)
@ @
[Dec 10 2010] - Jamdog
Minor bug fixes, added MAIL flag names and fixed compile warnings
Bug Fix: Alignment in medit now saves when it's the only thing edited (thanks cosine_omerta)
Added ZONE_WORLDMAP flag to set a whole zone to worldmap style maps
[Dec 08 2010] - Jamdog [Dec 08 2010] - Jamdog
Added olist <name> Added olist <name>
page_string now uses player's screen width and correctly parses ANSI color codes page_string now uses player's screen width and correctly parses ANSI color codes

12
src/asciimap.c
View file

@ -589,6 +589,16 @@ MapArea(target_room, ch, centre, centre, min, max, ns_size/2, ew_size/2, worldma
} }
bool show_worldmap(struct char_data *ch) {
room_rnum rm = IN_ROOM(ch);
zone_rnum zn = GET_ROOM_ZONE(rm);
if (ROOM_FLAGGED(rm, ROOM_WORLDMAP)) return TRUE;
if (ZONE_FLAGGED(zn, ZONE_WORLDMAP)) return TRUE;
return FALSE;
}
ACMD(do_map) { ACMD(do_map) {
if (!can_see_map(ch)) { if (!can_see_map(ch)) {
send_to_char(ch, "Sorry, the map is disabled!\r\n"); send_to_char(ch, "Sorry, the map is disabled!\r\n");
@ -601,7 +611,7 @@ ACMD(do_map) {
send_to_char(ch, "You can't see the map while blind!\r\n"); send_to_char(ch, "You can't see the map while blind!\r\n");
return; return;
} }
perform_map(ch, argument, ROOM_FLAGGED(IN_ROOM(ch), ROOM_WORLDMAP) ? 1 : 0 ); perform_map(ch, argument, show_worldmap(ch));
} }

2
src/constants.c
View file

@ -159,6 +159,7 @@ const char *room_bits[] = {
"OLC", "OLC",
"*", /* The BFS Mark. */ "*", /* The BFS Mark. */
"WORLDMAP", "WORLDMAP",
"MAIL",
"\n" "\n"
}; };
@ -285,6 +286,7 @@ const char *action_bits[] = {
"NO_BASH", "NO_BASH",
"NO_BLIND", "NO_BLIND",
"NO_KILL", "NO_KILL",
"MAILMAN",
"DEAD", /* You should never see this. */ "DEAD", /* You should never see this. */
"\n" "\n"
}; };

1
src/medit.c
View file

@ -1058,6 +1058,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
case MEDIT_ALIGNMENT: case MEDIT_ALIGNMENT:
GET_ALIGNMENT(OLC_MOB(d)) = LIMIT(i, -1000, 1000); GET_ALIGNMENT(OLC_MOB(d)) = LIMIT(i, -1000, 1000);
OLC_VAL(d) = TRUE;
medit_disp_stats_menu(d); medit_disp_stats_menu(d);
return; return;

4
src/oasis_list.c
View file

@ -384,8 +384,8 @@ ACMD(do_oasis_list)
send_to_char(ch, "Usage: %smlist <zone>%s - List mobiles in a zone\r\n", QYEL, QNRM); send_to_char(ch, "Usage: %smlist <zone>%s - List mobiles in a zone\r\n", QYEL, QNRM);
send_to_char(ch, " %smlist <vnum> <vnum>%s - List a range of mobiles by vnum\r\n", QYEL, QNRM); send_to_char(ch, " %smlist <vnum> <vnum>%s - List a range of mobiles by vnum\r\n", QYEL, QNRM);
send_to_char(ch, " %smlist level <num>%s - List all mobiles of a specified level\r\n", QYEL, QNRM); send_to_char(ch, " %smlist level <num>%s - List all mobiles of a specified level\r\n", QYEL, QNRM);
send_to_char(ch, " %smlist flags <num>%s - List all mobiles with flag set\r\n", QYEL, QNRM, MAX_OBJ_LIST); send_to_char(ch, " %smlist flags <num>%s - List all mobiles with flag set\r\n", QYEL, QNRM);
send_to_char(ch, "Just type %smlist flags%s to view available options.\r\n", QYEL, QNRM, QYEL, QNRM); send_to_char(ch, "Just type %smlist flags%s to view available options.\r\n", QYEL, QNRM);
return; return;
} }
else if (is_abbrev(arg, "level") || is_abbrev(arg, "flags")) { else if (is_abbrev(arg, "level") || is_abbrev(arg, "flags")) {

3
src/structs.h
View file

@ -103,8 +103,9 @@
#define ZONE_GRID 3 /**< Zone is 'on the grid', connected, show on 'areas' */ #define ZONE_GRID 3 /**< Zone is 'on the grid', connected, show on 'areas' */
#define ZONE_NOBUILD 4 /**< Building is not allowed in the zone */ #define ZONE_NOBUILD 4 /**< Building is not allowed in the zone */
#define ZONE_NOASTRAL 5 /**< No teleportation magic will work to or from this zone */ #define ZONE_NOASTRAL 5 /**< No teleportation magic will work to or from this zone */
#define ZONE_WORLDMAP 6 /**< Whole zone uses the WORLDMAP by default */
/** The total number of Zone Flags */ /** The total number of Zone Flags */
#define NUM_ZONE_FLAGS 6 #define NUM_ZONE_FLAGS 7
/* Exit info: used in room_data.dir_option.exit_info */ /* Exit info: used in room_data.dir_option.exit_info */
#define EX_ISDOOR (1 << 0) /**< Exit is a door */ #define EX_ISDOOR (1 << 0) /**< Exit is a door */