From 9c03c0d0eb547bf7e9f752f724659ef9004d910d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 8 Jun 2004 05:49:00 +0000 Subject: [PATCH] license update --- stepmania/src/CombinedLifeMeterEnemy.cpp | 37 ++++++++++++++------- stepmania/src/CombinedLifeMeterEnemy.h | 37 ++++++++++++++------- stepmania/src/ScreenEndlessBreak.cpp | 42 ++++++++++++++++-------- stepmania/src/ScreenEndlessBreak.h | 39 +++++++++++++++------- stepmania/src/StepMania.cpp | 35 ++++++++++++++------ stepmania/src/StepMania.h | 35 ++++++++++++++------ 6 files changed, 158 insertions(+), 67 deletions(-) diff --git a/stepmania/src/CombinedLifeMeterEnemy.cpp b/stepmania/src/CombinedLifeMeterEnemy.cpp index fd73146f27..9d052b2dbf 100644 --- a/stepmania/src/CombinedLifeMeterEnemy.cpp +++ b/stepmania/src/CombinedLifeMeterEnemy.cpp @@ -1,15 +1,4 @@ #include "global.h" -/* ------------------------------------------------------------------------------ - Class: CombinedLifeMeterEnemy - - Desc: See header. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - #include "CombinedLifeMeterEnemy.h" #include "RageUtil.h" #include "GameConstantsAndTypes.h" @@ -189,3 +178,29 @@ void CombinedLifeMeterEnemy::OnTaunt() { SetFace( taunt ); } + +/* + * (c) 2001-2003 Chris Danford + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + diff --git a/stepmania/src/CombinedLifeMeterEnemy.h b/stepmania/src/CombinedLifeMeterEnemy.h index 08c0a90c04..1ef1132a54 100644 --- a/stepmania/src/CombinedLifeMeterEnemy.h +++ b/stepmania/src/CombinedLifeMeterEnemy.h @@ -1,16 +1,5 @@ #ifndef CombinedLifeMeterEnemy_H #define CombinedLifeMeterEnemy_H -/* ------------------------------------------------------------------------------ - Class: CombinedLifeMeterEnemy - - Desc: A little graphic to the left of the song's text banner in the MusicWheel. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ - #include "CombinedLifeMeter.h" #include "Sprite.h" @@ -48,3 +37,29 @@ protected: #endif + +/* + * (c) 2001-2003 Chris Danford + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + diff --git a/stepmania/src/ScreenEndlessBreak.cpp b/stepmania/src/ScreenEndlessBreak.cpp index 8236afbdbe..050b4afff0 100644 --- a/stepmania/src/ScreenEndlessBreak.cpp +++ b/stepmania/src/ScreenEndlessBreak.cpp @@ -1,22 +1,10 @@ #include "global.h" - -/* ------------------------------------------------------------------------------ - Class: ScreenEndlessBreak - - Desc: See header - - Copyright (c) 2001-2003 by the person(s) listed below. All rights reserved. - Kevin Slaughter ------------------------------------------------------------------------------ -*/ - - -//TODO:: Add scripting support #include "RageLog.h" #include "ScreenManager.h" #include "ScreenEndlessBreak.h" +//TODO:: Add scripting support + ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName ) { LOG->Trace("ScreenEndlessBreak()"); @@ -105,3 +93,29 @@ void ScreenEndlessBreak::Input(const DeviceInput &DeviceI, const InputEventType //Compiler bitching over this.. //Screen::Input( DeviceI, type, GameI, MenuI, StyleI ); } + +/* + * (c) 2001-2003 Kevin Slaughter + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + diff --git a/stepmania/src/ScreenEndlessBreak.h b/stepmania/src/ScreenEndlessBreak.h index b6d0c5992d..b6175c174d 100644 --- a/stepmania/src/ScreenEndlessBreak.h +++ b/stepmania/src/ScreenEndlessBreak.h @@ -1,17 +1,8 @@ +/* Class: ScreenEndlessBreak - Break periods during endless mode. */ + #ifndef SCREENENDLESSBREAK_H #define SCREENENDLESSBREAK_H -/* ------------------------------------------------------------------------------ - Class: ScreenEndlessBreak - - Desc: Screen for break periods during endless mode. - - Copyright (c) 2001-2003 by the person(s) listed below. All rights reserved. - Kevin Slaughter ------------------------------------------------------------------------------ -*/ - #include "Screen.h" #include "PrefsManager.h" #include "Banner.h" @@ -43,3 +34,29 @@ private: bool m_bExiting; }; #endif + +/* + * (c) 2001-2003 Kevin Slaughter + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 69cbf0334e..dd5afbead2 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1,14 +1,4 @@ #include "global.h" -/* ------------------------------------------------------------------------------ - File: StepMania.cpp - - Desc: Entry point for program. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ #include "StepMania.h" @@ -1605,3 +1595,28 @@ static void GameLoop() GAMESTATE->EndGame(); } +/* + * (c) 2001-2004 Chris Danford, Glenn Maynard + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h index 2cdde25fdb..e9d72e0a15 100644 --- a/stepmania/src/StepMania.h +++ b/stepmania/src/StepMania.h @@ -1,15 +1,5 @@ #ifndef STEPMANIA_H #define STEPMANIA_H -/* ------------------------------------------------------------------------------ - File: StepMania.h - - Desc: Objects accessable from anywhere in the program. - - Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved. - Chris Danford ------------------------------------------------------------------------------ -*/ #include "Game.h" @@ -35,3 +25,28 @@ extern char **g_argv; bool GetCommandlineArgument( const CString &option, CString *argument=NULL, int iIndex=0 ); #endif + +/* + * (c) 2001-2004 Chris Danford + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, and/or sell copies of the Software, and to permit persons to + * whom the Software is furnished to do so, provided that the above + * copyright notice(s) and this permission notice appear in all copies of + * the Software and that both the above copyright notice(s) and this + * permission notice appear in supporting documentation. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF + * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS + * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT + * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */