skip bot AI walking when cheats are on

diff --git a/misc/tools/midi2cfg-ng.conf b/misc/tools/midi2cfg-ng.conf
index 1555088bcff866405dfc851dcd3dfb28addafddc..d38937e0f3a5f6c992d77cadfe77090a555a66a2 100644 (file)
--- a/misc/tools/midi2cfg-ng.conf
+++ b/misc/tools/midi2cfg-ng.conf
@@ -1,3 +1,11 @@
+raw exec cpp.cfg
+
+raw #ifeq $sv_cheats 1
+raw #define MOVETO "cc teleporttotarget"
+raw #else
+raw #define MOVETO "movetotarget"
+raw #endif
+
 timeoffset_preinit 2
 timeoffset_postinit 2
 timeoffset_predone 2
@@ -524,35 +532,35 @@ bot tuba_red
        include tuba
        transpose 0
        init
-               cmd cc "color 68"
+               cmd cc color 68
                super
 
 bot tuba_blue
        include tuba
        transpose 3
        init
-               cmd cc "color 221"
+               cmd cc color 221
                super
 
 bot accordeon_red
        include accordeon
        transpose 0
        init
-               cmd cc "color 68"
+               cmd cc color 68
                super
 
 bot accordeon_blue
        include accordeon
        transpose 3
        init
-               cmd cc "color 221"
+               cmd cc color 221
                super
 
 // laser = lasershot NONE
 bot laser
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 1
                cmd wait 0.5
@@ -573,7 +581,7 @@ bot laser
 bot shotgun
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 2
                cmd wait 0.5
@@ -593,7 +601,7 @@ bot shotgun
 bot uzi
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 3
                cmd wait 0.5
@@ -628,7 +636,7 @@ bot electro
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 6
                cmd wait 0.5
@@ -649,7 +657,7 @@ bot electro
 bot crylink
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 7
                cmd wait 0.5
@@ -696,7 +704,7 @@ bot crylink
 bot nex
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 8
                cmd wait 0.5
@@ -715,7 +723,7 @@ bot nex
 bot minstanex
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 12
                cmd wait 0.5
@@ -734,7 +742,7 @@ bot minstanex
 bot hagar
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 9
                cmd wait 0.5
@@ -761,7 +769,7 @@ bot hagar
 bot rocket
        channels 10
        init
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 10
                cmd wait 0.5
@@ -781,7 +789,7 @@ bot hook
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 13
                cmd wait 0.5
@@ -817,7 +825,7 @@ bot seeker
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 18
                cmd wait 0.5
@@ -849,7 +857,7 @@ bot rifle
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd selectweapon 16
                cmd wait 0.5
@@ -877,7 +885,7 @@ bot jetpack
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                raw settemp g_jetpack_attenuation 0.5
                cmd wait 0.5
@@ -899,7 +907,7 @@ bot jumper
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
        percussion 36 // 036_Kick_2-0.wav
@@ -914,7 +922,7 @@ bot metaljumper
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
        percussion 65 // 065_Timbale_High-0.wav
@@ -931,7 +939,7 @@ bot switcher
        channels 10
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
        percussion 29 // not in freepats
@@ -946,7 +954,7 @@ bot vocals
        channels -1
        init
                time -2
-               cmd aimtarget "tPercussion 1"
+               cmd aimtarget tPercussion 1
                cmd barrier
                cmd wait 0.5
        vocals
@@ -961,7 +969,7 @@ bot vocals
 bot common
        done
                cmd resetaim
-               cmd aim "270 0"
+               cmd aim 270 0
                cmd wait 1
                barrier
                buttons crouch
@@ -970,7 +978,7 @@ bot common
                cmd wait 1
                barrier
                buttons use
-               cmd cc "kill"
+               cmd cc kill
                cmd wait 900
 
 
@@ -981,7 +989,7 @@ bot instance_tuba_red
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd $MOVETO @places_tuba
                cmd barrier
                super
 
@@ -990,7 +998,7 @@ bot instance_tuba_blue
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd $MOVETO @places_tuba
                cmd barrier
                super
 
@@ -999,7 +1007,7 @@ bot instance_accordeon_red
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd $MOVETO @places_tuba
                cmd barrier
                super
 
@@ -1008,7 +1016,7 @@ bot instance_accordeon_blue
        include common
        count 16
        init
-               cmd movetotarget @places_tuba
+               cmd $MOVETO @places_tuba
                cmd barrier
                super
 
@@ -1017,7 +1025,7 @@ bot instance_laser
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1026,7 +1034,7 @@ bot instance_shotgun
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1035,7 +1043,7 @@ bot instance_uzi
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1044,7 +1052,7 @@ bot instance_electro
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1053,7 +1061,7 @@ bot instance_crylink
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1062,7 +1070,7 @@ bot instance_nex
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1071,7 +1079,7 @@ bot instance_minstanex
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1080,7 +1088,7 @@ bot instance_hagar
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1089,7 +1097,7 @@ bot instance_rocket
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1098,7 +1106,7 @@ bot instance_hook
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1107,7 +1115,7 @@ bot instance_seeker
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1116,7 +1124,7 @@ bot instance_rifle
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1125,7 +1133,7 @@ bot instance_jetpack
        include common
        count 16
        init
-               cmd movetotarget @places_nosteps
+               cmd $MOVETO @places_nosteps
                cmd barrier
                super
 
@@ -1134,7 +1142,7 @@ bot instance_jumper
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1143,7 +1151,7 @@ bot instance_metaljumper
        include common
        count 16
        init
-               cmd movetotarget @places_metalsteps
+               cmd $MOVETO @places_metalsteps
                cmd barrier
                super
 
@@ -1152,7 +1160,7 @@ bot instance_switcher
        include common
        count 16
        init
-               cmd movetotarget @places_percussion
+               cmd $MOVETO @places_percussion
                cmd barrier
                super
 
@@ -1161,8 +1169,8 @@ bot instance_vocals
        include common
        count 1
        init
-               cmd cc "playermodel models/player/suiseiseki.zym"
-               cmd movetotarget @places_vocals
+               cmd cc playermodel models/player/suiseiseki.zym
+               cmd $MOVETO @places_vocals
                cmd barrier
                super