From 19b354fb2f078e070b6bc7a94a3f193b9ffbab71 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Fri, 19 Apr 2024 13:32:39 -0400 Subject: [PATCH] Change around printing a little --- data/dynos_bin_actor.cpp | 2 +- data/dynos_bin_behavior.cpp | 2 +- data/dynos_bin_compress.cpp | 6 ------ data/dynos_bin_lvl.cpp | 2 +- data/dynos_bin_tex.cpp | 2 +- src/engine/behavior_script.c | 2 +- src/pc/configfile.c | 6 ++++-- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/data/dynos_bin_actor.cpp b/data/dynos_bin_actor.cpp index 149b1e98..aa49a2fa 100644 --- a/data/dynos_bin_actor.cpp +++ b/data/dynos_bin_actor.cpp @@ -245,7 +245,7 @@ static void DynOS_Actor_Generate(const SysPath &aPackFolder, Array> _ActorsFolders; GfxData *_GfxData = New(); diff --git a/data/dynos_bin_behavior.cpp b/data/dynos_bin_behavior.cpp index 62fa21e1..c1c69cb0 100644 --- a/data/dynos_bin_behavior.cpp +++ b/data/dynos_bin_behavior.cpp @@ -2647,7 +2647,7 @@ static void DynOS_Bhv_Generate(const SysPath &aPackFolder, Array> _BehaviorsFolders; GfxData *_GfxData = New(); diff --git a/data/dynos_bin_compress.cpp b/data/dynos_bin_compress.cpp index 040f7e47..879fc8b5 100644 --- a/data/dynos_bin_compress.cpp +++ b/data/dynos_bin_compress.cpp @@ -176,9 +176,7 @@ BinFile *DynOS_Bin_Decompress(const SysPath &aFilename) { DynOS_Bin_Compress_Free(); return BinFile::OpenR(aFilename.c_str()); } -#ifdef DEVELOPMENT PrintNoNewLine("Decompressing file \"%s\"...", aFilename.c_str()); -#endif // Read expected uncompressed file size 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); return NULL; } -#ifdef DEVELOPMENT Print("uncompress rc: %d, length uncompressed: %lu, length compressed: %lu, length header: %lu", uncompressRc, sLengthUncompressed, sLengthCompressed, _LengthHeader); -#endif // Return uncompressed data as a BinFile BinFile *_BinFile = BinFile::OpenB(sBufferUncompressed, sLengthUncompressed); DynOS_Bin_Compress_Free(); -#ifdef DEVELOPMENT Print(" Done."); -#endif return _BinFile; } diff --git a/data/dynos_bin_lvl.cpp b/data/dynos_bin_lvl.cpp index c9e837a2..b3b26ad6 100644 --- a/data/dynos_bin_lvl.cpp +++ b/data/dynos_bin_lvl.cpp @@ -1232,7 +1232,7 @@ static void DynOS_Lvl_GeneratePack_Recursive(const SysPath &directory, GfxData * } void DynOS_Lvl_GeneratePack(const SysPath &aPackFolder) { - Print("Processing Levels: \"%s\"", aPackFolder.c_str()); + Print("Processing levels: \"%s\"", aPackFolder.c_str()); Array> _ActorsFolders; GfxData *_GfxData = New(); diff --git a/data/dynos_bin_tex.cpp b/data/dynos_bin_tex.cpp index 93d86917..3a1e5820 100644 --- a/data/dynos_bin_tex.cpp +++ b/data/dynos_bin_tex.cpp @@ -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) { - Print("Processing Textures: \"%s\"", aPackFolder.c_str()); + Print("Processing textures: \"%s\"", aPackFolder.c_str()); // skip generation if any .tex files exist if (FileTypeExists(aOutputFolder, ".tex")) { diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c index 76252625..528aa3e1 100644 --- a/src/engine/behavior_script.c +++ b/src/engine/behavior_script.c @@ -1168,7 +1168,7 @@ static s32 bhv_cmd_spawn_obj_ext(void) { static s32 bhv_cmd_load_animations_ext(void) { //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; diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 63525b84..ddd0156d 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -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]); - else { +#endif + } else { switch (option->type) { case CONFIG_TYPE_BOOL: if (strcmp(tokens[1], "true") == 0)