diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-04-06 19:24:21 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-04-07 15:28:27 +0200 |
| commit | 41b6617e992d3fedda4c0a93ddd0fa4ad834a2ae (patch) | |
| tree | 14828062fd2d5faf7947feecae48ef6be1efcd00 /src | |
| parent | 1de4221b9e906ce8324237943165c161f78b5e07 (diff) | |
Lua: Refactor the "set" part of player.corruption() to C
Diffstat (limited to 'src')
| -rw-r--r-- | src/externs.h | 5 | ||||
| -rw-r--r-- | src/lua_bind.c | 39 | ||||
| -rw-r--r-- | src/player.pkg | 5 |
3 files changed, 40 insertions, 9 deletions
diff --git a/src/externs.h b/src/externs.h index 579ed463..3f48098c 100644 --- a/src/externs.h +++ b/src/externs.h @@ -1870,9 +1870,8 @@ extern void lua_display_list(int y, int x, int h, int w, cptr title, list_type * extern bool_ player_has_corruption(int corruption_idx); extern bool_ player_can_gain_corruption(int corruption_idx); -extern void player_gain_vampire_teeth(); -extern void player_gain_vampire_strength(); -extern void player_gain_vampire(); +extern void player_gain_corruption(int corruption_idx); +extern void player_lose_corruption(int corruption_idx); extern cptr compass(int y, int x, int y2, int x2); extern cptr approximate_distance(int y, int x, int y2, int x2); diff --git a/src/lua_bind.c b/src/lua_bind.c index ded66b21..1add61e3 100644 --- a/src/lua_bind.c +++ b/src/lua_bind.c @@ -657,7 +657,7 @@ static void subrace_add_power(player_race_mod *rmp_ptr, int power) } } -void player_gain_vampire_teeth() +static void player_gain_vampire_teeth() { player_race_mod *rmp_ptr = NULL; @@ -671,7 +671,7 @@ void player_gain_vampire_teeth() | PR1_NO_SUBRACE_CHANGE; } -void player_gain_vampire_strength() +static void player_gain_vampire_strength() { player_race_mod *rmp_ptr = &race_mod_info[SUBRACE_SAVE]; /* Apply the bonuses/penalities */ @@ -690,7 +690,7 @@ void player_gain_vampire_strength() cmsg_print(TERM_L_DARK, "You feel death slipping inside."); } -void player_gain_vampire() +static void player_gain_vampire() { player_race_mod *rmp_ptr = &race_mod_info[SUBRACE_SAVE]; @@ -721,6 +721,39 @@ void player_gain_vampire() | TR3_LITE1; } +static void player_set_corruption(int c, bool_ set) +{ + p_ptr->corruptions[c] = set; + p_ptr->redraw = p_ptr->redraw | PR_BASIC; + p_ptr->update = p_ptr->update | PU_BONUS | PU_TORCH | PU_BODY | PU_POWERS; + +} + +void player_gain_corruption(int corruption_idx) +{ + player_set_corruption(corruption_idx, TRUE); + + if (corruption_idx == CORRUPT_VAMPIRE_TEETH) + { + player_gain_vampire_teeth(); + } + else if (corruption_idx == CORRUPT_VAMPIRE_STRENGTH) + { + player_gain_vampire_strength(); + } + else if (corruption_idx == CORRUPT_VAMPIRE_VAMPIRE) + { + player_gain_vampire(); + } +} + +void player_lose_corruption(int corruption_idx) +{ + player_set_corruption(corruption_idx, FALSE); + /* Currently no corruptions need + any special handling when lost */ +} + /* * Gods */ diff --git a/src/player.pkg b/src/player.pkg index 5e693c9b..ad01e9eb 100644 --- a/src/player.pkg +++ b/src/player.pkg @@ -1854,9 +1854,8 @@ extern s16b MUT1_RESIST; extern s16b MUT1_EARTHQUAKE; extern bool player_can_gain_corruption(int corruption_idx); -extern void player_gain_vampire_teeth(); -extern void player_gain_vampire_strength(); -extern void player_gain_vampire(); +extern void player_gain_corruption(int corruption_idx); +extern void player_lose_corruption(int corruption_idx); /** @name Spellbinder triggers * @{ */ |