Rearrange files

src/g_ai.c

@@ -1,6 +1,6 @@
 // g_ai.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 qboolean FindTarget (edict_t *self);
 extern cvar_t	*maxclients;

src/g_cmds.c

@@ -1,6 +1,5 @@
-#include "g_local.h"
-#include "m_player.h"
-
+#include "header/local.h"
+#include "monster/misc/player.h"
 
 char *ClientTeam (edict_t *ent)
 {

src/g_combat.c

@@ -1,6 +1,6 @@
 // g_combat.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 ============

src/g_func.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 =========================================================

src/g_items.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 
 qboolean	Pickup_Weapon (edict_t *ent, edict_t *other);

src/g_main.c

@@ -1,5 +1,5 @@
 
-#include "g_local.h"
+#include "header/local.h"
 
 game_locals_t	game;
 level_locals_t	level;

src/g_misc.c

@@ -1,6 +1,6 @@
 // g_misc.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 int	gibsthisframe = 0;
 int lastgibframe = 0;

src/g_monster.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 //
 // monster weapons

src/g_phys.c

@@ -1,6 +1,6 @@
 // g_phys.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 

src/g_spawn.c

@@ -1,5 +1,5 @@
 
-#include "g_local.h"
+#include "header/local.h"
 
 typedef struct
 {

src/g_svcmds.c

@@ -1,5 +1,5 @@
 
-#include "g_local.h"
+#include "header/local.h"
 
 
 void	Svcmd_Test_f (void)

src/g_target.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 /*QUAKED target_temp_entity (1 0 0) (-8 -8 -8) (8 8 8)
 Fire an origin based temp entity event to the clients.

src/g_trigger.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 
 void InitTrigger (edict_t *self)

src/g_turret.c

@@ -1,6 +1,6 @@
 // g_turret.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 
 void AnglesNormalize(vec3_t vec)

src/g_utils.c

@@ -1,6 +1,6 @@
 // g_utils.c -- misc utility functions for game module
 
-#include "g_local.h"
+#include "header/local.h"
 
 
 void G_ProjectSource (vec3_t point, vec3_t distance, vec3_t forward, vec3_t right, vec3_t result)

src/g_weapon.c

@@ -1,4 +1,4 @@
-#include "g_local.h"
+#include "header/local.h"
 
 
 /*

src/game.h → src/header/game.h

@@ -1,3 +1,5 @@
+#ifndef ZAERO_GAME_H
+#define ZAERO_GAME_H
 
 // game.h -- game dll information visible to server
 
@@ -214,3 +216,5 @@ typedef struct
 } game_export_t;
 
 game_export_t *GetGameApi (game_import_t *import);
+
+#endif /* ZAERO_GAME_H */

src/g_local.h → src/header/local.h

@@ -1,7 +1,10 @@
+#ifndef ZAERO_LOCAL_H
+#define ZAERO_LOCAL_H
+
 // g_local.h -- local definitions for game module
 
-#include "q_shared.h"
-#include "z_anim.h"
+#include "shared.h"
+#include "anim.h"
 
 // define GAME_INCLUDE so that game.h does not define the
 // short, server-visible gclient_t and edict_t structures,
@@ -1241,3 +1244,4 @@ struct edict_s
 #define ZDM_NO_GL_POLYBLEND_DAMAGE	1
 #define ZDM_ZAERO_ITEMS				2
 
+#endif /* ZAERO_LOCAL_H */