mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-10 15:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove some spammy overlord prints (#3952)

Browse Source 
removing some print statements left over from debugging.

Co-authored-by: water111 <awaterford1111445@gmail.com>
This commit is contained in:
water111
2025-06-08 11:54:45 -04:00
committed by GitHub
parent c08118509b
commit 6c0107f166
5 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/overlord/jak2/iso.cpp
-1
View File
@@ -679,7 +679,6 @@ u32 ISOThread() {
if (pLVar14->id != 0) {
if (g_game_version != GameVersion::Jak3) {
// doesn't work.
printf("jak3 skipping vag stream\n");
QueueVAGStream(pLVar14);
}
}
game/overlord/jak3/iso.cpp
+13 -22
View File
@@ -367,8 +367,6 @@ void IsoPlayMusicStream(ISO_VAGCommand* user_cmd) {
}
// open the file!!
ovrld_log(LogCategory::VAG_SETUP, "vag dir entry offset is {}",
vag_dir_entry->words[1] >> 16);
auto* base_file = get_file_system()->OpenWAD(filedef, vag_dir_entry->words[1] >> 16);
internal_cmd->m_pBaseFile = base_file;
@@ -440,7 +438,7 @@ void IsoQueueVagStream(ISO_VAGCommand* user_cmd) {
// mysterious case to reject a command
if (user_cmd->vag_dir_entry && (user_cmd->vag_dir_entry->words[1] & 0x400U) != 0 &&
HowManyBelowThisPriority(user_cmd->priority_pq) < 2) {
ovrld_log(LogCategory::WARN, "mysterious rejection of a queued vag stream");
ovrld_log(LogCategory::WARN, "mysterious rejection of a queued vag stream: {}", user_cmd->name);
return;
}
@@ -840,8 +838,8 @@ u32 ISOThread() {
mbx_cmd->m_pBaseFile = nullptr;
auto msg_kind = mbx_cmd->msg_type;
ovrld_log(LogCategory::ISO_QUEUE, "Incoming message to the ISO Queue with type 0x{:x}",
(int)msg_kind);
// ovrld_log(LogCategory::ISO_QUEUE, "Incoming message to the ISO Queue with type 0x{:x}",
// (int)msg_kind);
// if we're a simple file loading command:
if (msg_kind == ISO_Hdr::MsgType::LOAD_EE || msg_kind == ISO_Hdr::MsgType::LOAD_EE_CHUNK ||
@@ -872,21 +870,21 @@ u32 ISOThread() {
// handle opening the file:
switch (msg_kind) {
case ISO_Hdr::MsgType::LOAD_EE_CHUNK: {
ovrld_log(LogCategory::ISO_QUEUE, "Opening File {} for EE Chunk Load offset {}",
mbx_cmd->file_def->name.data, ((ISO_LoadSingle*)mbx_cmd)->sector_offset);
// ovrld_log(LogCategory::ISO_QUEUE, "Opening File {} for EE Chunk Load offset {}",
// mbx_cmd->file_def->name.data, ((ISO_LoadSingle*)mbx_cmd)->sector_offset);
mbx_cmd->m_pBaseFile = get_file_system()->Open(
mbx_cmd->file_def, ((ISO_LoadSingle*)mbx_cmd)->sector_offset, 1);
} break;
case ISO_Hdr::MsgType::LOAD_IOP:
case ISO_Hdr::MsgType::LOAD_EE:
ovrld_log(LogCategory::ISO_QUEUE, "Opening File {} for Load {}",
msg_kind == ISO_Hdr::MsgType::LOAD_EE ? "EE" : "IOP",
mbx_cmd->file_def->name.data);
// ovrld_log(LogCategory::ISO_QUEUE, "Opening File {} for Load {}",
// msg_kind == ISO_Hdr::MsgType::LOAD_EE ? "EE" : "IOP",
// mbx_cmd->file_def->name.data);
mbx_cmd->m_pBaseFile = get_file_system()->Open(mbx_cmd->file_def, -1, 1);
break;
case ISO_Hdr::MsgType::LOAD_SOUNDBANK: {
ovrld_log(LogCategory::ISO_QUEUE, "Opening for LOAD_SOUNDBANK {} ",
load_sbk_cmd->name);
// ovrld_log(LogCategory::ISO_QUEUE, "Opening for LOAD_SOUNDBANK {} ",
// load_sbk_cmd->name);
// build name
ASSERT(load_sbk_cmd->name);
strncpy(local_name, load_sbk_cmd->name, 0xc);
@@ -991,11 +989,8 @@ u32 ISOThread() {
break;
case ISO_Hdr::MsgType::VAG_SET_PITCH_VOL:
vag_cmd = (ISO_VAGCommand*)mbx_cmd;
ovrld_log(LogCategory::ISO_QUEUE, "VAG_SET_PITCH_VOL (id {})", vag_cmd->id);
internal_vag_cmd = FindVagStreamId(vag_cmd->id);
if (internal_vag_cmd) {
ovrld_log(LogCategory::ISO_QUEUE, "VAG_SET_PITCH_VOL lookup ok, got {}",
internal_vag_cmd->name);
internal_vag_cmd->pitch_cmd = vag_cmd->pitch_cmd;
SetVAGVol(internal_vag_cmd);
}
@@ -1549,7 +1544,7 @@ void LoadDGO(RPC_Dgo_Cmd* cmd) {
return;
}
if (sLoadDGO.last_id < cmd->cgo_id) {
ovrld_log(LogCategory::RPC, "DGO RPC: new command ID, starting a load for {}\n", cmd->name);
ovrld_log(LogCategory::RPC, "DGO RPC: new command ID, starting a load for {}", cmd->name);
CancelDGO(nullptr);
sLoadDGO.msg_type = ISO_Hdr::MsgType::DGO_LOAD;
sLoadDGO.selected_id = cmd->cgo_id;
@@ -1567,12 +1562,8 @@ void LoadDGO(RPC_Dgo_Cmd* cmd) {
sLoadDGO.nosync_cancel_ack = 0;
// CpuResumeIntr(local_18[0]);
ASSERT(sLoadDGO.msg_type != ISO_Hdr::MsgType::MSG_0);
ovrld_log(LogCategory::RPC, "------------------DGO: RPC sending mbox (reply size is {})",
MbxSize(g_nDGOMbx));
SendMbx(g_nISOMbx, &sLoadDGO);
ovrld_log(LogCategory::RPC, "DGO: RPC waiting mbox (now has {})", MbxSize(g_nDGOMbx));
WaitMbx(g_nDGOMbx);
ovrld_log(LogCategory::RPC, "DGO: RPC recv mbox: {}", int(sLoadDGO.status));
if (sLoadDGO.status == EIsoStatus::OK_2) {
cmd->status = 2;
return;
@@ -1630,7 +1621,7 @@ void LoadNextDGO(RPC_Dgo_Cmd* cmd) {
}
void CancelDGO(RPC_Dgo_Cmd* param_1) {
ovrld_log(LogCategory::WARN, "DGO RPC: CancelDGO {}\n", param_1 ? param_1->name : "NO CMD");
ovrld_log(LogCategory::WARN, "DGO RPC: CancelDGO {}", param_1 ? param_1->name : "NO CMD");
if (sLoadDGO.msg_type != ISO_Hdr::MsgType::MSG_0) {
sLoadDGO.want_abort = 1;
if (NotifyDGO()) {
@@ -1645,7 +1636,7 @@ void CancelDGO(RPC_Dgo_Cmd* param_1) {
}
void CancelDGONoSync(int id) {
ovrld_log(LogCategory::WARN, "DGO RPC: CancelDGONoSync {}\n", id);
ovrld_log(LogCategory::WARN, "DGO RPC: CancelDGONoSync {}", id);
// CpuSuspendIntr(local_10);
sLoadDGO.nosync_cancel_pending_flag = 1;
if (0 < id - sLoadDGO.last_id) {
game/overlord/jak3/iso_api.cpp
-8
View File
@@ -69,10 +69,8 @@ int LoadISOFileToIOP(const ISOFileDef* file_def, void* addr, int length) {
cmd.file_def = file_def;
cmd.addr = (u8*)addr;
cmd.maxlen = length;
lg::warn("--------------- LoadISOFileToIOP START");
SendMbx(g_nISOMbx, &cmd);
SleepThread();
lg::warn("--------------- LoadISOFileToIOP END");
if (cmd.status == EIsoStatus::NONE_0) {
return cmd.length_to_copy;
} else {
@@ -88,10 +86,8 @@ int LoadISOFileToEE(const ISOFileDef* file_def, u32 addr, int length) {
cmd.file_def = file_def;
cmd.addr = (u8*)(u64)addr;
cmd.maxlen = length;
lg::warn("--------------- LoadISOFileToEE START");
SendMbx(g_nISOMbx, &cmd);
SleepThread();
lg::warn("--------------- LoadISOFileToEE END");
if (cmd.status == EIsoStatus::NONE_0) {
return cmd.length_to_copy;
}
@@ -107,10 +103,8 @@ int LoadISOFileChunkToEE(const ISOFileDef* file_def, u32 addr, int max_len, int
cmd.addr = (u8*)(u64)addr;
cmd.maxlen = max_len;
cmd.sector_offset = sector_offset;
lg::warn("--------------- LoadISOFileChunkToEE START");
SendMbx(g_nISOMbx, &cmd);
SleepThread();
lg::warn("--------------- LoadISOFileChunkToEE END");
if (cmd.status == EIsoStatus::NONE_0) {
return cmd.length_to_copy;
}
@@ -125,10 +119,8 @@ u32 LoadSoundBankToIOP(const char* name, SoundBankInfo* bank, u32 mode) {
cmd.bank_info = bank;
cmd.name = name;
cmd.priority = mode;
lg::warn("--------------- LoadSoundBankToIOP START");
SendMbx(g_nISOMbx, &cmd);
SleepThread();
lg::warn("--------------- LoadSoundBankToIOP END");
return (u32)cmd.status;
}
game/overlord/jak3/iso_cd.cpp
-1
View File
@@ -383,7 +383,6 @@ ISOFileDef* CISOCDFileSystem::FindIN(const jak3::ISOName* name) {
int CISOCDFileSystem::GetLength(const jak3::ISOFileDef* file) {
// actually open the file and get the length, in case it changed.
// return file->length;
lg::info("getlength");
file_util::assert_file_exists(file->full_path.c_str(), "CISOCDFileSystem GetLength");
FILE* fp = file_util::open_file(file->full_path.c_str(), "rb");
ASSERT(fp);
game/overlord/jak3/stream.cpp
-2
View File
@@ -112,8 +112,6 @@ void* RPC_STR(unsigned int, void* msg_in, int size) {
if (cache_entry == STR_INDEX_CACHE_SIZE) {
// cache miss, we need to load the header to the header cache on the IOP
ovrld_log(LogCategory::STR_RPC,
"STR_RPC header cache miss - loading .str file header now.");
cache_entry = oldest_idx;
sCache[oldest_idx].filedef = filedef;
sCache[oldest_idx].countdown = INT32_MAX - 1;