From f93cf73e01e9cf4b0a6be43d61ebc24b9fa64b0d Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Wed, 22 Feb 2012 23:46:56 +1000 Subject: Implement callAndReturn(), use it from callAndWait(). That's most of LuaSL's side of "use OpenSim to deal with in world stuff". --- LuaSL/src/LuaSL.h | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) (limited to 'LuaSL/src/LuaSL.h') diff --git a/LuaSL/src/LuaSL.h b/LuaSL/src/LuaSL.h index f6a5fad..6d495fa 100644 --- a/LuaSL/src/LuaSL.h +++ b/LuaSL/src/LuaSL.h @@ -49,17 +49,6 @@ typedef enum typedef struct { - char SID[PATH_MAX]; - char fileName[PATH_MAX]; - struct timeval startTime; - float compileTime; - int bugs, warnings; - boolean running; - -} script; - -typedef struct -{ Ecore_Evas *ee; // Our window. Evas *canvas; // The canvas for drawing directly onto. Evas_Object *bg; // Our background edje, also the game specific stuff. @@ -72,6 +61,24 @@ typedef struct boolean ui; // Wether we actually start up the UI. } gameGlobals; +typedef struct +{ + char SID[PATH_MAX]; + char fileName[PATH_MAX]; + struct timeval startTime; + float compileTime; + int bugs, warnings; + boolean running; + gameGlobals *game; + Ecore_Con_Client *client; +} script; + +typedef struct +{ + script *script; + const char message[PATH_MAX]; +} scriptMessage; + void loggingStartup(gameGlobals *game); char *getDateTime(struct tm **nowOut, char *dateOut, time_t *tiemOut); -- cgit v1.1