From f0876828f49564a41e36c0ac685fe3a2f93d0553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 20 Mar 2013 11:54:15 +0100
Subject: [PATCH] fixes #2791 don't crash on powerdown hotkey when playing cnc

---
 mods/cnc/bits/nopower.shp    | Bin 0 -> 2410 bytes
 mods/cnc/bits/poweroff.shp   | Bin 0 -> 3005 bytes
 mods/cnc/cursors.yaml        |  14 +++++++++++++-
 mods/cnc/notifications.yaml  |   2 ++
 mods/cnc/sequences/misc.yaml |  10 ++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 mods/cnc/bits/nopower.shp
 create mode 100644 mods/cnc/bits/poweroff.shp

diff --git a/mods/cnc/bits/nopower.shp b/mods/cnc/bits/nopower.shp
new file mode 100644
index 0000000000000000000000000000000000000000..b57ce96fd61c6e997497ef7905e009699faf52c7
GIT binary patch
literal 2410
zcmeHIOK!q26tpU&rmKiuSMCAgGxQR@1t$nnBG_^iq@=K6ogE_k9>hoJj9=n7iD^+Q
z7M1#t@bkRSyx2onDB3eVv{$9JTz3z$ek^2td6aea#OPqn;Qq*q*SD}pyEcWLM*-C5
ziQwZvo*02mse=kz0luKi`du^7^8-%`ou1i5B2rWri9I0Tm=UN2wi~puhf+5((YhzG
zW}`6tp)_t#TbQl@xKeG300ECT=tMk4gmbRTig9G*g?0~+f?g@ltZY?ko)0Ptt(!id
zB~_NO)!CXNfL(xamKoD^cN9w1E#?Pa=N-^5ZMv^v{noGTn|H<O&u;?XyxsZC?QdJf
z>yI$cF*wI1>@@7*x%vpsq+8&CpXsM@cXn~g6De`)jrV*>J1KdTj$HIa^DcumW5o;q
z9QWyDcAM}^7}zP8UlOR9Ftziq!IV-oeIG&bXn#&hJgUf}@Wdxi?v65ov-&E`w^G+W
zxQZ)Ma)P9WCn6TSnc<KyECPdZ4h#PrcjF1gzm&SW`eq5PGRVBMlmbBp{8XO%g9`?M
z>jX&+d-+LR@Vma1L`uu$cp&UVtbBt8^Gg<L=5JOf;wX%tLKKgpXfsWo@y}-c8VLU2
FJ^?74>q-Cs

literal 0
HcmV?d00001

diff --git a/mods/cnc/bits/poweroff.shp b/mods/cnc/bits/poweroff.shp
new file mode 100644
index 0000000000000000000000000000000000000000..04a194e6da41345cf59f2b84e9aa5ababedd0aa2
GIT binary patch
literal 3005
zcmeH}K~BXm3`8pgLWo7x9XH?>S#lsw@V6|v$=_s&dJ(P?iJ5Vl)JY`TeS<`zvE%31
zR`s7It~dN~eN5Ah`}c$GzmK-RKimHKV*Af4z3N))@%$--u!h04aL4Km;l5x+XCQy1
zAC+tViV`DoasUfXuqS7IZFQ!D)yps#!i5(<>&{RffJnVT1XiNvuR03hD`Ywn8p_Cj
zs6%b3%BXeT_#<zT|M~Y-?6)mcQAUThJ=rIul-AT|91@$+86cyqOLPYChx!3o;F7;Z
zi4i&N0XaCqj=bp_rTqn_qeeS-z8KHdggI~WGum;BOt8Ble-T)Tl0OL<;VWc1N2v*;
zKpdr!4z-h+D4boxG9Pbqva%6*EEoIPQDS?_<$6f-Jg;+aNi&<#86c~n&VZ*3^#iiN
zr4<$>M&z^y<lqD^ac9_cjnYmRH;<B&Y0v}qQS7Ud(T<BMZHQ&*0<k`pPsv|pHH0V7
zpio1Zqtt{qcNC)Q48p+K$(awZla-CgW4YMRj?(p2V(G50QW>CnI6F%9raxiCuHQ;1
L$@N<aMY#O|#$TKM

literal 0
HcmV?d00001

diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index 854dd17291..356daf14e4 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -272,4 +272,16 @@ Cursors:
 			start:213
 			length:1
 			x:12
-			y:12
\ No newline at end of file
+			y:12
+
+	nopower: cursor
+		powerdown-blocked:
+			start:0
+			length: 1
+			x: 12
+			y: 12
+		powerdown:
+			start:1
+			length: 3
+			x: 12
+			y: 12
\ No newline at end of file
diff --git a/mods/cnc/notifications.yaml b/mods/cnc/notifications.yaml
index 2509fe17ce..a8908d9b08 100644
--- a/mods/cnc/notifications.yaml
+++ b/mods/cnc/notifications.yaml
@@ -28,6 +28,8 @@ Sounds:
 		CashTickUp:
 		CashTickDown:
 		LevelUp: text2
+		DisablePower: bleep11
+		EnablePower: bleep12
 		ChatLine: scold1
 		TabClick: button
 		ClickSound: button
diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml
index fbb4ebf640..7017e13d48 100644
--- a/mods/cnc/sequences/misc.yaml
+++ b/mods/cnc/sequences/misc.yaml
@@ -269,3 +269,13 @@ overlay:
 		Start: 0
 	target-invalid:
 		Start: 1
+
+powerdown:
+	disabled: speed
+		Start: 3
+
+poweroff:
+	offline:
+		Start: 0
+		Length: *
+		Tick: 160
\ No newline at end of file