github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-20 05:13:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes text speed to a slider (unfinished)

Browse source 
Got most of the code working, but only works upon reloading the game, unsure of how to fix this.
This commit is contained in:
Ada 2022-04-16 13:14:44 +01:00
commit defaa9343c
4 changed files with 10 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libultraship/libultraship/GameSettings.cpp
View file

@ -52,8 +52,8 @@ namespace Game {
Settings.enhancements.skip_text = stob(Conf[EnhancementSection]["skip_text"]); Settings.enhancements.skip_text = stob(Conf[EnhancementSection]["skip_text"]);
CVar_SetS32("gSkipText", Settings.enhancements.skip_text); CVar_SetS32("gSkipText", Settings.enhancements.skip_text);
Settings.enhancements.fast_text = stob(Conf[EnhancementSection]["fast_text"]); Settings.enhancements.text_speed = Ship::stoi(Conf[EnhancementSection]["text_speed"]);
CVar_SetS32("gFastText", Settings.enhancements.fast_text); CVar_SetS32("gTextSpeed", Settings.enhancements.text_speed);
Settings.enhancements.disable_lod = stob(Conf[EnhancementSection]["disable_lod"]); Settings.enhancements.disable_lod = stob(Conf[EnhancementSection]["disable_lod"]);
CVar_SetS32("gDisableLOD", Settings.enhancements.disable_lod); CVar_SetS32("gDisableLOD", Settings.enhancements.disable_lod);
@ -152,7 +152,7 @@ namespace Game {
// Enhancements // Enhancements
Conf[EnhancementSection]["skip_text"] = std::to_string(Settings.enhancements.skip_text); Conf[EnhancementSection]["skip_text"] = std::to_string(Settings.enhancements.skip_text);
Conf[EnhancementSection]["fast_text"] = std::to_string(Settings.enhancements.fast_text); Conf[EnhancementSection]["text_speed"] = std::to_string(Settings.enhancements.text_speed);
Conf[EnhancementSection]["disable_lod"] = std::to_string(Settings.enhancements.disable_lod); Conf[EnhancementSection]["disable_lod"] = std::to_string(Settings.enhancements.disable_lod);
Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu); Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu);
Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui); Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui);

2
libultraship/libultraship/GameSettings.h
View file

@ -20,8 +20,8 @@ struct SoHConfigType {
// Enhancements // Enhancements
struct { struct {
int text_speed = 1;
bool skip_text = false; bool skip_text = false;
bool fast_text = false;
bool disable_lod = false; bool disable_lod = false;
bool animated_pause_menu = false; bool animated_pause_menu = false;
bool minimal_ui = false; bool minimal_ui = false;

8
libultraship/libultraship/SohImGuiImpl.cpp
View file

@ -378,13 +378,13 @@ namespace SohImGui {
ImGui::Text("Gameplay"); ImGui::Text("Gameplay");
ImGui::Separator(); ImGui::Separator();
if (ImGui::Checkbox("Skip Text", &Game::Settings.enhancements.skip_text)) { ImGui::Text("Text Speed", Game::Settings.enhancements.text_speed);
CVar_SetS32("gSkipText", Game::Settings.enhancements.skip_text); if (ImGui::SliderInt("##TEXTSPEED", &Game::Settings.enhancements.text_speed, 1, 5)) {
needs_save = true; needs_save = true;
} }
if (ImGui::Checkbox("Fast Text", &Game::Settings.enhancements.fast_text)) { if (ImGui::Checkbox("Skip Text", &Game::Settings.enhancements.skip_text)) {
CVar_SetS32("gFastText", Game::Settings.enhancements.fast_text); CVar_SetS32("gSkipText", Game::Settings.enhancements.skip_text);
needs_save = true; needs_save = true;
} }

16
soh/src/code/z_message_PAL.c
View file

@ -37,10 +37,6 @@ MessageTableEntry* sStaffMessageEntryTablePtr;
char* _message_0xFFFC_nes; char* _message_0xFFFC_nes;
const int fastText = 5;
const int slowText = 1;
bool textSpeed = 1;
//MessageTableEntry sNesMessageEntryTable[] = { //MessageTableEntry sNesMessageEntryTable[] = {
//#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \ //#define DEFINE_MESSAGE(textId, type, yPos, nesMessage, gerMessage, fraMessage) \
// { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes }, // { textId, (_SHIFTL(type, 4, 8) | _SHIFTL(yPos, 0, 8)), _message_##textId##_nes },
@ -957,11 +953,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
} }
} }
i = j - 1; i = j - 1;
if (CVar_GetS32("gFastText", 0) !=0) msgCtx->textDrawPos = i + CVar_GetS32("gTextSpeed", 1);
textSpeed = fastText;
else
textSpeed = slowText;
msgCtx->textDrawPos = i + textSpeed;
if (character) {} if (character) {}
} }
@ -1154,11 +1146,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
} }
} }
if (msgCtx->textDelayTimer == 0) { if (msgCtx->textDelayTimer == 0) {
if (CVar_GetS32("gFastText", 0) !=0) msgCtx->textDrawPos = i + CVar_GetS32("gTextSpeed", 1);
textSpeed = fastText;
else
textSpeed = slowText;
msgCtx->textDrawPos = i + textSpeed;
msgCtx->textDelayTimer = msgCtx->textDelay; msgCtx->textDelayTimer = msgCtx->textDelay;
} else { } else {
msgCtx->textDelayTimer--; msgCtx->textDelayTimer--;