Skip to content

Commit

Permalink
Fixed|libcommon|libdoom|libdoom64|libheretic|libhexen|g++: Compiler w…
Browse files Browse the repository at this point in the history 
…arnings (unused variables, signed/unsigned comparison)
  • Loading branch information
@danij-deng
danij-deng committed Jul 4, 2014
1 parent e847bc7 commit 5b4e530
Show file tree
Hide file tree
Showing 28 changed files with 260 additions and 195 deletions.
4 changes: 4 additions & 0 deletions doomsday/plugins/common/src/g_game.cpp
View file
Expand Up @@ -3201,6 +3201,8 @@ static bool G_WarpMap(de::Uri const &newMapUri)

D_CMD(WarpMap)
{
DENG2_UNUSED(argc);

bool isNumber;
int number = de::String(argv[1]).toInt(&isNumber);

Expand Down Expand Up @@ -3284,6 +3286,8 @@ D_CMD(WarpMap)
#if __JDOOM__ || __JHERETIC__
D_CMD(WarpEpisodeMap)
{
DENG2_UNUSED(argc);

uint epsd = de::max(0, de::String(argv[1]).toInt());
uint map = de::max(0, de::String(argv[2]).toInt());

Expand Down
27 changes: 14 additions & 13 deletions doomsday/plugins/common/src/hu_lib.cpp
View file
Expand Up @@ -1699,9 +1699,9 @@ void MNRect_Drawer(mn_object_t *ob, Point2Raw const *origin)
}
}

void MNRect_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
void MNRect_UpdateGeometry(mn_object_t *ob, mn_page_t * /*page*/)
{
mndata_rect_t* rct = (mndata_rect_t*)ob->_typedata;
mndata_rect_t *rct = (mndata_rect_t *)ob->_typedata;
DENG2_ASSERT(ob->_type == MN_RECT);

if(rct->dimensions.width == 0 && rct->dimensions.height == 0)
Expand All @@ -1710,7 +1710,7 @@ void MNRect_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
patchinfo_t info;
if(R_GetPatchInfo(rct->patch, &info))
{
memcpy(&rct->dimensions, &info.geometry.size, sizeof(rct->dimensions));
std::memcpy(&rct->dimensions, &info.geometry.size, sizeof(rct->dimensions));
}
}
Rect_SetWidthHeight(ob->_geometry, rct->dimensions.width, rct->dimensions.height);
Expand Down Expand Up @@ -2144,7 +2144,7 @@ int MNEdit_Responder(mn_object_t *ob, event_t* ev)
return false;
}

void MNEdit_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
void MNEdit_UpdateGeometry(mn_object_t *ob, mn_page_t * /*page*/)
{
// @todo calculate visible dimensions properly.
DENG2_ASSERT(ob);
Expand Down Expand Up @@ -2881,43 +2881,44 @@ int MNColorBox_CommandResponder(mn_object_t *ob, menucommand_e cmd)
}
}

void MNColorBox_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
void MNColorBox_UpdateGeometry(mn_object_t *ob, mn_page_t * /*page*/)
{
mndata_colorbox_t* cbox = (mndata_colorbox_t*)ob->_typedata;
patchinfo_t info;
DENG2_ASSERT(ob->_type == MN_COLORBOX);

mndata_colorbox_t *cbox = (mndata_colorbox_t *)ob->_typedata;
patchinfo_t info;

Rect_SetWidthHeight(ob->_geometry, cbox->width, cbox->height);

// Add bottom border?
if(R_GetPatchInfo(borderPatches[2], &info))
{
info.geometry.size.width = cbox->width;
info.geometry.origin.y = cbox->height;
info.geometry.origin.y = cbox->height;
Rect_UniteRaw(ob->_geometry, &info.geometry);
}

// Add right border?
if(R_GetPatchInfo(borderPatches[1], &info))
{
info.geometry.size.height = cbox->height;
info.geometry.origin.x = cbox->width;
info.geometry.origin.x = cbox->width;
Rect_UniteRaw(ob->_geometry, &info.geometry);
}

// Add top border?
if(R_GetPatchInfo(borderPatches[0], &info))
{
info.geometry.size.width = cbox->width;
info.geometry.origin.y = -info.geometry.size.height;
info.geometry.origin.y = -info.geometry.size.height;
Rect_UniteRaw(ob->_geometry, &info.geometry);
}

// Add left border?
if(R_GetPatchInfo(borderPatches[3], &info))
{
info.geometry.size.height = cbox->height;
info.geometry.origin.x = -info.geometry.size.width;
info.geometry.origin.x = -info.geometry.size.width;
Rect_UniteRaw(ob->_geometry, &info.geometry);
}

Expand Down Expand Up @@ -3380,7 +3381,7 @@ static char* composeValueString(float value, float defaultValue, dd_bool floatMo
return buf;
}

void MNSlider_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
void MNSlider_UpdateGeometry(mn_object_t *ob, mn_page_t * /*page*/)
{
int middleWidth;
patchinfo_t info;
Expand Down Expand Up @@ -3602,7 +3603,7 @@ void MNMobjPreview_Drawer(mn_object_t *ob, Point2Raw const *offset)
DGL_Disable(DGL_TEXTURE_2D);
}

void MNMobjPreview_UpdateGeometry(mn_object_t *ob, mn_page_t *page)
void MNMobjPreview_UpdateGeometry(mn_object_t *ob, mn_page_t * /*page*/)
{
// @todo calculate visible dimensions properly!
DENG2_ASSERT(ob && ob->_type == MN_MOBJPREVIEW);
Expand Down
11 changes: 6 additions & 5 deletions doomsday/plugins/common/src/m_ctrl.c
View file
Expand Up @@ -673,17 +673,18 @@ void Hu_MenuControlGrabDrawer(const char* niceName, float alpha)
DGL_Disable(DGL_TEXTURE_2D);
}

void MNBindings_Ticker(mn_object_t* ob)
void MNBindings_Ticker(mn_object_t *ob)
{
mndata_bindings_t* binds = (mndata_bindings_t*) ob->_typedata;
assert(ob && ob->_type == MN_BINDINGS);

DENG_UNUSED(ob);
//DENG_ASSERT(ob && ob->_type == MN_BINDINGS);
//mndata_bindings_t *binds = (mndata_bindings_t *) ob->_typedata;
// Stub.
}

int MNBindings_PrivilegedResponder(mn_object_t* obj, event_t* ev)
int MNBindings_PrivilegedResponder(mn_object_t *obj, event_t *ev)
{
assert(obj && ev);

// We're interested in key or button down events.
if((obj->_flags & MNF_ACTIVE) && ev->type == EV_SYMBOLIC)
{
Expand Down
30 changes: 15 additions & 15 deletions doomsday/plugins/common/src/p_user.c
View file
Expand Up @@ -682,9 +682,9 @@ void P_DeathThink(player_t* player)
*
* @param player Player that wishes to be reborn.
*/
void P_PlayerReborn(player_t* player)
void P_PlayerReborn(player_t *player)
{
const uint plrNum = player - players;
int const plrNum = player - players;

if(plrNum == CONSOLEPLAYER)
{
Expand Down Expand Up @@ -1219,11 +1219,11 @@ void P_PlayerThinkItems(player_t *player)
#endif
}

void P_PlayerThinkWeapons(player_t* player)
void P_PlayerThinkWeapons(player_t *player)
{
playerbrain_t* brain = &player->brain;
weapontype_t oldweapon = player->pendingWeapon;
weapontype_t newweapon = WT_NOCHANGE;
playerbrain_t *brain = &player->brain;
//weapontype_t oldweapon = player->pendingWeapon;
weapontype_t newweapon = WT_NOCHANGE;

if(IS_NETWORK_SERVER)
{
Expand Down Expand Up @@ -1717,15 +1717,15 @@ void P_PlayerThinkLookPitch(player_t* player, timespan_t ticLength)
plr->lookDir = MINMAX_OF(-LOOKDIRMAX, plr->lookDir, LOOKDIRMAX);
}

void P_PlayerThinkUpdateControls(player_t* player)
void P_PlayerThinkUpdateControls(player_t *player)
{
int playerNum = player - players;
ddplayer_t *dp = player->plr;
float vel, off, offsetSensitivity = 100;
int i;
dd_bool strafe = false;
playerbrain_t *brain = &player->brain;
dd_bool oldAttack = brain->attack;
int playerNum = player - players;
ddplayer_t *dp = player->plr;
float vel, off, offsetSensitivity = 100;
int i;
//dd_bool strafe = false;
playerbrain_t *brain = &player->brain;
dd_bool oldAttack = brain->attack;

if(IS_DEDICATED) return;

Expand All @@ -1735,7 +1735,7 @@ void P_PlayerThinkUpdateControls(player_t* player)

// Check for strafe.
P_GetControlState(playerNum, CTL_MODIFIER_1, &vel, 0);
strafe = (!FEQUAL(vel, 0));
//strafe = (!FEQUAL(vel, 0));

// Move status.
P_GetControlState(playerNum, CTL_WALK, &vel, &off);
Expand Down
8 changes: 5 additions & 3 deletions doomsday/plugins/common/src/p_view.c
View file
Expand Up @@ -72,13 +72,15 @@
/**
* Calculate the walking / running height adjustment.
*/
void P_CalcHeight(player_t* plr)
void P_CalcHeight(player_t *plr)
{
#if __JHEXEN__
int plrNum = plr - players;
#endif
dd_bool airborne;
dd_bool morphed = false;
ddplayer_t* ddplr = plr->plr;
mobj_t* pmo = ddplr->mo;
ddplayer_t *ddplr = plr->plr;
mobj_t *pmo = ddplr->mo;
coord_t target, step;

// Regular movement bobbing (needs to be calculated for gun swing even
Expand Down
10 changes: 7 additions & 3 deletions doomsday/plugins/doom/src/p_enemy.c
View file
Expand Up @@ -263,7 +263,7 @@ static dd_bool tryMoveMobj(mobj_t *actor)

static void doNewChaseDir(mobj_t *actor, coord_t deltaX, coord_t deltaY)
{
dirtype_t xdir, ydir, tdir;
dirtype_t xdir, ydir;
dirtype_t olddir = actor->moveDir;
dirtype_t turnaround = olddir;

Expand Down Expand Up @@ -305,17 +305,21 @@ static void doNewChaseDir(mobj_t *actor, coord_t deltaX, coord_t deltaY)
// Randomly determine direction of search.
if(P_Random() & 1)
{
int tdir;
for(tdir = DI_EAST; tdir <= DI_SOUTHEAST; tdir++)
if(tdir != turnaround &&
if((dirtype_t)tdir != turnaround &&
(actor->moveDir = tdir, tryMoveMobj(actor)))
return;
}
else
{
int tdir;
for(tdir = DI_SOUTHEAST; tdir != DI_EAST - 1; tdir--)
if(tdir != turnaround &&
{
if((dirtype_t)tdir != turnaround &&
(actor->moveDir = tdir, tryMoveMobj(actor)))
return;
}
}

if((actor->moveDir = turnaround) != DI_NODIR && !tryMoveMobj(actor))
Expand Down
12 changes: 6 additions & 6 deletions doomsday/plugins/doom/src/p_inter.c
View file
Expand Up @@ -1097,13 +1097,13 @@ int P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source,
*
* @return Actual amount of damage done.
*/
int P_DamageMobj2(mobj_t* target, mobj_t* inflictor, mobj_t* source,
int P_DamageMobj2(mobj_t *target, mobj_t *inflictor, mobj_t *source,
int damageP, dd_bool stomping, dd_bool skipNetworkCheck)
{
angle_t angle;
int saved, originalHealth;
player_t* player;
int temp, damage;
angle_t angle;
int saved, originalHealth;
player_t *player;
int /*temp,*/ damage;

if(!target)
return 0; // Wha?
Expand Down Expand Up @@ -1245,7 +1245,7 @@ int P_DamageMobj2(mobj_t* target, mobj_t* inflictor, mobj_t* source,
if(player->damageCount > 100)
player->damageCount = 100; // Teleport stomp does 10k points...

temp = damage < 100 ? damage : 100;
// temp = damage < 100 ? damage : 100; Unused?

// Maybe unhide the HUD?
ST_HUDUnHide(player - players, HUE_ON_DAMAGE);
Expand Down
6 changes: 3 additions & 3 deletions doomsday/plugins/doom/src/p_mobj.c
View file
Expand Up @@ -112,10 +112,10 @@ static coord_t getFriction(mobj_t *mo)
return P_MobjGetFriction(mo);
}

void P_MobjMoveXY(mobj_t* mo)
void P_MobjMoveXY(mobj_t *mo)
{
coord_t pos[3], mom[3];
player_t* player;
//player_t *player;
dd_bool largeNegative;

// $democam: cameramen have their own movement code.
Expand All @@ -142,7 +142,7 @@ void P_MobjMoveXY(mobj_t* mo)
mo->mom[MX] = mom[MX];
mo->mom[MY] = mom[MY];

player = mo->player;
//player = mo->player;

do
{
Expand Down
2 changes: 1 addition & 1 deletion doomsday/plugins/doom/src/p_pspr.c
View file
Expand Up @@ -64,7 +64,7 @@

// PRIVATE DATA DEFINITIONS ------------------------------------------------

static float swing[2];
//static float swing[2];
static float bulletSlope;

// CODE --------------------------------------------------------------------
Expand Down

0 comments on commit 5b4e530

Please sign in to comment.