diff options
Diffstat (limited to 'macosx/plugins/DFXVideo/macsrc')
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginConfigController.m | 5 | ||||
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 1 | ||||
| -rwxr-xr-x | macosx/plugins/DFXVideo/macsrc/drawgl.m | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 95eb38da..2932d3d7 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -323,7 +323,6 @@ void ReadConfig(void) [fragmentShaderViewablePath setToolTip:[fragmentPath path]]; unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue]; - NSArray *views = [hacksView subviews]; for (NSView *control in views) { if ([control isKindOfClass:[NSButton class]]) { @@ -359,8 +358,8 @@ char* PLUGLOC(char *toloc) { NSBundle *mainBundle = [NSBundle bundleForClass:[PluginConfigController class]]; NSString *origString = nil, *transString = nil; - origString = [NSString stringWithCString:toloc encoding:NSUTF8StringEncoding]; + origString = @(toloc); transString = [mainBundle localizedStringForKey:origString value:nil table:nil]; - return (char*)[transString cStringUsingEncoding:NSUTF8StringEncoding]; + return (char*)[transString UTF8String]; } diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index 388049cf..f17e1f5b 100755 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -169,7 +169,6 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) } - [NSOpenGLContext clearCurrentContext]; [glLock unlock]; diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m index ae5ab6fb..fd127469 100755 --- a/macosx/plugins/DFXVideo/macsrc/drawgl.m +++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m @@ -118,7 +118,7 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW PluginWindowController *windowController = [PluginWindowController openGameView]; glView = [windowController openGLView]; - NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]; + NSString *title = @(pCaptionText); [[windowController window] setTitle:title]; window = [windowController window]; }); |
