Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Okay, so there were some compiling errors in the LuaPluginManager. Th…

…ey are fixed now.
  • Loading branch information...
commit 8d94f7f34036aa161c1d42f5f2d673b2d8f50e48 1 parent 5167e20
@Grayson authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 LuaPluginManager.m
View
14 LuaPluginManager.m
@@ -105,7 +105,7 @@ -(id)runScriptAtPath:(NSString *)path
@end
-@implementation LuaCore (LuaPluginManagerAdditions)
+@implementation LCLua (LuaPluginManagerAdditions)
- (id)callEmptyFunctionNamed:(NSString *)functionName expectReturnValue:(BOOL)expect {
// Push the function name onto the stack
lua_pushstring (L, [functionName UTF8String]);
@@ -115,8 +115,8 @@ - (id)callEmptyFunctionNamed:(NSString *)functionName expectReturnValue:(BOOL)ex
lua_pcall (L, 0, expect, 0);
if (expect) {
- id ret = lua_objc_topropertylist(L, -1);
- if (!ret) ret = lua_objc_getid(L, -1);
+ id ret = (id)lua_objc_topropertylist(L, -1);
+ if (!ret) ret = (id)lua_objc_getid(L, -1);
return ret;
}
return nil;
@@ -125,7 +125,7 @@ - (id)callEmptyFunctionNamed:(NSString *)functionName expectReturnValue:(BOOL)ex
- (id)callFunction:(NSString *)functionName expectReturnValue:(BOOL)expect arguments:(id)firstArg, ... {
int functionCount = 0;
- [[[NSThread currentThread] threadDictionary] setObject:[NSNumber numberWithBool:YES] forKey:LCRunningInLuaKey];
+ [[[NSThread currentThread] threadDictionary] setObject:[NSNumber numberWithBool:YES] forKey:@"LCRunningInLua"];
lua_getglobal(L, [functionName UTF8String]);
@@ -147,10 +147,10 @@ - (id)callFunction:(NSString *)functionName expectReturnValue:(BOOL)expect argum
NSLog(@"Error running function '%@': %s", functionName, lua_tostring(L, -1));
}
- [[[NSThread currentThread] threadDictionary] removeObjectForKey:LCRunningInLuaKey];
+ [[[NSThread currentThread] threadDictionary] removeObjectForKey:@"LCRunningInLua"];
if (expect) {
- id ret = lua_objc_topropertylist(L, -1);
- if (!ret) ret = lua_objc_getid(L, -1);
+ id ret = (id)lua_objc_topropertylist(L, -1);
+ if (!ret) ret = (id)lua_objc_getid(L, -1);
return ret;
}
return nil;
Please sign in to comment.
Something went wrong with that request. Please try again.