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

17 Aug 2017

This commit is contained in:
g-cont 2017-08-17 00:00:00 +03:00 committed by Alibek Omarov
parent 8ce7375339
commit 4632e38389
4 changed files with 16 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engine/client/gl_rpart.c
View File

@ -607,14 +607,13 @@ void CL_DrawTracers( double frametime )
VectorNormalize( tmp );
// build point along noraml line (normal is -y, x)
VectorScale( RI.cull_vup, tmp[0], normal );
VectorScale( RI.cull_vright, -tmp[1], tmp2 );
VectorScale( RI.cull_vup, tmp[0] * gTracerSize[p->type], normal );
VectorScale( RI.cull_vright, -tmp[1] * gTracerSize[p->type], tmp2 );
VectorSubtract( normal, tmp2, normal );
// compute four vertexes
VectorScale( normal, gTracerSize[p->type] * (texWidth / 16), tmp );
VectorSubtract( start, tmp, verts[0] );
VectorAdd( start, tmp, verts[1] );
VectorSubtract( start, normal, verts[0] );
VectorAdd( start, normal, verts[1] );
VectorAdd( verts[0], delta, verts[2] );
VectorAdd( verts[1], delta, verts[3] );
@ -1557,10 +1556,11 @@ make implosion tracers
*/
void R_Implosion( const vec3_t end, float radius, int count, float life )
{
float dist = ( radius / 100.0f );
vec3_t start, temp, vel;
float factor;
int i;
float dist = ( radius / 100.0f );
vec3_t start, temp, vel;
float factor;
particle_t *p;
int i;
if( life <= 0.0f ) life = 0.1f; // to avoid divide by zero
factor = -1.0 / life;
@ -1573,8 +1573,10 @@ void R_Implosion( const vec3_t end, float radius, int count, float life )
VectorScale( temp, factor, vel );
VectorAdd( temp, end, start );
if( !R_AllocTracer( start, vel, life ))
if(( p = R_AllocTracer( start, vel, life )) == NULL )
return;
p->type = pt_explode;
}
}

7
engine/client/gl_studio.c
View File

@ -1597,10 +1597,11 @@ void R_StudioDynamicLight( cl_entity_t *ent, alight_t *plight )
VectorSubtract( pseqdesc->bbmax, pseqdesc->bbmin, size );
total = Q_max( size[0], Q_max( size[1], size[2] ));
if( RI.currententity == &clgame.viewent )
total = 0.0f; // never used for viewmodels
// don't use it for too big models (like dinosaurs in ganman)
if( total < 128.0f || total > 400.0f || RI.currententity == &clgame.viewent )
total = 0.0f; // ignore
if( !FBitSet( pseqdesc->flags, STUDIO_LOOPING ) && !pseqdesc->activity && m_pStudioHeader->numseq > 1 && total > 128.0f )
if( !FBitSet( pseqdesc->flags, STUDIO_LOOPING ) && !pseqdesc->activity && m_pStudioHeader->numseq > 1 && total != 0.0f )
Matrix3x4_OriginFromMatrix( g_studio.lighttransform[0], origin );
else Matrix3x4_OriginFromMatrix( g_studio.rotationmatrix, origin );
}

33
engine/engine.plg
View File

@ -1,33 +0,0 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: engine - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "C:\WINDOWS\TEMP\RSP33AA.bat" with contents
[
@echo off
copy \Xash3D\src_main\temp\engine\!release\xash.dll "D:\Xash3D\xash.dll"
copy \Xash3D\src_main\temp\engine\!release\xash.dll "D:\Paranoia2\xash.dll"
copy \Xash3D\src_main\temp\engine\!release\xash.dll "D:\Area51\xash.dll"
copy \Xash3D\src_main\temp\engine\!release\xash.dll "D:\Quake\xash.dll"
]
Creating command line "C:\WINDOWS\TEMP\RSP33AA.bat"
<h3>Output Window</h3>
Performing Custom Build Step on \Xash3D\src_main\temp\engine\!release\xash.dll
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
‘ª®¯¨à®¢ ­® ä ©«®¢: 1.
Žâª § ­® ¢ ¤®áâ㯥.
‘ª®¯¨à®¢ ­® ä ©«®¢: 0.
Error executing c:\windows\system32\cmd.exe.
<h3>Results</h3>
xash.dll - 1 error(s), 0 warning(s)
</pre>
</body>
</html>

16
mainui/mainui.plg
View File

@ -1,16 +0,0 @@
<html>
<body>
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: mainui - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
menu.dll - 0 error(s), 0 warning(s)
</pre>
</body>
</html>