diff --git a/PythonAPI/.pylintrc b/PythonAPI/.pylintrc index a7983ff4d..091e9996a 100644 --- a/PythonAPI/.pylintrc +++ b/PythonAPI/.pylintrc @@ -3,4 +3,4 @@ max-line-length=120 [MASTER] disable=I0011,I0013,E1121,E1126 [TYPECHECK] -ignored-modules=carla,carla.command,libcarla,pygame,numpy,configparser,ConfigParser +ignored-modules=carla,carla.command,libcarla,pygame,numpy,configparser,ConfigParser,libad_rss_python2,libad_rss_python3,libad_map_access_python2,libad_map_access_python3,libad_rss_map_integration_python2,libad_rss_map_integration_python3 diff --git a/PythonAPI/examples/rss/manual_control_rss.py b/PythonAPI/examples/rss/manual_control_rss.py index 641e2d397..5e1463569 100755 --- a/PythonAPI/examples/rss/manual_control_rss.py +++ b/PythonAPI/examples/rss/manual_control_rss.py @@ -474,18 +474,6 @@ class VehicleControl(object): if pygame.mouse.get_pressed()[0]: self._parse_mouse(pygame.mouse.get_pos()) self._control.reverse = self._control.gear < 0 - # Set automatic control-related vehicle lights - if self._control.brake: - current_lights |= carla.VehicleLightState.Brake - else: # Remove the Brake flag - current_lights &= carla.VehicleLightState.All ^ carla.VehicleLightState.Brake - if self._control.reverse: - current_lights |= carla.VehicleLightState.Reverse - else: # Remove the Reverse flag - current_lights &= carla.VehicleLightState.All ^ carla.VehicleLightState.Reverse - if current_lights != self._lights: # Change the light state only if necessary - self._lights = current_lights - world.player.set_light_state(carla.VehicleLightState(self._lights)) vehicle_control = self._control world.hud.original_vehicle_control = vehicle_control @@ -509,6 +497,19 @@ class VehicleControl(object): if world.hud.original_vehicle_control.steer != world.hud.restricted_vehicle_control.steer: self._steer_cache = prev_steer_cache + # Set automatic control-related vehicle lights + if vehicle_control.brake: + current_lights |= carla.VehicleLightState.Brake + else: # Remove the Brake flag + current_lights &= carla.VehicleLightState.All ^ carla.VehicleLightState.Brake + if vehicle_control.reverse: + current_lights |= carla.VehicleLightState.Reverse + else: # Remove the Reverse flag + current_lights &= carla.VehicleLightState.All ^ carla.VehicleLightState.Reverse + if current_lights != self._lights: # Change the light state only if necessary + self._lights = current_lights + world.player.set_light_state(carla.VehicleLightState(self._lights)) + world.player.apply_control(vehicle_control) def _parse_vehicle_keys(self, keys, milliseconds):