FWGS
/
Xash3DArchive
Archived
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

26 Apr 2011

This commit is contained in:
g-cont 2011-04-26 00:00:00 +04:00 committed by Alibek Omarov
parent 773dbe4d28
commit 72e86d112d
16 changed files with 32 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
change.log
View File

@ -1,3 +1,7 @@
build 1540
Fixed many-many small and large bugs before final release
build 1529
FS: add "fallback_dir" option

3
common/const.h
View File

@ -697,8 +697,7 @@ enum
kRenderTransTexture, // src*a+dest*(1-a)
kRenderGlow, // src*a+dest -- No Z buffer checks
kRenderTransAlpha, // src*srca+dest*(1-srca)
kRenderTransAdd, // src*a+dest
kRenderTransInverse // src*(1-a)+dest*a
kRenderTransAdd // src*a+dest
};
enum

14
engine/client/cl_game.c
View File

@ -1329,6 +1329,8 @@ void CL_ClearWorld( void )
cl.world->curstate.movetype = MOVETYPE_PUSH;
cl.world->model = cl.worldmodel;
cl.world->index = 0;
clgame.ds.cullMode = GL_FRONT;
}
void CL_InitEdicts( void )
@ -2908,12 +2910,6 @@ void TriRenderMode( int mode )
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break;
case kRenderTransInverse:
pglEnable( GL_BLEND );
pglDisable( GL_ALPHA_TEST );
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break;
}
}
@ -3059,13 +3055,13 @@ void TriCullFace( TRICULLSTYLE mode )
switch( mode )
{
case TRI_FRONT:
mode = GL_FRONT;
clgame.ds.cullMode = GL_FRONT;
break;
default:
mode = GL_NONE;
clgame.ds.cullMode = GL_NONE;
break;
}
GL_Cull( mode );
GL_Cull( clgame.ds.cullMode );
}
/*

7
engine/client/cl_tent.c
View File

@ -2362,6 +2362,7 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
float falloff;
pmtrace_t trace;
dlight_t *dl;
int key;
if(( pEnt->index - 1 ) == cl.playernum )
{
@ -2396,8 +2397,12 @@ void CL_UpdateFlashlight( cl_entity_t *pEnt )
falloff *= falloff;
if( cl.maxclients == 1 )
key = cl.playernum + 1;
else key = pEnt->index;
// update flashlight endpos
dl = CL_AllocDlight( pEnt->index );
dl = CL_AllocDlight( key );
VectorCopy( trace.endpos, dl->origin );
dl->die = cl.time + 0.01f; // die on next frame
dl->color.r = 255 * falloff;

2
engine/client/client.h
View File

@ -210,6 +210,8 @@ typedef struct
int scissor_height;
qboolean scissor_test;
int cullMode; // override CULL FACE from TriAPI
// holds text color
rgba_t textColor;
rgba_t spriteColor;

6
engine/client/gl_backend.c
View File

@ -333,12 +333,6 @@ void GL_SetRenderMode( int mode )
pglBlendFunc( GL_SRC_ALPHA, GL_ONE );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break;
case kRenderTransInverse:
pglEnable( GL_BLEND );
pglDisable( GL_ALPHA_TEST );
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
break;
}
}

1
engine/client/gl_rmain.c
View File

@ -22,7 +22,6 @@ static int R_RankForRenderMode( cl_entity_t *ent )
switch( ent->curstate.rendermode )
{
case kRenderTransTexture:
case kRenderTransInverse:
return 1; // draw second
case kRenderTransAdd:
return 2; // draw third

2
engine/client/gl_rsurf.c
View File

@ -651,7 +651,6 @@ void R_BlendLightmaps( void )
switch( RI.currententity->curstate.rendermode )
{
case kRenderTransTexture:
case kRenderTransInverse:
case kRenderTransColor:
case kRenderTransAdd:
case kRenderGlow:
@ -1201,7 +1200,6 @@ void R_DrawBrushModel( cl_entity_t *e )
{
case kRenderTransAdd:
case kRenderTransTexture:
case kRenderTransInverse:
need_sort = true;
case kRenderGlow:
pglColor4ub( 255, 255, 255, e->curstate.renderamt );

2
engine/client/gl_rsurf.old.c
View File

@ -382,7 +382,6 @@ void R_BlendLightmaps( void )
switch( RI.currententity->curstate.rendermode )
{
case kRenderTransTexture:
case kRenderTransInverse:
case kRenderTransColor:
case kRenderTransAdd:
case kRenderGlow:
@ -1029,7 +1028,6 @@ void R_DrawBrushModel( cl_entity_t *e )
{
case kRenderTransAdd:
case kRenderTransTexture:
case kRenderTransInverse:
need_sort = true;
case kRenderGlow:
pglColor4ub( 255, 255, 255, e->curstate.renderamt );

4
engine/client/gl_sprite.c
View File

@ -890,10 +890,6 @@ void R_DrawSpriteModel( cl_entity_t *e )
pglEnable( GL_BLEND );
pglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
break;
case kRenderTransInverse:
pglEnable( GL_BLEND );
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
break;
case kRenderGlow:
case kRenderTransAdd:
pglEnable( GL_BLEND );

4
engine/client/gl_studio.c
View File

@ -2200,9 +2200,9 @@ R_StudioSetupRenderer
*/
static void R_StudioSetupRenderer( int rendermode )
{
g_iRenderMode = bound( 0, rendermode, kRenderTransInverse );
g_iRenderMode = bound( 0, rendermode, kRenderTransAdd );
pglShadeModel( GL_SMOOTH ); // enable gouraud shading
GL_Cull( GL_FRONT );
if( clgame.ds.cullMode != GL_NONE ) GL_Cull( GL_FRONT );
// enable depthmask on studiomodels
if( glState.drawTrans ) pglDepthMask( GL_TRUE );

5
engine/common/build.c
View File

@ -12,6 +12,8 @@ static char mond[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
// returns days since Feb 13 2007
int Q_buildnum( void )
{
// do not touch this! Only author of Xash3D can increase buildnumbers!
#if 0
int m = 0, d = 0, y = 0;
static int b = 0;
@ -35,4 +37,7 @@ int Q_buildnum( void )
b -= 38752; // Feb 13 2007
return b;
#else
return 1540;
#endif
}

2
engine/common/common.h
View File

@ -65,7 +65,7 @@ typedef enum
#include "com_model.h"
#include "crtlib.h"
#define XASH_VERSION 0.8f // engine current version
#define XASH_VERSION 0.85f // engine current version
// PERFORMANCE INFO
#define MIN_FPS 0.1 // host minimum fps value for maxfps.

5
engine/common/console.c
View File

@ -1314,7 +1314,10 @@ void Con_DrawInput( void )
if( host.key_overstrike && cursorChar )
{
// overstrike cursor
GL_SetRenderMode( kRenderTransInverse );
pglEnable( GL_BLEND );
pglDisable( GL_ALPHA_TEST );
pglBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA );
pglTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
Con_DrawGenericChar( x + curPos, y, cursorChar, colorDefault );
}
else Con_DrawCharacter( x + curPos, y, '_', colorDefault );

1
engine/server/sv_game.c
View File

@ -1243,6 +1243,7 @@ edict_t *pfnFindEntityInSphere( edict_t *pStartEdict, const float *org, float fl
=================
pfnFindClientInPVS
FIXME: this code is totally wrong. Get PF_checkclient from QW.
=================
*/
edict_t* pfnFindClientInPVS( edict_t *pEdict )

59
mainui/menu_credits.cpp
View File

@ -27,65 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static const char *uiCreditsDefault[] =
{
"^3Xash3D",
"",
"^3PROGRAMMING",
"Uncle Mike",
"",
"^3ART",
"Chorus",
"Small Link",
"The FiEctro",
"",
"^3LEVEL DESIGN",
"Scrama",
"Mitoh",
"",
"",
"^3SPECIAL THANKS",
"Chain Studios et al.",
"",
"",
"",
"",
"",
"",
"^3MUSIC",
"Dj Existence",
"",
"",
"^3THANKS TO",
"ID Software at all",
"Georg Destroy for icon graphics",
"LokiMb for fixed console font",
"Crazy Russian for HL-style menu buttons",
"",
"",
"",
"",
"",
"",
"",
"^3Xash3D using some parts of:",
"Quake 1 (Id Software)",
"Quake 2 (Id Software)",
"Quake 3 (Id Software)",
"Half-Life (Valve Software)",
"Darkplaces (Darkplaces Team)",
"Quake 2 Evolved (Team Blur)",
"AVIKit (by randomnine)",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"",
"Copyright XashXT Group 2010 (C)",
"Copyright XashXT Group 2011 (C)",
0
};