From 6ae71631d4458b78e96bb77bce3060541f62d531 Mon Sep 17 00:00:00 2001 From: freem Date: Sun, 26 Jan 2014 17:57:13 -0600 Subject: [PATCH] damnit TortoiseMerge (fix newline and crap) --- src/ScreenWithMenuElements.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ScreenWithMenuElements.cpp b/src/ScreenWithMenuElements.cpp index 7e5ca7f54c..575ed7a7ec 100644 --- a/src/ScreenWithMenuElements.cpp +++ b/src/ScreenWithMenuElements.cpp @@ -369,10 +369,12 @@ class LunaScreenWithMenuElements: public Luna public: static int Cancel( T* p, lua_State *L ) { p->Cancel( SM_GoToPrevScreen ); return 0; } static int IsTransitioning( T* p, lua_State *L ) { lua_pushboolean( L, p->IsTransitioning() ); return 1; } + LunaScreenWithMenuElements() { - ADD_METHOD( Cancel ); - ADD_METHOD( IsTransitioning ); } + ADD_METHOD( Cancel ); + ADD_METHOD( IsTransitioning ); + } }; LUA_REGISTER_DERIVED_CLASS( ScreenWithMenuElements, Screen )