From afd126e1d207c8fe7933562227f16684b00bfc7c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Tue, 13 May 2014 13:15:42 +1000 Subject: Finish separating out love. --- docs/README.LuaSL | 8 ++-- src/LuaSL/LuaSL.h | 23 +-------- src/LuaSL/LuaSL_compile.c | 15 +++--- src/LuaSL/LuaSL_main.c | 37 +++++++-------- src/LuaSL/LuaSL_utilities.c | 60 ------------------------ src/LuaSL/build.lua | 2 +- src/extantz/build.lua | 2 +- src/libraries/Runnr.c | 34 ++++++++++++++ src/libraries/Runnr.h | 4 ++ src/love/love.c | 110 +++++++++++++++++++++++++++++++++++--------- 10 files changed, 154 insertions(+), 141 deletions(-) delete mode 100644 src/LuaSL/LuaSL_utilities.c diff --git a/docs/README.LuaSL b/docs/README.LuaSL index 56adf12..f278c59 100644 --- a/docs/README.LuaSL +++ b/docs/README.LuaSL @@ -243,18 +243,18 @@ LSL.Lua State changes implemented, with a TODO about clearing out pending events. - Not implemented - + Not implemented (? means I think it's implemented in scriptSendBack) - llSay + friends, including llOwnerSay(). llGetOwner() llGetInventory*() llGetInventoryType() faked to just return script. - llSetScriptState() and llResetOtherScript() +? llSetScriptState() and llResetOtherScript() llResetTime() llGetNoteCardLine() llMessageLinked() llGetFreeMemory() - llSleep() - sorta, not sure how the comment there makes sense. lol - llSetTimerEvent() +? llSleep() - sorta, not sure how the comment there makes sense. lol +? llSetTimerEvent() llGetLinkNumber() llGetKey() llDialog() diff --git a/src/LuaSL/LuaSL.h b/src/LuaSL/LuaSL.h index d1f448e..175cebf 100644 --- a/src/LuaSL/LuaSL.h +++ b/src/LuaSL/LuaSL.h @@ -8,9 +8,7 @@ #include #include #include -#include #include -#include #include #include @@ -26,26 +24,12 @@ typedef struct _gameGlobals gameGlobals; // Define this here, so LuaSL_threads.h #include "LumbrJack.h" -#define WIDTH (512) -#define HEIGHT (384) - - -#define TABLE_WIDTH 7 -#define TABLE_HEIGHT 42 - - struct _gameGlobals { - Ecore_Evas *ee; // Our window. - Evas *canvas; // The canvas for drawing directly onto. - Evas_Object *bg; // Our background edje, also the game specific stuff. - Evas_Object *edje; // The edje of the background. Ecore_Con_Server *server; Eina_Hash *scripts, *names; - int logDom; const char *address; int port; - boolean ui; // Wether we actually start up the UI. }; struct _script @@ -56,9 +40,7 @@ struct _script char fileName[PATH_MAX]; lua_State *L; struct timeval startTime; - float compileTime, timerTime; - int bugs, warnings; - boolean running; + float timerTime; int status; int args; Eina_Clist messages; @@ -75,8 +57,5 @@ typedef struct void scriptSendBack(void * data); -void sendBack(gameGlobals *ourGlobals, Ecore_Con_Client *client, const char *SID, const char *message, ...); -void sendForth(gameGlobals *ourGlobals, const char *SID, const char *message, ...); -float timeDiff(struct timeval *now, struct timeval *then); #include "LuaSL_LSL_tree.h" diff --git a/src/LuaSL/LuaSL_compile.c b/src/LuaSL/LuaSL_compile.c index 3265acf..0c398b9 100644 --- a/src/LuaSL/LuaSL_compile.c +++ b/src/LuaSL/LuaSL_compile.c @@ -1,5 +1,6 @@ #include "LuaSL.h" +#include "Runnr.h" /* TODO - problem de jour */ @@ -316,7 +317,6 @@ static LSL_Leaf *findVariable(LuaSL_compiler *compiler, const char *name) LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf *dot, LSL_Leaf *sub) { - gameGlobals *ourGlobals = compiler->game; const char *search; if (dot) @@ -358,7 +358,7 @@ LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf else { compiler->script.bugCount++; - sendBack(ourGlobals, compiler->client, compiler->SID, "compilerError(%d,%d,NOT found %s)", identifier->line, identifier->column, identifier->value.stringValue); + sendBack(compiler->client, compiler->SID, "compilerError(%d,%d,NOT found %s)", identifier->line, identifier->column, identifier->value.stringValue); } } @@ -367,8 +367,6 @@ LSL_Leaf *checkVariable(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Leaf LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval, LSL_Leaf *right) { - gameGlobals *ourGlobals = compiler->game; - if (lval) { opType lType, rType; @@ -402,7 +400,7 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval, if (OT_undeclared == lType) { compiler->script.warningCount++; - sendBack(ourGlobals, compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column); + sendBack(compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column); lval->basicType = OT_undeclared; return lval; } @@ -430,7 +428,7 @@ LSL_Leaf *addOperation(LuaSL_compiler *compiler, LSL_Leaf *left, LSL_Leaf *lval, if (OT_undeclared == rType) { compiler->script.warningCount++; - sendBack(ourGlobals, compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column); + sendBack(compiler->client, compiler->SID, "compilerWarning(%d,%d,Undeclared identifier issue, deferring this until the second pass)", lval->line, lval->column); lval->basicType = OT_undeclared; return lval; } @@ -587,7 +585,7 @@ else } compiler->script.bugCount++; - sendBack(ourGlobals, compiler->client, compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken); + sendBack(compiler->client, compiler->SID, "compilerError(%d,%d,Invalid operation [%s(%s) %s %s(%s)])", lval->line, lval->column, leftType, leftToken, lval->toKen->toKen, rightType, rightToken); } } @@ -991,7 +989,6 @@ LSL_Leaf *addFor(LuaSL_compiler *compiler, LSL_Leaf *lval, LSL_Leaf *flow, LSL_L LSL_Leaf *addStatement(LuaSL_compiler *compiler, LSL_Leaf *lval, LSL_Leaf *flow, LSL_Leaf *left, LSL_Leaf *expr, LSL_Leaf *right, LSL_Leaf *block, LSL_Leaf *identifier) { -// gameGlobals *ourGlobals = compiler->game; LSL_Statement *stat = calloc(1, sizeof(LSL_Statement)); boolean justOne = FALSE; @@ -2220,7 +2217,7 @@ boolean compileLSL(gameGlobals *ourGlobals, Ecore_Con_Client *client, char *SID, call->call->basicType = func->basicType; } else - sendBack(ourGlobals, compiler.client, compiler.SID, "compilerError(%d,%d,Undeclared function %s called)", call->call->line, call->call->column, call->call->value.stringValue); + sendBack(compiler.client, compiler.SID, "compilerError(%d,%d,Undeclared function %s called)", call->call->line, call->call->column, call->call->value.stringValue); } } secondPass(&compiler, compiler.ast); diff --git a/src/LuaSL/LuaSL_main.c b/src/LuaSL/LuaSL_main.c index f4c94ac..0d8a6db 100644 --- a/src/LuaSL/LuaSL_main.c +++ b/src/LuaSL/LuaSL_main.c @@ -1,5 +1,6 @@ #include "LuaSL.h" +#include "Runnr.h" int logDom; // Our logging domain. @@ -110,7 +111,7 @@ void scriptSendBack(void * data) else if (0 == strncmp(message->message, "llResetScript(", 14)) resetScript(message->script); else - sendBack(ourGlobals, message->script->client, message->script->SID, message->message); + sendBack(message->script->client, message->script->SID, message->message); free(message); } @@ -166,10 +167,10 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Client_D me->client = ev->client; eina_hash_add(ourGlobals->scripts, me->SID, me); eina_hash_add(ourGlobals->names, me->fileName, me); - sendBack(ourGlobals, ev->client, SID, "compiled(true)"); + sendBack(ev->client, SID, "compiled(true)"); } else - sendBack(ourGlobals, ev->client, SID, "compiled(false)"); + sendBack(ev->client, SID, "compiled(false)"); } else if (0 == strcmp(command, "run()")) { @@ -238,6 +239,8 @@ int main(int argc, char **argv) { if ((ourGlobals.server = ecore_con_server_add(ECORE_CON_REMOTE_TCP, ourGlobals.address, ourGlobals.port, &ourGlobals))) { + int i; + ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD, (Ecore_Event_Handler_Cb) _add, &ourGlobals); ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA, (Ecore_Event_Handler_Cb) _data, &ourGlobals); ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DEL, (Ecore_Event_Handler_Cb) _del, &ourGlobals); @@ -247,26 +250,18 @@ int main(int argc, char **argv) ecore_con_server_client_limit_set(ourGlobals.server, 3, 0); clientStream = eina_strbuf_new(); - if (edje_init()) + result = 0; + compilerSetup(&ourGlobals); + luaprocInit(); + for (i = 0; i < CPUs; i++) { - int i; - - result = 0; - compilerSetup(&ourGlobals); - luaprocInit(); - for (i = 0; i < CPUs; i++) - { - if ( sched_create_worker( ) != LUAPROC_SCHED_OK ) - PE("Error creating luaproc worker thread."); - } - ecore_main_loop_begin(); - - // TODO - this is what hangs the system, should change from raw pthreads to ecore threads. - sched_join_workerthreads(); - edje_shutdown(); + if ( sched_create_worker( ) != LUAPROC_SCHED_OK ) + PE("Error creating luaproc worker thread."); } - else - PC("Failed to init edje!"); + ecore_main_loop_begin(); + + // TODO - this is what hangs the system, should change from raw pthreads to ecore threads. + sched_join_workerthreads(); } else PC("Failed to add server!"); diff --git a/src/LuaSL/LuaSL_utilities.c b/src/LuaSL/LuaSL_utilities.c deleted file mode 100644 index 40263df..0000000 --- a/src/LuaSL/LuaSL_utilities.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "LuaSL.h" - - -void sendBack(gameGlobals *ourGlobals, Ecore_Con_Client *client, const char *SID, const char *message, ...) -{ - va_list args; - char buf[PATH_MAX]; - int length = strlen(SID); - - strncpy(buf, SID, length); - buf[length++] = '.'; - va_start(args, message); - length += vsprintf(&buf[length], message, args); - va_end(args); - buf[length++] = '\n'; - buf[length++] = '\0'; - ecore_con_client_send(client, buf, strlen(buf)); - ecore_con_client_flush(client); -} - -void sendForth(gameGlobals *ourGlobals, const char *SID, const char *message, ...) -{ - va_list args; - char buf[PATH_MAX]; - int length = strlen(SID); - - strncpy(buf, SID, length); - buf[length++] = '.'; - va_start(args, message); - length += vsprintf(&buf[length], message, args); - va_end(args); - buf[length++] = '\n'; - buf[length++] = '\0'; - ecore_con_server_send(ourGlobals->server, buf, strlen(buf)); - ecore_con_server_flush(ourGlobals->server); -} - -float timeDiff(struct timeval *now, struct timeval *then) -{ - if (0 == gettimeofday(now, 0)) - { - struct timeval thisTime = { 0, 0 }; - double result = 0.0; - - thisTime.tv_sec = now->tv_sec; - thisTime.tv_usec = now->tv_usec; - if (thisTime.tv_usec < then->tv_usec) - { - thisTime.tv_sec--; - thisTime.tv_usec += 1000000; - } - thisTime.tv_usec -= then->tv_usec; - thisTime.tv_sec -= then->tv_sec; - result = ((double) thisTime.tv_usec) / ((double) 1000000.0); - result += thisTime.tv_sec; - return result; - } - else - return 0.0; -} diff --git a/src/LuaSL/build.lua b/src/LuaSL/build.lua index 0efcca3..084a39c 100755 --- a/src/LuaSL/build.lua +++ b/src/LuaSL/build.lua @@ -26,4 +26,4 @@ CFLAGS = CFLAGS .. ' -DPACKAGE_LIB_DIR=\\"' .. lib_d .. '\\"' CFLAGS = CFLAGS .. ' -DPACKAGE_DATA_DIR=\\"' .. data_d .. '\\"' CFLAGS = CFLAGS .. ' -DPACKAGE_LOCALE_DIR=\\"' .. locale_d .. '\\"' -compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_utilities', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') +compileFiles('../../LuaSL', dir, {'LuaSL_main', 'LuaSL_compile', 'LuaSL_threads', 'LuaSL_lexer', 'LuaSL_lemon_yaccer'}, '') diff --git a/src/extantz/build.lua b/src/extantz/build.lua index 1591e8a..caca02f 100755 --- a/src/extantz/build.lua +++ b/src/extantz/build.lua @@ -15,7 +15,7 @@ end CFLAGS = CFLAGS .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua' LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux' -libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang -lRunnr' +libs = libs .. ' -lIrrlicht -lGL -lbz2 -lGuiLua -lwinFang' removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'}) removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'}) diff --git a/src/libraries/Runnr.c b/src/libraries/Runnr.c index f316755..8109dd8 100644 --- a/src/libraries/Runnr.c +++ b/src/libraries/Runnr.c @@ -333,3 +333,37 @@ int push_lua(lua_State *L, char *params, ...) // Stack usage [-0, +n, em] free(f); return n; } + +void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...) +{ + va_list args; + char buf[PATH_MAX]; + int length = strlen(SID); + + strncpy(buf, SID, length); + buf[length++] = '.'; + va_start(args, message); + length += vsprintf(&buf[length], message, args); + va_end(args); + buf[length++] = '\n'; + buf[length++] = '\0'; + ecore_con_client_send(client, buf, strlen(buf)); + ecore_con_client_flush(client); +} + +void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...) +{ + va_list args; + char buf[PATH_MAX]; + int length = strlen(SID); + + strncpy(buf, SID, length); + buf[length++] = '.'; + va_start(args, message); + length += vsprintf(&buf[length], message, args); + va_end(args); + buf[length++] = '\n'; + buf[length++] = '\0'; + ecore_con_server_send(server, buf, strlen(buf)); + ecore_con_server_flush(server); +} diff --git a/src/libraries/Runnr.h b/src/libraries/Runnr.h index ac22039..d7386f6 100644 --- a/src/libraries/Runnr.h +++ b/src/libraries/Runnr.h @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -15,4 +16,7 @@ void dumpStack(lua_State *L, int i); int pull_lua(lua_State *L, int i, char *params, ...); int push_lua(lua_State *L, char *params, ...); +void sendBack(Ecore_Con_Client *client, const char *SID, const char *message, ...); +void sendForth(Ecore_Con_Server *server, const char *SID, const char *message, ...); + #endif diff --git a/src/love/love.c b/src/love/love.c index f3137b5..b0d1c05 100644 --- a/src/love/love.c +++ b/src/love/love.c @@ -4,8 +4,47 @@ Dedicated to my girl Boots, coz she means the world to me. */ +#include +#include +#include +#include +#include +#include -#include "../LuaSL/LuaSL.h" +#include "LumbrJack.h" +#include "Runnr.h" + + +#define WIDTH (512) +#define HEIGHT (384) + + +#define TABLE_WIDTH 7 +#define TABLE_HEIGHT 42 + + +typedef struct _gameGlobals +{ + Ecore_Evas *ee; // Our window. + Evas *canvas; // The canvas for drawing directly onto. + Evas_Object *bg; // Our background edje, also the game specific stuff. + Evas_Object *edje; // The edje of the background. + Ecore_Con_Server *server; + Eina_Hash *scripts; + const char *address; + int port; + boolean ui; // Wether we actually start up the UI. +} gameGlobals; + +typedef struct _script +{ + char SID[PATH_MAX]; + char fileName[PATH_MAX]; + struct timeval startTime; + float compileTime; + int bugs, warnings; + boolean running; +} script; int logDom; // Our logging domain. @@ -26,8 +65,33 @@ static const char *names[] = }; +static float timeDiff(struct timeval *now, struct timeval *then) +{ + if (0 == gettimeofday(now, 0)) + { + struct timeval thisTime = { 0, 0 }; + double result = 0.0; + + thisTime.tv_sec = now->tv_sec; + thisTime.tv_usec = now->tv_usec; + if (thisTime.tv_usec < then->tv_usec) + { + thisTime.tv_sec--; + thisTime.tv_usec += 1000000; + } + thisTime.tv_usec -= then->tv_usec; + thisTime.tv_sec -= then->tv_sec; + result = ((double) thisTime.tv_usec) / ((double) 1000000.0); + result += thisTime.tv_sec; + return result; + } + else + return 0.0; +} + + static void -_edje_signal_cb(void *data, Evas_Object *obj __UNUSED__, const char *emission, const char *source) +_edje_signal_cb(void *data, Evas_Object *obj, const char *emission, const char *source) { // gameGlobals *ourGlobals = data; } @@ -78,7 +142,7 @@ Eina_Bool anim(void *data) } static void -_on_delete(Ecore_Evas *ee __UNUSED__) +_on_delete(Ecore_Evas *ee) { ecore_main_loop_quit(); } @@ -100,7 +164,7 @@ static void dirList_compile(const char *name, const char *path, void *data) snprintf(me->SID, sizeof(me->SID), "%08lx-%04lx-%04lx-%04lx-%012lx", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); snprintf(me->fileName, sizeof(me->fileName), "%s/%s", path, name); eina_hash_add(ourGlobals->scripts, me->SID, me); - sendForth(ourGlobals, me->SID, "compile(%s)", me->fileName); + sendForth(ourGlobals->server, me->SID, "compile(%s)", me->fileName); } } } @@ -119,14 +183,14 @@ static Eina_Bool _timer_cb(void *data) { case 5 : { - sendForth(ourGlobals, me->SID, "events.detectedKeys({\"%s\"})", ownerKey); - sendForth(ourGlobals, me->SID, "events.detectedNames({\"%s\"})", ownerName); - sendForth(ourGlobals, me->SID, "events.touch_start(1)"); + sendForth(ourGlobals->server, me->SID, "events.detectedKeys({\"%s\"})", ownerKey); + sendForth(ourGlobals->server, me->SID, "events.detectedNames({\"%s\"})", ownerName); + sendForth(ourGlobals->server, me->SID, "events.touch_start(1)"); break; } case 9 : { - sendForth(ourGlobals, me->SID, "quit()"); + sendForth(ourGlobals->server, me->SID, "quit()"); break; } case 11 : @@ -140,14 +204,14 @@ static Eina_Bool _timer_cb(void *data) if (exit) { - sendForth(ourGlobals, ownerKey, "exit()"); + sendForth(ourGlobals->server, ownerKey, "exit()"); ecore_main_loop_quit(); return ECORE_CALLBACK_CANCEL; } return ECORE_CALLBACK_RENEW; } -static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Add *ev) +static Eina_Bool _add(void *data, int type, Ecore_Con_Event_Server_Add *ev) { gameGlobals *ourGlobals = data; char buf[PATH_MAX]; @@ -161,7 +225,7 @@ static Eina_Bool _add(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Ad return ECORE_CALLBACK_RENEW; } -static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Data *ev) +static Eina_Bool _data(void *data, int type, Ecore_Con_Event_Server_Data *ev) { gameGlobals *ourGlobals = data; @@ -254,31 +318,31 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Server_D PD("TOTAL compile speed is %f scripts per second", compiledCount / timeDiff(&now, &startTime)); } // PD("The compile of %s worked, running it now.", SID); - sendForth(ourGlobals, SID, "run()"); + sendForth(ourGlobals->server, SID, "run()"); } else { // Send back some random or fixed values for testing. if (0 == strcmp(command, "llGetKey()")) - sendForth(ourGlobals, SID, "return \"%08lx-%04lx-%04lx-%04lx-%012lx\"", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); + sendForth(ourGlobals->server, SID, "return \"%08lx-%04lx-%04lx-%04lx-%012lx\"", random(), random() % 0xFFFF, random() % 0xFFFF, random() % 0xFFFF, random()); else if (0 == strcmp(command, "llGetOwner()")) - sendForth(ourGlobals, SID, "return \"%s\"", ownerKey); + sendForth(ourGlobals->server, SID, "return \"%s\"", ownerKey); else if (0 == strcmp(command, "llGetPos()")) - sendForth(ourGlobals, SID, "return {x=128.0, y=128.0, z=128.0}"); + sendForth(ourGlobals->server, SID, "return {x=128.0, y=128.0, z=128.0}"); else if (0 == strcmp(command, "llGetRot()")) - sendForth(ourGlobals, SID, "return {x=0.0, y=0.0, z=0.0, s=1.0}"); + sendForth(ourGlobals->server, SID, "return {x=0.0, y=0.0, z=0.0, s=1.0}"); else if (0 == strcmp(command, "llGetObjectDesc()")) - sendForth(ourGlobals, SID, "return \"\""); + sendForth(ourGlobals->server, SID, "return \"\""); else if (0 == strncmp(command, "llGetAlpha(", 11)) - sendForth(ourGlobals, SID, "return 1.0"); + sendForth(ourGlobals->server, SID, "return 1.0"); else if (0 == strcmp(command, "llGetInventoryNumber(7)")) - sendForth(ourGlobals, SID, "return 3"); + sendForth(ourGlobals->server, SID, "return 3"); else if (0 == strcmp(command, "llGetInventoryName(7, 2)")) - sendForth(ourGlobals, SID, "return \".readme\""); + sendForth(ourGlobals->server, SID, "return \".readme\""); else if (0 == strcmp(command, "llGetInventoryName(7, 1)")) - sendForth(ourGlobals, SID, "return \".POSITIONS\""); + sendForth(ourGlobals->server, SID, "return \".POSITIONS\""); else if (0 == strcmp(command, "llGetInventoryName(7, 0)")) - sendForth(ourGlobals, SID, "return \".MENUITEMS\""); + sendForth(ourGlobals->server, SID, "return \".MENUITEMS\""); else PI("Script %s sent command %s", SID, command); } @@ -291,7 +355,7 @@ static Eina_Bool _data(void *data, int type __UNUSED__, Ecore_Con_Event_Server_D return ECORE_CALLBACK_RENEW; } -static Eina_Bool _del(void *data, int type __UNUSED__, Ecore_Con_Event_Server_Del *ev) +static Eina_Bool _del(void *data, int type, Ecore_Con_Event_Server_Del *ev) { gameGlobals *ourGlobals = data; -- cgit v1.1