Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up jump propulsion code. Fix warning in audio test code. Ref warnings from ticket:2531

master
Per Inge Mathisen 2011-03-15 18:50:03 +01:00
parent 925730fb9a
commit 8c69f5dc19
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/sound/audio.cpp
View File

@ -1199,7 +1199,7 @@ void audioTest()
for (i = 0; i < 10; i++)
{
// On non-debug builds prevent warnings about defining but not using dummyCB
(void)dummyCB;
dummyCB(NULL);
assert(audio_Shutdown());
assert(audio_Init(dummyCB));

18
src/move.cpp
View File

@ -1890,7 +1890,7 @@ static void moveUpdateVtolModel(DROID *psDroid, SDWORD speed, uint16_t direction
moveAdjustVtolHeight(psDroid, iMapZ);
}
#define CYBORG_VERTICAL_SPEED (psDroid->baseSpeed/2)
#define CYBORG_VERTICAL_SPEED ((int)psDroid->baseSpeed / 2)
static void
moveCyborgLaunchAnimDone( ANIM_OBJECT *psObj )
@ -1902,7 +1902,7 @@ moveCyborgLaunchAnimDone( ANIM_OBJECT *psObj )
/* raise cyborg a little bit so flying - terrible hack - GJ */
psDroid->pos.z++;
psDroid->sMove.iVertSpeed = (SWORD)CYBORG_VERTICAL_SPEED;
psDroid->sMove.iVertSpeed = CYBORG_VERTICAL_SPEED;
psDroid->psCurAnim = NULL;
}
@ -1970,12 +1970,12 @@ static void moveUpdateCyborgModel(DROID *psDroid, SDWORD moveSpeed, uint16_t mov
"moveUpdateCyborgModel: invalid propulsion stats pointer" );
/* do vertical movement */
if ( psPropStats->propulsionType == PROPULSION_TYPE_JUMP )
if (psPropStats->propulsionType == PROPULSION_TYPE_JUMP)
{
int32_t iDz = gameTimeAdjustedIncrement(psDroid->sMove.iVertSpeed);
int32_t iDroidZ = (SDWORD) psDroid->pos.z;
int iDz = gameTimeAdjustedIncrement(psDroid->sMove.iVertSpeed);
int iDroidZ = psDroid->pos.z;
if ( iDroidZ+iDz < iMapZ )
if (iDroidZ + iDz < iMapZ)
{
psDroid->sMove.iVertSpeed = 0;
psDroid->pos.z = iMapZ;
@ -1984,11 +1984,9 @@ static void moveUpdateCyborgModel(DROID *psDroid, SDWORD moveSpeed, uint16_t mov
{
psDroid->pos.z = psDroid->pos.z + iDz;
}
if ( (psDroid->pos.z >= (iMapZ+CYBORG_MAX_JUMP_HEIGHT)) &&
(psDroid->sMove.iVertSpeed > 0) )
if (psDroid->pos.z >= iMapZ + CYBORG_MAX_JUMP_HEIGHT && psDroid->sMove.iVertSpeed > 0)
{
psDroid->sMove.iVertSpeed = (SWORD)-CYBORG_VERTICAL_SPEED;
psDroid->sMove.iVertSpeed = -CYBORG_VERTICAL_SPEED;
}
}