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
39 lines
1.2 KiB
C
39 lines
1.2 KiB
C
/* NetHack 3.7 spell.h $NHDT-Date: 1646838388 2022/03/09 15:06:28 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.14 $ */
|
|
/* Copyright 1986, M. Stephenson */
|
|
/* NetHack may be freely redistributed. See license for details. */
|
|
|
|
#ifndef SPELL_H
|
|
#define SPELL_H
|
|
|
|
#define NO_SPELL 0
|
|
#define UNKNOWN_SPELL (-1)
|
|
|
|
/* spellbook re-use control; used when reading and when polymorphing */
|
|
#define MAX_SPELL_STUDY 3
|
|
|
|
struct spell {
|
|
short sp_id; /* spell id (== object.otyp) */
|
|
xint16 sp_lev; /* power level */
|
|
int sp_know; /* knowledge of spell */
|
|
};
|
|
|
|
enum spellknowledge {
|
|
spe_Forgotten = -1, /* known but no longer castable */
|
|
spe_Unknown = 0, /* not yet known */
|
|
spe_Fresh = 1, /* castable if various casting criteria are met */
|
|
spe_GoingStale = 2 /* still castable but nearly forgotten */
|
|
};
|
|
|
|
/* levels of memory destruction with a scroll of amnesia */
|
|
#define ALL_MAP 0x1
|
|
#define ALL_SPELLS 0x2
|
|
|
|
#define decrnknow(spell) svs.spl_book[spell].sp_know--
|
|
#define spellid(spell) svs.spl_book[spell].sp_id
|
|
#define spellknow(spell) svs.spl_book[spell].sp_know
|
|
|
|
/* how much Pw a spell of level lvl costs to cast? */
|
|
#define SPELL_LEV_PW(lvl) ((lvl) * 5)
|
|
|
|
#endif /* SPELL_H */
|