From 7d110de48f8aa0af09b34fa1741eaf992b1201c8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 20 Jun 2018 07:09:55 -0700 Subject: STARTREK: Silence most Visual Studio warnings Enums are signed in at least Visual Studio, and it was generating many warnings of the cast to byte in the Action constructor was losing precision. Likewise, there were some cases of -1 being passed as a parameter to Action. This resolves these warnings by making the constructor parameters int --- engines/startrek/action.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'engines/startrek') diff --git a/engines/startrek/action.h b/engines/startrek/action.h index af27177963..a501b7860a 100644 --- a/engines/startrek/action.h +++ b/engines/startrek/action.h @@ -25,6 +25,8 @@ #include "common/serializer.h" +namespace StarTrek { + enum Acton { ACTION_TICK = 0, @@ -49,11 +51,11 @@ struct Action : Common::Serializable { byte b3; Action() {} - Action(byte _type, byte _b1, byte _b2, byte _b3) - : type(_type), - b1(_b1), - b2(_b2), - b3(_b3) {} + Action(int _type, int _b1, int _b2, int _b3) + : type((byte)_type), + b1((byte)_b1), + b2((byte)_b2), + b3((byte)_b3) {} // ACTION_USE, ACTION_GET, ACTION_LOOK, ACTION_TALK @@ -89,4 +91,6 @@ struct Action : Common::Serializable { } }; +} + #endif -- cgit v1.2.3