From 51df751e449a38f2dc16ba5b39d487dead35e39f Mon Sep 17 00:00:00 2001 From: Joseph-Eugene Winzer Date: Thu, 15 Jun 2017 18:59:17 +0200 Subject: 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 --- engines/supernova/msn_def.h | 5 ----- 1 file changed, 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; -- cgit v1.2.3