From 27b41e697a5b46c0ee4a6f2edd7370c43d17ad32 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Sun, 9 Oct 2011 15:58:20 +0000 Subject: [PATCH] Move player.h to misc/ --- src/game/baseq2/g_cmds.c | 2 +- src/game/baseq2/monster/header/rider.h | 88 ------------------- .../baseq2/monster/{header => misc}/player.h | 0 src/game/baseq2/player/client.c | 2 +- src/game/baseq2/player/view.c | 2 +- src/game/baseq2/player/weapon.c | 2 +- 6 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 src/game/baseq2/monster/header/rider.h rename src/game/baseq2/monster/{header => misc}/player.h (100%) diff --git a/src/game/baseq2/g_cmds.c b/src/game/baseq2/g_cmds.c index 08d7be8b..9e25f58a 100644 --- a/src/game/baseq2/g_cmds.c +++ b/src/game/baseq2/g_cmds.c @@ -25,7 +25,7 @@ */ #include "header/local.h" -#include "monster/header/player.h" +#include "monster/misc/player.h" char * ClientTeam(edict_t *ent) diff --git a/src/game/baseq2/monster/header/rider.h b/src/game/baseq2/monster/header/rider.h deleted file mode 100644 index 3017517b..00000000 --- a/src/game/baseq2/monster/header/rider.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (C) 1997-2001 Id Software, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * ======================================================================= - * - * Turret rider animations. - * - * ======================================================================= - */ - -#define FRAME_stand201 0 -#define FRAME_stand202 1 -#define FRAME_stand203 2 -#define FRAME_stand204 3 -#define FRAME_stand205 4 -#define FRAME_stand206 5 -#define FRAME_stand207 6 -#define FRAME_stand208 7 -#define FRAME_stand209 8 -#define FRAME_stand210 9 -#define FRAME_stand211 10 -#define FRAME_stand212 11 -#define FRAME_stand213 12 -#define FRAME_stand214 13 -#define FRAME_stand215 14 -#define FRAME_stand216 15 -#define FRAME_stand217 16 -#define FRAME_stand218 17 -#define FRAME_stand219 18 -#define FRAME_stand220 19 -#define FRAME_stand221 20 -#define FRAME_stand222 21 -#define FRAME_stand223 22 -#define FRAME_stand224 23 -#define FRAME_stand225 24 -#define FRAME_stand226 25 -#define FRAME_stand227 26 -#define FRAME_stand228 27 -#define FRAME_stand229 28 -#define FRAME_stand230 29 -#define FRAME_stand231 30 -#define FRAME_stand232 31 -#define FRAME_stand233 32 -#define FRAME_stand234 33 -#define FRAME_stand235 34 -#define FRAME_stand236 35 -#define FRAME_stand237 36 -#define FRAME_stand238 37 -#define FRAME_stand239 38 -#define FRAME_stand240 39 -#define FRAME_stand241 40 -#define FRAME_stand242 41 -#define FRAME_stand243 42 -#define FRAME_stand244 43 -#define FRAME_stand245 44 -#define FRAME_stand246 45 -#define FRAME_stand247 46 -#define FRAME_stand248 47 -#define FRAME_stand249 48 -#define FRAME_stand250 49 -#define FRAME_stand251 50 -#define FRAME_stand252 51 -#define FRAME_stand253 52 -#define FRAME_stand254 53 -#define FRAME_stand255 54 -#define FRAME_stand256 55 -#define FRAME_stand257 56 -#define FRAME_stand258 57 -#define FRAME_stand259 58 -#define FRAME_stand260 59 - -#define MODEL_SCALE 1.000000 diff --git a/src/game/baseq2/monster/header/player.h b/src/game/baseq2/monster/misc/player.h similarity index 100% rename from src/game/baseq2/monster/header/player.h rename to src/game/baseq2/monster/misc/player.h diff --git a/src/game/baseq2/player/client.c b/src/game/baseq2/player/client.c index 16bbebf6..e32cc963 100644 --- a/src/game/baseq2/player/client.c +++ b/src/game/baseq2/player/client.c @@ -25,7 +25,7 @@ */ #include "../header/local.h" -#include "../monster/header/player.h" +#include "../monster/misc/player.h" void ClientUserinfoChanged(edict_t *ent, char *userinfo); void SP_misc_teleporter_dest(edict_t *ent); diff --git a/src/game/baseq2/player/view.c b/src/game/baseq2/player/view.c index 1309cebd..a2c7cbb4 100644 --- a/src/game/baseq2/player/view.c +++ b/src/game/baseq2/player/view.c @@ -25,7 +25,7 @@ */ #include "../header/local.h" -#include "../monster/header/player.h" +#include "../monster/misc/player.h" static edict_t *current_player; static gclient_t *current_client; diff --git a/src/game/baseq2/player/weapon.c b/src/game/baseq2/player/weapon.c index 4652d0a1..e75833c4 100644 --- a/src/game/baseq2/player/weapon.c +++ b/src/game/baseq2/player/weapon.c @@ -25,7 +25,7 @@ */ #include "../header/local.h" -#include "../monster/header/player.h" +#include "../monster/misc/player.h" #define FRAME_FIRE_FIRST (FRAME_ACTIVATE_LAST + 1) #define FRAME_IDLE_FIRST (FRAME_FIRE_LAST + 1)