diff -Naur lua-original/scripts/MSO.lua kada/scripts/MSO.lua --- lua-original/scripts/MSO.lua 1970-01-01 01:00:00.000000000 +0100 +++ kada/scripts/MSO.lua 2007-04-01 19:19:52.000000000 +0200 @@ -0,0 +1,6 @@ +function mso_notification(imsg) + n, id, msg = bunpack(imsg, "zz") + print(" MSO received'"..msg.."'") +end + +evt_bind("MSO", mso_notification) diff -Naur lua-original/src/config.c kada/src/config.c --- lua-original/src/config.c 2007-04-01 17:04:40.000000000 +0200 +++ kada/src/config.c 2007-04-01 19:06:56.000000000 +0200 @@ -22,7 +22,7 @@ { printf("Loading config\n"); if (luaL_dofile(L, "config.lua") > 0) - fprintf(stderr, "Config not OK (%s)\n", lua_error(L)); + fprintf(stderr, "Config not OK (%d)\n", lua_error(L)); lua_getglobal(L, "config"); if (!lua_istable(L, -1)) @@ -85,6 +85,7 @@ I->last_contact = now; I->last_keepalive = now; + return (1); } int conf_gettable_num(lua_State *L, const char *name) @@ -126,7 +127,7 @@ } else { - r = lua_tostring(L, -1); + r = (char*) lua_tostring(L, -1); } /* back a level */ diff -Naur lua-original/src/ilua.c kada/src/ilua.c --- lua-original/src/ilua.c 2007-03-31 21:13:40.000000000 +0200 +++ kada/src/ilua.c 2007-04-01 19:09:26.000000000 +0200 @@ -36,7 +36,7 @@ lua_error(L); } - insim_send(I, lua_tostring(L, 1), lua_tonumber(L, 2)); + insim_send(I, (char*)lua_tostring(L, 1), lua_tonumber(L, 2)); return 0; } @@ -85,7 +85,7 @@ printf("Loading core\n"); if (luaL_dofile(L, "scripts/core/core.lua") > 0) { - fprintf(stderr, "Core not OK (%s)\n", lua_error(L)); + fprintf(stderr, "Core not OK (%d)\n", lua_error(L)); return -1; } diff -Naur lua-original/src/insim.c kada/src/insim.c --- lua-original/src/insim.c 2007-04-01 17:09:18.000000000 +0200 +++ kada/src/insim.c 2007-04-01 19:14:51.000000000 +0200 @@ -17,7 +17,11 @@ */ #include "insim.h" +#include "ilua.h" +#ifndef WIN32 +#include +#endif insim_t *insim_create() { insim_t *I = malloc(sizeof(insim_t)); @@ -120,7 +124,7 @@ memcpy(&r, buf, sizeof(struct ISV)); printf("Connected to LFS %s (%s), InSIM v%d\n", r.product, r.version, r.insimver); I->gotversion = TRUE; - ilua_evt_fire(EVT_CONNECTED, NULL); + ilua_evt_fire(EVT_CONNECTED, NULL, 0); } else { @@ -141,6 +145,7 @@ p.value = 0; insim_send(I, (char *)&p, sizeof(struct ISP)); insim_close(I); + return (1); } int insim_send(insim_t *I, char *buf, int size) @@ -208,6 +213,7 @@ { return -1; } + return (1); } int insim_close(insim_t *I) diff -Naur lua-original/src/insim.h kada/src/insim.h --- lua-original/src/insim.h 2007-04-01 16:58:30.000000000 +0200 +++ kada/src/insim.h 2007-04-01 18:56:45.000000000 +0200 @@ -29,10 +29,14 @@ #include #include #include -#include #define closesocket(s) close(s) #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 +#define TRUE 1 +#define FALSE 0 +typedef unsigned char BOOL; +typedef unsigned char byte; #endif #include #include diff -Naur lua-original/src/main.c kada/src/main.c --- lua-original/src/main.c 2007-03-31 21:14:44.000000000 +0200 +++ kada/src/main.c 2007-04-01 19:15:21.000000000 +0200 @@ -20,6 +20,7 @@ #include "ilua.h" #include "insim.h" #include "events.h" +#include "config.h" lua_State* L; insim_t *I;