Fixed|libcommon: Compiler warnings/errors (void const * -> void *, mi…

…ssing initializer)

doomsday/plugins/common/src/d_netcl.c

@@ -45,7 +45,7 @@ void NetCl_UpdateGameState(Reader* msg)
     Uri *mapUri;
     uint gsEpisode = 0;
     uint gsMap = 0;
-    uint gsMapEntrance = 0;
+    //uint gsMapEntrance = 0;
     byte configFlags = 0;
     //byte gsDeathmatch = 0;
     //byte gsMonsters = 0;

doomsday/plugins/common/src/d_netsv.c

@@ -1365,12 +1365,12 @@ static void NetSv_HitFloorCallback(mobj_t* mo, void* param)
     P_HitFloor(mo);
 }
 
-void NetSv_DoFloorHit(int player, Reader* msg)
+void NetSv_DoFloorHit(int player, Reader *msg)
 {
-    player_t* plr = &players[player];
-    mobj_t* mo;
+    player_t *plr = &players[player];
+    mobj_t *mo;
     coord_t pos[3];
-    coord_t mom[3];
+    //coord_t mom[3];
 
     if(player < 0 || player >= MAXPLAYERS)
         return;
@@ -1383,9 +1383,9 @@ void NetSv_DoFloorHit(int player, Reader* msg)
     pos[VZ] = Reader_ReadFloat(msg);
 
     // The momentum is included, although we don't really need it.
-    mom[MX] = Reader_ReadFloat(msg);
-    mom[MY] = Reader_ReadFloat(msg);
-    mom[MZ] = Reader_ReadFloat(msg);
+    /*mom[MX] =*/ Reader_ReadFloat(msg);
+    /*mom[MY] =*/ Reader_ReadFloat(msg);
+    /*mom[MZ] =*/ Reader_ReadFloat(msg);
 
     NetSv_TemporaryPlacedCallback(mo, 0, pos, mo->angle, NetSv_HitFloorCallback);
 }

doomsday/plugins/common/src/g_controls.c

@@ -73,9 +73,9 @@ typedef enum joyaxis_e {
 D_CMD(DefaultGameBinds);
 
 // Input devices; state controls.
-static int     povangle = -1;          // -1 means centered (really 0 - 7).
-static float   mousex;
-static float   mousey;
+//static int povangle = -1;  ///< @c -1= means centered (really 0 - 7).
+//static float mousex;
+//static float mousey;
 
 // Player control state.
 static pcontrolstate_t controlStates[MAXPLAYERS];

doomsday/plugins/common/src/g_game.cpp

@@ -1384,46 +1384,44 @@ int G_PrivilegedResponder(event_t *ev)
     return false; // Not eaten.
 }
 
-void G_UpdateGSVarsForPlayer(player_t* pl)
+void G_UpdateGSVarsForPlayer(player_t *pl)
 {
-    int i, plrnum;
-    gamestate_t gameState;
-
     if(!pl) return;
 
-    plrnum = pl - players;
-    gameState = G_GameState();
-
-    gsvHealth = pl->health;
+    gsvHealth  = pl->health;
 #if !__JHEXEN__
     // Map stats
-    gsvKills = pl->killCount;
-    gsvItems = pl->itemCount;
+    gsvKills   = pl->killCount;
+    gsvItems   = pl->itemCount;
     gsvSecrets = pl->secretCount;
 #endif
         // armor
 #if __JHEXEN__
-    gsvArmor = FixedDiv(PCLASS_INFO(pl->class_)->autoArmorSave +
-                        pl->armorPoints[ARMOR_ARMOR] +
-                        pl->armorPoints[ARMOR_SHIELD] +
-                        pl->armorPoints[ARMOR_HELMET] +
-                        pl->armorPoints[ARMOR_AMULET], 5 * FRACUNIT) >> FRACBITS;
+    gsvArmor   = FixedDiv(PCLASS_INFO(pl->class_)->autoArmorSave +
+                          pl->armorPoints[ARMOR_ARMOR] +
+                          pl->armorPoints[ARMOR_SHIELD] +
+                          pl->armorPoints[ARMOR_HELMET] +
+                          pl->armorPoints[ARMOR_AMULET], 5 * FRACUNIT) >> FRACBITS;
 #else
-    gsvArmor = pl->armorPoints;
+    gsvArmor   = pl->armorPoints;
 #endif
     // Owned keys
-    for(i = 0; i < NUM_KEY_TYPES; ++i)
+    for(int i = 0; i < NUM_KEY_TYPES; ++i)
+    {
 #if __JHEXEN__
         gsvKeys[i] = (pl->keys & (1 << i))? 1 : 0;
 #else
         gsvKeys[i] = pl->keys[i];
 #endif
+    }
     // current weapon
     gsvCurrentWeapon = pl->readyWeapon;
 
     // owned weapons
-    for(i = 0; i < NUM_WEAPON_TYPES; ++i)
+    for(int i = 0; i < NUM_WEAPON_TYPES; ++i)
+    {
         gsvWeapons[i] = pl->weapons[i].owned;
+    }
 
 #if __JHEXEN__
     // weapon pieces
@@ -1433,15 +1431,17 @@ void G_UpdateGSVarsForPlayer(player_t* pl)
     gsvWPieces[3] = (pl->pieces == 7)? 1 : 0;
 #endif
     // Current ammo amounts.
-    for(i = 0; i < NUM_AMMO_TYPES; ++i)
+    for(int i = 0; i < NUM_AMMO_TYPES; ++i)
+    {
         gsvAmmo[i] = pl->ammo[i].owned;
+    }
 
 #if __JHERETIC__ || __JHEXEN__ || __JDOOM64__
     // Inventory items.
-    for(i = 0; i < NUM_INVENTORYITEM_TYPES; ++i)
+    for(int i = 0; i < NUM_INVENTORYITEM_TYPES; ++i)
     {
-        if(pl->plr->inGame && gameState == GS_MAP)
-            gsvInvItems[i] = P_InventoryCount(plrnum, inventoryitemtype_t(IIT_FIRST + i));
+        if(pl->plr->inGame && G_GameState() == GS_MAP)
+            gsvInvItems[i] = P_InventoryCount(pl - players, inventoryitemtype_t(IIT_FIRST + i));
         else
             gsvInvItems[i] = 0;
     }

doomsday/plugins/common/src/hu_automap.c

@@ -1160,14 +1160,17 @@ static void drawMarkedPoints(uiwidget_t* obj, float scale)
 /**
  * Sets up the state for automap drawing.
  */
-static void setupGLStateForMap(uiwidget_t* obj)
+static void setupGLStateForMap(uiwidget_t *obj)
 {
-    guidata_automap_t* am = (guidata_automap_t*)obj->typedata;
-    const float alpha = uiRendState->pageAlpha;
+    //guidata_automap_t *am = (guidata_automap_t *)obj->typedata;
+    float const alpha = uiRendState->pageAlpha;
+#if __JDOOM64__
     int player = UIWidget_Player(obj);
+#endif
     float angle, bgColor[3];
     coord_t plx, ply;
     RectRaw geometry;
+
     assert(obj->type == GUI_AUTOMAP);
 
     UIAutomap_ParallaxLayerOrigin(obj, &plx, &ply);