eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 03:09:18 +02:00
Code Issues 121 Wiki Activity

maintenance: settings item refactoring, include dependencies fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-01-26 16:44:47 +01:00
parent 9d008d2a3e
commit 0124032d3b
92 changed files with 2226 additions and 2233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
EvLaunch.cpp
View File

@@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/.
#include "stdafx.h"
#include "EvLaunch.h"
#include "Globals.h"
#include "Logs.h"
#include "Event.h"
@@ -22,6 +23,8 @@ http://mozilla.org/MPL/2.0/.
#include "Timer.h"
#include "parser.h"
#include "Console.h"
#include "world.h"
#include "utilities.h"
//---------------------------------------------------------------------------
@@ -128,14 +131,14 @@ bool TEventLauncher::check_conditions()
bool bCond = false;
if (iKey != 0)
{
if( Global::bActive ) {
if( Global.bActive ) {
// tylko jeśli okno jest aktywne
if( iKey > 255 ) {
// key and modifier
auto const modifier = ( iKey & 0xff00 ) >> 8;
bCond = ( Console::Pressed( iKey & 0xff ) )
&& ( ( modifier & 1 ) ? Global::shiftState : true )
&& ( ( modifier & 2 ) ? Global::ctrlState : true );
&& ( ( modifier & 1 ) ? Global.shiftState : true )
&& ( ( modifier & 2 ) ? Global.ctrlState : true );
}
else {
// just key