From c8c09860cb732006e161d26f25ff46e508770218 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Wed, 9 Mar 2016 08:40:58 -0500 Subject: XML'd pages --- src/gameplay.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/gameplay.cpp') diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 0624067..7155678 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -9,7 +9,6 @@ using namespace tinyxml2; extern Player *player; // main.cpp extern World *currentWorld; // main.cpp -extern float shit; extern Menu *currentMenu; extern Menu pauseMenu; extern Menu optionsMenu; @@ -23,7 +22,7 @@ std::vector dopt; void destroyEverything(void); -void segFault(){ +inline void segFault() { (*((int *)NULL))++; } @@ -210,6 +209,21 @@ CONT: return 0; } +void commonPageFunc( Mob *callee ) +{ + static bool lock = false; + + if ( !lock ) { + lock = true; + + ui::drawPage( callee->heyid ); + ui::waitForDialog(); + + callee->alive = false; + lock = false; + } +} + void commonTriggerFunc(Mob *callee){ static bool lock = false; XMLDocument xml; -- cgit v1.2.3