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

Like revision 789, but with a slightly higher number.

Browse Source 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@791 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton 2007-02-28 21:12:47 +00:00
parent c14057f135
commit 78b8c11810
20 changed files with 277 additions and 511 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oolite.xcodeproj/project.pbxproj
View File

@ -122,7 +122,6 @@
25161188099544390037C2E1 /* StationEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161136099544390037C2E1 /* StationEntity.h */; }; 25161188099544390037C2E1 /* StationEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161136099544390037C2E1 /* StationEntity.h */; };
2516118B099544390037C2E1 /* ResourceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161139099544390037C2E1 /* ResourceManager.m */; }; 2516118B099544390037C2E1 /* ResourceManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161139099544390037C2E1 /* ResourceManager.m */; };
2516118C099544390037C2E1 /* ResourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2516113A099544390037C2E1 /* ResourceManager.h */; }; 2516118C099544390037C2E1 /* ResourceManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 2516113A099544390037C2E1 /* ResourceManager.h */; };
2516118D099544390037C2E1 /* ShipEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 2516113B099544390037C2E1 /* ShipEntity.m */; };
2516118E099544390037C2E1 /* ShipEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 2516113C099544390037C2E1 /* ShipEntity.h */; }; 2516118E099544390037C2E1 /* ShipEntity.h in Headers */ = {isa = PBXBuildFile; fileRef = 2516113C099544390037C2E1 /* ShipEntity.h */; };
25161195099544390037C2E1 /* Universe.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161143099544390037C2E1 /* Universe.m */; }; 25161195099544390037C2E1 /* Universe.m in Sources */ = {isa = PBXBuildFile; fileRef = 25161143099544390037C2E1 /* Universe.m */; };
25161196099544390037C2E1 /* Universe.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161144099544390037C2E1 /* Universe.h */; }; 25161196099544390037C2E1 /* Universe.h in Headers */ = {isa = PBXBuildFile; fileRef = 25161144099544390037C2E1 /* Universe.h */; };
@ -1629,7 +1628,6 @@
25161182099544390037C2E1 /* ScannerExtension.m in Sources */, 25161182099544390037C2E1 /* ScannerExtension.m in Sources */,
25161187099544390037C2E1 /* StationEntity.m in Sources */, 25161187099544390037C2E1 /* StationEntity.m in Sources */,
2516118B099544390037C2E1 /* ResourceManager.m in Sources */, 2516118B099544390037C2E1 /* ResourceManager.m in Sources */,
2516118D099544390037C2E1 /* ShipEntity.m in Sources */,
25161195099544390037C2E1 /* Universe.m in Sources */, 25161195099544390037C2E1 /* Universe.m in Sources */,
25161197099544390037C2E1 /* TextureStore.m in Sources */, 25161197099544390037C2E1 /* TextureStore.m in Sources */,
25F46753099695D5009483BF /* OoliteApp.m in Sources */, 25F46753099695D5009483BF /* OoliteApp.m in Sources */,

52
src/Cocoa/OoliteApp.h
View File

@ -1,46 +1,38 @@
/* /*
Oolite OoliteApp.h
Created by Giles Williams on 2005-05-01.
OoliteApp.h This is a subclass of NSApplication for Oolite.
Created by Giles Williams on 01/05/2005. It gets around problems with the system intercepting certain events (NSKeyDown
and NSKeyUp) before MyOpenGLView gets to see them, it does this by sending
those events to MyOpenGLView regardless of any other processing NSApplication
will do with them.
For Oolite
Copyright (C) 2005 Giles C Williams
Copyright (c) 2005, Giles C Williams This program is free software; you can redistribute it and/or
All rights reserved. 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 work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. This program is distributed in the hope that it will be useful,
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ but WITHOUT ANY WARRANTY; without even the implied warranty of
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You are free: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• to copy, distribute, display, and perform the work Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
• to make derivative works MA 02110-1301, USA.
Under the following conditions:
• Attribution. You must give the original author credit.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */
#import "OOCocoa.h" #import "OOCocoa.h"
@interface OoliteApp : NSApplication { @interface OoliteApp: NSApplication
}
@end @end

52
src/Cocoa/OoliteApp.m
View File

@ -1,38 +1,25 @@
/* /*
Oolite OoliteApp.m
Created by Giles Williams on 2005-05-01.
OoliteApp.m For Oolite
Copyright (C) 2005 Giles C Williams
Created by Giles Williams on 01/05/2005. 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.
Copyright (c) 2005, Giles C Williams You should have received a copy of the GNU General Public License
All rights reserved. along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. MA 02110-1301, USA.
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free:
• to copy, distribute, display, and perform the work
• to make derivative works
Under the following conditions:
• Attribution. You must give the original author credit.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */
@ -40,13 +27,6 @@ Your fair use and other rights are in no way affected by the above.
#import "GameController.h" #import "GameController.h"
#import "MyOpenGLView.h" #import "MyOpenGLView.h"
/*--
This is a subclass of NSApplication for Oolite.
It gets around problems with the system intercepting certain events (NSKeyDown and NSKeyUp)
before MyOpenGLView gets to see them, it does this by sending those events to MyOpenGLView
regardless of any other processing NSApplication will do with them.
--*/
@implementation OoliteApp @implementation OoliteApp

45
src/Core/OOTrumble.h
View File

@ -1,39 +1,26 @@
//
// OOTrumble.h
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams OOTrumble.h
All rights reserved.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. Implements cute, fuzzy trumbles.
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: For Oolite
Copyright (C) 2004 Giles C Williams
• to copy, distribute, display, and perform the work This program is free software; you can redistribute it and/or
• to make derivative works 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.
Under the following conditions: 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.
• Attribution. You must give the original author credit. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Noncommercial. You may not use this work for commercial purposes. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

45
src/Core/OOTrumble.m
View File

@ -1,39 +1,24 @@
//
// OOTrumble.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams OOTrumble.m
All rights reserved.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

77
src/Core/OOXMLExtensions.h
View File

@ -1,70 +1,37 @@
/* /*
Oolite OOXMLExtensions.h
Created by Giles Williams on 2005-10-26.
OOXMLExtensions.m Extensions to Foundation property list classes to export property lists in
XML format, which both Cocoa and GNUstep can read. This is done because
Created by Giles Williams on 26/10/2005. GNUstep defaults to writing a version of OpenStep text-based property lists
that Cocoa can't understand. The XML format is understood by both
implementations, although GNUstep complains about not being able to find the
DTD:
For Oolite
Copyright (C) 2005 Giles C Williams
Copyright (c) 2005, Giles C Williams This program is free software; you can redistribute it and/or
All rights reserved. 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 work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. This program is distributed in the hope that it will be useful,
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ but WITHOUT ANY WARRANTY; without even the implied warranty of
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You are free: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• to copy, distribute, display, and perform the work Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
• to make derivative works MA 02110-1301, USA.
Under the following conditions:
• Attribution. You must give the original author credit.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */
/* /*
Currently the windows version exports property lists in a weird format that
is incompatible with the Mac (at least).
This means that a game saved on a PC could not be loaded elsewhere.
However the PC version can now load XML property lists, so if we could save
the game in that format we'd have cross-compatible saved games.
Adding XML export to the windows version wouldn't mean much work —
just extending those classes that can be written to a property list to have a
method that returns a pointer to an NSString containing their description in
XML, and a method to writes out a file compatible with Apple's XML property
lists.
The classes to extend are NSNumber, NSString, NSArray, NSDictionary (and
optionally, NSData).
The methods to add would be:
- (NSString *) OOXMLdescription
which would be used by:
- (BOOL) writeOOXMLToFile:(NSString *)path atomically:(BOOL)flag
(and optionally:)
- (BOOL) writeOOXMLToURL:(NSURL *)aURL atomically:(BOOL)atomically
*/ */

45
src/Core/OOXMLExtensions.m
View File

@ -1,38 +1,25 @@
/* /*
Oolite OOXMLExtensions.m
Created by Giles Williams on 2005-10-26.
OOXMLExtensions.m For Oolite
Copyright (C) 2005 Giles C Williams
Created by Giles Williams on 26/10/2005.
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.
Copyright (c) 2005, Giles C Williams This program is distributed in the hope that it will be useful,
All rights reserved. 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.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. You should have received a copy of the GNU General Public License
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ along with this program; if not, write to the Free Software
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
You are free:
• to copy, distribute, display, and perform the work
• to make derivative works
Under the following conditions:
• Attribution. You must give the original author credit.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

46
src/Core/OpenGLSprite.h
View File

@ -1,39 +1,25 @@
//
// OpenGLSprite.h
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams OpenGLSprite.h
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
¥ to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
¥ to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
¥ Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
¥ Noncommercial. You may not use this work for commercial purposes.
¥ Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

46
src/Core/OpenGLSprite.m
View File

@ -1,39 +1,25 @@
//
// OpenGLSprite.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams OpenGLSprite.m
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

46
src/Core/ParticleEntity.h
View File

@ -1,39 +1,27 @@
//
// ParticleEntity.h
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams ParticleEntity.h
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. Entity subclass implementing a variety of special effects.
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: For Oolite
Copyright (C) 2004 Giles C Williams
• to copy, distribute, display, and perform the work This program is free software; you can redistribute it and/or
• to make derivative works 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.
Under the following conditions: 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.
• Attribution. You must give the original author credit. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Noncommercial. You may not use this work for commercial purposes. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

46
src/Core/ParticleEntity.m
View File

@ -1,39 +1,25 @@
//
// ParticleEntity.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams ParticleEntity.m
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

47
src/Core/PlanetEntity.h
View File

@ -1,39 +1,28 @@
//
// PlanetEntity.h
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlanetEntity.h
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. Entity subclass representing a planet. Or a sun. Or an atmosphere. Basically
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ anything big and ball-shaped.
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: For Oolite
Copyright (C) 2004 Giles C Williams
• to copy, distribute, display, and perform the work This program is free software; you can redistribute it and/or
• to make derivative works 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.
Under the following conditions: 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.
• Attribution. You must give the original author credit. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Noncommercial. You may not use this work for commercial purposes. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

46
src/Core/PlanetEntity.m
View File

@ -1,39 +1,25 @@
//
// PlanetEntity.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlanetEntity.m
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

48
src/Core/PlayerEntity.h
View File

@ -1,39 +1,29 @@
//
// PlayerEntity.h
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlayerEntity.m
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. Entity subclass nominally representing the player's ship, but also
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ implementing much of the interaction, menu system etc. Breaking it up into
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. ten or so different classes is a perennial to-do item.
You are free: For Oolite
Copyright (C) 2004 Giles C Williams
• to copy, distribute, display, and perform the work This program is free software; you can redistribute it and/or
• to make derivative works 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.
Under the following conditions: 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.
• Attribution. You must give the original author credit. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Noncommercial. You may not use this work for commercial purposes. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

48
src/Core/PlayerEntity.m
View File

@ -1,44 +1,30 @@
//
// PlayerEntity.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlayerEntity.m
All rights reserved. Created by Giles Williams on 2004-04-03.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */
#import "PlayerEntity.h" #import "PlayerEntity.h"
#import "PlayerEntityAdditions.h" #import "PlayerEntityScripting.h"
#import "PlayerEntityContracts.h" #import "PlayerEntityContracts.h"
#import "PlayerEntityControls.h" #import "PlayerEntityControls.h"
#import "PlayerEntitySound.h" #import "PlayerEntitySound.h"

44
src/Core/PlayerEntityAdditions.h
View File

@ -1,38 +1,26 @@
/* /*
* PlayerEntity Additions.h
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlayerEntityScripting.h
All rights reserved.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. Various utility methods used for scripting.
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: For Oolite
Copyright (C) 2004 Giles C Williams
• to copy, distribute, display, and perform the work This program is free software; you can redistribute it and/or
• to make derivative works 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.
Under the following conditions: 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.
• Attribution. You must give the original author credit. You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Noncommercial. You may not use this work for commercial purposes. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */

47
src/Core/PlayerEntityAdditions.m
View File

@ -1,44 +1,29 @@
//
// PlayerEntity Additions.m
/* /*
*
* Oolite
*
* Created by Giles Williams on Sat Apr 03 2004.
* Copyright (c) 2004 for aegidian.org. All rights reserved.
*
Copyright (c) 2004, Giles C Williams PlayerEntityScripting.m
All rights reserved.
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License. For Oolite
To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/2.0/ Copyright (C) 2004 Giles C Williams
or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
You are free: 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.
• to copy, distribute, display, and perform the work This program is distributed in the hope that it will be useful,
• to make derivative works 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.
Under the following conditions: You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
• Attribution. You must give the original author credit. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
• Noncommercial. You may not use this work for commercial purposes.
• Share Alike. If you alter, transform, or build upon this work,
you may distribute the resulting work only under a license identical to this one.
For any reuse or distribution, you must make clear to others the license terms of this work.
Any of these conditions can be waived if you get permission from the copyright holder.
Your fair use and other rights are in no way affected by the above.
*/ */
#import "PlayerEntity.h" #import "PlayerEntity.h"
#import "PlayerEntityAdditions.h" #import "PlayerEntityScripting.h"
#import "GuiDisplayGen.h" #import "GuiDisplayGen.h"
#import "Universe.h" #import "Universe.h"
#import "ResourceManager.h" #import "ResourceManager.h"

2
src/Core/PlayerEntityContracts.h
View File

@ -38,7 +38,7 @@ Your fair use and other rights are in no way affected by the above.
*/ */
#import "PlayerEntity.h" #import "PlayerEntity.h"
#import "PlayerEntityAdditions.h" #import "PlayerEntityScripting.h"
#define PASSENGER_KEY_NAME @"name" #define PASSENGER_KEY_NAME @"name"
#define PASSENGER_KEY_DESTINATION_NAME @"destination_name" #define PASSENGER_KEY_DESTINATION_NAME @"destination_name"

2
src/Core/PlayerEntityContracts.m
View File

@ -38,7 +38,7 @@ Your fair use and other rights are in no way affected by the above.
*/ */
#import "PlayerEntity.h" #import "PlayerEntity.h"
#import "PlayerEntityAdditions.h" #import "PlayerEntityScripting.h"
#import "PlayerEntityContracts.h" #import "PlayerEntityContracts.h"
#import "Universe.h" #import "Universe.h"
#import "AI.h" #import "AI.h"

2
src/Core/entities.h
View File

@ -29,7 +29,7 @@ MA 02110-1301, USA.
#import "ShipEntity.h" #import "ShipEntity.h"
#import "StationEntity.h" #import "StationEntity.h"
#import "PlayerEntity.h" #import "PlayerEntity.h"
#import "PlayerEntityAdditions.h" #import "PlayerEntityScripting.h"
#import "PlayerEntityContracts.h" #import "PlayerEntityContracts.h"
// //
#import "PlanetEntity.h" #import "PlanetEntity.h"