Rearrange files

Makefile

@@ -107,13 +107,13 @@ CTF_OBJS_ = \
 	src/g_trigger.o \
 	src/g_utils.o \
 	src/g_weapon.o \
-	src/m_move.o \
+	src/menu/menu.o \
-	src/p_client.o \
+	src/monster/move.o \
-	src/p_hud.o \
+	src/player/client.o \
-	src/p_menu.o \
+	src/player/hud.o \
-	src/p_trail.o \
+	src/player/trail.o \
-	src/p_view.o \
+	src/player/view.o \
-	src/p_weapon.o \
+	src/player/weapon.o \
 	src/shared/shared.o 
 
 # ----------

src/g_ai.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_ai.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 qboolean FindTarget (edict_t *self);
 extern cvar_t	*maxclients;

src/g_chase.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 
 void UpdateChaseCam(edict_t *ent)

src/g_cmds.c

@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
-#include "m_player.h"
+#include "monster/player.h"
 
 
 char *ClientTeam (edict_t *ent)

src/g_combat.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_combat.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 ============

src/g_ctf.c

@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
-#include "m_player.h"
+#include "monster/player.h"
 
 typedef enum match_s {
 	MATCH_NONE,

src/g_func.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 =========================================================

src/g_items.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 
 qboolean	Pickup_Weapon (edict_t *ent, edict_t *other);

src/g_main.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "g_local.h"
+#include "header/local.h"
 
 game_locals_t	game;
 level_locals_t	level;

src/g_misc.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_misc.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 
 /*QUAKED func_group (0 0 0) ?

src/g_monster.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 
 //

src/g_phys.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_phys.c
 
-#include "g_local.h"
+#include "header/local.h"
 
 /*
 

src/g_save.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "g_local.h"
+#include "header/local.h"
 
 field_t fields[] = {
 	{"classname", FOFS(classname), F_LSTRING},

src/g_spawn.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "g_local.h"
+#include "header/local.h"
 
 typedef struct
 {

src/g_svcmds.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "g_local.h"
+#include "header/local.h"
 
 
 void	Svcmd_Test_f (void)

src/g_target.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#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

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 
 void InitTrigger (edict_t *self)

src/g_utils.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // 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

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "header/local.h"
 
 
 /*

src/header/ctf.h

@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef CTF_CTF_H
+#define CTF_CTF_H
+
 #define CTF_VERSION			1.52
 #define CTF_VSTRING2(x) #x
 #define CTF_VSTRING(x) CTF_VSTRING2(x)
@@ -190,3 +193,5 @@ void SP_info_teleport_destination (edict_t *ent);
 
 void CTFSetPowerUpEffect(edict_t *ent, int def);
 
+#endif /* CTF_CTF_H */
+

src/header/game.h

@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef CTF_GAME_H
+#define CTF_GAME_H
+
 // game.h -- game dll information visible to server
 
 #define	GAME_API_VERSION	3
@@ -241,3 +244,5 @@ typedef struct
 
 game_export_t *GetGameApi (game_import_t *import);
 
+#endif /* CTF_GAME_H */
+

src/header/local.h

@@ -19,7 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_local.h -- local definitions for game module
 
-#include "header/shared.h"
+#ifndef CTF_LOCAL_H
+#define CTF_LOCAL_H
+
+#include "shared.h"
 
 // define GAME_INCLUDE so that game.h does not define the
 // short, server-visible gclient_t and edict_t structures,
@@ -28,11 +31,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "game.h"
 
 //ZOID
-#include "p_menu.h"
+#include "menu.h"
 //ZOID
 
 // the "gameversion" client command will print this plus compile date
-#define	GAMEVERSION	"baseq2"
+#define	GAMEVERSION	"ctf"
 
 // protocol bytes that can be directly added to messages
 #define	svc_muzzleflash		1
@@ -1141,6 +1144,8 @@ struct edict_s
 };
 
 //ZOID
-#include "g_ctf.h"
+#include "ctf.h"
 //ZOID
 
+#endif /* CTF_LOCAL_H */
+

src/header/menu.h

@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef CTF_MENU_H
+#define CTF_MENU_H
+
 enum {
 	PMENU_ALIGN_LEFT,
 	PMENU_ALIGN_CENTER,
@@ -48,3 +51,5 @@ void PMenu_Next(edict_t *ent);
 void PMenu_Prev(edict_t *ent);
 void PMenu_Select(edict_t *ent);
 
+#endif
+

src/header/shared.h

@@ -7,8 +7,8 @@
  * =======================================================================
  */
 
-#ifndef COMMON_SHARED_H
+#ifndef CTF_SHARED_H
-#define COMMON_SHARED_H
+#define CTF_SHARED_H
 
 #include <assert.h>
 #include <math.h>
@@ -1062,4 +1062,4 @@ extern int vidref_val;
 size_t verify_fread(void *, size_t, size_t, FILE *);
 size_t verify_fwrite(void *, size_t, size_t, FILE *);
 
-#endif /* COMMON_SHARED_H */
+#endif /* CTF_SHARED_H */

src/menu/menu.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "../header/local.h"
 
 // Note that the pmenu entries are duplicated
 // this is so that a static set of pmenu entries can be used

src/monster/move.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // m_move.c -- monster movement
 
-#include "g_local.h"
+#include "../header/local.h"
 
 #define	STEPSIZE	18
 

src/player/client.c

@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "../header/local.h"
-#include "m_player.h"
+#include "../monster/player.h"
 
 void SP_misc_teleporter_dest (edict_t *ent);
 

src/player/hud.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "../header/local.h"
 
 
 

src/player/trail.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "g_local.h"
+#include "../header/local.h"
 
 
 /*

src/player/view.c

@@ -18,8 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "g_local.h"
+#include "../header/local.h"
-#include "m_player.h"
+#include "../monster/player.h"
 
 
 

src/player/weapon.c

@@ -19,8 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // g_weapon.c
 
-#include "g_local.h"
+#include "../header/local.h"
-#include "m_player.h"
+#include "../monster/player.h"
 
 
 static qboolean	is_quad;