kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source 
Among other things it fixes masterserver compiling.
This commit is contained in:
aurhat
2015-08-16 16:44:18 +02:00
parent 673286d25b
commit 3a4edff826
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_settings.cfg
+2 -2
View File
@@ -345,7 +345,7 @@ menuitem [1680x1050 (16:10)] [ scr_w 1680; scr_h 1050; closecurmenu; showmenu vi
menuitem [1920x1080 (16:9)] [ scr_w 1920; scr_h 1080; closecurmenu; showmenu video ]
menuitem [1920x1200 (16:10)] [ scr_w 1920; scr_h 1200; closecurmenu; showmenu video ]
const fsaa_valuemap [-1 2 4 8 16]
const fsaa_valuemap [-1 0 2 4 8 16]
const aniso_valuemap [0 2 4 8 16]
const minlod_valuemap [60 100 200 250]
const watersubdiv_valuemap [16 8 4 2 1]
@@ -353,7 +353,7 @@ const watersubdiv_valuemap [16 8 4 2 1]
newmenu [Advanced video settings]
menuitemslider [Scope FOV: ] 5 60 "$scopefov" 5 [] [ scopefov $arg1 ]
menuitemslider [Antialiasing (FSAA): ] 0 4 "(findlist $fsaa_valuemap $fsaa)" 1 [Off 2 4 8 16] [ fsaa (at $fsaa_valuemap $arg1) ]
menuitemslider [Antialiasing (FSAA): ] 0 5 "(findlist $fsaa_valuemap $fsaa)" 1 [Default Off 2 4 8 16] [ fsaa (at $fsaa_valuemap $arg1) ]
menuitemslider [Anisotropic filtering: ] 0 4 "(findlist $aniso_valuemap $aniso)" 1 [Off 2 4 8 16] [ aniso (at $aniso_valuemap $arg1) ]
menuitemslider [Minimal level of detail: ] 0 3 "(findlist $minlod_valuemap $minlod)" 1 [Low Decent Good Best] [ minlod (at $minlod_valuemap $arg1) ]
menuitemslider [Light error: ] 1 100 "$lighterror" 5 [] [ lighterror $arg1 ]
config/scripts.cfg
+2 -2
View File
@@ -464,7 +464,7 @@ const ignoreteam [
]
] ignoreall
]
const ignoreenemy [ ignoreteam (at [0 1] (! (player1 team))) ]
const ignoreenemy [ if (! (player1 spect)) [ignoreteam (at [0 1] (! (player1 team)))] ]
// Simple claim-admin script for one single-server.
// Fill in the 3 aliases below, and uncomment the below line to activate.
@@ -487,7 +487,7 @@ const setgamma [
$nn = $arg1
echo "gamma preset for map" (curmap 1) "set to" $arg1
] [
if (&& (checkalias $nn) (strlen $$nn)) [
if (&& [checkalias $nn] [strlen $$nn]) [
$nn = ""
echo "gamma preset for map" (curmap 1) "deleted"
]
source/src/command.cpp
+2
View File
@@ -364,6 +364,7 @@ void _getalias(char *name)
}
COMMANDN(getalias, _getalias, "s");
#ifndef STANDALONE
void getvarrange(char *_what, char *name)
{
ident *id = idents->access(name);
@@ -387,6 +388,7 @@ void getvarrange(char *_what, char *name)
result("");
}
COMMAND(getvarrange, "ss");
#endif
COMMANDF(isIdent, "s", (char *name) { intret(identexists(name) ? 1 : 0); });
source/src/rendergl.cpp
+5 -2
View File
@@ -628,6 +628,9 @@ GLuint reflecttex = 0, refracttex = 0;
int reflectlastsize = 0;
VARP(reflectsize, 6, 8, 10);
// FIXME The bug: HUD (equipment icons etc.) reflects on the water surface.
// Therefore previous default value of reflectlip was changed from 3 to 1, in order to minimalize this negative effect.
// Restore it, when the bug will be fixed.
VAR(reflectclip, 0, 1, 100);
VARP(waterreflect, 0, 1, 1);
VARP(waterrefract, 0, 0, 1);
@@ -951,7 +954,7 @@ void sethudgunperspective(bool on)
glMatrixMode(GL_MODELVIEW);
}
void drawhudgun(int w, int h, float aspect, int farplane)
void drawhudgun()
{
sethudgunperspective(true);
@@ -1122,7 +1125,7 @@ void gl_drawframe(int w, int h, float changelod, float curfps)
WaypointClass.Think();
// end add
drawhudgun(w, h, aspect, farplane);
drawhudgun();
resettmu(0);