immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use binary literals in radar filters 

@tomaszkax86 noticed that this syntax is valid only in C++14 and Visual Studio 2013 doesn't support that
master
krzys-h 2015-07-08 19:05:11 +02:00
parent b75ab7d8f6
commit c18b5daf57
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/object/object_manager.h
View File

@ -48,14 +48,14 @@ class CObjectFactory;
enum RadarFilter enum RadarFilter
{ {
FILTER_NONE = (0b00000000) << 8, FILTER_NONE = 0,
FILTER_ONLYLANDING = (0b00000001) << 8, FILTER_ONLYLANDING = 1 << (8+0),
FILTER_ONLYFLYING = (0b00000010) << 8, FILTER_ONLYFLYING = 1 << (8+1),
FILTER_FRIENDLY = (0b00000100) << 8, FILTER_FRIENDLY = 1 << (8+2),
FILTER_ENEMY = (0b00001000) << 8, FILTER_ENEMY = 1 << (8+3),
FILTER_NEUTRAL = (0b00010000) << 8, FILTER_NEUTRAL = 1 << (8+4),
}; };
using CObjectMap = std::map<int, std::unique_ptr<CObject>>; using CObjectMap = std::map<int, std::unique_ptr<CObject>>;