teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Menus: disable mouse pointer if CROSSHAIR is void. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4862 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2014-12-28 19:48:20 +00:00
parent 1734e0db53
commit 7033205fcf
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/build/src/engine.c
View file

@ -13736,11 +13736,10 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
#endif
if (wal->nextsector < 0 || (wal->cstat&dawalclipmask))
{
clipyou = 1;
#ifdef YAX_ENABLE
int16_t cb = yax_getbunch(dasect, YAX_CEILING);
clipyou = 1;
if (cb >= 0 && (sec->ceilingstat & yax_waltosecmask(dawalclipmask)) == 0)
{
int32_t ynw = yax_getnextwall(j, YAX_CEILING);
@ -13751,8 +13750,6 @@ int32_t clipmove(vec3_t *pos, int16_t *sectnum,
clipyou = check_floor_curb(dasect, wall[ynw].nextsector, flordist, pos->z, dax, day);
}
}
#else
clipyou = 1;
#endif
}
else if (editstatus == 0)

2
polymer/eduke32/source/menus.c
View file

@ -5439,7 +5439,7 @@ void M_DisplayMenus(void)
if (VM_HaveEvent(EVENT_DISPLAYMENUREST))
VM_OnEvent(EVENT_DISPLAYMENUREST, g_player[screenpeek].ps->i, screenpeek);
if (mousestatus)
if (tilesiz[CROSSHAIR].x > 0 && mousestatus)
{
#if !defined EDUKE32_TOUCH_DEVICES
if (!MOUSEACTIVECONDITION)