License: Update GPLv2+ header to match current FSF recommendation

[lugaru.git] / Source / Awards.h

diff --git a/Source/Awards.h b/Source/Awards.h
index 9168f1cbd786da45d30baade5d75005092ded11f..a2be1f36f72348d5e5d50972cb2b1d1227a2fdfa 100644 (file)
--- a/Source/Awards.h
+++ b/Source/Awards.h
@@ -3,37 +3,31 @@ Copyright (C) 2010 - Lugaru authors
 
 This file is part of Lugaru.
 
-Lugaru 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.
+Lugaru 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,
+Lugaru 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.
+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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef AWARDS_H
 #define AWARDS_H
 
 enum bonus_types {
-#define DECLARE_BONUS(id, name) id,
+#define DECLARE_BONUS(id, ...) id,
 #include "Bonuses.def"
 #undef DECLARE_BONUS
-bonus_count
+    bonus_count
 };
 
-static const char *bonus_names[bonus_count] = {
-#define DECLARE_BONUS(id, name) name,
-#include "Bonuses.def"
-#undef DECLARE_BONUS
-};
+extern const char *bonus_names[bonus_count];
 
 extern int bonus;
 extern float bonusvalue;
@@ -42,18 +36,16 @@ extern float bonustime;
 extern float startbonustotal;
 extern float bonusnum[100];
 
+extern void award_bonus(int playerid, int bonusid, int alt_value = 0);
+
 enum award_types {
 #define DECLARE_AWARD(id, name) id,
 #include "Awards.def"
 #undef DECLARE_AWARD
-award_count
+    award_count
 };
 
-static const char *award_names[award_count] = {
-#define DECLARE_AWARD(id, name) name,
-#include "Awards.def"
-#undef DECLARE_AWARD
-};
+extern const char *award_names[award_count];
 
 extern int award_awards(int *);