diff options
| author | Joseph-Eugene Winzer | 2017-06-15 18:59:17 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-22 22:59:48 +0000 |
| commit | 51df751e449a38f2dc16ba5b39d487dead35e39f (patch) | |
| tree | b0dd70b4c4011310537e1dcf11b00454f7245eae /engines | |
| parent | 87287de83bbf26b2fc63269f96f578bd44992540 (diff) | |
| download | scummvm-rg350-51df751e449a38f2dc16ba5b39d487dead35e39f.tar.gz scummvm-rg350-51df751e449a38f2dc16ba5b39d487dead35e39f.tar.bz2 scummvm-rg350-51df751e449a38f2dc16ba5b39d487dead35e39f.zip | |
SUPERNOVA: Removes ORing ObjectTypes from msn_def.h
The reason for the removal is because of gcc warnings when the operator
is not used in a translation unit that includes msn_def.h.
Currently I also see it used in the game logic anyway so there's no need
for it to be defined in a ubiquitiously used header file like msn_def.h
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/supernova/msn_def.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/engines/supernova/msn_def.h b/engines/supernova/msn_def.h index cbac52efe7..83755e71f9 100644 --- a/engines/supernova/msn_def.h +++ b/engines/supernova/msn_def.h @@ -371,11 +371,6 @@ const byte font[][5] = { }; - -static ObjectType operator|(ObjectType a, ObjectType b) { - return ObjectType(+a | +b); -} - struct Object { static const char *const defaultDescription; |