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

GnuMake cleanup: just the one logcontrol file now, and removed compiler warnings from PlayerEntityLegacyScriptEngine

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1455 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2008-03-04 20:32:38 +00:00
parent aaee1b7fcb
commit 2ca6f60d5c
3 changed files with 13 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile.postamble
View File

@ -28,5 +28,3 @@ after-all::
$(CP) -r Schemata $(PROGDIR)/Resources
$(CP) src/Cocoa/Info-Oolite.plist $(GNUSTEP_OW)
$(CP) $(BINARY) $(PROGDIR)
rm $(PROGDIR)/Resources/Config/logcontrol.plist
mv $(PROGDIR)/Resources/Config/logcontrol.plist.xml $(PROGDIR)/Resources/Config/logcontrol.plist

492
Resources/Config/logcontrol.plist.xml
View File

@ -1,492 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>$aiError</key>
<string>$scriptError</string>
<key>$dataCacheDebug</key>
<string>no</string>
<key>$dataCacheError</key>
<string>$error</string>
<key>$dataCacheStatus</key>
<string>yes</string>
<key>$entityState</key>
<string>no</string>
<key>$error</key>
<string>yes</string>
<key>$linkedListError</key>
<string>$error</string>
<key>$plistError</key>
<string>$error</string>
<key>$scriptDebugOn</key>
<string>no</string>
<key>$scriptError</key>
<string>$error</string>
<key>$shaderDebug</key>
<string>$shaderDebugOn</string>
<key>$shaderDebugOn</key>
<string>no</string>
<key>$shaderError</key>
<string>$error</string>
<key>$soundDebug</key>
<string>no</string>
<key>$soundDebugVerbose</key>
<string>$soundDebug</string>
<key>$soundError</key>
<string>$error</string>
<key>$textureDebug</key>
<string>no</string>
<key>$troubleShootingDump</key>
<string>yes</string>
<key>_default</key>
<string>yes</string>
<key>ai</key>
<string>$entityState</string>
<key>ai.error.recursion</key>
<string>$aiError</string>
<key>ai.message.receive</key>
<string>inherit</string>
<key>ai.pop</key>
<string>inherit</string>
<key>ai.rollD.invalidValue</key>
<string>$aiError</string>
<key>ai.setTakeOffFromPlanet.noPlanet</key>
<string>$aiError</string>
<key>ai.suggestEscort</key>
<string>inherit</string>
<key>ai.suggestEscort.refused</key>
<string>inherit</string>
<key>ai.syntax.setCoordinates</key>
<string>$aiError</string>
<key>ai.takeAction.badSelector</key>
<string>inherit</string>
<key>ai.takeAction.debugMessage</key>
<string>inherit</string>
<key>ai.takeAction.noAction</key>
<string>inherit</string>
<key>ai.takeAction.orphaned</key>
<string>$error</string>
<key>ai.takeAction.takeAction</key>
<string>inherit</string>
<key>beacon.list</key>
<string>$scriptDebugOn</string>
<key>beacon.list.flightTraining</key>
<string>inherit</string>
<key>character</key>
<string>inherit</string>
<key>character.load.unknownSystem</key>
<string>inherit</string>
<key>dataCache.clear.success</key>
<string>$dataCacheDebug</string>
<key>dataCache.found</key>
<string>no</string>
<key>dataCache.notFound</key>
<string>$dataCacheError</string>
<key>dataCache.prune</key>
<string>$dataCacheDebug</string>
<key>dataCache.rebuild</key>
<string>$dataCacheStatus</string>
<key>dataCache.rebuild.datesChanged</key>
<string>inherit</string>
<key>dataCache.rebuild.explicitFlush</key>
<string>inherit</string>
<key>dataCache.rebuild.pathsChanged</key>
<string>inherit</string>
<key>dataCache.remove.success</key>
<string>$dataCacheDebug</string>
<key>dataCache.removedOld</key>
<string>$dataCacheStatus</string>
<key>dataCache.retrieve.failed</key>
<string>$dataCacheDebug</string>
<key>dataCache.retrieve.success</key>
<string>$dataCacheDebug</string>
<key>dataCache.set.failed</key>
<string>$dataCacheError</string>
<key>dataCache.set.success</key>
<string>$dataCacheDebug</string>
<key>dataCache.upToDate</key>
<string>$dataCacheStatus</string>
<key>dataCache.write.buildPath.failed</key>
<string>$dataCacheError</string>
<key>dataCache.write.failed</key>
<string>$dataCacheError</string>
<key>dataCache.write.serialize.failed</key>
<string>$dataCacheError</string>
<key>dataCache.write.success</key>
<string>$dataCacheStatus</string>
<key>display.context.create.failed</key>
<string>$error</string>
<key>display.mode.switch.failed</key>
<string>$error</string>
<key>display.modes.noneFound</key>
<string>$error</string>
<key>entity.behaviour.changed</key>
<string>$entityState</string>
<key>entity.linkedList</key>
<string>inherit</string>
<key>entity.linkedList.add</key>
<string>inherit</string>
<key>entity.linkedList.add.error</key>
<string>$linkedListError</string>
<key>entity.linkedList.remove</key>
<string>inherit</string>
<key>entity.linkedList.remove.error</key>
<string>$linkedListError</string>
<key>entity.linkedList.update.error</key>
<string>$linkedListError</string>
<key>entity.linkedList.verify.error</key>
<string>no</string>
<key>entity.linkedList.verify.rebuild</key>
<string>inherit</string>
<key>equip.buy.mounted</key>
<string>no</string>
<key>equip.buy.mounted.failed</key>
<string>$scriptError</string>
<key>exception</key>
<string>yes</string>
<key>files.notFound</key>
<string>$error</string>
<key>files.notLoaded</key>
<string>$error</string>
<key>general.error</key>
<string>$error</string>
<key>general.error.deprecatedMethod</key>
<string>inherit</string>
<key>general.error.inconsistentState</key>
<string>inherit</string>
<key>general.error.parameterError</key>
<string>inherit</string>
<key>general.error.subclassResponsibility</key>
<string>inherit</string>
<key>growl.debug</key>
<string>no</string>
<key>growl.error</key>
<string>$error</string>
<key>gui.reset</key>
<string>no</string>
<key>iTunesIntegration.failed</key>
<string>$error</string>
<key>input.keyMapping.codeOutOfRange</key>
<string>inherit</string>
<key>input.keyMapping.keyPress</key>
<string>no</string>
<key>input.keyMapping.keyPress.keyDown</key>
<string>inherit</string>
<key>input.keyMapping.keyPress.keyUp</key>
<string>inherit</string>
<key>load.failed</key>
<string>yes</string>
<key>mesh.load.error</key>
<string>$error</string>
<key>mesh.load.error.fileNotFound</key>
<string>inherit</string>
<key>mesh.load.error.tooManyFaces</key>
<string>inherit</string>
<key>mesh.load.error.tooManyVertices</key>
<string>inherit</string>
<key>oxp.versionMismatch</key>
<string>$error</string>
<key>plist.homebrew.badEncoding</key>
<string>$plistError</string>
<key>plist.homebrew.exception</key>
<string>$plistError</string>
<key>plist.homebrew.interpret.trace</key>
<string>no</string>
<key>plist.homebrew.parseError</key>
<string>$plistError</string>
<key>plist.homebrew.parseWarning</key>
<string>$plistError</string>
<key>plist.homebrew.success</key>
<string>yes</string>
<key>plist.homebrew.tokenize.trace</key>
<string>no</string>
<key>plist.parse.foundation.failed</key>
<string>$plistError</string>
<key>plist.wrongType</key>
<string>$plistError</string>
<key>quickSave.failed</key>
<string>yes</string>
<key>rendering.opengl.error</key>
<string>no</string>
<key>rendering.opengl.extensions</key>
<string>$troubleShootingDump</string>
<key>rendering.opengl.shader.support</key>
<string>$troubleShootingDump</string>
<key>rendering.opengl.shader.uniform</key>
<string>$shaderDebugOn</string>
<key>rendering.opengl.stateDump</key>
<string>yes</string>
<key>rendering.opengl.version</key>
<string>$troubleShootingDump</string>
<key>resourceManager.foundFile</key>
<string>off</string>
<key>save.failed</key>
<string>yes</string>
<key>save.success</key>
<string>no</string>
<key>script.addShips.failed</key>
<string>$scriptError</string>
<key>script.debug</key>
<string>$scriptDebugOn</string>
<key>script.debug.message</key>
<string>inherit</string>
<key>script.debug.note</key>
<string>inherit</string>
<key>script.debug.note.addPlanet</key>
<string>inherit</string>
<key>script.debug.note.addShips</key>
<string>inherit</string>
<key>script.debug.note.awardCargo</key>
<string>inherit</string>
<key>script.debug.note.processSceneString</key>
<string>inherit</string>
<key>script.debug.note.removeAllCargo</key>
<string>inherit</string>
<key>script.debug.note.replaceVariablesInString</key>
<string>inherit</string>
<key>script.debug.note.set</key>
<string>inherit</string>
<key>script.debug.note.setFuelLeak</key>
<string>inherit</string>
<key>script.debug.note.showShipModel</key>
<string>inherit</string>
<key>script.debug.note.showShipyardModel</key>
<string>inherit</string>
<key>script.debug.note.testCondition</key>
<string>no</string>
<key>script.debug.note.useSpecialCargo</key>
<string>inherit</string>
<key>script.debug.onOff</key>
<string>inherit</string>
<key>script.debug.processSceneString.addBillboard</key>
<string>inherit</string>
<key>script.debug.processSceneString.addLocalPlanet</key>
<string>inherit</string>
<key>script.debug.processSceneString.addModel</key>
<string>inherit</string>
<key>script.debug.processSceneString.addScene</key>
<string>inherit</string>
<key>script.debug.processSceneString.addTargetPlanet</key>
<string>inherit</string>
<key>script.debug.setSunNovaIn</key>
<string>inherit</string>
<key>script.debug.syntax</key>
<string>$scriptError</string>
<key>script.debug.syntax.action</key>
<string>inherit</string>
<key>script.debug.syntax.action.badElement</key>
<string>inherit</string>
<key>script.debug.syntax.action.badSelector</key>
<string>inherit</string>
<key>script.debug.syntax.action.noneSpecified</key>
<string>inherit</string>
<key>script.debug.syntax.addShips</key>
<string>inherit</string>
<key>script.debug.syntax.awardCargo</key>
<string>inherit</string>
<key>script.debug.syntax.badComparison</key>
<string>inherit</string>
<key>script.debug.syntax.badConditional</key>
<string>inherit</string>
<key>script.debug.syntax.messageShipAIs</key>
<string>inherit</string>
<key>script.debug.syntax.reset</key>
<string>inherit</string>
<key>script.debug.syntax.scriptCondition.noneSpecified</key>
<string>inherit</string>
<key>script.debug.syntax.set</key>
<string>inherit</string>
<key>script.debug.syntax.setPlanetInfo</key>
<string>inherit</string>
<key>script.debug.syntax.subtract</key>
<string>inherit</string>
<key>script.debug.trace</key>
<string>off</string>
<key>script.debug.trace.scriptAction</key>
<string>inherit</string>
<key>script.debug.trace.testCondition</key>
<string>inherit</string>
<key>script.debug.trace.testCondition.checkingVariable</key>
<string>inherit</string>
<key>script.debug.trace.testCondition.oneOf</key>
<string>inherit</string>
<key>script.debug.trace.testCondition.testValues</key>
<string>inherit</string>
<key>script.error</key>
<string>$scriptError</string>
<key>script.error.addPlanet.keyNotFound</key>
<string>inherit</string>
<key>script.error.addPlanet.noPosition</key>
<string>inherit</string>
<key>script.error.exception</key>
<string>inherit</string>
<key>script.error.removeAllCargo.notDocked</key>
<string>inherit</string>
<key>script.javaScript.badParameter</key>
<string>$scriptError</string>
<key>script.javaScript.call.badSelector</key>
<string>$scriptError</string>
<key>script.javaScript.error</key>
<string>$scriptError</string>
<key>script.javaScript.exception</key>
<string>$scriptError</string>
<key>script.javaScript.init.error</key>
<string>$error</string>
<key>script.javaScript.init.success</key>
<string>no</string>
<key>script.javaScript.load.failed</key>
<string>$scriptError</string>
<key>script.javaScript.load.success</key>
<string>no</string>
<key>script.javaScript.warning</key>
<string>$scriptError</string>
<key>script.load</key>
<string>no</string>
<key>script.load.badName</key>
<string>$scriptError</string>
<key>script.load.exception</key>
<string>$error</string>
<key>script.load.notFound</key>
<string>$scriptError</string>
<key>script.load.parseOK</key>
<string>inherit</string>
<key>script.load.unnamed</key>
<string>$scriptError</string>
<key>script.load.world.listAll</key>
<string>$troubleShootingDump</string>
<key>script.missionDescription.noMissionKey</key>
<string>inherit</string>
<key>script.missionDescription.noMissionText</key>
<string>inherit</string>
<key>script.plist.run.badTarget</key>
<string>$error</string>
<key>script.trace</key>
<string>no</string>
<key>script.trace.javaScript.call</key>
<string>inherit</string>
<key>script.trace.plist.run</key>
<string>inherit</string>
<key>script.trace.runWorld</key>
<string>inherit</string>
<key>searchPaths.dumpAll</key>
<string>$troubleShootingDump</string>
<key>setup.ship.badEntry.subentities</key>
<string>inherit</string>
<key>shader.compile.fragment.failure</key>
<string>$shaderError</string>
<key>shader.compile.vertex.failure</key>
<string>$shaderError</string>
<key>shader.link.failure</key>
<string>$shaderError</string>
<key>shader.load.noShader</key>
<string>$error</string>
<key>shader.uniform</key>
<string>$shaderDebug</string>
<key>shader.uniform.badDescription</key>
<string>inherit</string>
<key>shader.uniform.bind.failed</key>
<string>inherit</string>
<key>shader.uniform.set</key>
<string>inherit</string>
<key>shader.uniform.unSet</key>
<string>inherit</string>
<key>shader.vessel.init</key>
<string>$shaderDebug</string>
<key>ship.noPrimaryRole</key>
<string>no</string>
<key>sound.channel.cleanup.failed</key>
<string>$soundError</string>
<key>sound.channel.cleanup.failed.badState</key>
<string>inherit</string>
<key>sound.channel.cleanup.failed.broken</key>
<string>inherit</string>
<key>sound.channel.cleanup.success</key>
<string>$soundDebugVerbose</string>
<key>sound.channel.machPortError</key>
<string>$soundError</string>
<key>sound.initialization</key>
<string>inherit</string>
<key>sound.initialization.error</key>
<string>$soundError</string>
<key>sound.invalidBeep</key>
<string>inherit</string>
<key>sound.load.failed</key>
<string>$soundError</string>
<key>sound.load.success</key>
<string>$soundDebug</string>
<key>sound.mixer.failedToConnectChannel</key>
<string>$soundError</string>
<key>sound.mixer.inspector.loadFailed</key>
<string>$soundError</string>
<key>sound.mixer.outOfChannels</key>
<string>$soundError</string>
<key>sound.mixer.replacingBrokenChannel</key>
<string>$soundDebug</string>
<key>sound.play.failed</key>
<string>$soundError</string>
<key>sound.play.failed.auError</key>
<string>inherit</string>
<key>sound.play.failed.badReuse</key>
<string>inherit</string>
<key>sound.play.failed.setupFailed</key>
<string>inherit</string>
<key>sound.play.success</key>
<string>$soundDebugVerbose</string>
<key>sound.render.undexpectedNull</key>
<string>$soundError</string>
<key>sound.streaming.loop</key>
<string>$soundDebug</string>
<key>sound.streaming.refill</key>
<string>$soundDebugVerbose</string>
<key>sound.streaming.releaseContext</key>
<string>$soundDebug</string>
<key>sound.streaming.underflow</key>
<string>$soundError</string>
<key>sound.virtualringbuffer</key>
<string>$soundError</string>
<key>strings.conversion</key>
<string>$scriptError</string>
<key>strings.conversion.quaternion</key>
<string>inherit</string>
<key>strings.conversion.randomSeed</key>
<string>inherit</string>
<key>strings.conversion.vector</key>
<string>inherit</string>
<key>strings.conversion.vectorAndQuaternion</key>
<string>inherit</string>
<key>texture.dealloc</key>
<string>$textureDebug</string>
<key>texture.load.noName</key>
<string>$error</string>
<key>texture.planet.generate</key>
<string>inherit</string>
<key>texture.upload</key>
<string>$textureDebug</string>
<key>textureCache</key>
<string>$textureDebug</string>
<key>textureLoader.asyncLoad</key>
<string>$textureDebug</string>
<key>textureLoader.asyncLoad.done</key>
<string>inherit</string>
<key>textureLoader.asyncLoad.exception</key>
<string>$error</string>
<key>textureLoader.block</key>
<string>$textureDebug</string>
<key>textureLoader.block.done</key>
<string>inherit</string>
<key>textureLoader.detachThreads.failed</key>
<string>$error</string>
<key>textureLoader.queueTask.inconsistency</key>
<string>$error</string>
<key>textureLoader.unknownType</key>
<string>$error</string>
<key>unclassified</key>
<string>inherit</string>
<key>universe.populate</key>
<string>no</string>
<key>universe.populate.witchspace</key>
<string>inherit</string>
<key>verifyOXP.verbose</key>
<string>no</string>
</dict>
</plist>

26
src/Core/Entities/PlayerEntityLegacyScriptEngine.m
View File

@ -580,11 +580,11 @@ static BOOL sRunningScript = NO;
{
NSString *result = [self performSelector:selector];
TraceLog(kOOLogTraceTestConditionValues, @"..... comparing \"%@\" (%@ from %@) to \"%@\" (%@) with operator %@",
result ?: @"nil",
[result class] ?: @"Nil",
result ? result : @"nil",
[result class] ? (NSString *)[result class] : @"nil",
NSStringFromSelector(selector),
valueString ?: (comparator == COMPARISON_UNDEFINED ? @"undefined" : @"nil"),
[valueString class] ?: @"Nil",
valueString ? valueString: (comparator == COMPARISON_UNDEFINED ? @"undefined" : @"nil"),
[valueString class] ? (NSString *)[valueString class] : @"nil",
ComparisonTypeToString(comparator));
switch (comparator)
@ -632,12 +632,12 @@ static BOOL sRunningScript = NO;
{
valueStrings = [valueString componentsSeparatedByString:@","];
TraceLog(kOOLogTraceTestConditionValues, @"..... comparing \"%@\" (%@ from %@) to \"%@\" (%@) with operator %@",
result ?: @"nil",
[result class] ?: @"Nil",
TraceLog(kOOLogTraceTestConditionValues, @"..... comparing '%@' (%@ from %@) to '%@' (%@) with operator %@",
result ? (NSString *)result : @"nil",
[result class] ? (NSString *)[result class] : @"nil",
NSStringFromSelector(selector),
valueString ?: @"nil",
[valueString class] ?: @"NIL",
valueString ? valueString : @"nil",
[valueString class] ? (NSString *)[valueString class] : @"nil",
ComparisonTypeToString(comparator));
count = [valueStrings count];
@ -661,11 +661,11 @@ static BOOL sRunningScript = NO;
value = [NSNumber numberWithDouble:[valueString doubleValue]];
TraceLog(kOOLogTraceTestConditionValues, @"..... comparing \"%@\" (%@ from %@) to \"%@\" (%@) with operator %@",
result ?: @"nil",
[result class] ?: @"Nil",
result ? (NSString *)result : @"nil",
[result class] ? (NSString *)[result class] : @"nil",
NSStringFromSelector(selector),
value ?: (comparator == COMPARISON_UNDEFINED ? @"undefined" : @"nil"),
[value class] ?: @"NIL",
value ? (NSString *)value : (comparator == COMPARISON_UNDEFINED ? @"undefined" : @"nil"),
[value class] ? (NSString *)[value class] : @"nil",
ComparisonTypeToString(comparator));
switch (comparator)