Remove modes from protocol

2017-05-08 12:15:51 +02:00 · 2017-05-08 12:15:51 +02:00 · b78e433cd8
parent 4224c5c6e3
commit b78e433cd8
2 changed files with 1 additions and 8 deletions
--- a/Source/CarlaServer/source/carla/server/Protocol.cpp
+++ b/Source/CarlaServer/source/carla/server/Protocol.cpp
@ -11,12 +11,7 @@
 #include <stdlib.h>

 #ifdef CARLA_WITH_PNG_COMPRESSION
-#include CARLA_LIBPNG_INCLUDE
-static_assert(
-        CARLA_LIBPNG_VERSION_MAJOR == PNG_LIBPNG_VER_MAJOR &&
-        CARLA_LIBPNG_VERSION_MINOR == PNG_LIBPNG_VER_MINOR &&
-        CARLA_LIBPNG_VERSION_RELEASE == PNG_LIBPNG_VER_RELEASE,
-    "PNG versions do not match");
+#include <png.h>
 #endif // CARLA_WITH_PNG_COMPRESSION

 namespace carla {
--- a/Source/CarlaServer/source/carla/server/carla_protocol.proto
+++ b/Source/CarlaServer/source/carla/server/carla_protocol.proto
@ -22,8 +22,6 @@ message EpisodeStart {

 message SceneInit {

-
-  optional int32 mode =1;
  optional int32 scene =2;