Overhaul to console structure, a bit
This commit is contained in:
+6
-6
@@ -234,7 +234,7 @@ static int probe_umx (fshandle_t *f, const struct upkg_hdr *hdr,
|
||||
if (hdr->name_offset >= fsiz ||
|
||||
hdr->export_offset >= fsiz ||
|
||||
hdr->import_offset >= fsiz) {
|
||||
Con_DPrintf("Illegal values in header.\n");
|
||||
console::debug("Illegal values in header.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -292,7 +292,7 @@ static int32_t probe_header (fshandle_t *f, struct upkg_hdr *hdr)
|
||||
hdr->import_offset = LittleLong(hdr->import_offset);
|
||||
|
||||
if (hdr->tag != UPKG_HDR_TAG) {
|
||||
Con_DPrintf("Unknown header tag 0x%x\n", hdr->tag);
|
||||
console::debug("Unknown header tag 0x%x\n", hdr->tag);
|
||||
return -1;
|
||||
}
|
||||
if (hdr->name_count < 0 ||
|
||||
@@ -301,7 +301,7 @@ static int32_t probe_header (fshandle_t *f, struct upkg_hdr *hdr)
|
||||
hdr->name_offset < 36 ||
|
||||
hdr->export_offset < 36 ||
|
||||
hdr->import_offset < 36) {
|
||||
Con_DPrintf("Illegal values in header.\n");
|
||||
console::debug("Illegal values in header.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ static int32_t probe_header (fshandle_t *f, struct upkg_hdr *hdr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
Con_DPrintf("Unknown upkg version %d\n", hdr->file_version);
|
||||
console::debug("Unknown upkg version %d\n", hdr->file_version);
|
||||
return -1;
|
||||
#endif /* #if 0 */
|
||||
}
|
||||
@@ -356,11 +356,11 @@ static bool S_UMX_CodecOpenStream (snd_stream_t *stream)
|
||||
|
||||
type = process_upkg(&stream->fh, &ofs, &size);
|
||||
if (type < 0) {
|
||||
Con_DPrintf("%s: unrecognized umx\n", stream->name);
|
||||
console::debug("%s: unrecognized umx\n", stream->name);
|
||||
return false;
|
||||
}
|
||||
|
||||
Con_DPrintf("%s: %s data @ 0x%x, %d bytes\n", stream->name, mustype[type], ofs, size);
|
||||
console::debug("%s: %s data @ 0x%x, %d bytes\n", stream->name, mustype[type], ofs, size);
|
||||
/* hack the fshandle_t start pos and length members so
|
||||
* that only the relevant data is accessed from now on */
|
||||
stream->fh.start += ofs;
|
||||
|
||||
Reference in New Issue
Block a user