diff options
author | mekolat <mekolat@users.noreply.github.com> | 2015-06-18 01:56:31 -0500 |
---|---|---|
committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:45:02 -0400 |
commit | ef4ae4d281127a0b84a73ab034bd22d6281a09ed (patch) | |
tree | 9c85593f052f354fa88c633c1b0cdd5ebad7ceb4 /src/map/map.hpp | |
parent | 87312fe719956671a77a3c78021e821c679764fe (diff) | |
download | tmwa-ef4ae4d281127a0b84a73ab034bd22d6281a09ed.tar.gz tmwa-ef4ae4d281127a0b84a73ab034bd22d6281a09ed.tar.bz2 tmwa-ef4ae4d281127a0b84a73ab034bd22d6281a09ed.tar.xz tmwa-ef4ae4d281127a0b84a73ab034bd22d6281a09ed.zip |
implement puppet npcs
Diffstat (limited to 'src/map/map.hpp')
-rw-r--r-- | src/map/map.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/map.hpp b/src/map/map.hpp index 66253ca..a2d0f5d 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -331,6 +331,7 @@ struct npc_data : block_list Opt3 opt3; Opt0 option; short flag; + bool disposable; std::list<RString> eventqueuel; Array<Timer, MAX_EVENTTIMER> eventtimer; @@ -359,6 +360,9 @@ public: short xs, ys; bool event_needs_map; + // the npc containing the actual script + BlockId parent; + // Whether the timer advances if not beyond end. bool timer_active; // Tick counter through the timers. |