From a343ccf6b05df1d889cb4302a3e9e21c4816c048 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 10 Mar 2016 18:41:54 +0100 Subject: Remove player gender, age, height, etc. --- src/variable.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index f0d18111..98d2c1c0 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -469,7 +469,6 @@ player_type *p_ptr = nullptr; * Pointer to the player tables * (sex, race, race mod, class, magic) */ -player_sex *sp_ptr; player_race *rp_ptr; player_race_mod *rmp_ptr; player_class *cp_ptr; -- cgit v1.2.3 From 899041ce6b7cbc33e8cb3124aaa54b518c4a4b72 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 29 Mar 2016 20:32:55 +0200 Subject: Convert dungeon_info_type to use new flag_set --- src/variable.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 98d2c1c0..6fa38470 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -10,6 +10,7 @@ #include "variable.h" #include "cli_comm_fwd.hpp" +#include "dungeon_flag_set.hpp" #include "player_type.hpp" #include "randart_gen_type.hpp" #include "util.hpp" @@ -909,8 +910,7 @@ bool_ generate_special_feeling = FALSE; /* * Dungeon flags */ -u32b dungeon_flags1; -u32b dungeon_flags2; +DECLARE_FLAG_ZERO_IMPL(dungeon_flag_set, dungeon_flags); /* * The last character displayed -- cgit v1.2.3 From 7137a17f77fd3b6c3bbcefa2d621b3a11f161679 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Mon, 20 Jun 2016 22:49:05 +0200 Subject: Remove monster memory Instead of having monster memory, the player automatically knows everything about all monsters from the start. --- src/variable.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 6fa38470..524766ea 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -175,7 +175,6 @@ bool_ cheat_peek; /* Peek into object creation */ bool_ cheat_hear; /* Peek into monster creation */ bool_ cheat_room; /* Peek into dungeon creation */ bool_ cheat_xtra; /* Peek into something else */ -bool_ cheat_know; /* Know complete monster info */ bool_ cheat_live; /* Allow player to avoid death */ -- cgit v1.2.3 From 2fa1a5e82a4e13f16ea6001c11d2452bac036d20 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:13 +0200 Subject: Unify skill_* fields into skill_modifier{,s} --- src/variable.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 524766ea..4ac48b50 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -13,6 +13,7 @@ #include "dungeon_flag_set.hpp" #include "player_type.hpp" #include "randart_gen_type.hpp" +#include "skill_modifiers.hpp" #include "util.hpp" @@ -938,10 +939,7 @@ effect_type effects[MAX_EFFECTS]; /* * General skills set */ -char gen_skill_basem[MAX_SKILLS]; -u32b gen_skill_base[MAX_SKILLS]; -char gen_skill_modm[MAX_SKILLS]; -s16b gen_skill_mod[MAX_SKILLS]; +skill_modifiers *gen_skill; /* * Table of "cli" macros. -- cgit v1.2.3 From 8ef7443e887958060d7a77b3750f495b592eb7b3 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Remove unused player_type::special field --- src/variable.cc | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 4ac48b50..c40ac8ba 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -881,9 +881,6 @@ s16b doppleganger; /* To allow wilderness encounters */ bool_ generate_encounter; -/* Special levels */ -bool_ special_lvls; - /* * Such an ugly hack ... */ -- cgit v1.2.3 From 6c62afae8ef0bb96866afd221d0fb7cbc2c7a9af Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Remove unused version_* variables --- src/variable.cc | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index c40ac8ba..25e01c12 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -24,13 +24,6 @@ char *macro_modifier_name[MAX_MACRO_MOD]; char *macro_trigger_name[MAX_MACRO_TRIG]; char *macro_trigger_keycode[2][MAX_MACRO_TRIG]; -/* - * Executable version - */ -byte version_major; -byte version_minor; -byte version_patch; - /* * Savefile version */ -- cgit v1.2.3 From e1273e8666e5c03c36b55a4fec80f6f76270ee10 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Move sf_* variables from global variable.cc to loadsave.cc --- src/variable.cc | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 25e01c12..a0e075b3 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -24,20 +24,6 @@ char *macro_modifier_name[MAX_MACRO_MOD]; char *macro_trigger_name[MAX_MACRO_TRIG]; char *macro_trigger_keycode[2][MAX_MACRO_TRIG]; -/* - * Savefile version - */ -byte sf_major; /* Savefile's "version_major" */ -byte sf_minor; /* Savefile's "version_minor" */ -byte sf_patch; /* Savefile's "version_patch" */ - -/* - * Savefile information - */ -u32b sf_when; /* Time when savefile created */ -u16b sf_lives; /* Number of past "lives" with this file */ -u16b sf_saves; /* Number of "saves" during this life */ - /* * Run-time aruments */ -- cgit v1.2.3 From 902611ac55dbd2c967f244b27c54d37540964c47 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Move non-boolean options to options.cc too --- src/variable.cc | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index a0e075b3..fd8ccd40 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -142,33 +142,6 @@ void (*text_out_hook)(byte a, cptr str) = text_out_to_screen; int text_out_indent = 0; -/* - * Software options (set via the '=' command). See "tables.c" - */ - - - - -/* Cheating options */ - -bool_ cheat_peek; /* Peek into object creation */ -bool_ cheat_hear; /* Peek into monster creation */ -bool_ cheat_room; /* Peek into dungeon creation */ -bool_ cheat_xtra; /* Peek into something else */ -bool_ cheat_live; /* Allow player to avoid death */ - - -/* Special options */ - -byte hitpoint_warn; /* Hitpoint warning (0 to 9) */ - -byte delay_factor; /* Delay factor (0 to 9) */ - -bool_ autosave_l; /* Autosave before entering new levels */ -bool_ autosave_t; /* Timed autosave */ -s16b autosave_freq; /* Autosave frequency */ - - /* * Dungeon variables */ -- cgit v1.2.3 From f035201f330a3b1f50a2041ea9ad3f854f7d4e00 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Move all options to a struct instead of using globals --- src/variable.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index fd8ccd40..9bb78ca9 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -142,6 +142,11 @@ void (*text_out_hook)(byte a, cptr str) = text_out_to_screen; int text_out_indent = 0; +/* + * Options + */ +struct options *options = nullptr; + /* * Dungeon variables */ -- cgit v1.2.3 From 6d11bb4a2d5bc8ab7c1491639f1083532b1b8fd1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Replace RNG with PCG random number generator --- src/variable.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 9bb78ca9..00fd340d 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -42,7 +42,11 @@ bool_ character_loaded; /* The character was loaded from a savefile */ bool_ character_icky; /* The game is in an icky full screen mode */ bool_ character_xtra; /* The game is in an icky startup mode */ -u32b seed_flavor; /* Hack -- consistent object colors */ +seed_t &seed_flavor() +{ + static seed_t *instance = new seed_t(seed_t::system()); + return *instance; +} s16b command_cmd; /* Current "Angband Command" */ -- cgit v1.2.3 From 1e045ed09258e6c7fff63ef829759c6c8f06f441 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Separate skill values from skill descriptions --- src/variable.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 00fd340d..827ee1af 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -510,6 +510,11 @@ ability_type *ab_info; */ skill_type *s_info; +/** + * Skill descriptors. + */ +skill_descriptor *s_descriptors; + /* * Player race arrays */ -- cgit v1.2.3 From 7d8641b99e82d62ddb8753d7b50d6b9fcab91c41 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:14 +0200 Subject: Don't try to handle added skills on load --- src/variable.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 827ee1af..51ec1333 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -683,7 +683,6 @@ wilderness_map **wild_map; /* * Maximum number of skills in s_info.txt */ -u16b old_max_s_idx = 0; u16b max_s_idx; /* -- cgit v1.2.3 From dc261d2c9732554d9f510e11711ac84d028e5ac1 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Use grid<> for wilderness grid --- src/variable.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 51ec1333..e9557c6a 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -668,16 +668,10 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum size of the wilderness map - */ -u16b max_wild_x; -u16b max_wild_y; - /* * Wilderness map */ -wilderness_map **wild_map; +grid *wilderness_ptr; /* -- cgit v1.2.3 From 05cdb1a997cba7748f0089cffa0a5885ca0b2c43 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Move wilderness structure into Game --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index e9557c6a..91cb2a08 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -668,12 +668,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Wilderness map - */ -grid *wilderness_ptr; - - /* * Maximum number of skills in s_info.txt */ -- cgit v1.2.3 From 8bf363159104aa0c87d8021e731022c41df8037f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Remove init_wilderness() --- src/variable.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 91cb2a08..553c1dd2 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -832,7 +832,7 @@ s16b *max_dlv; s16b doppleganger; /* To allow wilderness encounters */ -bool_ generate_encounter; +bool_ generate_encounter = FALSE; /* * Such an ugly hack ... -- cgit v1.2.3 From b85a1f777946af3ba763942ee78a7a4bce2afdb0 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Move player_hp[] into Game --- src/variable.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 553c1dd2..941bc9a0 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -437,14 +437,6 @@ player_class *cp_ptr; player_spec *spp_ptr; -/* - * Calculated base hp values for player at each level, - * store them so that drain life + restore life does not - * affect hit points. Also prevents shameless use of backup - * savefiles for hitpoint acquirement. - */ -s16b player_hp[PY_MAX_LEVEL]; - /* * The vault generation arrays */ -- cgit v1.2.3 From 3d617a0320d126715173681cb10ce7f6b80daff9 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 17 Sep 2016 09:58:15 +0200 Subject: Move tvals[] to tables.cc --- src/variable.cc | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 941bc9a0..ccb8556d 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -948,56 +948,3 @@ const char *get_version_string() } return version_str; } - -/* - * A list of tvals and their textual names - */ -tval_desc tvals[] = -{ - { TV_SWORD, "Sword" }, - { TV_POLEARM, "Polearm" }, - { TV_HAFTED, "Hafted Weapon" }, - { TV_AXE, "Axe" }, - { TV_BOW, "Bow" }, - { TV_BOOMERANG, "Boomerang" }, - { TV_ARROW, "Arrows" }, - { TV_BOLT, "Bolts" }, - { TV_SHOT, "Shots" }, - { TV_SHIELD, "Shield" }, - { TV_CROWN, "Crown" }, - { TV_HELM, "Helm" }, - { TV_GLOVES, "Gloves" }, - { TV_BOOTS, "Boots" }, - { TV_CLOAK, "Cloak" }, - { TV_DRAG_ARMOR, "Dragon Scale Mail" }, - { TV_HARD_ARMOR, "Hard Armor" }, - { TV_SOFT_ARMOR, "Soft Armor" }, - { TV_RING, "Ring" }, - { TV_AMULET, "Amulet" }, - { TV_LITE, "Lite" }, - { TV_POTION, "Potion" }, - { TV_POTION2, "Potion" }, - { TV_SCROLL, "Scroll" }, - { TV_WAND, "Wand" }, - { TV_STAFF, "Staff" }, - { TV_ROD_MAIN, "Rod" }, - { TV_ROD, "Rod Tip" }, - { TV_BOOK, "Schools Spellbook", }, - { TV_SYMBIOTIC_BOOK, "Symbiotic Spellbook", }, - { TV_DRUID_BOOK, "Elemental Stone" }, - { TV_MUSIC_BOOK, "Music Book" }, - { TV_DAEMON_BOOK, "Daemon Book" }, - { TV_SPIKE, "Spikes" }, - { TV_DIGGING, "Digger" }, - { TV_CHEST, "Chest" }, - { TV_FOOD, "Food" }, - { TV_FLASK, "Flask" }, - { TV_MSTAFF, "Mage Staff" }, - { TV_PARCHMENT, "Parchment" }, - { TV_INSTRUMENT, "Musical Instrument" }, - { TV_RUNE1, "Rune 1" }, - { TV_RUNE2, "Rune 2" }, - { TV_JUNK, "Junk" }, - { TV_TRAPKIT, "Trapping Kit" }, - { 0, NULL } -}; -- cgit v1.2.3 From faf6923e1c35b8f69905548467874a76a4c740bd Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Remove max_plev --- src/variable.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index ccb8556d..4f967ca7 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -918,7 +918,6 @@ s32b VERSION_PATCH; /* * Some module info */ -s32b max_plev = 50; s32b DUNGEON_BASE = 4; s32b DUNGEON_DEATH = 28; s32b DUNGEON_ASTRAL = 8; -- cgit v1.2.3 From 44465e6fdbeab3b90b0bef9d33adac3514b48ffc Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Remove unused max_bact --- src/variable.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 4f967ca7..3813614e 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -889,11 +889,6 @@ skill_modifiers *gen_skill; cli_comm *cli_info; int cli_total = 0; -/* - * max_bact, only used so that lua scripts can add new bacts without worrying about the numbers - */ -int max_bact = 127; - /* * Automatizer enabled status */ -- cgit v1.2.3 From a82be561ad77d615f619ed16614c3c09fdc9ba2f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move random_spells into player_type # Conflicts: # src/loadsave.cc --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 3813614e..84fcdfba 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -789,12 +789,6 @@ s32b RANDART_WEAPON; s32b RANDART_ARMOR; s32b RANDART_JEWEL; -/* - * Random spells. - */ -random_spell random_spells[MAX_SPELLS]; -s16b spell_num; - /* * Runecrafter's selfmade spells. */ -- cgit v1.2.3 From 0e91eb9e205508daf5de1234e7ac3e59fa809982 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move rune_spells into player_type --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 84fcdfba..f3defc5d 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -789,12 +789,6 @@ s32b RANDART_WEAPON; s32b RANDART_ARMOR; s32b RANDART_JEWEL; -/* - * Runecrafter's selfmade spells. - */ -rune_spell rune_spells[MAX_RUNES]; -s16b rune_num; - /* * Fate. */ -- cgit v1.2.3 From d8de8c129fb9fc8d2110f39108949d7025456151 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Remove dead code --- src/variable.cc | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index f3defc5d..777c2b17 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -277,13 +277,6 @@ bool_ *macro__cmd; char *macro__buf; -/* - * The array of normal options - */ -u32b option_flag[8]; -u32b option_mask[8]; - - /* * The array of window options */ -- cgit v1.2.3 From 1173c144b06d5d2d3c9e6351af5e6f06cb843d4b Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move v_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 777c2b17..33f9694e 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -430,11 +430,6 @@ player_class *cp_ptr; player_spec *spp_ptr; -/* - * The vault generation arrays - */ -vault_type *v_info; - /* * The terrain feature arrays */ @@ -678,11 +673,6 @@ u16b max_re_idx; */ u16b max_k_idx; -/* - * Maximum number of vaults in v_info.txt - */ -u16b max_v_idx; - /* * Maximum number of terrain features in f_info.txt */ -- cgit v1.2.3 From fd6449ac75f553e32d2efa84c3cdfba88bb32d6e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move ra_gen and ra_info into GameEditData --- src/variable.cc | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 33f9694e..3d27e442 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -455,12 +455,6 @@ set_type *set_info; */ ego_item_type *e_info; -/* - * The randart arrays - */ -randart_part_type *ra_info; -randart_gen_type ra_gen[30]; - /* jk */ /* the trap-arrays */ trap_type *t_info; @@ -688,11 +682,6 @@ u16b max_a_idx; */ u16b max_e_idx; -/* - * Maximum number of randarts in ra_info.txt - */ -u16b max_ra_idx; - /* * Maximum number of dungeon types in d_info.txt */ -- cgit v1.2.3 From b329b2fd77e32112a08fc41e1be58b32648225cf Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move ow_info and ba_info into GameEditData --- src/variable.cc | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 3d27e442..1eb5aaab 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -516,16 +516,6 @@ int wildc2i[256]; */ store_info_type *st_info; -/* - * The building actions types arrays - */ -store_action_type *ba_info; - -/* - * The owner types arrays - */ -owner_type *ow_info; - /* * Default texts for feature information. */ @@ -705,16 +695,6 @@ u16b max_rmp_idx; u16b max_c_idx; u16b max_mc_idx; -/* - * Maximum number of actions types in ba_info.txt - */ -u16b max_ba_idx; - -/* - * Maximum number of owner types in ow_info.txt - */ -u16b max_ow_idx; - /* * Maximum number of objects in the level */ -- cgit v1.2.3 From 460513b54733dbc3b10274622d960b3c47f60e85 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Remove meta_class_info We replace it with a single number on the C:N: line which determines the display order of the classes. (That's all that meta_class_info effectively did.) --- src/variable.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 1eb5aaab..0f51c49e 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -503,7 +503,6 @@ player_race_mod *race_mod_info; * Player class arrays */ player_class *class_info; -meta_class_type *meta_class_info; /* * The wilderness features arrays @@ -693,7 +692,6 @@ u16b max_set_idx = 1; u16b max_rp_idx; u16b max_rmp_idx; u16b max_c_idx; -u16b max_mc_idx; /* * Maximum number of objects in the level -- cgit v1.2.3 From 80f38daed5c89df95dcf3aee3e9d3a4ecafe5d03 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Remove unused includes --- src/variable.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 0f51c49e..6356d2b9 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -10,9 +10,7 @@ #include "variable.h" #include "cli_comm_fwd.hpp" -#include "dungeon_flag_set.hpp" #include "player_type.hpp" -#include "randart_gen_type.hpp" #include "skill_modifiers.hpp" #include "util.hpp" -- cgit v1.2.3 From 3cdeb22086fc177165acb2d7b6530ccc230ec8e6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move class_info to GameEditData --- src/variable.cc | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 6356d2b9..30d07469 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -424,8 +424,8 @@ player_type *p_ptr = nullptr; */ player_race *rp_ptr; player_race_mod *rmp_ptr; -player_class *cp_ptr; -player_spec *spp_ptr; +player_class const *cp_ptr; +player_spec const *spp_ptr; /* @@ -497,11 +497,6 @@ player_race *race_info; */ player_race_mod *race_mod_info; -/* - * Player class arrays - */ -player_class *class_info; - /* * The wilderness features arrays */ @@ -689,7 +684,6 @@ u16b max_set_idx = 1; */ u16b max_rp_idx; u16b max_rmp_idx; -u16b max_c_idx; /* * Maximum number of objects in the level -- cgit v1.2.3 From d33961f89a0c80f2fae4020184e72467b5c192cf Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move race_info and race_mod_info to GameEditData --- src/variable.cc | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 30d07469..426d4b3a 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -422,8 +422,8 @@ player_type *p_ptr = nullptr; * Pointer to the player tables * (sex, race, race mod, class, magic) */ -player_race *rp_ptr; -player_race_mod *rmp_ptr; +player_race const *rp_ptr; +player_race_mod const *rmp_ptr; player_class const *cp_ptr; player_spec const *spp_ptr; @@ -487,16 +487,6 @@ skill_type *s_info; */ skill_descriptor *s_descriptors; -/* - * Player race arrays - */ -player_race *race_info; - -/* - * Player mod race arrays - */ -player_race_mod *race_mod_info; - /* * The wilderness features arrays */ @@ -679,12 +669,6 @@ u16b max_st_idx; */ u16b max_set_idx = 1; -/* - * Maximum number of players info in p_info.txt - */ -u16b max_rp_idx; -u16b max_rmp_idx; - /* * Maximum number of objects in the level */ -- cgit v1.2.3 From 42847682e6b753a819d23c3df77467f6d39c486b Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move bg into GameEditData --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 426d4b3a..272d9267 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -773,12 +773,6 @@ DECLARE_FLAG_ZERO_IMPL(dungeon_flag_set, dungeon_flags); */ birther previous_char; -/* - * Race histories - */ -hist_type *bg; -int max_bg_idx; - /* * The spell list of schools */ -- cgit v1.2.3 From 4b179786d73cde338e97503d036baea9015f655d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move gen_skill to GameEditData --- src/variable.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 272d9267..b1a8c674 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -786,11 +786,6 @@ int project_time = 0; s32b project_time_effect = 0; effect_type effects[MAX_EFFECTS]; -/* - * General skills set - */ -skill_modifiers *gen_skill; - /* * Table of "cli" macros. */ -- cgit v1.2.3 From 667acd0e312301ad613b6a71f843c51d2062aee6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move d_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index b1a8c674..621cdd4c 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -467,11 +467,6 @@ monster_race *r_info; */ monster_ego *re_info; -/* - * The dungeon types arrays - */ -dungeon_info_type *d_info; - /* * Player abilities arrays */ @@ -654,11 +649,6 @@ u16b max_a_idx; */ u16b max_e_idx; -/* - * Maximum number of dungeon types in d_info.txt - */ -u16b max_d_idx; - /* * Maximum number of stores types in st_info.txt */ -- cgit v1.2.3 From 1726fc7a8ab66c15385bdda8f0533cddeb867b58 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move set_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 621cdd4c..8356148b 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -443,11 +443,6 @@ object_kind *k_info; */ artifact_type *a_info; -/* - * The item set arrays - */ -set_type *set_info; - /* * The ego-item arrays */ @@ -654,11 +649,6 @@ u16b max_e_idx; */ u16b max_st_idx; -/* - * Item sets - */ -u16b max_set_idx = 1; - /* * Maximum number of objects in the level */ -- cgit v1.2.3 From aebc48dffa75698be4d2c1bb2b1a0927b10be1cc Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move st_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 8356148b..89e0bd5b 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -483,11 +483,6 @@ skill_descriptor *s_descriptors; wilderness_type_info *wf_info; int wildc2i[256]; -/* - * The store/building types arrays - */ -store_info_type *st_info; - /* * Default texts for feature information. */ @@ -644,11 +639,6 @@ u16b max_a_idx; */ u16b max_e_idx; -/* - * Maximum number of stores types in st_info.txt - */ -u16b max_st_idx; - /* * Maximum number of objects in the level */ -- cgit v1.2.3 From dd76070a7d8676a5f13dcc91fc7ed2eb2639d9df Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move ab_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 89e0bd5b..a13ee3aa 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -462,11 +462,6 @@ monster_race *r_info; */ monster_ego *re_info; -/* - * Player abilities arrays - */ -ability_type *ab_info; - /* * Player skills arrays */ @@ -604,11 +599,6 @@ s32b get_level_use_stick = -1; */ u16b max_s_idx; -/* - * Maximum number of abilities in ab_info.txt - */ -u16b max_ab_idx; - /* * Maximum number of monsters in r_info.txt */ -- cgit v1.2.3 From 765e1a3dc7abce3a849b8d1f124ada7a6984154a Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move s_{info,descriptors} to Game/GameEdtiData --- src/variable.cc | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index a13ee3aa..0e892bf3 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -462,16 +462,6 @@ monster_race *r_info; */ monster_ego *re_info; -/* - * Player skills arrays - */ -skill_type *s_info; - -/** - * Skill descriptors. - */ -skill_descriptor *s_descriptors; - /* * The wilderness features arrays */ @@ -594,11 +584,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum number of skills in s_info.txt - */ -u16b max_s_idx; - /* * Maximum number of monsters in r_info.txt */ -- cgit v1.2.3 From e1230547a936c7180b3a69012659fc511027f035 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move re_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 0e892bf3..35aeff7f 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -457,11 +457,6 @@ trap_type *t_info; */ monster_race *r_info; -/* - * The monster ego race arrays - */ -monster_ego *re_info; - /* * The wilderness features arrays */ @@ -589,11 +584,6 @@ s32b get_level_use_stick = -1; */ u16b max_r_idx; -/* - * Maximum number of ego monsters in re_info.txt - */ -u16b max_re_idx; - /* * Maximum number of items in k_info.txt */ -- cgit v1.2.3 From 5ddcbbf1cdce68e565376819efedd519892512ad Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move wf_info into GameEditData --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 35aeff7f..1f861563 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -460,7 +460,6 @@ monster_race *r_info; /* * The wilderness features arrays */ -wilderness_type_info *wf_info; int wildc2i[256]; /* @@ -619,11 +618,6 @@ u16b max_m_idx; */ u16b max_t_idx; -/* - * Maximum number of wilderness features in wf_info.txt - */ -u16b max_wf_idx; - /* * Flags for initialization */ -- cgit v1.2.3 From 0c2f30b56c221a826ba64f0ec864c29d0f717644 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move r_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 1f861563..a58191d5 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -452,11 +452,6 @@ ego_item_type *e_info; /* the trap-arrays */ trap_type *t_info; -/* - * The monster race arrays - */ -monster_race *r_info; - /* * The wilderness features arrays */ @@ -578,11 +573,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum number of monsters in r_info.txt - */ -u16b max_r_idx; - /* * Maximum number of items in k_info.txt */ -- cgit v1.2.3 From b9fca0267b1d6a32d57e1fb4387f52c19d1c3fa6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move f_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index a58191d5..f8be6224 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -428,11 +428,6 @@ player_class const *cp_ptr; player_spec const *spp_ptr; -/* - * The terrain feature arrays - */ -feature_type *f_info; - /* * The object kind arrays */ @@ -578,11 +573,6 @@ s32b get_level_use_stick = -1; */ u16b max_k_idx; -/* - * Maximum number of terrain features in f_info.txt - */ -u16b max_f_idx; - /* * Maximum number of artifacts in a_info.txt */ -- cgit v1.2.3 From 1bbed63b66c0f69809e698576a51501150f06bba Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move k_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index f8be6224..4275f21f 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -428,11 +428,6 @@ player_class const *cp_ptr; player_spec const *spp_ptr; -/* - * The object kind arrays - */ -object_kind *k_info; - /* * The artifact arrays */ @@ -568,11 +563,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum number of items in k_info.txt - */ -u16b max_k_idx; - /* * Maximum number of artifacts in a_info.txt */ -- cgit v1.2.3 From 57bb453a15034c67d04496360b306a5f3bfd0bf2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move a_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 4275f21f..542ba16d 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -428,11 +428,6 @@ player_class const *cp_ptr; player_spec const *spp_ptr; -/* - * The artifact arrays - */ -artifact_type *a_info; - /* * The ego-item arrays */ @@ -563,11 +558,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum number of artifacts in a_info.txt - */ -u16b max_a_idx; - /* * Maximum number of ego-items in e_info.txt */ -- cgit v1.2.3 From 89e75b855662b1dcc86a6dc3789fa496aafbb0a2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move e_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 542ba16d..cfb1f7bf 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -428,11 +428,6 @@ player_class const *cp_ptr; player_spec const *spp_ptr; -/* - * The ego-item arrays - */ -ego_item_type *e_info; - /* jk */ /* the trap-arrays */ trap_type *t_info; @@ -558,11 +553,6 @@ bool_ (*get_obj_num_hook)(int k_idx); s32b get_level_max_stick = -1; s32b get_level_use_stick = -1; -/* - * Maximum number of ego-items in e_info.txt - */ -u16b max_e_idx; - /* * Maximum number of objects in the level */ -- cgit v1.2.3 From c25b265c056a4512b0fb0e1789927e6c4b7b32cf Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move t_info into GameEditData --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index cfb1f7bf..f1d007ff 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -427,11 +427,6 @@ player_race_mod const *rmp_ptr; player_class const *cp_ptr; player_spec const *spp_ptr; - -/* jk */ -/* the trap-arrays */ -trap_type *t_info; - /* * The wilderness features arrays */ @@ -563,11 +558,6 @@ u16b max_o_idx; */ u16b max_m_idx; -/* - * Maximum number of traps in tr_info.txt - */ -u16b max_t_idx; - /* * Flags for initialization */ -- cgit v1.2.3 From a40a0d1aeddb4742e486f601cbcc7e9ddcc06e2d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Move player_{name,base} to Game --- src/variable.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index f1d007ff..e0a31604 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -201,16 +201,6 @@ object_type *tracked_object; -/* - * Current player's character name - */ -char player_name[32]; - -/* - * Stripped version of "player_name" - */ -char player_base[32]; - /* * What killed the player */ -- cgit v1.2.3 From 0f37adeca0e2facfcb32f30e285048fac23c8845 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Move died_from to Game struct --- src/variable.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index e0a31604..32f3bbc7 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -201,11 +201,6 @@ object_type *tracked_object; -/* - * What killed the player - */ -char died_from[80]; - /* * Hack -- Textual "history" for the Player */ -- cgit v1.2.3 From 598c5887ae589059e4f4a9801ff1e4f7f8385f00 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Move previous_char to Game struct --- src/variable.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 32f3bbc7..8395a75e 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -622,11 +622,6 @@ bool_ generate_special_feeling = FALSE; */ DECLARE_FLAG_ZERO_IMPL(dungeon_flag_set, dungeon_flags); -/* - * The last character displayed - */ -birther previous_char; - /* * The spell list of schools */ -- cgit v1.2.3 From ca47ccdc66d252e0b5791112cac4042e86cefc89 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove character background --- src/variable.cc | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 8395a75e..3b81a51a 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -201,11 +201,6 @@ object_type *tracked_object; -/* - * Hack -- Textual "history" for the Player - */ -char history[4][60]; - /* * Buffer to hold the current savefile name */ -- cgit v1.2.3 From 2c8b8579faf729b9cf21b8b2d827f0e482570bd3 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Move random_artifacts to Game struct --- src/variable.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 3b81a51a..7aae4187 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -558,8 +558,6 @@ bool_ carried_monster_hit = FALSE; /* * Random artifacts. */ -random_artifact random_artifacts[MAX_RANDARTS]; -/* These three used to be constants but now are set by modules */ s32b RANDART_WEAPON; s32b RANDART_ARMOR; s32b RANDART_JEWEL; -- cgit v1.2.3 From c0d3818fa0a3859d5f6cd923488ac3244d3c00d6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Use ANGBAND_TERM_MAX instead of literal 8 (This won't cover nearly all cases, but it helps a little.) --- src/variable.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 7aae4187..1bcab738 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -258,8 +258,8 @@ char *macro__buf; /* * The array of window options */ -u32b window_flag[8]; -u32b window_mask[8]; +u32b window_flag[ANGBAND_TERM_MAX]; +u32b window_mask[ANGBAND_TERM_MAX]; /* -- cgit v1.2.3 From 1eb13ec5a357c43c5366c276dce87fba6f713fc6 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 13 Jun 2017 18:24:42 +0200 Subject: Move alloc_* tables to Game struct We also change the arrays to std::vector<> --- src/variable.cc | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 1bcab738..8a6a71c8 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -340,34 +340,6 @@ u16b max_real_towns; */ town_type *town_info; -/* - * The size of "alloc_kind_table" (at most max_k_idx * ALLOCATIONS_MAX) - */ -s16b alloc_kind_size; - -/* - * The entries in the "kind allocator table" - */ -alloc_entry *alloc_kind_table; - -/* - * The flag to tell if alloc_kind_table contains valid entries - * for normal (i.e. kind_is_legal) object allocation - */ -bool_ alloc_kind_table_valid = FALSE; - - -/* - * The size of "alloc_race_table" (at most max_r_idx) - */ -s16b alloc_race_size; - -/* - * The entries in the "race allocator table" - */ -alloc_entry *alloc_race_table; - - /* * Specify attr/char pairs for visual special effects * Be sure to use "index & 0x7F" to avoid illegal access -- cgit v1.2.3 From 94080e67843f84cb68e1538990736ab0ee82ab9f Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 7 Sep 2017 12:53:57 +0200 Subject: Move gl_timer to Game struct and change timer_type to class --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 8a6a71c8..7734c26b 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -636,12 +636,6 @@ s32b DUNGEON_ASTRAL = 8; s32b DUNGEON_ASTRAL_WILD_X = 45; s32b DUNGEON_ASTRAL_WILD_Y = 19; -/* - * Timers - */ -timer_type *gl_timers = NULL; - - /** * Get the version string. */ -- cgit v1.2.3 From 39e1689130e87732cf410aaea7458dfdc399d50e Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 7 Sep 2017 12:53:57 +0200 Subject: Move special_level[] to Game struct Refactor into a multi_array<> to make it more robust. --- src/variable.cc | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/variable.cc') diff --git a/src/variable.cc b/src/variable.cc index 7734c26b..ae40676f 100644 --- a/src/variable.cc +++ b/src/variable.cc @@ -576,12 +576,6 @@ s16b plots[MAX_PLOTS]; */ random_quest random_quests[MAX_RANDOM_QUEST]; -/* - * Special levels - */ -bool_ *special_lvl[MAX_DUNGEON_DEPTH]; -bool_ generate_special_feeling = FALSE; - /* * Dungeon flags */ -- cgit v1.2.3