redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-22 15:27:44 +00:00
Code Activity

Update to latest Physis changes

Browse source 
I changed the API for layer groups a bit, and so we need some slight
modifications.
This commit is contained in:
Joshua Goins 2025-04-13 18:36:43 -04:00
parent ca94e26e1c
commit 55340f4e8c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -985,7 +985,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
[[package]] [[package]]
name = "physis" name = "physis"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/redstrate/physis#d2e724227b3297025d51e5899a32827b0a74cd49" source = "git+https://github.com/redstrate/physis#cdc39ad4b6fbd2cdc3f1e991a994ba011b64990d"
dependencies = [ dependencies = [
"binrw", "binrw",
"bitflags 1.3.2", "bitflags 1.3.2",

6
src/world/zone.rs
View file

@ -71,7 +71,7 @@ impl Zone {
instance_id: u32, instance_id: u32,
) -> Option<(&InstanceObject, &ExitRangeInstanceObject)> { ) -> Option<(&InstanceObject, &ExitRangeInstanceObject)> {
// TODO: also check position! // TODO: also check position!
for group in &self.planmap.as_ref().unwrap().layers { for group in &self.planmap.as_ref().unwrap().chunks[0].layers {
for object in &group.objects { for object in &group.objects {
if let LayerEntryData::ExitRange(exit_range) = &object.data { if let LayerEntryData::ExitRange(exit_range) = &object.data {
if object.instance_id == instance_id { if object.instance_id == instance_id {
@ -89,7 +89,7 @@ impl Zone {
instance_id: u32, instance_id: u32,
) -> Option<(&InstanceObject, &PopRangeInstanceObject)> { ) -> Option<(&InstanceObject, &PopRangeInstanceObject)> {
// TODO: also check position! // TODO: also check position!
for group in &self.planmap.as_ref().unwrap().layers { for group in &self.planmap.as_ref().unwrap().chunks[0].layers {
for object in &group.objects { for object in &group.objects {
if let LayerEntryData::PopRange(pop_range) = &object.data { if let LayerEntryData::PopRange(pop_range) = &object.data {
if object.instance_id == instance_id { if object.instance_id == instance_id {
@ -100,7 +100,7 @@ impl Zone {
} }
// For certain PopRanges (e.g. the starting position in the opening zones) // For certain PopRanges (e.g. the starting position in the opening zones)
for group in &self.planevent.as_ref().unwrap().layers { for group in &self.planevent.as_ref().unwrap().chunks[0].layers {
for object in &group.objects { for object in &group.objects {
if let LayerEntryData::PopRange(pop_range) = &object.data { if let LayerEntryData::PopRange(pop_range) = &object.data {
if object.instance_id == instance_id { if object.instance_id == instance_id {