From 6b7c660d794f7cadb438bc1ac3201222bcbced8a Mon Sep 17 00:00:00 2001 From: Jens Ayton Date: Wed, 28 Feb 2007 14:34:40 +0000 Subject: [PATCH] Began work on changing license notifications to GPL. git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@782 127b21dd-08f5-0310-b4b7-95ae10353056 --- src/Cocoa/Groolite.h | 43 +++++++++++++++---------------- src/Cocoa/Groolite.m | 37 +++++++++++---------------- src/Core/AI.h | 46 +++++++++++++-------------------- src/Core/AI.m | 46 ++++++++++++--------------------- src/Core/CollisionRegion.h | 46 +++++++++++++-------------------- src/Core/CollisionRegion.m | 45 ++++++++++++--------------------- src/Core/DustEntity.h | 46 +++++++++++++-------------------- src/Core/DustEntity.m | 46 ++++++++++++--------------------- src/Core/Entity.h | 46 +++++++++++++-------------------- src/Core/Entity.m | 47 +++++++++++++--------------------- src/Core/GameController.h | 46 +++++++++++++-------------------- src/Core/GameController.m | 45 ++++++++++++--------------------- src/Core/Geometry.h | 46 +++++++++++++-------------------- src/Core/Geometry.m | 45 ++++++++++++--------------------- src/Core/GuiDisplayGen.h | 47 +++++++++++++--------------------- src/Core/GuiDisplayGen.m | 46 ++++++++++++--------------------- src/Core/HeadUpDisplay.h | 48 +++++++++++++---------------------- src/Core/HeadUpDisplay.m | 49 ++++++++++++----------------------- src/Core/LoadSave.h | 45 ++++++++++++++++++++++----------- src/Core/LoadSave.m | 40 +++++++++++++++++------------ src/Core/legacy_random.c | 46 +++++++++++++-------------------- src/Core/legacy_random.h | 52 +++++++++++++++----------------------- 22 files changed, 398 insertions(+), 605 deletions(-) diff --git a/src/Cocoa/Groolite.h b/src/Cocoa/Groolite.h index fecc05df..da8cdae4 100644 --- a/src/Cocoa/Groolite.h +++ b/src/Cocoa/Groolite.h @@ -1,32 +1,31 @@ -// -// Groolite.h -// -// Growl integration module for Oolite /* -Copyright © 2005 Jens Ayton -All rights reserved. +Groolite.h -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +Growl integration class. The singleton Groolite object listens for Growl +notifications and reports them by printing to the game communication log. For +more about Growl, see . -You are free: +To do: reimplement using delegate pattern, remove dependency on Growl +framework headers (the framework is not needed at run time). -• to copy, distribute, display, and perform the work -• to make derivative works +For Oolite +Copyright (C) 2005 Jens Ayton and Giles C Williams -Under the following conditions: +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. -• Attribution. You must give the original author credit. -• 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. +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. -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. */ @@ -44,4 +43,4 @@ Your fair use and other rights are in no way affected by the above. + (NSString*) priorityDescription: (int) min_priority; -@end \ No newline at end of file +@end diff --git a/src/Cocoa/Groolite.m b/src/Cocoa/Groolite.m index 66b34163..1fde68a7 100644 --- a/src/Cocoa/Groolite.m +++ b/src/Cocoa/Groolite.m @@ -1,31 +1,24 @@ -// -// Groolite.m -// Oolite /* -Copyright © 2005 Jens Ayton and Giles Williams -All rights reserved. +Groolite.m -This work is licensed under the Creative Commons Attribution-ShareAlike License. -To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/2.0/ -or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA. +For Oolite +Copyright (C) 2005 Jens Ayton and 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. -• 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. */ diff --git a/src/Core/AI.h b/src/Core/AI.h index 264cada4..f2b2e35e 100644 --- a/src/Core/AI.h +++ b/src/Core/AI.h @@ -1,39 +1,27 @@ -// -// AI.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. +AI.h +Created by Giles Williams on 2004-04-03. -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. +Core NPC behaviour/artificial intelligence class. -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. */ diff --git a/src/Core/AI.m b/src/Core/AI.m index c77bbc52..be5dece8 100644 --- a/src/Core/AI.m +++ b/src/Core/AI.m @@ -1,39 +1,25 @@ -// -// AI.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. +AI.m +Created by Giles Williams on 2004-04-03. -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. */ diff --git a/src/Core/CollisionRegion.h b/src/Core/CollisionRegion.h index 5cdf9f49..59314122 100644 --- a/src/Core/CollisionRegion.h +++ b/src/Core/CollisionRegion.h @@ -1,38 +1,28 @@ /* - Oolite +CollisionRegion.h +Created by Giles Williams on 2006-03-01. - CollisionRegion.h - - Created by Giles Williams on 01/03/2006. +Collision regions are used to group entities which may potentially collide, to +reduce the number of collision checks required. +For Oolite +Copyright (C) 2006 Giles C Williams -Copyright (c) 2005, Giles C Williams -All rights reserved. +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 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. +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 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. */ diff --git a/src/Core/CollisionRegion.m b/src/Core/CollisionRegion.m index 190c36e1..0c2a46b5 100644 --- a/src/Core/CollisionRegion.m +++ b/src/Core/CollisionRegion.m @@ -1,38 +1,25 @@ /* - Oolite +CollisionRegion.m +Created by Giles Williams on 2006-03-01. - CollisionRegion.m - - Created by Giles Williams on 01/03/2006. +For Oolite +Copyright (C) 2006 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. */ diff --git a/src/Core/DustEntity.h b/src/Core/DustEntity.h index 90f3d745..8463314d 100644 --- a/src/Core/DustEntity.h +++ b/src/Core/DustEntity.h @@ -1,39 +1,27 @@ -// -// DustEntity.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. +DustEntity.h +Created by Giles Williams on 2004-04-03. -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 representing a number of dust particles. -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. */ diff --git a/src/Core/DustEntity.m b/src/Core/DustEntity.m index df20bd6d..9eab0481 100644 --- a/src/Core/DustEntity.m +++ b/src/Core/DustEntity.m @@ -1,39 +1,25 @@ -// -// DustEntity.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. +DustEntity.m +Created by Giles Williams on 2004-04-03. -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. */ diff --git a/src/Core/Entity.h b/src/Core/Entity.h index b5811101..0c677c71 100644 --- a/src/Core/Entity.h +++ b/src/Core/Entity.h @@ -1,39 +1,27 @@ -// -// Entity.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. +Entity.h +Created by Giles Williams on 2004-04-03. -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: +Base class for entities, i.e. drawable world objects. -• 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. */ diff --git a/src/Core/Entity.m b/src/Core/Entity.m index fe0b5637..f5351567 100644 --- a/src/Core/Entity.m +++ b/src/Core/Entity.m @@ -1,41 +1,28 @@ -// -// Entity.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. +Entity.m +Created by Giles Williams on 2004-04-03. -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. */ + #import "Entity.h" #import "vector.h" diff --git a/src/Core/GameController.h b/src/Core/GameController.h index 2f8b5b75..8e436380 100644 --- a/src/Core/GameController.h +++ b/src/Core/GameController.h @@ -1,37 +1,27 @@ -/* GameController - * - * 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. +GameController.h +Created by Giles Williams on 2004-04-03. -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. +Main application controller class. -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. */ diff --git a/src/Core/GameController.m b/src/Core/GameController.m index ca842864..b522401c 100644 --- a/src/Core/GameController.m +++ b/src/Core/GameController.m @@ -1,41 +1,28 @@ /* - * - * 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. +GameController.m +Created by Giles Williams on 2004-04-03. -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. */ - #import "GameController.h" #import "Universe.h" #import "ResourceManager.h" diff --git a/src/Core/Geometry.h b/src/Core/Geometry.h index a00c85b9..f5635211 100644 --- a/src/Core/Geometry.h +++ b/src/Core/Geometry.h @@ -1,38 +1,28 @@ /* - Oolite +Geometry.h +Created by Giles Williams on 2006-01-30. - Geometry.h - - Created by Giles Williams on 30/01/2006. +Class for reasoning about triangle meshes, in particular for the creation of +octtrees for collision-detection purposes. +For Oolite +Copyright (C) 2006 Giles C Williams -Copyright (c) 2005, Giles C Williams -All rights reserved. +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 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. +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 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. */ diff --git a/src/Core/Geometry.m b/src/Core/Geometry.m index 2e931b74..2c1b992f 100644 --- a/src/Core/Geometry.m +++ b/src/Core/Geometry.m @@ -1,38 +1,25 @@ /* - Oolite +Geometry.m +Created by Giles Williams on 2006-01-30. - Geometry.m - - Created by Giles Williams on 30/01/2006. +For Oolite +Copyright (C) 2006 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. */ diff --git a/src/Core/GuiDisplayGen.h b/src/Core/GuiDisplayGen.h index 5f134d5e..ea6b2a8a 100644 --- a/src/Core/GuiDisplayGen.h +++ b/src/Core/GuiDisplayGen.h @@ -1,39 +1,28 @@ -// -// GuiDisplayGen.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. +GuiDisplayGen.h +Created by Giles Williams on 2004-04-03. -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. +Class handling interface elements, primarily text, that are not part of the 3D +game world, together with GuiDisplayGen. -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. */ diff --git a/src/Core/GuiDisplayGen.m b/src/Core/GuiDisplayGen.m index 51300892..a010c443 100644 --- a/src/Core/GuiDisplayGen.m +++ b/src/Core/GuiDisplayGen.m @@ -1,39 +1,25 @@ -// -// GuiDisplayGen.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. +GuiDisplayGen.m +Created by Giles Williams on 2004-04-03. -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. */ diff --git a/src/Core/HeadUpDisplay.h b/src/Core/HeadUpDisplay.h index c323bffb..c46e612a 100644 --- a/src/Core/HeadUpDisplay.h +++ b/src/Core/HeadUpDisplay.h @@ -1,41 +1,27 @@ -// -// HeadUpDisplay.h -// Oolite -// /* - * - * Oolite - * - * Created by Giles Williams on Fri Jul 30 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * -Copyright (c) 2004, Giles C Williams -All rights reserved. +HeadUpDisplay.h +Created by Giles Williams on 2004-07-30. -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. +Class handling the player ship’s heads-up display, and 2D drawing functions. -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. */ diff --git a/src/Core/HeadUpDisplay.m b/src/Core/HeadUpDisplay.m index 3f134bb3..d0204e9e 100644 --- a/src/Core/HeadUpDisplay.m +++ b/src/Core/HeadUpDisplay.m @@ -1,44 +1,27 @@ -// -// HeadUpDisplay.m -// Oolite -// /* - * - * Oolite - * - * Created by Giles Williams on Fri Jul 30 2004. - * Copyright (c) 2004 for aegidian.org. All rights reserved. - * -Copyright (c) 2004, Giles C Williams -All rights reserved. +HeadUpDisplay.m +Created by Giles Williams on 2004-07-30. -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. */ -// #import "HeadUpDisplay.h" #import "ResourceManager.h" diff --git a/src/Core/LoadSave.h b/src/Core/LoadSave.h index a572c368..5e74bfd7 100644 --- a/src/Core/LoadSave.h +++ b/src/Core/LoadSave.h @@ -1,19 +1,34 @@ +/* + +PlayerEntityLoadSave.h +Created by Dylan Smith on 2005-06-21. + +Created for the Oolite-Linux project (but is portable) + +LoadSave has been separated out into a separate category because +PlayerEntity.m has gotten far too big and is in danger of becoming +the whole general mish mash. + +For Oolite +Copyright (C) 2005 Giles C Williams and Dylan Smith + +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. + +*/ -// -// LoadSave.h -// -// Created for the Oolite-Linux project (but is portable) -// -// Dylan Smith, 2005-06-21 -// -// LoadSave has been separated out into a separate category because -// PlayerEntity.m has gotten far too big and is in danger of becoming -// the whole general mish mash. -// -// oolite: (c) 2004 Giles C Williams. -// This work is licensed under the Creative Commons Attribution NonCommercial -// ShareAlike license. -// #import "PlayerEntity.h" #import "GuiDisplayGen.h" #import "MyOpenGLView.h" diff --git a/src/Core/LoadSave.m b/src/Core/LoadSave.m index 5f3a77b7..18ddaf82 100644 --- a/src/Core/LoadSave.m +++ b/src/Core/LoadSave.m @@ -1,19 +1,27 @@ -/* */ -// -// LoadSave.m -// -// Created for the Oolite-Linux project (but is portable) -// -// Dylan Smith, 2005-06-21 -// -// LoadSave has been separated out into a separate category because -// PlayerEntity.m has gotten far too big and is in danger of becoming -// the whole general mish mash. -// -// oolite: (c) 2004 Giles C Williams. -// This work is licensed under the Creative Commons Attribution NonCommercial -// ShareAlike license. -// +/* + +PlayerEntityLoadSave.m +Created by Dylan Smith on 2005-06-21. + +For Oolite +Copyright (C) 2005 Giles C Williams and Dylan Smith + +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. + +*/ #import "LoadSave.h" #import "OOFileManager.h" diff --git a/src/Core/legacy_random.c b/src/Core/legacy_random.c index 42e5cbee..3522549b 100644 --- a/src/Core/legacy_random.c +++ b/src/Core/legacy_random.c @@ -1,38 +1,28 @@ /* - * legacy_random.c - * - * 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. +legacy_random.c +Created by Giles Williams on 2004-04-03. -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. +Class handling interface elements, primarily text, that are not part of the 3D +game world, together with GuiDisplayGen. -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. */ diff --git a/src/Core/legacy_random.h b/src/Core/legacy_random.h index 921e33d8..55bc62ff 100644 --- a/src/Core/legacy_random.h +++ b/src/Core/legacy_random.h @@ -1,43 +1,34 @@ -#ifndef LEGACY_RANDOM_H -#define LEGACY_RANDOM_H /* - * legacy_random.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. +legacy_random.h +Created by Giles Williams on 2004-04-03. -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. +Pseudo-random number generator designed to produce identical results to that +used in BBC Elite (for dynamic world generation), and related functions. -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. */ +#ifndef LEGACY_RANDOM_H +#define LEGACY_RANDOM_H + struct rand_seed_6uc { @@ -99,4 +90,3 @@ int rotate_byte_left (int x); int equal_seeds (Random_Seed seed1, Random_Seed seed2); #endif -