mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-25 05:25:14 +00:00
Change around printing a little
This commit is contained in:
parent
998a057051
commit
19b354fb2f
7 changed files with 9 additions and 13 deletions
|
@ -245,7 +245,7 @@ static void DynOS_Actor_Generate(const SysPath &aPackFolder, Array<Pair<u64, Str
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynOS_Actor_GeneratePack(const SysPath &aPackFolder) {
|
void DynOS_Actor_GeneratePack(const SysPath &aPackFolder) {
|
||||||
Print("Processing Actors: \"%s\"", aPackFolder.c_str());
|
Print("Processing actors: \"%s\"", aPackFolder.c_str());
|
||||||
Array<Pair<u64, String>> _ActorsFolders;
|
Array<Pair<u64, String>> _ActorsFolders;
|
||||||
GfxData *_GfxData = New<GfxData>();
|
GfxData *_GfxData = New<GfxData>();
|
||||||
|
|
||||||
|
|
|
@ -2647,7 +2647,7 @@ static void DynOS_Bhv_Generate(const SysPath &aPackFolder, Array<Pair<u64, Strin
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynOS_Bhv_GeneratePack(const SysPath &aPackFolder) {
|
void DynOS_Bhv_GeneratePack(const SysPath &aPackFolder) {
|
||||||
Print("Processing Behaviors: \"%s\"", aPackFolder.c_str());
|
Print("Processing behaviors: \"%s\"", aPackFolder.c_str());
|
||||||
Array<Pair<u64, String>> _BehaviorsFolders;
|
Array<Pair<u64, String>> _BehaviorsFolders;
|
||||||
GfxData *_GfxData = New<GfxData>();
|
GfxData *_GfxData = New<GfxData>();
|
||||||
|
|
||||||
|
|
|
@ -176,9 +176,7 @@ BinFile *DynOS_Bin_Decompress(const SysPath &aFilename) {
|
||||||
DynOS_Bin_Compress_Free();
|
DynOS_Bin_Compress_Free();
|
||||||
return BinFile::OpenR(aFilename.c_str());
|
return BinFile::OpenR(aFilename.c_str());
|
||||||
}
|
}
|
||||||
#ifdef DEVELOPMENT
|
|
||||||
PrintNoNewLine("Decompressing file \"%s\"...", aFilename.c_str());
|
PrintNoNewLine("Decompressing file \"%s\"...", aFilename.c_str());
|
||||||
#endif
|
|
||||||
|
|
||||||
// Read expected uncompressed file size
|
// Read expected uncompressed file size
|
||||||
if (!DynOS_Bin_Compress_Check(
|
if (!DynOS_Bin_Compress_Check(
|
||||||
|
@ -228,15 +226,11 @@ BinFile *DynOS_Bin_Decompress(const SysPath &aFilename) {
|
||||||
PrintError("ERROR: uncompress rc: %d, length uncompressed: %lu, length compressed: %lu, length header: %lu", uncompressRc, sLengthUncompressed, sLengthCompressed, _LengthHeader);
|
PrintError("ERROR: uncompress rc: %d, length uncompressed: %lu, length compressed: %lu, length header: %lu", uncompressRc, sLengthUncompressed, sLengthCompressed, _LengthHeader);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
#ifdef DEVELOPMENT
|
|
||||||
Print("uncompress rc: %d, length uncompressed: %lu, length compressed: %lu, length header: %lu", uncompressRc, sLengthUncompressed, sLengthCompressed, _LengthHeader);
|
Print("uncompress rc: %d, length uncompressed: %lu, length compressed: %lu, length header: %lu", uncompressRc, sLengthUncompressed, sLengthCompressed, _LengthHeader);
|
||||||
#endif
|
|
||||||
|
|
||||||
// Return uncompressed data as a BinFile
|
// Return uncompressed data as a BinFile
|
||||||
BinFile *_BinFile = BinFile::OpenB(sBufferUncompressed, sLengthUncompressed);
|
BinFile *_BinFile = BinFile::OpenB(sBufferUncompressed, sLengthUncompressed);
|
||||||
DynOS_Bin_Compress_Free();
|
DynOS_Bin_Compress_Free();
|
||||||
#ifdef DEVELOPMENT
|
|
||||||
Print(" Done.");
|
Print(" Done.");
|
||||||
#endif
|
|
||||||
return _BinFile;
|
return _BinFile;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1232,7 +1232,7 @@ static void DynOS_Lvl_GeneratePack_Recursive(const SysPath &directory, GfxData *
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynOS_Lvl_GeneratePack(const SysPath &aPackFolder) {
|
void DynOS_Lvl_GeneratePack(const SysPath &aPackFolder) {
|
||||||
Print("Processing Levels: \"%s\"", aPackFolder.c_str());
|
Print("Processing levels: \"%s\"", aPackFolder.c_str());
|
||||||
Array<Pair<u64, String>> _ActorsFolders;
|
Array<Pair<u64, String>> _ActorsFolders;
|
||||||
|
|
||||||
GfxData *_GfxData = New<GfxData>();
|
GfxData *_GfxData = New<GfxData>();
|
||||||
|
|
|
@ -466,7 +466,7 @@ static void DynOS_Tex_GeneratePack_Recursive(const SysPath &aPackFolder, SysPath
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynOS_Tex_GeneratePack(const SysPath &aPackFolder, SysPath &aOutputFolder, bool aAllowCustomTextures) {
|
void DynOS_Tex_GeneratePack(const SysPath &aPackFolder, SysPath &aOutputFolder, bool aAllowCustomTextures) {
|
||||||
Print("Processing Textures: \"%s\"", aPackFolder.c_str());
|
Print("Processing textures: \"%s\"", aPackFolder.c_str());
|
||||||
|
|
||||||
// skip generation if any .tex files exist
|
// skip generation if any .tex files exist
|
||||||
if (FileTypeExists(aOutputFolder, ".tex")) {
|
if (FileTypeExists(aOutputFolder, ".tex")) {
|
||||||
|
|
|
@ -1168,7 +1168,7 @@ static s32 bhv_cmd_spawn_obj_ext(void) {
|
||||||
static s32 bhv_cmd_load_animations_ext(void) {
|
static s32 bhv_cmd_load_animations_ext(void) {
|
||||||
//u8 field = BHV_CMD_GET_2ND_U8(0);
|
//u8 field = BHV_CMD_GET_2ND_U8(0);
|
||||||
|
|
||||||
printf("LOAD_ANIMATIONS_EXT is not yet supported! Skipping behavior command.\n");
|
LOG_ERROR("LOAD_ANIMATIONS_EXT is not yet supported! Skipping behavior command.\n");
|
||||||
|
|
||||||
//BehaviorScript *behavior = (BehaviorScript *)gCurrentObject->behavior;
|
//BehaviorScript *behavior = (BehaviorScript *)gCurrentObject->behavior;
|
||||||
|
|
||||||
|
|
|
@ -570,9 +570,11 @@ static void configfile_load_internal(const char *filename, bool* error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (option == NULL)
|
if (option == NULL) {
|
||||||
|
#ifdef DEVELOPMENT
|
||||||
printf("unknown option '%s'\n", tokens[0]);
|
printf("unknown option '%s'\n", tokens[0]);
|
||||||
else {
|
#endif
|
||||||
|
} else {
|
||||||
switch (option->type) {
|
switch (option->type) {
|
||||||
case CONFIG_TYPE_BOOL:
|
case CONFIG_TYPE_BOOL:
|
||||||
if (strcmp(tokens[1], "true") == 0)
|
if (strcmp(tokens[1], "true") == 0)
|
||||||
|
|
Loading…
Reference in a new issue