redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-07-23 21:17:45 +00:00
Code Activity

Replace INVALID_ACTOR_ID with INVALID_OBJECT_ID

Browse source 
These duplicate the same underlying constant value.
This commit is contained in:
Joshua Goins 2025-07-17 23:05:35 -04:00
parent 64fc99d7a9
commit 4993ae5f38
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/bin/kawari-world.rs
View file

@ -3,7 +3,7 @@ use std::sync::{Arc, Mutex};
use std::time::{Duration, Instant};
use kawari::common::Position;
use kawari::common::{GameData, ItemInfoQuery, timestamp_secs};
use kawari::common::{GameData, INVALID_OBJECT_ID, ItemInfoQuery, timestamp_secs};
use kawari::config::get_config;
use kawari::inventory::{
BuyBackItem, ContainerType, CurrencyKind, Item, ItemOperationKind, get_container_type,
@ -42,7 +42,7 @@ use tokio::sync::mpsc::{Receiver, UnboundedReceiver, UnboundedSender, channel, u
use tokio::sync::oneshot;
use tokio::task::JoinHandle;
use kawari::{INVALID_ACTOR_ID, INVENTORY_ACTION_ACK_GENERAL, INVENTORY_ACTION_ACK_SHOP};
use kawari::{INVENTORY_ACTION_ACK_GENERAL, INVENTORY_ACTION_ACK_SHOP};
fn spawn_main_loop() -> (ServerHandle, JoinHandle<()>) {
let (send, recv) = channel(64);
@ -838,7 +838,7 @@ async fn client_loop(
src_container_index: action.src_container_index,
src_stack: action.src_stack,
src_catalog_id: action.src_catalog_id,
dst_actor_id: INVALID_ACTOR_ID,
dst_actor_id: INVALID_OBJECT_ID.0,
dummy_container: ContainerType::DiscardingItemSentinel,
dst_storage_id: ContainerType::DiscardingItemSentinel,
dst_container_index: u16::MAX,
@ -938,7 +938,7 @@ async fn client_loop(
src_container_index: 0,
src_stack: connection.player_data.inventory.currency.gil.quantity,
src_catalog_id: CurrencyKind::Gil as u32,
dst_actor_id: INVALID_ACTOR_ID,
dst_actor_id: INVALID_OBJECT_ID.0,
dummy_container: ContainerType::DiscardingItemSentinel,
dst_storage_id: ContainerType::DiscardingItemSentinel,
dst_container_index: u16::MAX,
@ -977,7 +977,7 @@ async fn client_loop(
src_container_index: index as u16,
src_stack: quantity,
src_catalog_id: item_info.id,
dst_actor_id: INVALID_ACTOR_ID,
dst_actor_id: INVALID_OBJECT_ID.0,
dummy_container: ContainerType::DiscardingItemSentinel,
dst_storage_id: ContainerType::DiscardingItemSentinel,
dst_container_index: u16::MAX,

3
src/lib.rs
View file

@ -88,9 +88,6 @@ pub const CLASSJOB_ARRAY_SIZE: usize = 32;
/// The maximum durability of an item.
pub const ITEM_CONDITION_MAX: u16 = 30000;
/// The invalid/nothing/none actor ID.
pub const INVALID_ACTOR_ID: u32 = 0xE000_0000;
// This operation code change regularly, so update it when needed!
pub const BASE_INVENTORY_ACTION: u8 = 144;