OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made the automap an object.

Browse source 
This simplifies handling a lot because it allows to make the level the owner of its map.
This commit is contained in:
Christoph Oelckers 2019-01-26 15:21:20 +01:00
commit 05830455e7
14 changed files with 839 additions and 791 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/g_game.cpp
View file

@ -955,7 +955,7 @@ bool G_Responder (event_t *ev)
{
if (ST_Responder (ev))
return true; // status window ate it
if (!viewactive && AM_Responder (ev, false))
if (!viewactive && currentUILevel->automap->Responder (ev, false))
return true; // automap ate it
}
else if (gamestate == GS_FINALE)
@ -986,7 +986,7 @@ bool G_Responder (event_t *ev)
// the events *last* so that any bound keys get precedence.
if (gamestate == GS_LEVEL && viewactive)
return AM_Responder (ev, true);
return currentUILevel->automap->Responder (ev, true);
return (ev->type == EV_KeyDown ||
ev->type == EV_Mouse);
@ -1179,7 +1179,7 @@ void G_Ticker ()
{
case GS_LEVEL:
P_Ticker ();
AM_Ticker ();
currentUILevel->automap->Ticker ();
break;
case GS_TITLELEVEL: