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

Reduce cntrlcen.h includes

Browse source
This commit is contained in:
Kp 2015-04-19 04:18:51 +00:00
parent 726e5737bb
commit 8c6ddf1abf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/main/cntrlcen.h
View file

@ -23,11 +23,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#ifndef _CNTRLCEN_H
#define _CNTRLCEN_H
#pragma once
#include "vecmat.h"
#include "switch.h"
#include <physfs.h>
#ifdef __cplusplus
#include "fwdobject.h"
@ -48,6 +46,7 @@ struct control_center_triggers : public prohibit_void_ptr<control_center_trigger
extern control_center_triggers ControlCenterTriggers;
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#include "vecmat.h"
struct reactor {
#if defined(DXX_BUILD_DESCENT_II)
int model_num;
@ -148,5 +147,3 @@ static inline void control_center_triggers_read(control_center_triggers *cct, PH
void control_center_triggers_write(const control_center_triggers *cct, PHYSFS_file *fp);
#endif
#endif /* _CNTRLCEN_H */

3
common/main/fwdobject.h
View file

@ -13,8 +13,11 @@
#include "objnum.h"
#include "segnum.h"
#include "fwdvalptridx.h"
#include "maths.h"
struct bitmap_index;
struct vms_vector;
struct vms_matrix;
const unsigned MAX_OBJECTS = 350;
const unsigned MAX_USED_OBJECTS = MAX_OBJECTS - 20;