mirror of
https://github.com/tbamud/tbamud.git
synced 2026-01-26 02:46:09 +01:00
Do_flee fix. 128 bit updates. --Rumble
This commit is contained in:
parent
d7332e9640
commit
511a0a3da3
6 changed files with 47 additions and 29 deletions
16
src/db.c
16
src/db.c
|
|
@ -1192,7 +1192,10 @@ void parse_room(FILE *fl, int virtual_nr)
|
|||
world[room_nr].room_flags[2] = 0;
|
||||
world[room_nr].room_flags[3] = 0;
|
||||
|
||||
sprintf(flags, "room #%d", virtual_nr); /* sprintf: OK (until 399-bit integers) */
|
||||
/* In the old-style files, the 3rd item was the sector-type */
|
||||
world[room_nr].sector_type = atoi(flags2);
|
||||
|
||||
sprintf(flags, "room #%d", virtual_nr); /* sprintf: OK (until 399-bit integers) */
|
||||
|
||||
/* No need to scan the other three sections; they're 0 anyway. */
|
||||
check_bitvector_names(world[room_nr].room_flags[0], room_bits_count, flags, "room");
|
||||
|
|
@ -1214,13 +1217,16 @@ void parse_room(FILE *fl, int virtual_nr)
|
|||
sprintf(flags, "object #%d", virtual_nr); /* sprintf: OK (until 399-bit integers) */
|
||||
for(taeller=0; taeller < AF_ARRAY_MAX; taeller++)
|
||||
check_bitvector_names(world[room_nr].room_flags[taeller], room_bits_count, flags, "room");
|
||||
} else {
|
||||
log("SYSERR: Format error in roomflags/sector type of room #%d", virtual_nr);
|
||||
|
||||
/* Added Sanity check */
|
||||
if (t[2] > NUM_ROOM_SECTORS) t[2] = SECT_INSIDE;
|
||||
|
||||
world[room_nr].sector_type = t[2];
|
||||
} else {
|
||||
log("SYSERR: Format error in roomflags/sector type of room #%d", virtual_nr);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
world[room_nr].sector_type = t[2];
|
||||
|
||||
world[room_nr].func = NULL;
|
||||
world[room_nr].contents = NULL;
|
||||
world[room_nr].people = NULL;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue