cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ntnet components not being type safe (#61426)

Browse Source 
Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com>
This commit is contained in:
Watermelon914
2021-09-22 00:37:21 +01:00
committed by GitHub
parent 2fe71664d5
commit 711bc1526a
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/ntnet/ntnet_receive.dm
+3 -29
View File
@@ -3,7 +3,6 @@
*
* Receives data through NTNet.
*/
/obj/item/circuit_component/ntnet_receive
display_name = "NTNet Receiver"
desc = "Receives data packages through NTNet. If Encryption Key is set then only signals with the same Encryption Key will be received."
@@ -12,41 +11,17 @@
network_id = __NETWORK_CIRCUITS
var/datum/port/input/push_hid
var/datum/port/output/hid
/// Data being received
var/datum/port/output/data_package
var/datum/port/output/secondary_package
/// Encryption key
var/datum/port/input/enc_key
var/datum/port/input/option/data_type_options
var/datum/port/input/option/secondary_data_type_options
/obj/item/circuit_component/ntnet_receive/populate_ports()
data_package = add_output_port("Data Package", PORT_TYPE_ANY)
secondary_package = add_output_port("Secondary Package", PORT_TYPE_ANY)
enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING)
RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive)
/obj/item/circuit_component/ntnet_receive/populate_options()
var/static/component_options = list(
PORT_TYPE_ANY,
PORT_TYPE_STRING,
PORT_TYPE_NUMBER,
PORT_TYPE_LIST,
PORT_TYPE_ATOM,
)
data_type_options = add_option_port("Data Type", component_options)
secondary_data_type_options = add_option_port("Secondary Data Type", component_options)
/obj/item/circuit_component/ntnet_receive/input_received(datum/port/input/port)
if(COMPONENT_TRIGGERED_BY(data_type_options, port))
data_package.set_datatype(data_type_options.value)
if(COMPONENT_TRIGGERED_BY(secondary_data_type_options, port))
secondary_package.set_datatype(secondary_data_type_options.value)
return TRUE
/obj/item/circuit_component/ntnet_receive/proc/ntnet_receive(datum/source, datum/netdata/data)
SIGNAL_HANDLER
@@ -54,5 +29,4 @@
return
data_package.set_output(data.data["data"])
secondary_package.set_output(data.data["data_secondary"])
trigger_output.set_output(COMPONENT_SIGNAL)
code/modules/wiremod/components/ntnet/ntnet_send.dm
+4 -3
View File
@@ -12,14 +12,15 @@
network_id = __NETWORK_CIRCUITS
/// Data being sent
var/datum/port/input/data_package
var/datum/port/input/secondary_package
/// Encryption key
var/datum/port/input/enc_key
/obj/item/circuit_component/ntnet_send/populate_ports()
data_package = add_input_port("Data Package", PORT_TYPE_ANY)
secondary_package = add_input_port("Secondary Package", PORT_TYPE_ANY)
enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING)
/obj/item/circuit_component/ntnet_send/input_received(datum/port/input/port)
ntnet_send(list("data" = data_package.value, "data_secondary" = secondary_package.value, "enc_key" = enc_key.value))
ntnet_send(list("data" = data_package.value, "enc_key" = enc_key.value))