diff options
author | David Walter Seikel | 2016-01-19 02:40:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-01-19 02:40:23 +1000 |
commit | 022ec48aa446dce7fb97023a206d0f1479e63d82 (patch) | |
tree | f27cf4215ecc904c0ff5f9449fddf947519a7dbe /src/extantz | |
parent | Fix up events. (diff) | |
download | SledjHamr-022ec48aa446dce7fb97023a206d0f1479e63d82.zip SledjHamr-022ec48aa446dce7fb97023a206d0f1479e63d82.tar.gz SledjHamr-022ec48aa446dce7fb97023a206d0f1479e63d82.tar.bz2 SledjHamr-022ec48aa446dce7fb97023a206d0f1479e63d82.tar.xz |
Clean up LSL command and argument passing.
Diffstat (limited to '')
-rw-r--r-- | src/extantz/extantz.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c index f9b638a..f4f602e 100644 --- a/src/extantz/extantz.c +++ b/src/extantz/extantz.c | |||
@@ -37,12 +37,12 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
37 | globals *ourGlobals = data; | 37 | globals *ourGlobals = data; |
38 | char buf[PATH_MAX]; | 38 | char buf[PATH_MAX]; |
39 | 39 | ||
40 | if ((0 == strncmp(command, "llOwnerSay(", 11)) | 40 | if ((0 == strcmp(command, "llOwnerSay")) |
41 | || (0 == strncmp(command, "llWhisper(", 10)) | 41 | || (0 == strcmp(command, "llWhisper")) |
42 | || (0 == strncmp(command, "llSay(", 6)) | 42 | || (0 == strcmp(command, "llSay")) |
43 | || (0 == strncmp(command, "llShout(", 8))) | 43 | || (0 == strcmp(command, "llShout"))) |
44 | { | 44 | { |
45 | sprintf(buf, "%s: %s", SID, command); | 45 | sprintf(buf, "%s: %s(%s", SID, command, arguments); |
46 | if (ourGlobals->purkle) | 46 | if (ourGlobals->purkle) |
47 | { | 47 | { |
48 | int _P; | 48 | int _P; |
@@ -54,7 +54,7 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
54 | else | 54 | else |
55 | PE("No purkle to put - %s", buf); | 55 | PE("No purkle to put - %s", buf); |
56 | } | 56 | } |
57 | else if (0 == strncmp(command, "llDialog(", 9)) | 57 | else if (0 == strcmp(command, "llDialog")) |
58 | { | 58 | { |
59 | if (ourGlobals->LSLGuiMess) | 59 | if (ourGlobals->LSLGuiMess) |
60 | { | 60 | { |
@@ -64,12 +64,13 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
64 | _M = lua_gettop(ourGlobals->LSLGuiMess->L); | 64 | _M = lua_gettop(ourGlobals->LSLGuiMess->L); |
65 | 65 | ||
66 | // TODO - Somewhere in the chain the new lines that MLP likes to put into llDialog's message munge things. Fix that. | 66 | // TODO - Somewhere in the chain the new lines that MLP likes to put into llDialog's message munge things. Fix that. |
67 | push_lua(ourGlobals->LSLGuiMess->L, "@ ( $ )", _M, "doLua", command, 0); | 67 | sprintf(buf, "%s(%s", command, arguments); |
68 | push_lua(ourGlobals->LSLGuiMess->L, "@ ( $ )", _M, "doLua", buf, 0); | ||
68 | } | 69 | } |
69 | else | 70 | else |
70 | PE("No LSLGuiMess to send - %s", command); | 71 | PE("No LSLGuiMess to send - %s(%s", command, arguments); |
71 | } | 72 | } |
72 | else if (0 == strncmp(command, "loadSim(", 8)) | 73 | else if (0 == strcmp(command, "loadSim")) |
73 | { | 74 | { |
74 | #if USE_EVAS_3D | 75 | #if USE_EVAS_3D |
75 | char *p, *t; | 76 | char *p, *t; |
@@ -80,7 +81,7 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
80 | strcpy(ourGlobals->uuid, SID); | 81 | strcpy(ourGlobals->uuid, SID); |
81 | PI("Your UUID is %s.", ourGlobals->uuid); | 82 | PI("Your UUID is %s.", ourGlobals->uuid); |
82 | #if USE_EVAS_3D | 83 | #if USE_EVAS_3D |
83 | strcpy(buf, &command[8]); | 84 | strcpy(buf, arguments); |
84 | p = buf; | 85 | p = buf; |
85 | while ('"' == p[0]) | 86 | while ('"' == p[0]) |
86 | p++; | 87 | p++; |
@@ -109,7 +110,7 @@ static Eina_Bool clientParser(void *data, Connection *connection, char *SID, cha | |||
109 | #endif | 110 | #endif |
110 | } | 111 | } |
111 | else | 112 | else |
112 | PI("Some random command %s", command); | 113 | PI("Some random command %s(%s", command, arguments); |
113 | 114 | ||
114 | return ECORE_CALLBACK_RENEW; | 115 | return ECORE_CALLBACK_RENEW; |
115 | } | 116 | } |