yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-26 14:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move patches authors to about menu

Browse source 
With whole respect to original authors
This commit is contained in:
Denis Pauk 2019-03-20 21:28:42 +02:00
parent fbe42511c1
commit 0f9e3cc69a
13 changed files with 30 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/client/menu/menu.c
View file

@ -1559,6 +1559,11 @@ static const char *idcredits[] = {
"Marty Stratton",
"Henk Hartong",
"",
"+Patches authors:"
"PGM",
"PMM",
"eliasm",
"",
"+YAMAGI QUAKE II BY",
"Yamagi Burmeister",
"Daniel Gibson",

4
src/client/refresh/soft/header/local.h
View file

@ -364,7 +364,7 @@ extern float d_sdivzorigin, d_tdivzorigin, d_ziorigin;
void D_DrawSpansPow2(espan_t *pspans);
void D_DrawZSpans(espan_t *pspans);
void TurbulentPow2(espan_t *pspan);
void NonTurbulentPow2(espan_t *pspan); //PGM
void NonTurbulentPow2(espan_t *pspan);
surfcache_t *D_CacheSurface(const entity_t *currententity, msurface_t *surface, int miplevel);
@ -387,7 +387,7 @@ extern int r_drawnpolycount;
extern int *sintable;
extern int *intsintable;
extern int *blanktable; // PGM
extern int *blanktable;
extern vec3_t vup, base_vup;
extern vec3_t vpn, base_vpn;

2
src/client/refresh/soft/header/model.h
View file

@ -68,7 +68,7 @@ typedef struct mplane_s
#define SURF_DRAWBACKGROUND 0x40
#define SURF_DRAWSKYBOX 0x80 // sky box
#define SURF_FLOW 0x100 //PGM
#define SURF_FLOW 0x100
typedef struct
{

39
src/client/refresh/soft/sw_alias.c
View file

@ -404,7 +404,7 @@ R_AliasTransformFinalVerts(const entity_t *currententity, int numpoints, finalve
plightnormal = r_avertexnormals[newv->lightnormalindex];
// PMM - added double damage shell
// added double damage shell
if ( currententity->flags & ( RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | RF_SHELL_DOUBLE | RF_SHELL_HALF_DAM) )
{
lerped_vert[0] += plightnormal[0] * POWERSUIT_SCALE;
@ -762,16 +762,16 @@ R_AliasDrawModel(entity_t *currententity, const model_t *currentmodel)
/*
** select the proper span routine based on translucency
*/
// PMM - added double damage shell
// PMM - reordered to handle blending
// added double damage shell
// reordered to handle blending
if ( currententity->flags & ( RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | RF_SHELL_DOUBLE | RF_SHELL_HALF_DAM) )
{
int color;
// PMM - added double
// added double
color = currententity->flags & ( RF_SHELL_RED | RF_SHELL_GREEN | RF_SHELL_BLUE | RF_SHELL_DOUBLE | RF_SHELL_HALF_DAM);
// PMM - reordered, new shells after old shells (so they get overriden)
// reordered, new shells after old shells (so they get overriden)
if ( color == RF_SHELL_RED )
r_aliasblendcolor = SHELL_RED_COLOR;
else if ( color == RF_SHELL_GREEN )
@ -784,40 +784,13 @@ R_AliasDrawModel(entity_t *currententity, const model_t *currentmodel)
r_aliasblendcolor = SHELL_RB_COLOR;
else if ( color == (RF_SHELL_BLUE | RF_SHELL_GREEN) )
r_aliasblendcolor = SHELL_BG_COLOR;
// PMM - added this .. it's yellowish
// added this .. it's yellowish
else if ( color == (RF_SHELL_DOUBLE) )
r_aliasblendcolor = SHELL_DOUBLE_COLOR;
else if ( color == (RF_SHELL_HALF_DAM) )
r_aliasblendcolor = SHELL_HALF_DAM_COLOR;
// pmm
else
r_aliasblendcolor = SHELL_WHITE_COLOR;
/*
if ( color & RF_SHELL_RED )
{
if ( ( color & RF_SHELL_BLUE) && ( color & RF_SHELL_GREEN) )
r_aliasblendcolor = SHELL_WHITE_COLOR;
else if ( color & (RF_SHELL_BLUE | RF_SHELL_DOUBLE))
r_aliasblendcolor = SHELL_RB_COLOR;
else
r_aliasblendcolor = SHELL_RED_COLOR;
}
else if ( color & RF_SHELL_BLUE)
{
if ( color & RF_SHELL_DOUBLE )
r_aliasblendcolor = SHELL_CYAN_COLOR;
else
r_aliasblendcolor = SHELL_BLUE_COLOR;
}
else if ( color & (RF_SHELL_DOUBLE) )
r_aliasblendcolor = SHELL_DOUBLE_COLOR;
else if ( color & (RF_SHELL_HALF_DAM) )
r_aliasblendcolor = SHELL_HALF_DAM_COLOR;
else if ( color & RF_SHELL_GREEN )
r_aliasblendcolor = SHELL_GREEN_COLOR;
else
r_aliasblendcolor = SHELL_WHITE_COLOR;
*/
if ( currententity->alpha > 0.33 )
d_pdrawspans = R_PolysetDrawSpansConstant8_66;

2
src/client/refresh/soft/sw_draw.c
View file

@ -96,7 +96,7 @@ RE_Draw_CharScaled(int x, int y, int num, float scale)
if (y <= -8)
return; // totally off screen
if ( ( y + 8 ) > vid.height ) // PGM - status text was missing in sw...
if ( ( y + 8 ) > vid.height ) // status text was missing in sw...
return;
row = num>>4;

5
src/client/refresh/soft/sw_edge.c
View file

@ -828,7 +828,7 @@ D_CalcGradients (msurface_t *pface)
((pface->texturemins[1] << SHIFT16XYZ) >> miplevel)
+ pface->texinfo->vecs[1][3]*t;
// PGM - changing flow speed for non-warping textures.
// changing flow speed for non-warping textures.
if (pface->texinfo->flags & SURF_FLOWING)
{
if(pface->texinfo->flags & SURF_WARP)
@ -836,7 +836,6 @@ D_CalcGradients (msurface_t *pface)
else
sadjust += SHIFT16XYZ_MULT * (-128 * ( (r_newrefdef.time * 0.77) - (int)(r_newrefdef.time * 0.77) ));
}
// PGM
//
// -1 (-epsilon) so we never wander off the edge of the texture
@ -902,13 +901,11 @@ D_TurbulentSurf(surf_t *s)
D_CalcGradients (pface);
//============
//PGM
// textures that aren't warping are just flowing. Use NonTurbulentPow2 instead
if(!(pface->texinfo->flags & SURF_WARP))
NonTurbulentPow2 (s->spans);
else
TurbulentPow2 (s->spans);
//PGM
//============
D_DrawZSpans (s->spans);

14
src/client/refresh/soft/sw_light.c
View file

@ -48,20 +48,16 @@ R_MarkLights (dlight_t *light, int bit, mnode_t *node, int r_dlightframecount)
splitplane = node->plane;
dist = DotProduct (light->origin, splitplane->normal) - splitplane->dist;
//=====
//PGM
i=light->intensity;
if(i<0)
i=-i;
//PGM
//=====
if (dist > i) // PGM (dist > light->intensity)
if (dist > i) // (dist > light->intensity)
{
R_MarkLights (light, bit, node->children[0], r_dlightframecount);
return;
}
if (dist < -i) // PGM (dist < -light->intensity)
if (dist < -i) // (dist < -light->intensity)
{
R_MarkLights (light, bit, node->children[1], r_dlightframecount);
return;
@ -289,7 +285,7 @@ R_AddDynamicLights (drawsurf_t* drawsurf)
int smax, tmax;
mtexinfo_t *tex;
dlight_t *dl;
int negativeLight; //PGM
int negativeLight;
surf = drawsurf->surf;
smax = (surf->extents[0]>>4)+1;
@ -306,14 +302,12 @@ R_AddDynamicLights (drawsurf_t* drawsurf)
rad = dl->intensity;
//=====
//PGM
negativeLight = 0;
if(rad < 0)
{
negativeLight = 1;
rad = -rad;
}
//PGM
//=====
dist = DotProduct (dl->origin, surf->plane->normal) -
@ -352,7 +346,6 @@ R_AddDynamicLights (drawsurf_t* drawsurf)
dist = td + (sd>>1);
//====
//PGM
if(!negativeLight)
{
if (dist < minlight)
@ -365,7 +358,6 @@ R_AddDynamicLights (drawsurf_t* drawsurf)
if(*plightdest < minlight)
*plightdest = minlight;
}
//PGM
//====
plightdest ++;
}

4
src/client/refresh/soft/sw_main.c
View file

@ -148,9 +148,7 @@ cvar_t *r_lightlevel; //FIXME HACK
static cvar_t *vid_fullscreen;
static cvar_t *vid_gamma;
//PGM
static cvar_t *r_lockpvs;
//PGM
// sw_vars.c
@ -261,9 +259,7 @@ R_RegisterVariables (void)
vid_gamma->modified = true; // force us to rebuild the gamma table later
sw_overbrightbits->modified = true; // force us to rebuild palette later
//PGM
r_lockpvs = ri.Cvar_Get ("r_lockpvs", "0", 0);
//PGM
}
static void

20
src/client/refresh/soft/sw_model.c
View file

@ -365,14 +365,11 @@ Mod_LoadVertexes (lump_t *l)
count = l->filelen / sizeof(*in);
out = Hunk_Alloc((count+8)*sizeof(*out)); // extra for skybox
/*
* PATCH: eliasm
*
* This patch fixes the problem where the games dumped core
* when changing levels.
*/
memset( out, 0, (count + 6) * sizeof( *out ) );
/* END OF PATCH */
/*
* This patch fixes the problem where the games dumped core
* when changing levels.
*/
memset( out, 0, (count + 6) * sizeof( *out ) );
loadmodel->vertexes = out;
loadmodel->numvertexes = count;
@ -512,15 +509,12 @@ Mod_LoadTexinfo (lump_t *l)
if (next > 0)
out->next = loadmodel->texinfo + next;
/*
* PATCH: eliasm
*
* This patch fixes the problem where the game
* domed core when loading a new level.
*/
else {
out->next = NULL;
}
/* END OF PATCH */
Com_sprintf (name, sizeof(name), "textures/%s.wal", in->texture);
out->image = R_FindImage (name, it_wall);
@ -683,7 +677,6 @@ Mod_LoadFaces (lump_t *l)
}
//==============
//PGM
// this marks flowing surfaces as turbulent, but with the new
// SURF_FLOW flag.
if (out->texinfo->flags & SURF_FLOWING)
@ -696,7 +689,6 @@ Mod_LoadFaces (lump_t *l)
}
continue;
}
//PGM
//==============
}
}
@ -1339,9 +1331,7 @@ RE_RegisterModel (char *name)
pheader = (dmdl_t *)mod->extradata;
for (i=0 ; i<pheader->num_skins ; i++)
mod->skins[i] = R_FindImage ((char *)pheader + pheader->ofs_skins + i*MAX_SKINNAME, it_skin);
//PGM
mod->numframes = pheader->num_frames;
//PGM
}
else if (mod->type == mod_brush)
{

21
src/client/refresh/soft/sw_poly.c
View file

@ -589,7 +589,7 @@ R_ClipPolyFace (int nump, clipplane_t *pclipplane)
/*
** R_PolygonDrawSpans
*/
// PGM - iswater was qboolean. changed to allow passing more flags
// iswater was qboolean. changed to allow passing more flags
static void
R_PolygonDrawSpans(espan_t *pspan, int iswater )
{
@ -600,13 +600,11 @@ R_PolygonDrawSpans(espan_t *pspan, int iswater )
s_spanletvars.pbase = cacheblock;
//PGM
if ( iswater & SURF_WARP)
r_turb_turb = sintable + ((int)(r_newrefdef.time*SPEED)&(CYCLE-1));
else
// iswater & SURF_FLOWING
r_turb_turb = blanktable;
//PGM
sdivzspanletstepu = d_sdivzstepu * AFFINE_SPANLET_SIZE;
tdivzspanletstepu = d_tdivzstepu * AFFINE_SPANLET_SIZE;
@ -910,7 +908,7 @@ R_PolygonScanRightEdge(espan_t *s_polygon_spans)
/*
** R_ClipAndDrawPoly
*/
// PGM - isturbulent was qboolean. changed to int to allow passing more flags
// isturbulent was qboolean. changed to int to allow passing more flags
void
R_ClipAndDrawPoly ( float alpha, int isturbulent, qboolean textured )
{
@ -1074,14 +1072,12 @@ R_BuildPolygonFromSurface(const entity_t *currententity, const model_t *currentm
VectorSubtract( vec3_origin, r_polydesc.vpn, r_polydesc.vpn );
}
// PGM 09/16/98
if ( fa->texinfo->flags & (SURF_WARP|SURF_FLOWING) )
{
r_polydesc.pixels = fa->texinfo->image->pixels[0];
r_polydesc.pixel_width = fa->texinfo->image->width;
r_polydesc.pixel_height = fa->texinfo->image->height;
}
// PGM 09/16/98
else
{
surfcache_t *scache;
@ -1153,7 +1149,7 @@ R_PolygonCalculateGradients (void)
**
** This should NOT be called externally since it doesn't do clipping!
*/
// PGM - iswater was qboolean. changed to support passing more flags
// iswater was qboolean. changed to support passing more flags
static void
R_DrawPoly(int iswater)
{
@ -1225,20 +1221,11 @@ R_DrawAlphaSurfaces(const entity_t *currententity)
{
R_BuildPolygonFromSurface(currententity, currentmodel, s);
//=======
//PGM
// if (s->texinfo->flags & SURF_TRANS66)
// R_ClipAndDrawPoly( 0.60f, ( s->texinfo->flags & SURF_WARP) != 0, true );
// else
// R_ClipAndDrawPoly( 0.30f, ( s->texinfo->flags & SURF_WARP) != 0, true );
// PGM - pass down all the texinfo flags, not just SURF_WARP.
// pass down all the texinfo flags, not just SURF_WARP.
if (s->texinfo->flags & SURF_TRANS66)
R_ClipAndDrawPoly( 0.60f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true );
else
R_ClipAndDrawPoly( 0.30f, (s->texinfo->flags & (SURF_WARP|SURF_FLOWING)), true );
//PGM
//=======
s = s->nextalphasurface;
}

4
src/client/refresh/soft/sw_polyset.c
View file

@ -86,7 +86,6 @@ static void R_PolysetSetEdgeTable(void);
static void R_RasterizeAliasPolySmooth(const entity_t *currententity);
// ======================
// PGM
// 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
static const byte irtable[256] = {
79, 78, 77, 76, 75, 74, 73, 72, // black/white
@ -129,7 +128,6 @@ static const byte irtable[256] = {
208, 208, 64, 64, 70, 71, 72, 64, // mishmash1
66, 68, 70, 64, 65, 66, 67, 68}; // mishmash2
// PGM
// ======================
/*
@ -698,12 +696,10 @@ R_PolysetDrawSpans8_Opaque (const entity_t *currententity, spanpackage_t *pspanp
{
if ((lzi >> SHIFT16XYZ) >= *lpz)
{
//PGM
if(r_newrefdef.rdflags & RDF_IRGOGGLES && currententity->flags & RF_IR_VISIBLE)
*lpdest = ((byte *)vid_colormap)[irtable[*lptex]];
else
*lpdest = ((byte *)vid_colormap)[*lptex + (llight & 0xFF00)];
//PGM
*lpz = lzi >> SHIFT16XYZ;
}

2
src/client/refresh/soft/sw_rast.c
View file

@ -46,7 +46,7 @@ static qboolean r_nearzionly;
int *sintable;
int *intsintable;
int *blanktable; // PGM
int *blanktable;
static mvertex_t r_leftenter, r_leftexit;
static mvertex_t r_rightenter, r_rightexit;

3
src/client/refresh/soft/sw_scan.c
View file

@ -331,7 +331,6 @@ TurbulentPow2 (espan_t *pspan)
}
//====================
//PGM
/*
=============
NonTurbulentPow2 - this is for drawing scrolling textures. they're warping water textures
@ -484,7 +483,7 @@ NonTurbulentPow2 (espan_t *pspan)
} while ((pspan = pspan->pnext) != NULL);
}
//PGM
//====================
// Enable custom filtering