From d421b30a8822f81b43e5e401291c594a7ed0c47a Mon Sep 17 00:00:00 2001 From: Andy Newjack Date: Sat, 2 May 2020 22:17:12 -0300 Subject: [PATCH] remove commented things --- src/common/mainloop.rs | 2 -- src/entity/gateway/entitygateway.rs | 2 -- src/entity/gateway/inmemory.rs | 4 ---- src/entity/item/tool.rs | 1 - src/main.rs | 1 - src/ship/drops/box_drop_table.rs | 7 ------- src/ship/drops/generic_unit.rs | 1 - src/ship/drops/generic_weapon.rs | 1 - 8 files changed, 19 deletions(-) diff --git a/src/common/mainloop.rs b/src/common/mainloop.rs index cd4c714..3f16227 100644 --- a/src/common/mainloop.rs +++ b/src/common/mainloop.rs @@ -1,9 +1,7 @@ #![allow(dead_code)] use log::{trace, info, warn}; use async_std::sync::{Arc, Mutex}; -// use async_std::io::{Read, Write}; use async_std::io::prelude::{ReadExt, WriteExt}; -// use async_std::prelude::{StreamExt}; use std::collections::HashMap; use libpso::crypto::{PSOCipher, NullCipher, CipherError}; diff --git a/src/entity/gateway/entitygateway.rs b/src/entity/gateway/entitygateway.rs index 7cc674f..9e0bd42 100644 --- a/src/entity/gateway/entitygateway.rs +++ b/src/entity/gateway/entitygateway.rs @@ -2,8 +2,6 @@ use crate::entity::account::*; use crate::entity::character::*; use crate::entity::item::*; -// use libpso::item; - pub trait EntityGateway { fn create_user(&mut self, _user: NewUserAccountEntity) -> Option { unimplemented!() diff --git a/src/entity/gateway/inmemory.rs b/src/entity/gateway/inmemory.rs index 1735e28..d4365a7 100644 --- a/src/entity/gateway/inmemory.rs +++ b/src/entity/gateway/inmemory.rs @@ -1,14 +1,10 @@ use std::collections::HashMap; -// use std::default::Default; use crate::entity::account::*; use crate::entity::character::*; use crate::entity::gateway::EntityGateway; use crate::entity::item::*; -// use libpso::character::settings; -// use libpso::item; - use std::sync::{Arc, Mutex}; #[derive(Clone)] diff --git a/src/entity/item/tool.rs b/src/entity/item/tool.rs index 207d2cb..7894530 100644 --- a/src/entity/item/tool.rs +++ b/src/entity/item/tool.rs @@ -388,7 +388,6 @@ impl ToolType { ToolType::TeamPoints1000 => [0x03, 0x19, 0x01], ToolType::TeamPoints5000 => [0x03, 0x19, 0x02], ToolType::TeamPoints10000 => [0x03, 0x19, 0x03], - // _ => panic!() } } } diff --git a/src/main.rs b/src/main.rs index eefe8be..f4fefe1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -103,7 +103,6 @@ fn main() { } async_std::task::block_on(async move { - // let thread_entity_gateway = entity_gateway.clone(); let patch = async_std::task::spawn(async { info!("[patch] starting server"); let patch_config = load_config(); diff --git a/src/ship/drops/box_drop_table.rs b/src/ship/drops/box_drop_table.rs index f2cf562..7346792 100644 --- a/src/ship/drops/box_drop_table.rs +++ b/src/ship/drops/box_drop_table.rs @@ -1,15 +1,8 @@ #![allow(dead_code, unused_variables)] -// use std::collections::HashMap; use rand::{Rng}; use rand::distributions::{WeightedIndex, Distribution}; use serde::{Serialize, Deserialize}; -// use crate::entity::item::weapon::{Weapon, WeaponType}; -// use crate::entity::item::armor::{Armor, ArmorType}; -// use crate::entity::item::shield::{Shield, ShieldType}; -// use crate::entity::item::unit::{Unit, UnitType}; -// use crate::entity::item::tool::{Tool, ToolType}; use crate::entity::character::SectionID; -// use crate::ship::monster::MonsterType; use crate::ship::room::{Difficulty, Episode}; use crate::ship::map::MapArea; use crate::ship::drops::{ItemDropType, load_data_file}; diff --git a/src/ship/drops/generic_unit.rs b/src/ship/drops/generic_unit.rs index 0aaa13d..73bc4a6 100644 --- a/src/ship/drops/generic_unit.rs +++ b/src/ship/drops/generic_unit.rs @@ -1,7 +1,6 @@ use std::collections::BTreeMap; use serde::{Serialize, Deserialize}; use rand::{Rng}; -// use rand::distributions::{WeightedIndex, Distribution}; use rand::seq::IteratorRandom; use crate::entity::item::unit::{UnitType, Unit, UnitModifier}; diff --git a/src/ship/drops/generic_weapon.rs b/src/ship/drops/generic_weapon.rs index 6d04447..71e578c 100644 --- a/src/ship/drops/generic_weapon.rs +++ b/src/ship/drops/generic_weapon.rs @@ -5,7 +5,6 @@ use rand::distributions::{WeightedIndex, Distribution}; use rand::seq::SliceRandom; use crate::entity::item::weapon::{Weapon, WeaponType, Attribute, WeaponAttribute, WeaponSpecial}; -// use crate::ship::monster::MonsterType; use crate::ship::room::{Difficulty, Episode}; use crate::ship::map::MapArea; use crate::entity::character::SectionID;