From 1d2afcc364a157f99e7da440dc44e4fec6a0c791 Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Mon, 8 Jan 2024 17:31:51 -0800
Subject: [PATCH] do like dis

---
 src/load_bsp.rs | 32 ++++++++++++++++++--------------
 src/main.rs     |  2 +-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/load_bsp.rs b/src/load_bsp.rs
index 348d34e..4bcf1a5 100644
--- a/src/load_bsp.rs
+++ b/src/load_bsp.rs
@@ -1,24 +1,28 @@
-pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R) -> crate::model::IndexedModelInstances{
-	let mut spawn_point=crate::integer::Planar64Vec3::ZERO;
-
-	let mut indexed_models=Vec::new();
 
+pub fn generate_indexed_models<R:std::io::Read+std::io::Seek>(input:&mut R)->Result<crate::model::IndexedModelInstances,vbsp::BspError>{
 	let mut s=Vec::new();
 
 	match input.read_to_end(&mut s){
-		Ok(guac)=>println!("readed to string {:?}", guac),
-		Err(e)=>println!("faile {:?}",e),
+		Ok(_)=>(),
+		Err(e)=>println!("load_bsp::generate_indexed_models read_to_end failed: {:?}",e),
 	}
 
+
 	match vbsp::Bsp::read(s.as_slice()){
-		Ok(guac)=>println!("we got the guac {:?}", guac),
-		Err(e)=>println!("rotten {:?}",e),
-	}
+		Ok(bsp)=>{
+			let mut spawn_point=crate::integer::Planar64Vec3::ZERO;
 
-	crate::model::IndexedModelInstances{
-		textures:Vec::new(),
-		models:indexed_models,
-		spawn_point,
-		modes:Vec::new(),
+			let mut indexed_models=Vec::new();
+			Ok(crate::model::IndexedModelInstances{
+				textures:Vec::new(),
+				models:indexed_models,
+				spawn_point,
+				modes:Vec::new(),
+			})
+		},
+		Err(e)=>{
+			println!("rotten {:?}",e);
+			Err(e)
+		},
 	}
 }
diff --git a/src/main.rs b/src/main.rs
index f6579b5..319d585 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ fn load_file(path: std::path::PathBuf)->Option<model::IndexedModelInstances>{
 						},
 					}
 				},
-				b"VBSP"=>Some(load_bsp::generate_indexed_models(&mut input)),
+				b"VBSP"=>load_bsp::generate_indexed_models(&mut input).ok(),
 				//b"SNFM"=>Some(sniffer::generate_indexed_models(input)),
 				//b"SNFB"=>Some(sniffer::load_bot(input)),
 				other=>{