Yadda yadda consistent naming of categories yadda.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@793 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Jens Ayton
parent
374b59c209
commit
3de790d68d
@ -1,39 +1,26 @@
|
||||
//
|
||||
// PlayerEntity (contracts).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
|
||||
All rights reserved.
|
||||
PlayerEntityContracts.h
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
Methods relating to passenger and cargo contract handling.
|
||||
|
||||
You are free:
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
• to copy, distribute, display, and perform the work
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
• 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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@ -1,39 +1,24 @@
|
||||
//
|
||||
// PlayerEntity (contracts).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
|
||||
All rights reserved.
|
||||
PlayerEntityContracts.m
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
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
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@ -23,7 +23,6 @@ MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#import "PlayerEntity.h"
|
||||
#import "PlayerEntityScripting.h"
|
||||
#import "GuiDisplayGen.h"
|
||||
#import "Universe.h"
|
||||
#import "ResourceManager.h"
|
||||
|
||||
@ -1,43 +1,29 @@
|
||||
//
|
||||
// ResourceManager.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
|
||||
All rights reserved.
|
||||
ResourceManager.h
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
Singleton class responsible for loading various data files.
|
||||
|
||||
You are free:
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
• to copy, distribute, display, and perform the work
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
• 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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
#import "OOCocoa.h"
|
||||
#import "OOOpenGL.h"
|
||||
|
||||
|
||||
@ -1,41 +1,24 @@
|
||||
//
|
||||
// ResourceManager.m
|
||||
// Oolite
|
||||
//
|
||||
/*
|
||||
*
|
||||
* 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
|
||||
All rights reserved.
|
||||
ResourceManager.m
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
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
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@ -1,39 +1,26 @@
|
||||
//
|
||||
// RingEntity.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
|
||||
All rights reserved.
|
||||
RingEntity.h
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
Entity implementing tunnel effect for hyperspace and stations.
|
||||
|
||||
You are free:
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
• to copy, distribute, display, and perform the work
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
|
||||
• 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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@ -1,39 +1,24 @@
|
||||
//
|
||||
// RingEntity.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
|
||||
All rights reserved.
|
||||
RingEntity.m
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
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
|
||||
• to make derivative works
|
||||
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.
|
||||
|
||||
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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
|
||||
@ -1,44 +1,32 @@
|
||||
/*
|
||||
|
||||
Oolite
|
||||
NSScannerOOExtensions.h
|
||||
|
||||
ScannerExtension.h
|
||||
Additions to NSScanner to work around bugs.
|
||||
|
||||
Created by Giles Williams on 26/10/2005.
|
||||
For Oolite
|
||||
Copyright (C) 2004 Giles C Williams
|
||||
|
||||
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
|
||||
All rights reserved.
|
||||
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.
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
#import <Foundation/NSScanner.h>
|
||||
|
||||
@interface NSScanner (OoliteExtension)
|
||||
@interface NSScanner (OOExtensions)
|
||||
|
||||
- (BOOL) ooliteScanCharactersFromSet:(NSCharacterSet *)set intoString:(NSString **)value;
|
||||
- (BOOL) ooliteScanUpToCharactersFromSet:(NSCharacterSet *)set intoString:(NSString **)value;
|
||||
|
||||
@ -1,38 +1,24 @@
|
||||
/*
|
||||
|
||||
Oolite
|
||||
NSScannerOOExtensions.m
|
||||
|
||||
ScannerExtension.m
|
||||
For Oolite
|
||||
Copyright (C) 2004 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.
|
||||
|
||||
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
|
||||
All rights reserved.
|
||||
|
||||
This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike License.
|
||||
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.
|
||||
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.
|
||||
|
||||
*/
|
||||
|
||||
@ -40,7 +26,7 @@ Your fair use and other rights are in no way affected by the above.
|
||||
|
||||
#import "ScannerExtension.h"
|
||||
|
||||
@implementation NSScanner (OoliteExtension)
|
||||
@implementation NSScanner (OOExtensions)
|
||||
|
||||
- (BOOL) ooliteScanCharactersFromSet:(NSCharacterSet *)set intoString:(NSString **)value
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user