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/files.cc | 2 +- src/module_type.hpp | 3 --- src/modules.cc | 2 -- src/tables.cc | 4 ---- src/variable.cc | 1 - src/variable.hpp | 1 - src/xtra1.cc | 2 +- src/xtra2.cc | 4 ++-- 8 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/files.cc b/src/files.cc index 91795af3..12c05345 100644 --- a/src/files.cc +++ b/src/files.cc @@ -1151,7 +1151,7 @@ static void display_player_middle(void) prt_lnum("Max Exp ", p_ptr->max_exp, 11, 28, TERM_L_GREEN); - if ((p_ptr->lev >= PY_MAX_LEVEL) || (p_ptr->lev >= max_plev)) + if (p_ptr->lev >= PY_MAX_LEVEL) { put_str("Exp to Adv.", 12, 28); c_put_str(TERM_L_GREEN, " *****", 12, 28 + 11); diff --git a/src/module_type.hpp b/src/module_type.hpp index 96938856..1b75d84c 100644 --- a/src/module_type.hpp +++ b/src/module_type.hpp @@ -42,9 +42,6 @@ struct module_type s32b jewelry_chance; } randarts; - /* Max player level. */ - int max_plev; - /* Skills */ struct { /* Skill points per level */ diff --git a/src/modules.cc b/src/modules.cc index 3480e805..4d60c960 100644 --- a/src/modules.cc +++ b/src/modules.cc @@ -195,8 +195,6 @@ static void activate_module(int module_idx) game_module_idx = module_idx; /* Do misc inits */ - max_plev = module_ptr->max_plev; - RANDART_WEAPON = module_ptr->randarts.weapon_chance; RANDART_ARMOR = module_ptr->randarts.armor_chance; RANDART_JEWEL = module_ptr->randarts.jewelry_chance; diff --git a/src/tables.cc b/src/tables.cc index 54be6b45..8853b938 100644 --- a/src/tables.cc +++ b/src/tables.cc @@ -4238,8 +4238,6 @@ module_type modules[MAX_MODULES] = }, /* Randarts: */ { 30, 20, 20 }, - /* Max player level: */ - 50, /* Skills: */ { 6, 4, }, /* Intro function */ @@ -4260,8 +4258,6 @@ module_type modules[MAX_MODULES] = }, /* Randarts: */ { 30, 30, 30 }, - /* Max player level: */ - 50, /* Skill overage: */ { 6, 5, }, /* Intro function */ 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; diff --git a/src/variable.hpp b/src/variable.hpp index 877ad3ce..975ab39a 100644 --- a/src/variable.hpp +++ b/src/variable.hpp @@ -270,7 +270,6 @@ extern s32b game_module_idx; extern s32b VERSION_MAJOR; extern s32b VERSION_MINOR; extern s32b VERSION_PATCH; -extern s32b max_plev; extern s32b DUNGEON_BASE; extern s32b DUNGEON_DEATH; extern s32b DUNGEON_ASTRAL; diff --git a/src/xtra1.cc b/src/xtra1.cc index b4f2adf6..037a1f46 100644 --- a/src/xtra1.cc +++ b/src/xtra1.cc @@ -362,7 +362,7 @@ static void prt_exp(void) { char out_val[32]; - if ((p_ptr->lev >= PY_MAX_LEVEL) || (p_ptr->lev >= max_plev)) + if (p_ptr->lev >= PY_MAX_LEVEL) { (void)sprintf(out_val, "********"); } diff --git a/src/xtra2.cc b/src/xtra2.cc index b5ad738a..5ed06491 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -1916,8 +1916,8 @@ void check_experience(void) /* Gain levels while possible */ - while ((p_ptr->lev < PY_MAX_LEVEL) && (p_ptr->lev < max_plev) && - (p_ptr->exp >= (player_exp[p_ptr->lev - 1] * p_ptr->expfact / 100L))) + while ((p_ptr->lev < PY_MAX_LEVEL) && + (p_ptr->exp >= (player_exp[p_ptr->lev - 1] * p_ptr->expfact / 100L))) { /* Gain a level */ p_ptr->lev++; -- cgit v1.2.3