aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-27 05:33:43 +1000
committerDavid Walter Seikel2014-05-27 05:33:43 +1000
commit0e87ee7a5e36799b0693cca3283e9464340b14b9 (patch)
tree53659ca7678587901ce159788b586c51e4bc92a1 /src
parentPart one of changing the test sim to match the new specs. (diff)
downloadSledjHamr-0e87ee7a5e36799b0693cca3283e9464340b14b9.zip
SledjHamr-0e87ee7a5e36799b0693cca3283e9464340b14b9.tar.gz
SledjHamr-0e87ee7a5e36799b0693cca3283e9464340b14b9.tar.bz2
SledjHamr-0e87ee7a5e36799b0693cca3283e9464340b14b9.tar.xz
Last part of switching the sim over to the new specs.
Diffstat (limited to 'src')
-rw-r--r--src/libraries/love.h7
-rw-r--r--src/love/love.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/libraries/love.h b/src/libraries/love.h
index f75d5e7..cbd4c80 100644
--- a/src/libraries/love.h
+++ b/src/libraries/love.h
@@ -132,9 +132,10 @@ typedef struct _stuffs
132 //type 132 //type
133 union 133 union
134 { 134 {
135 Mesh *mesh; 135 Eina_Inarray stuffs; // Stuffs in the sim
136 script *scrip; // Not a typo, C++ is fussy about reusing names like this. 136 Mesh *mesh;
137 void *other; 137 script *scrip; // Not a typo, C++ is fussy about reusing names like this.
138 void *other;
138 } details; 139 } details;
139} Stuffs; 140} Stuffs;
140 141
diff --git a/src/love/love.c b/src/love/love.c
index 1a38e2b..dc27d9c 100644
--- a/src/love/love.c
+++ b/src/love/love.c
@@ -163,7 +163,7 @@ static Eina_Bool _addLuaSL(void *data, int type, Ecore_Con_Event_Server_Add *ev)
163 163
164 // Compile and run scripts. 164 // Compile and run scripts.
165 gettimeofday(&startTime, NULL); 165 gettimeofday(&startTime, NULL);
166 snprintf(buf, sizeof(buf), "%s/Test sim/objects", prefix_data_get()); 166 snprintf(buf, sizeof(buf), "%s/Test%%20sim", prefix_data_get());
167 eina_file_dir_list(buf, EINA_TRUE, dirList_compile, data); 167 eina_file_dir_list(buf, EINA_TRUE, dirList_compile, data);
168 168
169 return ECORE_CALLBACK_RENEW; 169 return ECORE_CALLBACK_RENEW;
@@ -410,7 +410,7 @@ static Eina_Bool _dataLuaSL(void *data, int type, Ecore_Con_Event_Server_Data *e
410 temp++; 410 temp++;
411 temp[0] = '\0'; 411 temp[0] = '\0';
412 lineNo = atoi(line); 412 lineNo = atoi(line);
413 snprintf(key, sizeof(key), "%s/Test sim/objects/onefang%%27s%%20test%%20bed.5cb927d5-1304-4f1a-9947-308251ef2df0/%s", prefix_data_get(), notecard); 413 snprintf(key, sizeof(key), "%s/Test%%20sim/onefang%%27s%%20test%%20bed/%s", prefix_data_get(), notecard);
414 414
415 fd = open(key, O_RDONLY); 415 fd = open(key, O_RDONLY);
416 if (-1 != fd) 416 if (-1 != fd)