From ec7f5089311a8de4b13c78696f8240835b3fe7c3 Mon Sep 17 00:00:00 2001
From: VladislavOstapov <dwsbenz@gmail.com>
Date: Sat, 7 Jan 2023 12:04:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=8D=D0=BC=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80=D0=B0=20=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=BE=D1=82=D0=BE=D0=B2,=20=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BE?=
 =?UTF-8?q?=D0=BF=D1=83=D1=81=D0=BA=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=B0=D0=BD=D0=B0=20=D0=B2=2022=20=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B5=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=20=D0=B2=D1=8B=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D1=84=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B3=20is=5Fempty=20=D1=83=20=D0=B1=D0=B0=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 robot.cpp | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/robot.cpp b/robot.cpp
index 08e82f5..caab3f8 100644
--- a/robot.cpp
+++ b/robot.cpp
@@ -36,6 +36,10 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
         return;
     }
 
+    if (code.barrel_id >= BARRELS_COUNT) {
+        code.barrel_id = -1;
+    }
+
     // приватизируем бочку
     if (code.barrel_id >= 0) {
         barrels[code.barrel_id].flags.robot = robot_id;
@@ -46,7 +50,7 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
     switch (code.code[code.PC] & (short)ROBOT_CMD_MASK) {
         case ROBOT_CMD_MOVE_TO_ZONE_code:
             // двигаемся в сторону цели
-            if (robot_move(r, (short)(cmd_arg & (~ROBOT_WITH_BARREL)), robot_id)) {
+            if (robot_move(r, (short)(cmd_arg & 0x7F), robot_id)) {
                 code.PC++;
             }
             if (cmd_arg & ROBOT_WITH_BARREL && code.barrel_id >= 0) {
@@ -81,7 +85,7 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
                     break;
                 }
                 barrels[code.barrel_id].flags.is_up = true;
-                r.mz.is_up = 1;
+                r.mz.is_up = true;
             }
             code.PC++;
             break;
@@ -91,6 +95,10 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
             if (code.barrel_id >= 0 && cmd_arg) {
                 barrels[code.barrel_id].flags.is_up = false;
                 r.mz.is_up = 0;
+
+                if (r.dx.current_zone == ZONE_UNLOAD) {
+                    barrels[code.barrel_id].flags.is_empty = true;
+                }
             }
             code.PC++;
             break;
@@ -167,6 +175,11 @@ static void emulate_robot(robot_code &code, robot_regs& r, char robot_id) {
 
 
 void robot_main() {
-    emulate_robot(robot1_code, robot1, 1);
-    emulate_robot(robot2_code, robot2, 2);
+    if (hla_robot1_en) {
+        emulate_robot(robot1_code, robot1, 1);
+    }
+
+    if (hla_robot2_en) {
+        emulate_robot(robot2_code, robot2, 2);
+    }
 }