nope, doesn't work

Putnam3145 · Dec 1, 2023 · a9cbc71 · a9cbc71
1 parent 9c249c0
commit a9cbc71
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 31 deletions.
diff --git a/src/gas.rs b/src/gas.rs
@@ -195,7 +195,7 @@ impl GasArena {
 
 			mix.write_var_id(
 				byond_string!("_extools_pointer_gasmixture"),
-				&f32::from_bits(next_idx as u32).into(),
+				&(next_idx as f32).into(),
 			)
 			.unwrap();
 
@@ -227,7 +227,7 @@ impl GasArena {
 				.clear_with_vol(init_volume);
 			mix.write_var_id(
 				byond_string!("_extools_pointer_gasmixture"),
-				&f32::from_bits(idx as u32).into(),
+				&(idx as f32).into(),
 			)
 			.unwrap();
 		}
@@ -255,8 +255,7 @@ where
 	F: FnOnce(&Mixture) -> Result<T>,
 {
 	GasArena::with_gas_mixture(
-		mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
+		mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
 		f,
 	)
 }
@@ -269,8 +268,7 @@ where
 	F: FnOnce(&mut Mixture) -> Result<T>,
 {
 	GasArena::with_gas_mixture_mut(
-		mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
+		mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
 		f,
 	)
 }
@@ -283,12 +281,8 @@ where
 	F: FnOnce(&Mixture, &Mixture) -> Result<T>,
 {
 	GasArena::with_gas_mixtures(
-		src_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
-		arg_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
+		src_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
+		arg_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
 		f,
 	)
 }
@@ -301,12 +295,8 @@ where
 	F: FnOnce(&mut Mixture, &mut Mixture) -> Result<T>,
 {
 	GasArena::with_gas_mixtures_mut(
-		src_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
-		arg_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
+		src_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
+		arg_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
 		f,
 	)
 }
@@ -319,12 +309,8 @@ where
 	F: FnMut(&RwLock<Mixture>, &RwLock<Mixture>) -> Result<T>,
 {
 	GasArena::with_gas_mixtures_custom(
-		src_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
-		arg_mix
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize,
+		src_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
+		arg_mix.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize,
 		f,
 	)
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -570,7 +570,7 @@ fn equalize_all_hook(gas_list: ByondValue) {
 			value
 				.read_number_id(byond_string!("_extools_pointer_gasmixture"))
 				.ok()
-				.map(|f| f.to_bits() as usize)
+				.map(|f| f as usize)
 		})
 		.collect::<BTreeSet<_>>();
 	GasArena::with_all_mixtures(move |all_mixtures| {

diff --git a/src/turfs.rs b/src/turfs.rs
@@ -441,9 +441,7 @@ fn hook_register_turf(src: ByondValue, flag: ByondValue) {
 	if flag >= 0 {
 		let mut to_insert: TurfMixture = TurfMixture::default();
 		let air = src.read_var_id(byond_string!("air"))?;
-		to_insert.mix = air
-			.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-			.to_bits() as usize;
+		to_insert.mix = air.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize;
 		to_insert.flags = SimulationFlags::from_bits_truncate(flag as u8);
 		to_insert.id = id;
 
@@ -542,9 +540,7 @@ fn update_visuals(src: ByondValue) -> Result<ByondValue> {
 			let mut overlay_types = Vec::new();
 			let gas_overlays =
 				byondapi::global_call::call_global_id(byond_string!("get_overlays"), &[])?;
-			let ptr = air
-				.read_number_id(byond_string!("_extools_pointer_gasmixture"))?
-				.to_bits() as usize;
+			let ptr = air.read_number_id(byond_string!("_extools_pointer_gasmixture"))? as usize;
 			GasArena::with_gas_mixture(ptr, |mix| {
 				mix.for_each_gas(|idx, moles| {
 					if let Some(amt) = gas::types::gas_visibility(idx) {