Fixed some warnings

[lugaru.git] / Source / Awards.h

diff --git a/Source/Awards.h b/Source/Awards.h
index 9168f1cbd786da45d30baade5d75005092ded11f..03bf4e596eb0c165d3d09089f60550e51fed61a7 100644 (file)
--- a/Source/Awards.h
+++ b/Source/Awards.h
@@ -23,17 +23,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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 +38,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 *);