phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-12-01 08:37:23 +00:00
Code Issues Releases Wiki Activity

we don't need a RefCell there

Browse source
This commit is contained in:
Alula 2020-12-26 01:03:36 +01:00
parent d1698d43b8
commit 4ecb11e89d
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/npc/list.rs
View file

@ -1,4 +1,4 @@
use std::cell::{RefCell, UnsafeCell}; use std::cell::{Cell, UnsafeCell};
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
use ggez::{GameError, GameResult}; use ggez::{GameError, GameResult};
@ -13,7 +13,7 @@ const NPC_LIST_MAX_CAP: usize = 512;
pub struct NPCList { pub struct NPCList {
// UnsafeCell lets us break the pointer aliasing rules without undefined behavior. // UnsafeCell lets us break the pointer aliasing rules without undefined behavior.
npcs: UnsafeCell<Box<[NPC; NPC_LIST_MAX_CAP]>>, npcs: UnsafeCell<Box<[NPC; NPC_LIST_MAX_CAP]>>,
max_npc: RefCell<u16>, max_npc: Cell<u16>,
} }
#[allow(dead_code)] #[allow(dead_code)]
@ -29,7 +29,7 @@ impl NPCList {
parts_uninit parts_uninit
})), })),
max_npc: RefCell::new(0), max_npc: Cell::new(0),
}; };
unsafe { unsafe {
@ -63,7 +63,7 @@ impl NPCList {
*npc_ref = npc; *npc_ref = npc;
if *self.max_npc.borrow() <= id { if self.max_npc.get() <= id {
self.max_npc.replace(id + 1); self.max_npc.replace(id + 1);
} }
@ -95,7 +95,7 @@ impl NPCList {
*npc_ref = npc; *npc_ref = npc;
} }
if *self.max_npc.borrow() <= id { if self.max_npc.get() <= id {
self.max_npc.replace(id + 1); self.max_npc.replace(id + 1);
} }
@ -131,7 +131,7 @@ impl NPCList {
/// Returns current capacity of this NPC list. /// Returns current capacity of this NPC list.
pub fn current_capacity(&self) -> u16 { pub fn current_capacity(&self) -> u16 {
*self.max_npc.borrow() self.max_npc.get()
} }
/// Returns maximum capacity of this NPC list. /// Returns maximum capacity of this NPC list.
@ -166,7 +166,7 @@ impl<'a> Iterator for NPCListMutableIterator<'a> {
type Item = &'a mut NPC; type Item = &'a mut NPC;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if self.index >= *self.map.max_npc.borrow() { if self.index >= self.map.max_npc.get() {
return None; return None;
} }
@ -196,7 +196,7 @@ impl<'a> Iterator for NPCListMutableAliveIterator<'a> {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
loop { loop {
if self.index >= *self.map.max_npc.borrow() { if self.index >= self.map.max_npc.get() {
return None; return None;
} }