Fix formation speed limiting setting to really be off.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9373 4a71c877-e1ca-e34f-864e-861f7616d084master
parent
3ab1a0104d
commit
e5ee9e2358
12
src/init.c
12
src/init.c
|
@ -776,14 +776,10 @@ BOOL stageOneInitialise(void)
|
|||
return false;
|
||||
}
|
||||
|
||||
|
||||
if (!environInit())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// reset speed limiter
|
||||
moveSetFormationSpeedLimiting(true);
|
||||
|
||||
if (!environInit())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
initMission();
|
||||
initTransporters();
|
||||
|
|
16
src/move.c
16
src/move.c
|
@ -219,8 +219,6 @@ static void moveCalcBoundary(DROID *psDroid);
|
|||
/* Turn a vector into an angle - returns a float (!) */
|
||||
static float vectorToAngle(float vx, float vy);
|
||||
|
||||
static BOOL g_bFormationSpeedLimitingOn = false;
|
||||
|
||||
/* Return the difference in directions */
|
||||
static UDWORD moveDirDiff(SDWORD start, SDWORD end)
|
||||
{
|
||||
|
@ -1793,19 +1791,9 @@ static BOOL moveReachedWayPoint(DROID *psDroid)
|
|||
return false;
|
||||
}
|
||||
|
||||
void moveToggleFormationSpeedLimiting( void )
|
||||
static BOOL moveFormationSpeedLimitingOn( void )
|
||||
{
|
||||
g_bFormationSpeedLimitingOn = !g_bFormationSpeedLimitingOn;
|
||||
}
|
||||
|
||||
void moveSetFormationSpeedLimiting( BOOL bVal )
|
||||
{
|
||||
g_bFormationSpeedLimitingOn = bVal;
|
||||
}
|
||||
|
||||
BOOL moveFormationSpeedLimitingOn( void )
|
||||
{
|
||||
return g_bFormationSpeedLimitingOn;
|
||||
return false;
|
||||
}
|
||||
|
||||
#define MAX_SPEED_PITCH 60
|
||||
|
|
|
@ -74,10 +74,6 @@ extern void moveUpdateTracked(DROID *psDroid);
|
|||
/* update body and turret to local slope */
|
||||
extern void updateDroidOrientation(DROID *psDroid);
|
||||
|
||||
extern void moveSetFormationSpeedLimiting( BOOL );
|
||||
extern void moveToggleFormationSpeedLimiting( void );
|
||||
extern BOOL moveFormationSpeedLimitingOn( void );
|
||||
|
||||
/* audio callback used to kill movement sounds */
|
||||
extern BOOL moveCheckDroidMovingAndVisible( void *psObj );
|
||||
|
||||
|
|
Loading…
Reference in New Issue