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

Copyright date bonanza! Most - if not all - copyright notices are now updated to 2011.

Browse Source 
Minor code cleanup:
- graphically cleaner windows resize for SDL systems.
- world event shipWillExit/ExitedWitchspace now also triggered if the escape capsule is rescued at a different system (via OXP override).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3965 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2011-01-03 02:16:03 +00:00
parent a02272fdcd
commit cb89afc4d4
417 changed files with 462 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Config/descriptions.plist
View File

@ -930,7 +930,7 @@
"unknown-ship-@" = "Unknown Ship '%@'.";
// Intro1 screen
"game-copyright" = "by Giles Williams and contributors © 2003–2010";
"game-copyright" = "by Giles Williams and contributors © 2003–2011";
"theme-music-credit" = "Oolite Theme Music by NoSleep © 2004";
"load-previous-commander" = "Load Previous Commander (Y/N)?";
"load-previous-commander-yes" = "y"; // Defines the key that corresponds to the yes answer to load-previous-commander.

2
src/Cocoa/Groolite.h
View File

@ -10,7 +10,7 @@ To do: reimplement using delegate pattern, remove dependency on Growl
framework headers (the framework is not needed at run time).
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Cocoa/Groolite.m
View File

@ -3,7 +3,7 @@
Groolite.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Cocoa/JAPersistentFileReference.h
View File

@ -7,7 +7,7 @@ data (when available) and aliases to track files even if they're moved or
renamed.
Copyright (C) 2010 Jens Ayton
Copyright (C) 2010-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/JAPersistentFileReference.m
View File

@ -3,7 +3,7 @@
JAPersistentFileReference.m
Copyright (C) 2010 Jens Ayton
Copyright (C) 2010-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/MyOpenGLView.h
View File

@ -3,7 +3,7 @@
MyOpenGLView.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Cocoa/MyOpenGLView.m
View File

@ -3,7 +3,7 @@
MyOpenGLView.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Cocoa/OOCABufferedSound.h
View File

@ -8,7 +8,7 @@ This class is an implementation detail. Do not use it directly; use OOSound.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCABufferedSound.m
View File

@ -4,7 +4,7 @@ OOCABufferedSound.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCAMusic.h
View File

@ -7,7 +7,7 @@ one instance of OOMusic may be playing at a time.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCAMusic.m
View File

@ -4,7 +4,7 @@ OOCAMusic.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASound.h
View File

@ -6,7 +6,7 @@ Abstract base class for sounds, and primary sound loading interface.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASound.m
View File

@ -4,7 +4,7 @@ OOCASound.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundChannel.h
View File

@ -9,7 +9,7 @@ OOSoundSource to play an OOSound.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundChannel.m
View File

@ -4,7 +4,7 @@ OOCASoundChannel.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundDebugMonitor.h
View File

@ -6,7 +6,7 @@ Protocol for debugging information for sound system.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundDecoder.h
View File

@ -8,7 +8,7 @@ load sounds.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundDecoder.m
View File

@ -4,7 +4,7 @@ OOCASoundDecoder.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundInternal.h
View File

@ -7,7 +7,7 @@ code.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundMixer.h
View File

@ -8,7 +8,7 @@ OOSound.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundMixer.m
View File

@ -4,7 +4,7 @@ OOCASoundMixer.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundReferencePoint.h
View File

@ -8,7 +8,7 @@ currently unimplemented, this class does nothing.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCASoundReferencePoint.m
View File

@ -4,7 +4,7 @@ OOCASoundReferencePoint.m
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCAStreamingSound.h
View File

@ -8,7 +8,7 @@ This class is an implementation detail. Do not use it directly; use OOSound.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOCAStreamingSound.m
View File

@ -6,7 +6,7 @@ This class is an implementation detail. Do not use it directly; use OOSound.
OOCASound - Core Audio sound implementation for Oolite.
Copyright (C) 2005-2010 Jens Ayton
Copyright (C) 2005-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOProgressBar.h
View File

@ -5,7 +5,7 @@ OOProgressBar.h
Simple custom progress indicator.
Copyright (C) 2008-2010 Jens Ayton
Copyright (C) 2008-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OOProgressBar.m
View File

@ -3,7 +3,7 @@
OOProgressBar.m
Copyright (C) 2008-2010 Jens Ayton
Copyright (C) 2008-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Cocoa/OoliteApp.h
View File

@ -10,7 +10,7 @@ those events to MyOpenGLView regardless of any other processing NSApplication
will do with them.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Cocoa/OoliteApp.m
View File

@ -3,7 +3,7 @@
OoliteApp.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/AI.h
View File

@ -5,7 +5,7 @@ AI.h
Core NPC behaviour/artificial intelligence class.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/AI.m
View File

@ -3,7 +3,7 @@
AI.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/AIGraphViz.m
View File

@ -3,7 +3,7 @@
AIGraphViz.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/CollisionRegion.h
View File

@ -6,7 +6,7 @@ Collision regions are used to group entities which may potentially collide, to
reduce the number of collision checks required.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/CollisionRegion.m
View File

@ -3,7 +3,7 @@
CollisionRegion.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Debug/OODebugMonitor.h
View File

@ -13,7 +13,7 @@ debugger (for instance, over Distributed Objects or TCP/IP).
Oolite debug support
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebugSupport.h
View File

@ -5,7 +5,7 @@ OODebugSupport.h
Set up debug support.
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebugSupport.m
View File

@ -3,7 +3,7 @@
OODebugSupport.m
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebugTCPConsoleClient.h
View File

@ -5,7 +5,7 @@ OODebugTCPConsoleClient.h
Oolite Debug OXP
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebugTCPConsoleClient.m
View File

@ -5,7 +5,7 @@ OODebugTCPConsoleClient.m
Oolite Debug OXP
Copyright (C) 2009-2010 Jens Ayton and contributors
Copyright (C) 2009-2011 Jens Ayton and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebugTCPConsoleProtocol.h
View File

@ -7,7 +7,7 @@ Definitions used in Oolite remote debug console protocol.
Oolite Debug OXP
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OODebuggerInterface.h
View File

@ -7,7 +7,7 @@ Protocols for communication between OODebugMonitor and OODebuggerInterface.
Oolite Debug OXP
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OOJSConsole.h
View File

@ -7,7 +7,7 @@ JavaScript object representing the JavaScript console.
Oolite Debug OXP
Copyright (C) 2007-2010 Jens Ayton
Copyright (C) 2007-2011 Jens Ayton
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Debug/OOTCPStreamDecoder.h
View File

@ -6,7 +6,7 @@ Psuedo-object to take blobs of data, create Oolite TCP debug console
protocol packets.
Copyright (C) 2007-2010 Jens Ayton and contributors
Copyright (C) 2007-2011 Jens Ayton and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

2
src/Core/Entities/DustEntity.h
View File

@ -5,7 +5,7 @@ DustEntity.h
Entity representing a number of dust particles.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/DustEntity.m
View File

@ -3,7 +3,7 @@
DustEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/Entity.h
View File

@ -5,7 +5,7 @@ Entity.h
Base class for entities, i.e. drawable world objects.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/Entity.m
View File

@ -3,7 +3,7 @@
Entity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/EntityShaderBindings.m
View File

@ -6,7 +6,7 @@ Extra methods exposed for shader bindings.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOECMBlastEntity.h
View File

@ -6,7 +6,7 @@ Invisible entity which radiates ECM blast energy.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOECMBlastEntity.m
View File

@ -4,7 +4,7 @@ OOECMBlastEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOEntityWithDrawable.h
View File

@ -5,7 +5,7 @@ OOEntityWithDrawable.h
Abstract intermediate class for entities which use an OODrawable to render.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOEntityWithDrawable.m
View File

@ -3,7 +3,7 @@
OOEntityWithDrawable.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOExhaustPlumeEntity.h
View File

@ -4,7 +4,7 @@ OOExhaustPlumeEntity.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOExhaustPlumeEntity.m
View File

@ -4,7 +4,7 @@ OOExhaustPlumeEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOFlashEffectEntity.h
View File

@ -6,7 +6,7 @@ Flashes during explosions and laser hits - not to be confused with flashers.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOFlashEffectEntity.m
View File

@ -4,7 +4,7 @@ OOFlashEffectEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOFlasherEntity.h
View File

@ -6,7 +6,7 @@ Flashing light attached to ships.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOFlasherEntity.m
View File

@ -4,7 +4,7 @@ OOFlasherEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOLightParticleEntity.h
View File

@ -6,7 +6,7 @@ Simple particle-type effect entity. Draws a billboard with additive blending.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOLightParticleEntity.m
View File

@ -4,7 +4,7 @@ OOLightParticleEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlanetEntity.h
View File

@ -5,7 +5,7 @@ OOPlanetEntity.h
Entity subclass representing a planet.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlanetEntity.m
View File

@ -3,7 +3,7 @@
OOPlanetEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlasmaBurstEntity.h
View File

@ -4,7 +4,7 @@ OOPlasmaBurstEntity.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlasmaBurstEntity.m
View File

@ -4,7 +4,7 @@ OOPlasmaBurstEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlasmaShotEntity.h
View File

@ -4,7 +4,7 @@ OOPlasmaShotEntity.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOPlasmaShotEntity.m
View File

@ -4,7 +4,7 @@ OOPlasmaShotEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSelfDrawingEntity.h
View File

@ -6,7 +6,7 @@ Abstract intermediate class for entities which draw themselves directly using
mesh data contained in the object itself.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSelfDrawingEntity.m
View File

@ -3,7 +3,7 @@
OOSelfDrawingEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSparkEntity.h
View File

@ -4,7 +4,7 @@ OOSparkEntity.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSparkEntity.m
View File

@ -4,7 +4,7 @@ OOSparkEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOStellarBody.h
View File

@ -6,7 +6,7 @@ Protocol shared by suns and planets (which used to be the same class).
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSunEntity.h
View File

@ -5,7 +5,7 @@ OOSunEntity.h
Entity subclass representing a sun.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/OOSunEntity.m
View File

@ -3,7 +3,7 @@
OOSunEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ParticleEntity.h
View File

@ -5,7 +5,7 @@ ParticleEntity.h
Entity subclass implementing a variety of special effects.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ParticleEntity.m
View File

@ -3,7 +3,7 @@
ParticleEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlanetEntity.h
View File

@ -5,7 +5,7 @@ PlanetEntity.h
Entity subclass representing a planet or an atmosphere.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlanetEntity.m
View File

@ -3,7 +3,7 @@
PlanetEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntity.h
View File

@ -7,7 +7,7 @@ implementing much of the interaction, menu system etc. Breaking it up into
ten or so different classes is a perennial to-do item.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

25
src/Core/Entities/PlayerEntity.m
View File

@ -3,7 +3,7 @@
PlayerEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -1924,8 +1924,14 @@ static bool minShieldLevelPercentageInitialised = false;
[UNIVERSE setSystemTo:system_seed];
galaxy_coordinates.x = system_seed.d;
galaxy_coordinates.y = system_seed.b;
[UNIVERSE setUpSpace];
[self setDockTarget:[UNIVERSE station]];
// send world script events to let oxps know we're in a new system.
// all player.ship properties are still disabled at this stage.
[self doScriptEvent:@"shipWillExitWitchspace"];
[self doScriptEvent:@"shipExitedWitchspace"];
[[UNIVERSE planet] update: 2.34375 * market_rnd]; // from 0..10 minutes
[[UNIVERSE station] update: 2.34375 * market_rnd]; // from 0..10 minutes
}
@ -6380,11 +6386,26 @@ static NSString *last_outfitting_key=nil;
// in non-strict mode, ask to load previous commander only if we have at least one save file.
// in strict mode, always ask to load previous commander.
NSFileManager *saveFileManager = [NSFileManager defaultManager];
NSArray *cdrArray = [saveFileManager commanderContentsOfPath: [[UNIVERSE gameController] playerFileDirectory]];
unsigned j;
BOOL fileExists, isDir, oneCdr = NO;
if ([UNIVERSE strict] || [cdrArray count] > 0)
for(j = 0; j < [cdrArray count] && !oneCdr; j++)
{
NSString* path = [cdrArray objectAtIndex:j];
fileExists = [saveFileManager fileExistsAtPath:path isDirectory:&isDir];
if (fileExists && !isDir && [[[path pathExtension] lowercaseString] isEqualToString:@"oolite-save"])
{
oneCdr = YES;
}
}
if ([UNIVERSE strict] || oneCdr)
{
text = DESC(@"load-previous-commander");
}
else

2
src/Core/Entities/PlayerEntityContracts.h
View File

@ -5,7 +5,7 @@ PlayerEntityContracts.h
Methods relating to passenger and cargo contract handling.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityContracts.m
View File

@ -3,7 +3,7 @@
PlayerEntityContracts.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityControls.h
View File

@ -5,7 +5,7 @@ PlayerEntityControls.h
Input management methods.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

21
src/Core/Entities/PlayerEntityControls.m
View File

@ -3,7 +3,7 @@
PlayerEntityControls.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -1158,21 +1158,19 @@ static NSTimeInterval time_last_frame;
{
if (!hyperspace_pressed)
{
galactic_witchjump = NO;
if ([self status] == STATUS_WITCHSPACE_COUNTDOWN)
{
// abort!
BOOL wasGalactic = galactic_witchjump;
galactic_witchjump = NO;
[self setStatus:STATUS_IN_FLIGHT];
[self playHyperspaceAborted];
// say it!
[UNIVERSE clearPreviousMessage];
[UNIVERSE addMessage:DESC(wasGalactic ? @"witch-user-galactic-abort" : @"witch-user-abort") forCount:3.0];
[UNIVERSE addMessage:DESC(@"witch-user-abort") forCount:3.0];
[self doScriptEvent:@"playerCancelledJumpCountdown"];
}
else if ([self witchJumpChecklist:false])
else if ([self witchJumpChecklist:false])
{
galactic_witchjump = NO;
witchspaceCountdown = hyperspaceMotorSpinTime;
[self setStatus:STATUS_WITCHSPACE_COUNTDOWN];
[self playStandardHyperspace];
@ -1199,21 +1197,22 @@ static NSTimeInterval time_last_frame;
if ([self status] == STATUS_WITCHSPACE_COUNTDOWN)
{
// abort!
BOOL wasGalactic = galactic_witchjump;
galactic_witchjump = NO;
[self setStatus:STATUS_IN_FLIGHT];
[self playHyperspaceAborted];
// say it!
[UNIVERSE clearPreviousMessage];
[UNIVERSE addMessage:DESC(wasGalactic ? @"witch-user-galactic-abort" : @"witch-user-abort") forCount:3.0];
[UNIVERSE addMessage:DESC(@"witch-user-galactic-abort") forCount:3.0];
[self doScriptEvent:@"playerCancelledJumpCountdown"];
}
else
{
galactic_witchjump = YES;
witchspaceCountdown = hyperspaceMotorSpinTime;
// even if we don't have a witchspace motor, we can still do a galactic jump (!)
if(![self hasHyperspaceMotor]) witchspaceCountdown = DEFAULT_HYPERSPACE_SPIN_TIME;
// even if we don't have a witchspace motor, we can still do a default galactic jump (!)
if(EXPECT([self hasHyperspaceMotor])) witchspaceCountdown = hyperspaceMotorSpinTime;
else witchspaceCountdown = DEFAULT_HYPERSPACE_SPIN_TIME;
[self setStatus:STATUS_WITCHSPACE_COUNTDOWN];
[self playGalacticHyperspace];
// say it!

2
src/Core/Entities/PlayerEntityLegacyScriptEngine.h
View File

@ -5,7 +5,7 @@ PlayerEntityLegacyScriptEngine.h
Various utility methods used for scripting.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

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

@ -3,7 +3,7 @@
PlayerEntityLegacyScriptEngine.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityLoadSave.h
View File

@ -9,7 +9,7 @@ PlayerEntity.m has gotten far too big and is in danger of becoming
the whole general mish mash.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityScriptMethods.h
View File

@ -6,7 +6,7 @@ Methods for use by scripting mechanisms.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityScriptMethods.m
View File

@ -3,7 +3,7 @@
PlayerEntityScriptMethods.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntitySound.h
View File

@ -3,7 +3,7 @@
PlayerEntitySound.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntitySound.m
View File

@ -3,7 +3,7 @@
PlayerEntitySound.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityStickMapper.h
View File

@ -5,7 +5,7 @@ PlayerEntityStickMapper.h
Joystick support for SDL implementation of Oolite.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/PlayerEntityStickMapper.m
View File

@ -3,7 +3,7 @@
PlayerEntityStickMapper.h
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ProxyPlayerEntity.h
View File

@ -7,7 +7,7 @@ this time it implements the extra shader bindable methods of PlayerShip.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ProxyPlayerEntity.m
View File

@ -4,7 +4,7 @@ ProxyPlayerEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/RingEntity.h
View File

@ -5,7 +5,7 @@ RingEntity.h
Entity implementing tunnel effect for hyperspace and stations.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/RingEntity.m
View File

@ -3,7 +3,7 @@
RingEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ShipEntity.h
View File

@ -6,7 +6,7 @@ Entity subclass representing a ship, or various other flying things like cargo
pods and stations (a subclass).
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

7
src/Core/Entities/ShipEntity.m
View File

@ -4,7 +4,7 @@ ShipEntity.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -3228,8 +3228,9 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
desired_speed = max_available_speed; // use afterburner to approach
// if within 0.75km of the target's six or twelve, or if target at standstill for 62.5% of non-thargoid ships (!), then vector in attack
if (distance < 750.0 || (target_speed == 0.0 && ![self isThargoid] && ([self universalID] & 7) > 2))
// if within 0.75km of the target's six or twelve, or if target almost at standstill for 62.5% of non-thargoid ships (!),
// then vector in attack.
if (distance < 750.0 || (target_speed < 0.2 && ![self isThargoid] && ([self universalID] & 14) > 4))
{
behaviour = BEHAVIOUR_ATTACK_FLY_TO_TARGET;
frustration = 0.0;

2
src/Core/Entities/ShipEntityAI.h
View File

@ -6,7 +6,7 @@ Additional methods relating to behaviour/artificial intelligence.
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
src/Core/Entities/ShipEntityAI.m
View File

@ -3,7 +3,7 @@
ShipEntityAI.m
Oolite
Copyright (C) 2004-2010 Giles C Williams and contributors
Copyright (C) 2004-2011 Giles C Williams and contributors
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

Some files were not shown because too many files have changed in this diff Show More