diff options
Diffstat (limited to 'source/frontend/StarCinematic.cpp')
| -rw-r--r-- | source/frontend/StarCinematic.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/frontend/StarCinematic.cpp b/source/frontend/StarCinematic.cpp index 40fc8d1..ade940d 100644 --- a/source/frontend/StarCinematic.cpp +++ b/source/frontend/StarCinematic.cpp @@ -12,7 +12,6 @@ const float vWidth = 960.0f; const float vHeight = 540.0f; Cinematic::Cinematic() { - m_completionTime = 0; m_completable = false; m_suppressInput = false; } @@ -197,7 +196,7 @@ void Cinematic::render() { drawable.scale(values.zoom); drawable.translate(values.position); drawable.color *= alphaColor; - drawDrawable(move(drawable), drawableScale, drawableTranslation); + drawDrawable(std::move(drawable), drawableScale, drawableTranslation); } if (!panel->avatar.empty() && m_player) { for (auto drawable : m_player->portrait(PortraitModeNames.getLeft(panel->avatar))) { @@ -205,7 +204,7 @@ void Cinematic::render() { drawable.scale(values.zoom); drawable.translate(values.position); drawable.color *= alphaColor; - drawDrawable(move(drawable), drawableScale, drawableTranslation); + drawDrawable(std::move(drawable), drawableScale, drawableTranslation); } } if (!panel->text.empty()) { @@ -274,7 +273,7 @@ void Cinematic::drawDrawable(Drawable const& drawable, float drawableScale, Vec2 Vec4B drawableColor = drawable.color.toRgba(); - primitives.emplace_back(std::in_place_type_t<RenderQuad>(), move(texture), + primitives.emplace_back(std::in_place_type_t<RenderQuad>(), std::move(texture), lowerLeft, Vec2F{0, 0}, lowerRight, Vec2F{size[0], 0}, upperRight, Vec2F{size[0], size[1]}, @@ -342,7 +341,7 @@ float Cinematic::currentTimecode() const { Cinematic::PanelValues Cinematic::determinePanelValues(PanelPtr panel, float timecode) { if (panel->endTime != 0) { if (timecode > panel->endTime) { - Cinematic::PanelValues result; + Cinematic::PanelValues result{}; result.alpha = 0; return result; } @@ -350,7 +349,7 @@ Cinematic::PanelValues Cinematic::determinePanelValues(PanelPtr panel, float tim if (panel->startTime != 0) { if (timecode < panel->startTime) { - Cinematic::PanelValues result; + Cinematic::PanelValues result{}; result.alpha = 0; return result; } else { |