tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Update cstrike.fmf and mk_mapdef.sh

This commit is contained in:
Marco Cawthorne 2020-11-07 10:41:27 +01:00
parent c737cebba7
commit afa9f0719c
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cstrike.fmf
View File

@ -27,9 +27,8 @@ BASEGAME cstrike
-set gameinfo_chatroom "freecs"
-set gameinfo_pkgname "cg_cstrike"
DOWNLOADSURL http://www.frag-net.com/dl/cstrike_packages
DOWNLOADSURL http://www.frag-net.com/dl/valve_packages
UPDATEURL http://www.frag-net.com/mods/cstrike.fmf
INSTALL "cstrike_essential;valve_essential;free_essential"
// you don't really want to change these
RTCBROKER master.frag-net.com:27950

10
platform/base_glsl.pk3dir/glsl/defaultwarp.glsl
View File

@ -44,7 +44,7 @@ varying vec2 lm0;
diffuse_f *= e_colourident;
// awful stipple alpha code
if (gl_stipplealpha == 1.0) {
#if gl_stipplealpha==1
float alpha = USEALPHA * e_colourident.a;
int x = int(mod(gl_FragCoord.x, 2.0));
int y = int(mod(gl_FragCoord.y, 2.0));
@ -68,16 +68,16 @@ varying vec2 lm0;
if (x + y == 2)
discard;
}
} else {
#else
#ifdef LIT
diffuse_f.rgb *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
#endif
}
#endif
if (gl_mono == 1.0) {
#if gl_mono==1
float bw = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0;
diffuse_f.rgb = vec3(bw, bw, bw);
}
#endif
gl_FragColor = fog4(diffuse_f);
}

2
platform/base_glsl.pk3dir/glsl/terrain.glsl
View File

@ -150,7 +150,7 @@ varying vec2 lm1, lm2, lm3;
diff2_f.rgb *= lightmap_fragment();
#endif
vec3 output_f = mix( diff1_f.rgb, diff2_f.rgb, alpha );
vec3 output_f = mix(diff1_f.rgb, diff2_f.rgb, alpha);
#ifdef FAKESHADOWS
output_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord);

12
src/mk_mapdef.sh
View File

@ -3,7 +3,17 @@
ENT_OUTFILE="./entities.def"
rm "$ENT_OUTFILE"
find */ -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do
find ./gs-entbase -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do
echo "Scanning for definitions inside $EDEF_N"
sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE"
done;
find ./client -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do
echo "Scanning for definitions inside $EDEF_N"
sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE"
done;
find ./server -type f \( -iname \*.cpp -o -iname \*.c \) | while read EDEF_N; do
echo "Scanning for definitions inside $EDEF_N"
sed -n '/\/*QUAKED/,/*\//p' $EDEF_N >> "$ENT_OUTFILE"
done;