mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-01-30 23:10:14 -05:00
fix 4 warnings (#4922)
1. pragma in cpp 2. missing return 3. unnecessary function call 4. remove impossible null check
This commit is contained in:
parent
eab11d7f56
commit
936b159a67
@ -196,7 +196,6 @@ void TimeDisplayWindow::Draw() {
|
||||
uint16_t textureIndex = 0;
|
||||
|
||||
for (size_t i = 0; i < textLength; i++) {
|
||||
ImVec2 originalCursorPos = ImGui::GetCursorPos();
|
||||
if (textToDecode[i] == ':' || textToDecode[i] == '.') {
|
||||
textureIndex = 10;
|
||||
} else {
|
||||
|
@ -402,6 +402,7 @@ static bool EntranceHandler(std::shared_ptr<Ship::Console> Console, const std::v
|
||||
gPlayState->transitionTrigger = TRANS_TRIGGER_START;
|
||||
gPlayState->transitionType = TRANS_TYPE_INSTANT;
|
||||
gSaveContext.nextTransitionType = TRANS_TYPE_INSTANT;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static bool VoidHandler(std::shared_ptr<Ship::Console> Console, const std::vector<std::string>& args, std::string* output) {
|
||||
|
@ -180,10 +180,8 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
|
||||
Font* font = &msgCtx->font;
|
||||
sMessageHasSetSfx = 0;
|
||||
for (u32 i = 0; i < FONT_CHAR_TEX_SIZE * 120; i += FONT_CHAR_TEX_SIZE) {
|
||||
if (&font->charTexBuf[i] != nullptr) {
|
||||
gSPInvalidateTexCache(play->state.gfxCtx->polyOpa.p++, reinterpret_cast<uintptr_t>(&font->charTexBuf[i]));
|
||||
}
|
||||
}
|
||||
R_TEXT_CHAR_SCALE = 75;
|
||||
R_TEXT_LINE_SPACING = 12;
|
||||
R_TEXT_INIT_XPOS = 65;
|
||||
|
@ -1,5 +1,3 @@
|
||||
#pragma once
|
||||
|
||||
#include "performanceTimer.h"
|
||||
|
||||
void StartPerformanceTimer(TimerID timer){
|
||||
|
Loading…
Reference in New Issue
Block a user