Update params for InputHex and InputHexShort

From int to uint64_t and uint32_t respectively
This commit is contained in:
Justin Scofield
2023-08-02 19:04:02 -04:00
parent d4fdee6d32
commit b3458b56db
5 changed files with 15 additions and 17 deletions

View File

@@ -122,8 +122,6 @@ absl::Status GraphicsEditor::DrawCgxImport() {
}
absl::Status GraphicsEditor::DrawFileImport() {
static int size = 0;
gui::TextWithSeparators("BIN Import");
ImGui::InputText("##ROMFile", file_path_, sizeof(file_path_));
@@ -142,11 +140,11 @@ absl::Status GraphicsEditor::DrawFileImport() {
[&]() -> auto { ImGui::SetClipboardText(file_path_); });
gui::InputHex("BIN Offset", &current_offset_);
gui::InputHex("BIN Size", &size);
gui::InputHex("BIN Size", &bin_size_);
if (ImGui::Button("Decompress BIN")) {
if (strlen(file_path_) > 0) {
RETURN_IF_ERROR(DecompressImportData(size))
RETURN_IF_ERROR(DecompressImportData(bin_size_))
} else {
return absl::InvalidArgumentError(
"Please select a file before importing.");

View File

@@ -80,15 +80,17 @@ class GraphicsEditor {
absl::Status DecompressSuperDonkey();
int current_offset_ = 0;
int current_size_ = 0;
uint64_t current_offset_ = 0;
uint64_t current_size_ = 0;
int current_palette_ = 0;
int current_palette_index_ = 0;
int num_sheets_to_load_ = 1;
uint64_t current_palette_index_ = 0;
int clipboard_offset_ = 0;
int clipboard_size_ = 0;
uint64_t num_sheets_to_load_ = 1;
uint64_t bin_size_ = 0;
uint64_t clipboard_offset_ = 0;
uint64_t clipboard_size_ = 0;
bool open_memory_editor_ = false;
bool gfx_loaded_ = false;

View File

@@ -138,8 +138,6 @@ void ScreenEditor::DrawMosaicEditor() {
ImGui::EndTable();
}
gui::InputHex("Routine Location", &overworldCustomMosaicASM);
END_TAB_ITEM()
}