license update, cleanup

stepmania/src/CombinedLifeMeter.h

@@ -1,15 +1,5 @@
 #ifndef COMBINEDLIFEMETER_H
 #define COMBINEDLIFEMETER_H
-/*
------------------------------------------------------------------------------
- Class: LifeMeter
-
- Desc: A graphic displayed in the LifeMeterBar during Dancing.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
------------------------------------------------------------------------------
-*/
 
 #include "PlayerNumber.h"
 #include "GameConstantsAndTypes.h"

stepmania/src/ScreenSelectDifficultyEX.h

@@ -1,16 +1,5 @@
 #ifndef ScreenSelectDifficultyEX_H
 #define ScreenSelectDifficultyEX_H
-/*
------------------------------------------------------------------------------
- Class: ScreenSelectDifficultyEX
-
- Desc: DDR Extreme Difficulty Select
-
- Copyright (c) 2001-2003 by the person(s) listed below.  All rights reserved.
-	Kevin Slaughter
------------------------------------------------------------------------------
-*/
-
 
 #include "BitmapText.h"
 #include "RageSound.h"

stepmania/src/global.cpp

@@ -41,3 +41,27 @@ void NORETURN sm_crash( const char *reason )
 #endif
 }
 
+/*
+ * (c) 2004 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.
+ */