Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed memory leak in debug OXP, probable breakage in non-Mac builds.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1143 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-08-25 02:17:01 +00:00
parent a1451d4a3e
commit 9a2dbbc6ae
2 changed files with 86 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/Core/OODebugBundleLoader.m Normal file
View File

@ -0,0 +1,86 @@
/*
OODebugBundleLoader.m
Oolite
Copyright (C) 2004-2007 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
This file may also be distributed under the MIT/X11 license:
Copyright (C) 2007 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#import "OODebugBundleLoader.h"
#import "ResourceManager.h"
void OOLoadDebugBundle(void)
{
NSString *bundlePath = nil;
NSBundle *bundle = nil;
Class principalClass = Nil;
bundlePath = [ResourceManager pathForFileNamed:@"DebugOXPLocatorBeacon.magic" inFolder:@"nil"];
if (bundlePath != nil)
{
bundlePath = [bundlePath stringByDeletingLastPathComponent];
bundle = [NSBundle bundleWithPath:bundlePath];
if ([bundle load])
{
principalClass = [bundle principalClass];
if (principalClass != Nil)
{
// Instantiate principal class of debug bundle, and let it do whatever it wants.
[[principalClass alloc] init];
}
else
{
OOLog(@"debugOXP.load.failed", @"Failed to find principal class of DebugOXP.bundle.");
}
}
else
{
OOLog(@"debugOXP.load.failed", @"Failed to load DebugOXP.bundle from %@.", bundlePath);
}
}
else
{
OOLog(@"debugOXP.load.none", @"Debug.oxp not found.");
}
}

2
src/Core/Universe.m
View File

@ -262,9 +262,7 @@ static NSComparisonResult comparePrice(NSDictionary *dict1, NSDictionary *dict2,
doProcedurallyTexturedPlanets = NO; doProcedurallyTexturedPlanets = NO;
#endif #endif
#if OO_USE_DEBUG_BUNDLE
OOLoadDebugBundle(); OOLoadDebugBundle();
#endif
[player doWorldScriptEvent:@"startUp" withArguments:nil]; [player doWorldScriptEvent:@"startUp" withArguments:nil];