Fixed story mode boss crash

kovidomi · Jul 29, 2018 · c9194c6 · c9194c6
1 parent 51d575f
commit c9194c6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+29-07-2018 -- version 1.05
+===============================
+- Fixed crash when fighting against the final boss in Story Mode
+
 28-07-2018 -- version 1.04
 ===============================
 - Added ingame palette editor

diff --git a/USER_README.txt b/USER_README.txt
@@ -1,4 +1,4 @@
-BBTAG Improvement Mod (v1.04) by KoviDomi -- README
+BBTAG Improvement Mod (v1.05) by KoviDomi -- README
 ==========================
 
 What this mod provides
@@ -24,7 +24,7 @@ Delete or rename dinput8.dll. The mod makes no permanent changes to anything.
 
 Known issues
 ==========================
-- the background text on the stage "Duel Field" gets scaled incorrectly
+- The background text on the stage "Duel Field" gets scaled incorrectly
 - The regionlock is still not completely unlocked
 - "Quick switching" characters in tutorial mode causes palettes to switch
 
@@ -57,7 +57,7 @@ Recommend picking Aegis, Rachel, Yukiko, and Makoto in the tutorial mode for adj
 5. Some of the custom HUD elements have gone beyond the screen and became unrecoverable:
 Press the "Reset custom HUD positions" button on the BBTAG_IM mod's main window to bring all the elements back onto the middle of the screen.
 
-6. Where are the custom palette files saved to / Where to place the downloaded custom palettes files
+6. Where are the custom palette files saved to / Where to place the downloaded custom palettes files?
 "..\Steam\SteamApps\common\BBTAG\BBTAG_IM\Palettes\"
 
 7. How do I convert the custom palettes between ".impl" and ".hpl" formats?
@@ -71,6 +71,10 @@ Keep in mind that the mod may partially, or completely stop working whenever a n
 Changelog
 ==========================
 
+29-07-2018 -- version 1.05
+===============================
+- Fixed crash when fighting against the final boss in Story Mode
+
 28-07-2018 -- version 1.04
 ===============================
 - Added ingame palette editor

diff --git a/resource/palettes.ini b/resource/palettes.ini
@@ -1,6 +1,12 @@
 # Lines starting with "#" are ignored.
 
 [General]
+
+######################################################################
+# Used to automatically download palettes from the mod's github repo #
+# 0: off							     #
+# 1: on								     #
+######################################################################
 OnlinePalettes = 1
 
 ######################################################################################

diff --git a/src/PaletteManager/PaletteManager.cpp b/src/PaletteManager/PaletteManager.cpp
@@ -82,7 +82,7 @@ void PaletteManager::ApplyDefaultCustomPalette(CharIndex charIndex, CharPaletteH
 {
 	LOG(2, "ApplyDefaultCustomPalette\n");
 
-	if (charIndex > TOTAL_CHAR_INDEXES)
+	if (charIndex > TOTAL_CHAR_INDEXES - 1)
 		return;
 
 	const int curPalIndex = charPalHandle.GetOrigPalIndex();

diff --git a/src/WindowManager/PaletteEditor.cpp b/src/WindowManager/PaletteEditor.cpp
@@ -440,13 +440,16 @@ void PaletteEditor::CheckSelectedPalOutOfBound()
 
 void PaletteEditor::ShowPaletteSelectButton(CharHandle & charHandle, const char * btnText, const char * popupID)
 {
-	ShowPaletteRandomizerButton(popupID, charHandle);
-	ImGui::SameLine();
-
 	CharPaletteHandle& charPalHandle = charHandle.GetPalHandle();
 	int selected_pal_index = g_interfaces.pPaletteManager->GetCurrentCustomPalIndex(charPalHandle);
 	CharIndex charIndex = (CharIndex)charHandle.GetData()->char_index;
 
+	if (charIndex >= TOTAL_CHAR_INDEXES - 1)
+		return;
+
+	ShowPaletteRandomizerButton(popupID, charHandle);
+	ImGui::SameLine();
+
 	if (ImGui::Button(btnText))
 		ImGui::OpenPopup(popupID);
 

diff --git a/src/main.h b/src/main.h
@@ -3,8 +3,8 @@
 #define RELEASE_VER //comment out to activate logging
 #define DEBUG_LOG_LEVEL	5 //0 = highest, 7 = lowest priority
 
-#define MOD_VERSION_NUM	"v1.04"
-#define MOD_VERSION_NUM_INTERNAL 104
+#define MOD_VERSION_NUM	"v1.05"
+#define MOD_VERSION_NUM_INTERNAL 105
 #define MOD_WINDOW_TITLE "BBTAG Improvement Mod"
 
 //Links