Browse Source

remove commented things

pbs
Andy Newjack 5 years ago
parent
commit
d421b30a88
  1. 2
      src/common/mainloop.rs
  2. 2
      src/entity/gateway/entitygateway.rs
  3. 4
      src/entity/gateway/inmemory.rs
  4. 1
      src/entity/item/tool.rs
  5. 1
      src/main.rs
  6. 7
      src/ship/drops/box_drop_table.rs
  7. 1
      src/ship/drops/generic_unit.rs
  8. 1
      src/ship/drops/generic_weapon.rs

2
src/common/mainloop.rs

@ -1,9 +1,7 @@
#![allow(dead_code)] #![allow(dead_code)]
use log::{trace, info, warn}; use log::{trace, info, warn};
use async_std::sync::{Arc, Mutex}; use async_std::sync::{Arc, Mutex};
// use async_std::io::{Read, Write};
use async_std::io::prelude::{ReadExt, WriteExt}; use async_std::io::prelude::{ReadExt, WriteExt};
// use async_std::prelude::{StreamExt};
use std::collections::HashMap; use std::collections::HashMap;
use libpso::crypto::{PSOCipher, NullCipher, CipherError}; use libpso::crypto::{PSOCipher, NullCipher, CipherError};

2
src/entity/gateway/entitygateway.rs

@ -2,8 +2,6 @@ use crate::entity::account::*;
use crate::entity::character::*; use crate::entity::character::*;
use crate::entity::item::*; use crate::entity::item::*;
// use libpso::item;
pub trait EntityGateway { pub trait EntityGateway {
fn create_user(&mut self, _user: NewUserAccountEntity) -> Option<UserAccountEntity> { fn create_user(&mut self, _user: NewUserAccountEntity) -> Option<UserAccountEntity> {
unimplemented!() unimplemented!()

4
src/entity/gateway/inmemory.rs

@ -1,14 +1,10 @@
use std::collections::HashMap; use std::collections::HashMap;
// use std::default::Default;
use crate::entity::account::*; use crate::entity::account::*;
use crate::entity::character::*; use crate::entity::character::*;
use crate::entity::gateway::EntityGateway; use crate::entity::gateway::EntityGateway;
use crate::entity::item::*; use crate::entity::item::*;
// use libpso::character::settings;
// use libpso::item;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
#[derive(Clone)] #[derive(Clone)]

1
src/entity/item/tool.rs

@ -388,7 +388,6 @@ impl ToolType {
ToolType::TeamPoints1000 => [0x03, 0x19, 0x01], ToolType::TeamPoints1000 => [0x03, 0x19, 0x01],
ToolType::TeamPoints5000 => [0x03, 0x19, 0x02], ToolType::TeamPoints5000 => [0x03, 0x19, 0x02],
ToolType::TeamPoints10000 => [0x03, 0x19, 0x03], ToolType::TeamPoints10000 => [0x03, 0x19, 0x03],
// _ => panic!()
} }
} }
} }

1
src/main.rs

@ -103,7 +103,6 @@ fn main() {
} }
async_std::task::block_on(async move { async_std::task::block_on(async move {
// let thread_entity_gateway = entity_gateway.clone();
let patch = async_std::task::spawn(async { let patch = async_std::task::spawn(async {
info!("[patch] starting server"); info!("[patch] starting server");
let patch_config = load_config(); let patch_config = load_config();

7
src/ship/drops/box_drop_table.rs

@ -1,15 +1,8 @@
#![allow(dead_code, unused_variables)] #![allow(dead_code, unused_variables)]
// use std::collections::HashMap;
use rand::{Rng}; use rand::{Rng};
use rand::distributions::{WeightedIndex, Distribution}; use rand::distributions::{WeightedIndex, Distribution};
use serde::{Serialize, Deserialize}; 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::entity::character::SectionID;
// use crate::ship::monster::MonsterType;
use crate::ship::room::{Difficulty, Episode}; use crate::ship::room::{Difficulty, Episode};
use crate::ship::map::MapArea; use crate::ship::map::MapArea;
use crate::ship::drops::{ItemDropType, load_data_file}; use crate::ship::drops::{ItemDropType, load_data_file};

1
src/ship/drops/generic_unit.rs

@ -1,7 +1,6 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
use rand::{Rng}; use rand::{Rng};
// use rand::distributions::{WeightedIndex, Distribution};
use rand::seq::IteratorRandom; use rand::seq::IteratorRandom;
use crate::entity::item::unit::{UnitType, Unit, UnitModifier}; use crate::entity::item::unit::{UnitType, Unit, UnitModifier};

1
src/ship/drops/generic_weapon.rs

@ -5,7 +5,6 @@ use rand::distributions::{WeightedIndex, Distribution};
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use crate::entity::item::weapon::{Weapon, WeaponType, Attribute, WeaponAttribute, WeaponSpecial}; use crate::entity::item::weapon::{Weapon, WeaponType, Attribute, WeaponAttribute, WeaponSpecial};
// use crate::ship::monster::MonsterType;
use crate::ship::room::{Difficulty, Episode}; use crate::ship::room::{Difficulty, Episode};
use crate::ship::map::MapArea; use crate::ship::map::MapArea;
use crate::entity::character::SectionID; use crate::entity::character::SectionID;

Loading…
Cancel
Save