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

Removed a spurious error message. Removed debugOn/debugOff pairs from shipdata.plist and PlayerEntity.m.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@900 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-04-03 18:43:53 +00:00
parent 140a9c0cb9
commit a2f6fea6a3
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Config/logcontrol.plist
View File

@ -240,7 +240,6 @@ strings.conversion.vector = inherit;
strings.conversion.quaternion = inherit;
strings.conversion.vectorAndQuaternion = inherit;
strings.conversion.randomSeed = inherit;
strings.conversion.coordinates = inherit;
texture.planet.generate = inherit;

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

@ -370,8 +370,6 @@
<string>$soundError</string>
<key>strings.conversion</key>
<string>$scriptError</string>
<key>strings.conversion.coordinates</key>
<string>inherit</string>
<key>strings.conversion.quaternion</key>
<string>inherit</string>
<key>strings.conversion.randomSeed</key>

4
Resources/Config/shipdata.plist
View File

@ -545,10 +545,8 @@
<string>CARGO_NOT_CARGO</string>
<key>death_actions</key>
<array>
<!-- <string>debugOn</string> -->
<string>spawn: cloaking-device 1</string>
<string>set: mission_cloak COMPLETE</string>
<!-- <string>debugOff</string> -->
</array>
<key>energy_recharge_rate</key>
<real>4</real>
@ -1441,7 +1439,6 @@
<string>CLASS_CARGO</string>
<key>script_actions</key>
<array>
<string>debugOn</string>
<string>testForEquipment: EQ_CLOAKING_DEVICE</string>
<dict>
<key>conditions</key>
@ -1463,7 +1460,6 @@
<string>awardCargo: 100 Gold</string>
</array>
</dict>
<string>debugOff</string>
</array>
<key>thrust</key>
<real>0.0</real>

6
src/Core/PlayerEntity.m
View File

@ -4439,8 +4439,8 @@ double scoopSoundPlayTime = 0.0;
[universe setDisplayText: YES];
[universe setDisplayCursor: NO];
[universe setViewDirection: VIEW_GUI_DISPLAY];
#if 0
// DEBUG SCENE TEST ROUTINES
[universe removeDemoShips];
[self debugOn];
@ -4448,7 +4448,7 @@ double scoopSoundPlayTime = 0.0;
[self debugOff];
[self setShowDemoShips: YES];
// END TEST
#endif
}
// DJS: moved from the above method because there are

3
src/Core/Universe.m
View File

@ -65,7 +65,6 @@ static NSString * const kOOLogDataCacheRebuild = @"dataCache.rebuild";
static NSString * const kOOLogUniversePopulate = @"universe.populate";
static NSString * const kOOLogUniversePopulateWitchspace = @"universe.populate.witchspace";
static NSString * const kOOLogScriptNoSystemForName = @"script.debug.note.systemSeedForSystemName";
static NSString * const kOOLogStringCoordinateConversion = @"strings.conversion.coordinates";
extern NSString * const kOOLogEntityVerificationError;
static NSString * const kOOLogEntityVerificationRebuild = @"entity.linkedList.verify.rebuild";
static NSString * const kOOLogFoundBeacon = @"beacon.list";
@ -2012,7 +2011,7 @@ GLfloat docked_light_specular[] = { (GLfloat) 1.0, (GLfloat) 1.0, (GLfloat) 0.5,
NSArray* tokens = ScanTokensFromString(system_x_y_z);
if ([tokens count] != 4)
{
OOLog(kOOLogStringCoordinateConversion, @"ERROR: Could not construct system coordinates from \"%@\" - too few pieces of data", system_x_y_z);
// Not necessarily an error.
return make_vector(0,0,0);
}
GLfloat dummy;