From af3057df7eb41973349b407539846f17d9094c21 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
Date: Wed, 4 Jul 2012 19:56:22 +0200
Subject: Merged changes from dev

Resolved conflicts & added fixes.
---
 src/app/app.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/app/app.h')

diff --git a/src/app/app.h b/src/app/app.h
index 098f0ad..ed2bd9a 100644
--- a/src/app/app.h
+++ b/src/app/app.h
@@ -84,10 +84,13 @@ public:
     Error       ParseArguments(int argc, char *argv[]);
     //! Initializes the application
     bool        Create();
-    //! Cleans up before exit
-    void        Destroy();
     //! Main event loop
     int         Run();
+    //! Returns the code to be returned at main() exit
+    int         GetExitCode();
+
+    //! Cleans up before exit
+    void        Destroy();
 
     //! Enters the pause mode
     void        Pause(bool pause);
@@ -96,7 +99,7 @@ public:
     void        StepSimulation(float rTime);
 
     //! Polls the state of joystick axes and buttons
-    void UpdateJoystick();
+    void        UpdateJoystick();
 
     void        SetShowStat(bool show);
     bool        GetShowStat();
-- 
cgit v1.2.3-1-g7c22