Fixed: Various compiler warnings (e.g., unused functions/variables)

skyjake · Jun 12, 2015 · ac01ae7 · ac01ae7
1 parent 0bb66ff
commit ac01ae7
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 3 deletions.
diff --git a/doomsday/apps/plugins/common/src/hu_lib.cpp b/doomsday/apps/plugins/common/src/hu_lib.cpp
@@ -121,6 +121,7 @@ void GUI_UpdateWidgetGeometry(HudWidget *wi)
         Rect_SetY(&wi->geometry(), Rect_Y(&wi->geometry()) - Rect_Height(&wi->geometry()) / 2);
 }
 
+#if defined(UI_DEBUG)
 static void drawWidgetGeometry(HudWidget *wi)
 {
     DENG2_ASSERT(wi);
@@ -147,6 +148,7 @@ static void drawWidgetAvailableSpace(HudWidget *wi)
     DGL_Color4f(0, .4f, 0, .1f);
     DGL_DrawRectf2(Rect_X(&wi->geometry()), Rect_Y(&wi->geometry()), wi->maximumSize().width, wi->maximumSize().height);
 }
+#endif
 
 static void drawWidget2(HudWidget *wi, Point2Raw const *offset = nullptr)
 {

diff --git a/doomsday/apps/plugins/common/src/hud/hudwidget.cpp b/doomsday/apps/plugins/common/src/hud/hudwidget.cpp
@@ -44,8 +44,8 @@ HudWidget::HudWidget(void (*updateGeometry) (HudWidget *wi),
                      void (*drawer) (HudWidget *wi, Point2Raw const *offset),
                      dint playerNum, uiwidgetid_t id)
     : updateGeometry(updateGeometry)
-    , d(new Instance)
     , drawer(drawer)
+    , d(new Instance)
 {
     setId(id);
     setPlayer(playerNum);

diff --git a/doomsday/apps/plugins/common/src/hud/widgets/chainwidget.cpp b/doomsday/apps/plugins/common/src/hud/widgets/chainwidget.cpp
@@ -99,6 +99,7 @@ void guidata_chain_t::tick(timespan_t /*elapsed*/)
 #undef MAX_DELTA
 }
 
+#ifdef __JHERETIC__
 static void drawShadows(dint x, dint y, dfloat alpha)
 {
     DGL_Begin(DGL_QUADS);
@@ -118,6 +119,7 @@ static void drawShadows(dint x, dint y, dfloat alpha)
         DGL_Vertex2f(x+ST_WIDTH-27, y+ST_HEIGHT);
     DGL_End();
 }
+#endif
 
 void guidata_chain_t::draw(Vector2i const &offset) const
 {

diff --git a/doomsday/apps/plugins/common/src/hud/widgets/flightwidget.cpp b/doomsday/apps/plugins/common/src/hud/widgets/flightwidget.cpp
@@ -44,7 +44,9 @@ guidata_flight_t::guidata_flight_t(de::dint player)
                 player)
 {}
 
+#if __JHERETIC__ || __JHEXEN__
 static patchid_t pIcon[16];
+#endif
 
 guidata_flight_t::~guidata_flight_t()
 {}

diff --git a/doomsday/apps/plugins/common/src/hud/widgets/keyswidget.cpp b/doomsday/apps/plugins/common/src/hud/widgets/keyswidget.cpp
@@ -26,7 +26,9 @@
 #endif
 #include "player.h"
 
+#if __JHERETIC__ || __JHEXEN__
 static patchid_t pKeys[NUM_KEY_TYPES];
+#endif
 
 using namespace de;
 

diff --git a/doomsday/apps/plugins/common/src/hud/widgets/playerlogwidget.cpp b/doomsday/apps/plugins/common/src/hud/widgets/playerlogwidget.cpp
@@ -256,6 +256,7 @@ void PlayerLogWidget::draw(Vector2i const &offset)
         // ================================================================================================
         {
             dint firstEntryVisibleToPlayer  = firstEntry;
+            DENG_UNUSED(firstEntryVisibleToPlayer);
 
             dint lastEntry = firstEntry + pvisEntryCount - 1;
             if(lastEntry > LOG_MAX_ENTRIES - 1)

diff --git a/doomsday/apps/plugins/doom/src/p_mobj.c b/doomsday/apps/plugins/doom/src/p_mobj.c
@@ -74,10 +74,12 @@ void P_FloorBounceMissile(mobj_t *mo)
     P_MobjChangeState(mo, P_GetState(mo->type, SN_DEATH));
 }
 
+/*
 static __inline dd_bool isInWalkState(player_t *pl)
 {
     return pl->plr->mo->state - STATES - PCLASS_INFO(pl->class_)->runState < 4;
 }
+*/
 
 void P_MobjMoveXY(mobj_t *mo)
 {

diff --git a/doomsday/apps/plugins/doom64/src/p_enemy.c b/doomsday/apps/plugins/doom64/src/p_enemy.c
@@ -1011,8 +1011,7 @@ void C_DECL A_Chase(mobj_t *actor)
     // Check for missile attack.
     if((state = P_GetState(actor->type, SN_MISSILE)) != S_NULL)
     {
-        if(!(!G_Ruleset_Fast() && actor->moveCount
-              && !G_Ruleset_Skill() != SM_HARD))
+        if(G_Ruleset_Fast() || !actor->moveCount || G_Ruleset_Skill() == SM_HARD)
         {
             if(checkMissileRange(actor))
             {

diff --git a/doomsday/apps/plugins/hexen/src/p_mobj.c b/doomsday/apps/plugins/hexen/src/p_mobj.c
@@ -255,10 +255,12 @@ dd_bool P_SeekerMissile(mobj_t* actor, angle_t thresh, angle_t turnMax)
     return true;
 }
 
+/*
 static __inline dd_bool isInWalkState(player_t* pl)
 {
     return pl->plr->mo->state - STATES - PCLASS_INFO(pl->class_)->runState < 4;
 }
+*/
 
 void P_MobjMoveXY(mobj_t* mo)
 {