ref: a1e3f3526b7ec899b58e9f4e2e1662ea254e5805
parent: 06334302be79aac913acdcf2c357f3f4e48fc6f3
author: qwx <>
date: Sat Jan 12 16:48:08 EST 2019
fix type during linking errors
--- a/code/qcommon/cm_local.h
+++ b/code/qcommon/cm_local.h
@@ -23,6 +23,7 @@
#include "../game/q_shared.h"
#include "qcommon.h"
#include "cm_polylib.h"
+#include "cm_patch.h"
#define MAX_SUBMODELS 256
#define BOX_MODEL_HANDLE 255
--- a/code/qcommon/cm_patch.c
+++ b/code/qcommon/cm_patch.c
@@ -21,7 +21,6 @@
*/
#include "cm_local.h"
-#include "cm_patch.h"
/*
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1071,4 +1071,6 @@
#define CL_ENCODE_START 12
#define CL_DECODE_START 4
+#include "../qcommon/vm_local.h"
+
#endif // _QCOMMON_H_
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
@@ -33,7 +33,8 @@
*/
-#include "vm_local.h"
+#include "../game/q_shared.h"
+#include "qcommon.h"
vm_t *currentVM = NULL; // bk001212
--- a/code/qcommon/vm_interpreted.c
+++ b/code/qcommon/vm_interpreted.c
@@ -19,7 +19,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
-#include "vm_local.h"
+#include "../game/q_shared.h"
+#include "qcommon.h"
#ifdef DEBUG_VM // bk001204
static char *opnames[256] = {--- a/code/qcommon/vm_local.h
+++ b/code/qcommon/vm_local.h
@@ -19,8 +19,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
===========================================================================
*/
-#include "../game/q_shared.h"
-#include "qcommon.h"
typedef enum {OP_UNDEF,
--- a/code/server/server.h
+++ b/code/server/server.h
@@ -28,6 +28,13 @@
//=============================================================================
+typedef struct worldSector_s {+ int axis; // -1 = leaf node
+ float dist;
+ struct worldSector_s *children[2];
+ struct svEntity_s *entities;
+} worldSector_t;
+
#define PERS_SCORE 0 // !!! MUST NOT CHANGE, SERVER AND
// GAME BOTH REFERENCE !!!
--- a/code/server/sv_world.c
+++ b/code/server/sv_world.c
@@ -61,12 +61,6 @@
===============================================================================
*/
-typedef struct worldSector_s {- int axis; // -1 = leaf node
- float dist;
- struct worldSector_s *children[2];
- svEntity_t *entities;
-} worldSector_t;
#define AREA_DEPTH 4
#define AREA_NODES 64