diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2012-04-10 20:17:39 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2012-04-10 20:19:20 +0200 |
| commit | b34352dcd834057993a5e4c146b5b61cca41da15 (patch) | |
| tree | feec8d8d22095434b1d61181d9ea967995ac8f4e /src | |
| parent | 4904124f7669d16c28271c1b94bc78633c699723 (diff) | |
Lua: Gods: Move GRACE_DELAY Lua variable to player_type struct
Diffstat (limited to 'src')
| -rw-r--r-- | src/dungeon.c | 8 | ||||
| -rw-r--r-- | src/loadsave.c | 1 | ||||
| -rw-r--r-- | src/types.h | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dungeon.c b/src/dungeon.c index db936b8a..57aafb0b 100644 --- a/src/dungeon.c +++ b/src/dungeon.c @@ -1066,14 +1066,12 @@ static void process_world_corruptions() */ static bool_ grace_delay_trigger() { - int grace_delay = get_lua_int("GRACE_DELAY"); - int new_grace_delay = 1 + grace_delay; - exec_lua(format("GRACE_DELAY = %d", new_grace_delay)); + p_ptr->grace_delay++; - if (new_grace_delay >= 15) + if (p_ptr->grace_delay >= 15) { /* reset */ - exec_lua("GRACE_DELAY = 0"); + p_ptr->grace_delay = 0; /* triggered */ return TRUE; } diff --git a/src/loadsave.c b/src/loadsave.c index eddac55b..cb9156a9 100644 --- a/src/loadsave.c +++ b/src/loadsave.c @@ -458,6 +458,7 @@ static bool_ do_extra(int flag) /* Gods */ do_s32b(&p_ptr->grace, flag); + do_s32b(&p_ptr->grace_delay, flag); do_byte((byte*)&p_ptr->praying, flag); do_s16b(&p_ptr->melkor_sacrifice, flag); do_byte(&p_ptr->pgod, flag); diff --git a/src/types.h b/src/types.h index 7b6019ae..fc4f7356 100644 --- a/src/types.h +++ b/src/types.h @@ -1489,6 +1489,7 @@ struct player_type u16b csane_frac; /* Cur sanity frac */ s32b grace; /* Your God's appreciation factor. */ + s32b grace_delay; /* Delay factor for granting piety. */ byte pgod; /* Your God. */ bool_ praying; /* Praying to your god. */ s16b melkor_sacrifice; /* How much hp has been sacrified for damage */ |