Skip to content

Commit

Permalink
Goofy ahh formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger committed Jun 11, 2024
1 parent ef9d337 commit 8ecccfc
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 38 deletions.
9 changes: 5 additions & 4 deletions source/m_lua.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,16 @@
#endif
#include "ff_main.h"
#include "lib_util.h"
#define LUA_IMPL
#include "m_lua.h"
#include "m_trans.h"
#include "main.h"
#include "physfs.h"
#include "sys_assert.h"
#include "sys_debug.h"
#include "sys_xoshiro.h"

#define LUA_IMPL
#include "m_lua.h"

static lua_State *LUA_ST;

static bool has_loaded = false;
Expand Down Expand Up @@ -2135,7 +2136,7 @@ void ob_print_reference()
if (!Script_CallFunc("ob_print_reference", 1))
{
// clang-format off
printf(_("ob_print_reference: Error creating REFERENCE.txt!\n"));
printf("%s\n", _("ob_print_reference: Error creating REFERENCE.txt!"));
// clang-format on
}
// clang-format off
Expand All @@ -2148,7 +2149,7 @@ void ob_print_reference_json()
if (!Script_CallFunc("ob_print_reference_json", 1))
{
// clang-format off
printf(_("ob_print_reference_json: Error printing json reference!\n"));
printf("%s\n", _("ob_print_reference_json: Error printing json reference!"));
// clang-format on
}
}
Expand Down
4 changes: 2 additions & 2 deletions source/m_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ bool Options_Save(std::string filename)
LogPrintf("Saving options file...\n");
}

fprintf(option_fp, "-- OPTIONS FILE : OBSIDIAN %s \"%s\"\n", OBSIDIAN_SHORT_VERSION, OBSIDIAN_CODE_NAME);
fprintf(option_fp, "-- OPTIONS FILE : OBSIDIAN %s \"%s\"\n", OBSIDIAN_SHORT_VERSION, OBSIDIAN_CODE_NAME.c_str());
fprintf(option_fp, "-- Build %s\n", OBSIDIAN_VERSION);
fprintf(option_fp, "-- Based on OBLIGE Level Maker (C) 2006-2017 Andrew Apted\n");
fprintf(option_fp, "-- %s\n\n", OBSIDIAN_WEBSITE);
Expand All @@ -216,7 +216,7 @@ bool Options_Save(std::string filename)
fprintf(option_fp, "password_mode = %d\n", (password_mode ? 1 : 0));
fprintf(option_fp, "mature_word_lists = %d\n", (mature_word_lists ? 1 : 0));
fprintf(option_fp, "filename_prefix = %d\n", filename_prefix);
fprintf(option_fp, "custom_prefix = %d\n", custom_prefix);
fprintf(option_fp, "custom_prefix = %s\n", custom_prefix.c_str());
fprintf(option_fp, "%s", StringFormat("default_output_path = %s\n\n", default_output_path.c_str()).c_str());

VFS_OptWrite(option_fp);
Expand Down
64 changes: 32 additions & 32 deletions source/m_theme.cc
Original file line number Diff line number Diff line change
Expand Up @@ -356,42 +356,42 @@ bool Theme_Options_Save(std::string filename)
LogPrintf("Saving theme file...\n");
}

fprintf(option_fp, "-- THEME FILE : OBSIDIAN %s \"%s\"\n", OBSIDIAN_SHORT_VERSION, OBSIDIAN_CODE_NAME);
fprintf(option_fp, "-- THEME FILE : OBSIDIAN %s \"%s\"\n", OBSIDIAN_SHORT_VERSION, OBSIDIAN_CODE_NAME.c_str());
fprintf(option_fp, "-- Build %s\n", OBSIDIAN_VERSION);
fprintf(option_fp, "-- Based on OBLIGE Level Maker (C) 2006-2017 Andrew Apted\n");
fprintf(option_fp, "-- %s\n\n", OBSIDIAN_WEBSITE);

fprintf(option_fp, "window_scaling = %s\n", NumToString(window_scaling));
fprintf(option_fp, "font_scaling = %s\n", NumToString(font_scaling));
fprintf(option_fp, "font_theme = %s\n", NumToString(font_theme));
fprintf(option_fp, "widget_theme = %s\n", NumToString(widget_theme));
fprintf(option_fp, "box_theme = %s\n", NumToString(box_theme));
fprintf(option_fp, "button_theme = %s\n", NumToString(button_theme));
fprintf(option_fp, "color_scheme = %s\n", NumToString(color_scheme));
fprintf(option_fp, "text_red = %s\n", NumToString(text_red));
fprintf(option_fp, "text_green = %s\n", NumToString(text_green));
fprintf(option_fp, "text_blue = %s\n", NumToString(text_blue));
fprintf(option_fp, "text2_red = %s\n", NumToString(text2_red));
fprintf(option_fp, "text2_green = %s\n", NumToString(text2_green));
fprintf(option_fp, "text2_blue = %s\n", NumToString(text2_blue));
fprintf(option_fp, "bg_red = %s\n", NumToString(bg_red));
fprintf(option_fp, "bg_green = %s\n", NumToString(bg_green));
fprintf(option_fp, "bg_blue = %s\n", NumToString(bg_blue));
fprintf(option_fp, "bg2_red = %s\n", NumToString(bg2_red));
fprintf(option_fp, "bg2_green = %s\n", NumToString(bg2_green));
fprintf(option_fp, "bg2_blue = %s\n", NumToString(bg2_blue));
fprintf(option_fp, "button_red = %s\n", NumToString(button_red));
fprintf(option_fp, "button_green = %s\n", NumToString(button_green));
fprintf(option_fp, "button_blue = %s\n", NumToString(button_blue));
fprintf(option_fp, "gradient_red = %s\n", NumToString(gradient_red));
fprintf(option_fp, "gradient_green = %s\n", NumToString(gradient_green));
fprintf(option_fp, "gradient_blue = %s\n", NumToString(gradient_blue));
fprintf(option_fp, "border_red = %s\n", NumToString(border_red));
fprintf(option_fp, "border_green = %s\n", NumToString(border_green));
fprintf(option_fp, "border_blue = %s\n", NumToString(border_blue));
fprintf(option_fp, "gap_red = %s\n", NumToString(gap_red));
fprintf(option_fp, "gap_green = %s\n", NumToString(gap_green));
fprintf(option_fp, "gap_blue = %s\n", NumToString(gap_blue));
fprintf(option_fp, "window_scaling = %d\n", window_scaling);
fprintf(option_fp, "font_scaling = %d\n", font_scaling);
fprintf(option_fp, "font_theme = %d\n", font_theme);
fprintf(option_fp, "widget_theme = %d\n", widget_theme);
fprintf(option_fp, "box_theme = %d\n", box_theme);
fprintf(option_fp, "button_theme = %d\n", button_theme);
fprintf(option_fp, "color_scheme = %d\n", color_scheme);
fprintf(option_fp, "text_red = %d\n", text_red);
fprintf(option_fp, "text_green = %d\n", text_green);
fprintf(option_fp, "text_blue = %d\n", text_blue);
fprintf(option_fp, "text2_red = %d\n", text2_red);
fprintf(option_fp, "text2_green = %d\n", text2_green);
fprintf(option_fp, "text2_blue = %d\n", text2_blue);
fprintf(option_fp, "bg_red = %d\n", bg_red);
fprintf(option_fp, "bg_green = %d\n", bg_green);
fprintf(option_fp, "bg_blue = %d\n", bg_blue);
fprintf(option_fp, "bg2_red = %d\n", bg2_red);
fprintf(option_fp, "bg2_green = %d\n", bg2_green);
fprintf(option_fp, "bg2_blue = %d\n", bg2_blue);
fprintf(option_fp, "button_red = %d\n", button_red);
fprintf(option_fp, "button_green = %d\n", button_green);
fprintf(option_fp, "button_blue = %d\n", button_blue);
fprintf(option_fp, "gradient_red = %d\n", gradient_red);
fprintf(option_fp, "gradient_green = %d\n", gradient_green);
fprintf(option_fp, "gradient_blue = %d\n", gradient_blue);
fprintf(option_fp, "border_red = %d\n", border_red);
fprintf(option_fp, "border_green = %d\n", border_green);
fprintf(option_fp, "border_blue = %d\n", border_blue);
fprintf(option_fp, "gap_red = %d\n", gap_red);
fprintf(option_fp, "gap_green = %d\n", gap_green);
fprintf(option_fp, "gap_blue = %d\n", gap_blue);
fprintf(option_fp, "\n\n");

fclose(option_fp);
Expand Down

0 comments on commit 8ecccfc

Please sign in to comment.