diff --git a/SConstruct b/SConstruct index f02839b6f..608dcdc87 100644 --- a/SConstruct +++ b/SConstruct @@ -767,7 +767,7 @@ class DXXProgram(DXXCommon): 'main/gamerend.cpp', 'main/gamesave.cpp', 'main/gameseg.cpp', -'main/gauges.c', +'main/gauges.cpp', 'main/hostage.c', 'main/hud.c', 'main/inferno.c', diff --git a/common/main/gauges.h b/common/main/gauges.h index b31e1f052..4c0bf6ba2 100644 --- a/common/main/gauges.h +++ b/common/main/gauges.h @@ -48,8 +48,8 @@ extern bitmap_index Gauges_hires[MAX_GAUGE_BMS]; // hires gauges // Flags for gauges/hud stuff -extern void add_points_to_score(); -extern void add_bonus_points_to_score(); +extern void add_points_to_score(int points); +extern void add_bonus_points_to_score(int points); void render_gauges(void); void init_gauges(void); diff --git a/similar/main/gauges.c b/similar/main/gauges.cpp similarity index 99% rename from similar/main/gauges.c rename to similar/main/gauges.cpp index 2394361e8..a5b9849c5 100644 --- a/similar/main/gauges.c +++ b/similar/main/gauges.cpp @@ -17,6 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. * */ +#include #include #include #include @@ -56,6 +57,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #include "args.h" +using std::min; + //bitmap numbers for gauges #define GAUGE_SHIELDS 0 //0..9, in decreasing order (100%,90%...0%) #define GAUGE_INVULNERABLE 10 //10..19