TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move similar/main/controls.c -> similar/main/controls.cpp

Browse source
This commit is contained in:
Kp 2012-11-11 22:12:51 +00:00
parent 5fff15b151
commit ba4b87d44a
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -756,7 +756,7 @@ class DXXProgram(DXXCommon):
'main/cntrlcen.cpp',
'main/config.cpp',
'main/console.cpp',
'main/controls.c',
'main/controls.cpp',
'main/credits.c',
'main/digiobj.c',
'main/effects.c',

8
common/main/controls.h
View file

@ -21,10 +21,18 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#ifndef _CONTROLS_H
#define _CONTROLS_H
#ifdef __cplusplus
extern "C" {
#endif
void read_flying_controls( object * obj );
#if defined(DXX_BUILD_DESCENT_II)
extern fix Afterburner_charge;
#endif
#ifdef __cplusplus
}
#endif
#endif

4
similar/main/controls.c → similar/main/controls.cpp
View file

@ -18,6 +18,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*/
#include <algorithm>
#include <stdlib.h>
#include "key.h"
#include "joy.h"
@ -48,6 +49,9 @@ fix Afterburner_charge=f1_0;
#define DROP_DELTA_TIME (f1_0/15) //drop 3 per second
#endif
using std::min;
using std::max;
void read_flying_controls( object * obj )
{
fix forward_thrust_time;