Move similar/main/controls.c -> similar/main/controls.cpp
This commit is contained in:
parent
5fff15b151
commit
ba4b87d44a
|
@ -756,7 +756,7 @@ class DXXProgram(DXXCommon):
|
||||||
'main/cntrlcen.cpp',
|
'main/cntrlcen.cpp',
|
||||||
'main/config.cpp',
|
'main/config.cpp',
|
||||||
'main/console.cpp',
|
'main/console.cpp',
|
||||||
'main/controls.c',
|
'main/controls.cpp',
|
||||||
'main/credits.c',
|
'main/credits.c',
|
||||||
'main/digiobj.c',
|
'main/digiobj.c',
|
||||||
'main/effects.c',
|
'main/effects.c',
|
||||||
|
|
|
@ -21,10 +21,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#ifndef _CONTROLS_H
|
#ifndef _CONTROLS_H
|
||||||
#define _CONTROLS_H
|
#define _CONTROLS_H
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
void read_flying_controls( object * obj );
|
void read_flying_controls( object * obj );
|
||||||
|
|
||||||
#if defined(DXX_BUILD_DESCENT_II)
|
#if defined(DXX_BUILD_DESCENT_II)
|
||||||
extern fix Afterburner_charge;
|
extern fix Afterburner_charge;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -18,6 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "key.h"
|
#include "key.h"
|
||||||
#include "joy.h"
|
#include "joy.h"
|
||||||
|
@ -48,6 +49,9 @@ fix Afterburner_charge=f1_0;
|
||||||
#define DROP_DELTA_TIME (f1_0/15) //drop 3 per second
|
#define DROP_DELTA_TIME (f1_0/15) //drop 3 per second
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
using std::min;
|
||||||
|
using std::max;
|
||||||
|
|
||||||
void read_flying_controls( object * obj )
|
void read_flying_controls( object * obj )
|
||||||
{
|
{
|
||||||
fix forward_thrust_time;
|
fix forward_thrust_time;
|
Loading…
Reference in a new issue