team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dedicated server should now compile. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2509 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2007-05-27 14:47:31 +00:00
parent 03be582675
commit 1c9eff8804
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/common/com_mesh.c
View File

@ -1,5 +1,5 @@
#include "quakedef.h"
#if defined(D3DQUAKE) || defined(RGLQUAKE)
#if defined(D3DQUAKE) || defined(RGLQUAKE) || defined(SERVERONLY)
#ifdef D3DQUAKE
#include "d3dquake.h"
@ -211,7 +211,7 @@ static void R_BuildSkeletalMesh(mesh_t *mesh, float *plerp, float **pose, int po
#if defined(D3DQUAKE) || defined(RGLQUAKE)
extern entity_t *currententity;
int numTempColours;
@ -530,7 +530,7 @@ qboolean R_GAliasBuildMesh(mesh_t *mesh, galiasinfo_t *inf, int frame1, int fram
return true; //to allow the mesh to be dlighted.
}
#endif
@ -740,6 +740,7 @@ void Mod_CompileTriangleNeighbours(galiasinfo_t *galias)
#endif
}
#if defined(D3DQUAKE) || defined(RGLQUAKE)
/*
=================
Mod_FloodFillSkin
@ -813,7 +814,7 @@ void Mod_FloodFillSkin( qbyte *skin, int skinwidth, int skinheight )
skin[x + skinwidth * y] = fdc;
}
}
#endif
//additional skin loading
char **skinfilelist;
@ -989,6 +990,8 @@ void Mod_ParseQ3SkinFile(char *out, char *surfname, char *modelname, int skinnum
break;
}
}
#if defined(D3DQUAKE) || defined(RGLQUAKE)
void Mod_LoadSkinFile(galiastexnum_t *texnum, char *surfacename, int skinnumber, unsigned char *rawdata, int width, int height, unsigned char *palette)
{
char shadername[MAX_QPATH];
@ -1002,7 +1005,7 @@ void Mod_LoadSkinFile(galiastexnum_t *texnum, char *surfacename, int skinnumber,
texnum->base = Mod_LoadHiResTexture(shadername, "models", true, true, true);
}
#endif

20
engine/server/svmodel.c
View File

@ -28,11 +28,11 @@ char loadname[32]; // for hunk tags
qboolean Mod_LoadBrushModel (model_t *mod, void *buffer);
qboolean Mod_LoadQ2BrushModel (model_t *mod, void *buffer);
qboolean GL_LoadQ1Model (model_t *mod, void *buffer);
qboolean GL_LoadQ2Model (model_t *mod, void *buffer);
qboolean GL_LoadQ3Model (model_t *mod, void *buffer);
qboolean GLMod_LoadZymoticModel (model_t *mod, void *buffer);
qboolean GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer);
qboolean Mod_LoadQ1Model (model_t *mod, void *buffer);
qboolean Mod_LoadQ2Model (model_t *mod, void *buffer);
qboolean Mod_LoadQ3Model (model_t *mod, void *buffer);
qboolean Mod_LoadZymoticModel (model_t *mod, void *buffer);
qboolean Mod_LoadDarkPlacesModel(model_t *mod, void *buffer);
qbyte mod_novis[MAX_MAP_LEAFS/8];
@ -441,30 +441,30 @@ model_t *Mod_LoadModel (model_t *mod, qboolean crash)
case IDPOLYHEADER:
if (!GL_LoadQ1Model(mod, buf))
if (!Mod_LoadQ1Model(mod, buf))
goto couldntload;
break;
#ifdef MD2MODELS
case MD2IDALIASHEADER:
if (!GL_LoadQ2Model(mod, buf))
if (!Mod_LoadQ2Model(mod, buf))
goto couldntload;
break;
#endif
#ifdef MD3MODELS
case MD3_IDENT:
if (!GL_LoadQ3Model (mod, buf))
if (!Mod_LoadQ3Model (mod, buf))
goto couldntload;
break;
#endif
#ifdef ZYMOTICMODELS
case (('O'<<24)+('M'<<16)+('Y'<<8)+'Z'):
if (!GLMod_LoadZymoticModel(mod, buf))
if (!Mod_LoadZymoticModel(mod, buf))
goto couldntload;
break;
#endif
#ifdef ZYMOTICMODELS
case (('K'<<24)+('R'<<16)+('A'<<8)+'D'):
if (!GLMod_LoadDarkPlacesModel(mod, buf))
if (!Mod_LoadDarkPlacesModel(mod, buf))
goto couldntload;
break;
#endif