diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-11 08:46:43 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-11 08:46:43 -0400 |
| commit | 5c48f10a46e470493328978d6ccee8722c743f31 (patch) | |
| tree | fc01f93915327d1136b698d5e995c01c538828bd /src/gameplay.cpp | |
| parent | 75a344b842d534830d7d420c7fd6fda6ad33e625 (diff) | |
merchant revision
Diffstat (limited to 'src/gameplay.cpp')
| -rw-r--r-- | src/gameplay.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp index ce514a4..9bf9728 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -219,20 +219,9 @@ CONT: } void commonPageFunc( Mob *callee ){ - //static bool lock = false; - - /*if ( !lock ) { - lock = true;*/ - if ( !ui::dialogBoxExists ) { - std::cout<<"begin\n"; - ui::drawPage( callee->heyid ); - while( ui::pageExists() ); - std::cout<<"done\n"; - //ui::waitForDialog(); - - callee->health = 0; - //lock = false; - } + ui::drawPage( callee->heyid ); + ui::waitForDialog(); + callee->health = 0; } void commonTriggerFunc(Mob *callee){ |