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

Add dedicated crosshair in edit mode

Browse Source 
DOCREF loadcrosshair
This commit is contained in:
aurhat
2015-04-28 20:47:54 +02:00
parent b96066031b
commit 1d497ac4d8
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_settings.cfg
+4
View File
@@ -286,6 +286,7 @@ menuitem [] -1
menuitemslider [Crosshair size: ] 0 50 "$crosshairsize" 5 [] [ crosshairsize $arg1 ]
menuitem [Change crosshair... ] [ showmenu Crosshairs ]
menuitem [Change scope crosshair... ] [ showmenu [Scope crosshairs] ]
menuitem [Change crosshair in edit mode... ] [ showmenu [Edit mode crosshairs] ]
newmenu Crosshairs
menudirlist "packages/crosshairs" png [ loadcrosshair default (concatword $arg1 .png) ] 1
@@ -293,6 +294,9 @@ menudirlist "packages/crosshairs" png [ loadcrosshair default (concatword $arg1
newmenu [Scope crosshairs]
menudirlist "packages/crosshairs" png [ loadcrosshair scope (concatword $arg1 .png) ] 1
newmenu [Edit mode crosshairs]
menudirlist "packages/crosshairs" png [ loadcrosshair edit (concatword $arg1 .png) ] 1
newmenu [Alternate edit binds]
menuitem [Back] [ closecurmenu ]
menuitem [Click to use alternate edit binds] [ exec config/opt/alternateeditbinds.cfg; closecurmenu ] [ echo (red) See config/opt/alternateeditbinds.cfg ]
source/src/main.cpp
+1
View File
@@ -1094,6 +1094,7 @@ int main(int argc, char **argv)
crosshairnames[CROSSHAIR_DEFAULT] = "default";
crosshairnames[CROSSHAIR_TEAMMATE] = "teammate";
crosshairnames[CROSSHAIR_SCOPE] = "scope";
crosshairnames[CROSSHAIR_EDIT] = "edit";
crosshairnames[CROSSHAIR_NUM] = gunnames[NUMGUNS] = "";
pushscontext(IEXC_CFG);
source/src/protos.h
+1
View File
@@ -320,6 +320,7 @@ enum
CROSSHAIR_DEFAULT = NUMGUNS,
CROSSHAIR_TEAMMATE,
CROSSHAIR_SCOPE,
CROSSHAIR_EDIT,
CROSSHAIR_NUM
};
source/src/weapon.cpp
+10 -2
View File
@@ -923,7 +923,11 @@ void weapon::onselecting()
}
void weapon::renderhudmodel() { renderhudmodel(owner->lastaction); }
void weapon::renderaimhelp(bool teamwarning) { drawcrosshair(owner, teamwarning ? CROSSHAIR_TEAMMATE : owner->weaponsel->type); }
void weapon::renderaimhelp(bool teamwarning)
{
if(!editmode) drawcrosshair(owner, teamwarning ? CROSSHAIR_TEAMMATE : owner->weaponsel->type);
else drawcrosshair(owner, CROSSHAIR_EDIT);
}
int weapon::dynspread() { return info.spread; }
float weapon::dynrecoil() { return info.recoil; }
bool weapon::selectable() { return this != owner->weaponsel && owner->state == CS_ALIVE && !owner->weaponchanging; }
@@ -1372,7 +1376,11 @@ void sniperrifle::renderhudmodel() { if(!scoped) weapon::renderhudmodel(); }
void sniperrifle::renderaimhelp(bool teamwarning)
{
if(scoped) drawscope();
if(scoped || teamwarning) drawcrosshair(owner, teamwarning ? CROSSHAIR_TEAMMATE : CROSSHAIR_SCOPE, NULL, 24.0f);
if(!editmode)
{
if(scoped || teamwarning) drawcrosshair(owner, teamwarning ? CROSSHAIR_TEAMMATE : CROSSHAIR_SCOPE, NULL, 24.0f);
}
else drawcrosshair(owner, CROSSHAIR_EDIT);
}
void sniperrifle::setscope(bool enable)