qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-19 07:20:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename host_skin.c to cl_skin.c.

Browse source 
I don't know why I thost host was a good idea.
This commit is contained in:
Bill Currie 2011-12-22 14:28:17 +09:00
parent 29306f7799
commit 0086fee233
7 changed files with 55 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nq/include/Makefile.am
View file

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS= foreign
## Process this file with automake to produce Makefile.in
EXTRA_DIST= chase.h client.h game.h host.h protocol.h server.h \
EXTRA_DIST= chase.h cl_skin.h client.h game.h host.h protocol.h server.h \
sv_pr_cmds.h sv_progs.h

41
nq/include/cl_skin.h Normal file
View file

@ -0,0 +1,41 @@
/*
cl_skin.h
Client skin definitions
Copyright (C) 1996-1997 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:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#ifndef _CL_SKIN_H
#define _CL_SKIN_H
#include "QF/qtypes.h"
#include "QF/skin.h"
void CL_Skins_f (void);
void CL_AllSkins_f (void);
void Skin_NextDownload (void);
void CL_Skin_Init (void);
void CL_Skin_Init_Cvars (void);
#endif

2
nq/include/host.h
View file

@ -61,8 +61,6 @@ void Host_ClearMemory (void);
void Host_ServerFrame (void);
void Host_InitCommands (void);
void Host_Init (void);
void Host_Skin_Init (void);
void Host_Skin_Init_Cvars (void);
void Host_Shutdown(void);
void Host_Error (const char *error, ...) __attribute__((format(printf,1,2)));
void Host_EndGame (const char *message, ...) __attribute__((format(printf,1,2)));

2
nq/source/Makefile.am
View file

@ -77,7 +77,7 @@ server_LIB_DEPS=$(server_LIBFILES) $(common_LIBFILES)
libnq_client_a_SOURCES= \
cl_cam.c cl_cmd.c cl_demo.c cl_ents.c cl_input.c cl_main.c \
cl_screen.c cl_parse.c cl_tent.c cl_view.c host_skin.c skin.c \
cl_screen.c cl_parse.c cl_skin.c cl_tent.c cl_view.c skin.c \
sbar.c
libnq_server_a_SOURCES= \

12
nq/source/host_skin.c → nq/source/cl_skin.c
View file

@ -47,8 +47,8 @@ static __attribute__ ((used)) const char rcsid[] =
#include "QF/va.h"
#include "compat.h"
#include "cl_skin.h"
#include "client.h"
#include "host.h"
#include "server.h"
cvar_t *noskins; //XXX FIXME
@ -60,7 +60,7 @@ cvar_t *cl_color;
static void
Host_Color_f (void)
CL_Color_f (void)
{
int top, bottom;
char playercolor;
@ -102,17 +102,17 @@ Host_Color_f (void)
void
Host_Skin_Init (void)
CL_Skin_Init (void)
{
Skin_Init ();
Cmd_AddCommand ("color", Host_Color_f, "The pant and shirt color (color "
Cmd_AddCommand ("color", CL_Color_f, "The pant and shirt color (color "
"shirt pants) Note that if only shirt color is given, "
"pants will match");
}
void
Host_Skin_Init_Cvars (void)
CL_Skin_Init_Cvars (void)
{
Skin_Init_Cvars ();
cl_color = Cvar_Get ("_cl_color", "0", CVAR_ARCHIVE, NULL, "Player color");
@ -130,7 +130,7 @@ CL_NewTranslation (int slot, skin_t *skin)
int skinnum;
if (slot > cl.maxclients)
Sys_Error ("Host_NewTranslation: slot > cl.maxclients");
Sys_Error ("CL_NewTranslation: slot > cl.maxclients");
player = &cl.scores[slot];
dest = player->translations;

5
nq/source/host.c
View file

@ -62,6 +62,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include "sbar.h"
#include "server.h"
#include "sv_progs.h"
#include "cl_skin.h"
#include "clview.h"
@ -903,6 +904,7 @@ Host_Init (void)
PI_Init ();
Chase_Init_Cvars ();
CL_Skin_Init_Cvars ();
CL_InitCvars ();
IN_Init_Cvars ();
VID_Init_Cvars ();
@ -913,7 +915,6 @@ Host_Init (void)
R_Init_Cvars ();
R_Particles_Init_Cvars ();
Mod_Init_Cvars ();
Host_Skin_Init_Cvars ();
V_Init_Cvars ();
PR_Init ();
@ -971,8 +972,8 @@ Host_Init (void)
IN_Init ();
CL_SetState (ca_disconnected);
CL_Skin_Init ();
}
Host_Skin_Init ();
CL_UpdateScreen (cl.time);
CL_UpdateScreen (cl.time);

5
nq/source/sv_ded.c
View file

@ -52,6 +52,7 @@ static __attribute__ ((used)) const char rcsid[] =
#include "r_dynamic.h"
#include "sbar.h"
#include "server.h"
#include "cl_skin.h"//FIXME
#include "clview.h" //FIXME
client_state_t cl;
@ -232,12 +233,12 @@ Draw_Init (void)
}
void
Host_Skin_Init (void)
CL_Skin_Init (void)
{
}
void
Host_Skin_Init_Cvars (void)
CL_Skin_Init_Cvars (void)
{
}