6c0ae092c6
The g? structs had a mix of variables that were written to
the savefile, and those that were not.
For better clarity and to distinguish those that end up in
the savefile, relocate some g? variables that get written
directly to the savefile into different structs.
This updates EDITLEVEL, although technically it probably
didn't need to, since savefile contents are not changing.
Details:
gb.bases -> svb.bases
gb.bbubbles -> svb.bbubbles
gb.branches -> svb.branches
gc.context -> svc.context
gd.disco -> svd.disco
gd.dndest -> svd.dndest
gd.doors -> svd.doors
gd.doors_alloc -> svd.doors_alloc
gd.dungeon_topology -> svd.dungeon_topology
gd.dungeons -> svd.dungeons
ge.exclusion_zones -> sve.exclusion_zones
gh.hackpid -> svh.hackpid
gi.inv_pos -> svi.inv_pos
gk.killer -> svk.killer
gl.lastseentyp -> svl.lastseentyp
gl.level -> svl.level
gl.level_info -> svl.level_info
gm.mapseenchn -> svm.mapseenchn
gm.moves -> svm.moves
gm.mvitals -> svm.mvitals
gn.n_dgns -> svn.n_dgns
gn.n_regions -> svn.n_regions
gn.nroom -> svn.nroom
go.oracle_cnt -> svo.oracle_cnt
gp.pl_character -> svp.pl_character
gp.pl_fruit -> svp.pl_fruit
gp.plname -> svp.plname
gp.program_state -> svp.program_state
gq.quest_status -> svq.quest_status
gr.rooms -> svr.rooms
gs.sp_levchn -> svs.sp_levchn
gs.spl_book -> svs.spl_book
gt.timer_id -> svt.timer_id
gt.tune -> svt.tune
gu.updest -> svu.updest
gx.xmax -> svx.xmax
gx.xmin -> svx.xmin
gy.ymax -> svy.ymax
gy.ymin -> svy.ymin
Related note:
There are some pointer variables that are heads of chains that were not
moved from 'g?' to 'sv?', because they are not actually written to the
savefile directly, but the objects/monst/trap/lightsource/timer in the
chains they point to are. That can be changed, if desired.
Examples: gi.invent, gm.migrating_objs, gb.billobjs, gm.migrating_mons,
gf.ftrap, gl.light_base, gt.timer_base
113 lines
5.0 KiB
C
113 lines
5.0 KiB
C
/* NetHack 3.7 mkroom.h $NHDT-Date: 1715203003 2024/05/08 21:16:43 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.31 $ */
|
|
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
|
|
/*-Copyright (c) Pasi Kallinen, 2016. */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#ifndef MKROOM_H
|
|
#define MKROOM_H
|
|
|
|
/* mkroom.h - types and structures for room and shop initialization */
|
|
|
|
struct mkroom {
|
|
coordxy lx, hx, ly, hy; /* usually coordxy, but hx may be -1 */
|
|
schar rtype; /* type of room (zoo, throne, etc...) */
|
|
schar orig_rtype; /* same as rtype, but not zeroed later */
|
|
schar rlit; /* is the room lit ? */
|
|
schar needfill; /* sp_lev: does the room need filling? */
|
|
boolean needjoining; /* sp_lev: should the room connect to others? */
|
|
schar doorct; /* door count */
|
|
int fdoor; /* index for the first door of the room */
|
|
schar nsubrooms; /* number of subrooms */
|
|
boolean irregular; /* true if room is non-rectangular */
|
|
schar roomnoidx;
|
|
struct mkroom *sbrooms[MAX_SUBROOMS]; /* Subrooms pointers */
|
|
struct monst *resident; /* priest/shopkeeper/guard for this room */
|
|
};
|
|
|
|
struct shclass {
|
|
const char *name; /* name of the shop type */
|
|
const char *annotation; /* simpler name for #overview; Null if same */
|
|
char symb; /* this identifies the shop type */
|
|
int prob; /* the shop type probability in % */
|
|
schar shdist; /* object placement type */
|
|
#define D_SCATTER 0 /* normal placement */
|
|
#define D_SHOP 1 /* shop-like placement */
|
|
#define D_TEMPLE 2 /* temple-like placement */
|
|
struct itp {
|
|
int iprob; /* probability of an item type */
|
|
int itype; /* item type: if >=0 a class, if < 0 a specific item */
|
|
} iprobs[9];
|
|
const char *const *shknms; /* list of shopkeeper names for this type */
|
|
};
|
|
|
|
/* the normal rooms on the current level are described in svr.rooms[0..n] for
|
|
* some n<MAXNROFROOMS
|
|
* the vault, if any, is described by svr.rooms[n+1]
|
|
* the next svr.rooms entry has hx -1 as a flag
|
|
* there is at most one non-vault special room on a level
|
|
*/
|
|
|
|
/* values for rtype in the room definition structure */
|
|
enum roomtype_types {
|
|
OROOM = 0, /* ordinary room */
|
|
THEMEROOM = 1, /* like OROOM, but never converted to special room */
|
|
COURT = 2, /* contains a throne */
|
|
SWAMP = 3, /* contains pools */
|
|
VAULT = 4, /* detached room usually reached via teleport trap */
|
|
BEEHIVE = 5, /* contains killer bees and royal jelly */
|
|
MORGUE = 6, /* contains corpses, undead and graves */
|
|
BARRACKS = 7, /* contains soldiers and their gear */
|
|
ZOO = 8, /* floor covered with treasure and monsters */
|
|
DELPHI = 9, /* contains Oracle and peripherals */
|
|
TEMPLE = 10, /* contains a shrine (altar attended by priest[ess]) */
|
|
LEPREHALL = 11, /* leprechaun hall (Tom Proudfoot) */
|
|
COCKNEST = 12, /* cockatrice nest (Tom Proudfoot) */
|
|
ANTHOLE = 13, /* ants (Tom Proudfoot) */
|
|
SHOPBASE = 14, /* everything above this is a shop */
|
|
ARMORSHOP = 15, /* specific shop defines for level compiler */
|
|
SCROLLSHOP = 16,
|
|
POTIONSHOP = 17,
|
|
WEAPONSHOP = 18,
|
|
FOODSHOP = 19,
|
|
RINGSHOP = 20,
|
|
WANDSHOP = 21,
|
|
TOOLSHOP = 22,
|
|
BOOKSHOP = 23,
|
|
FODDERSHOP = 24, /* health food store */
|
|
CANDLESHOP = 25
|
|
};
|
|
|
|
#define MAXRTYPE (CANDLESHOP) /* maximum valid room type */
|
|
#define UNIQUESHOP (CANDLESHOP) /* shops here & above not randomly gen'd. */
|
|
|
|
/* Special type for search_special() */
|
|
#define ANY_TYPE (-1)
|
|
#define ANY_SHOP (-2)
|
|
|
|
#define NO_ROOM 0 /* indicates lack of room-occupancy */
|
|
#define SHARED 1 /* indicates normal shared boundary */
|
|
#define SHARED_PLUS 2 /* indicates shared boundary - extra adjacent-square
|
|
* searching required */
|
|
#define ROOMOFFSET 3 /* (levl[x][y].roomno - ROOMOFFSET) gives svr.rooms[] index,
|
|
* for inside-squares and non-shared boundaries */
|
|
|
|
/* Values for needfill */
|
|
#define FILL_NONE 0 /* do not fill this room with anything */
|
|
#define FILL_NORMAL 1 /* fill the room normally (OROOM or THEMEROOM gets
|
|
fill_ordinary_room; any other room type gets stocked
|
|
with its usual monsters/objects/terrain) */
|
|
#define FILL_LVFLAGS 2 /* special rooms only; set the room's rtype and level
|
|
flags as appropriate, but do not put anything in it */
|
|
|
|
#define IS_ROOM_PTR(x) ((x) >= svr.rooms && (x) < svr.rooms + MAXNROFROOMS)
|
|
#define IS_ROOM_INDEX(x) ((x) >= 0 && (x) < MAXNROFROOMS)
|
|
#define IS_SUBROOM_PTR(x) \
|
|
((x) >= gs.subrooms && (x) < gs.subrooms + MAXNROFROOMS)
|
|
#define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) <= (MAXNROFROOMS * 2))
|
|
#define ROOM_INDEX(x) ((x) - svr.rooms)
|
|
#define SUBROOM_INDEX(x) ((x) - gs.subrooms)
|
|
#define IS_LAST_ROOM_PTR(x) (ROOM_INDEX(x) == svn.nroom)
|
|
#define IS_LAST_SUBROOM_PTR(x) (!gn.nsubroom || SUBROOM_INDEX(x) == gn.nsubroom)
|
|
|
|
#endif /* MKROOM_H */
|