From decfca70c31105d5d26b61d27f05cab2b579d63d Mon Sep 17 00:00:00 2001
From: korenkonder <admin@mysterious-home.net>
Date: Tue, 4 Mar 2025 14:28:46 +0300
Subject: [PATCH] ...

---
 src/ReDIVA/dw.hpp        | 24 ------------------------
 src/ReDIVA/x_pv_game.cpp |  6 ++++--
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/src/ReDIVA/dw.hpp b/src/ReDIVA/dw.hpp
index d7f313f8..4dde3632 100644
--- a/src/ReDIVA/dw.hpp
+++ b/src/ReDIVA/dw.hpp
@@ -703,30 +703,6 @@ namespace dw {
         bool round;
         bool field_A5;
         bool field_A6;
-        __int64 field_A8;
-        __int64 field_B0;
-        __int64 field_B8;
-        __int64 field_C0;
-        __int64 field_C8;
-        __int64 field_D0;
-        __int64 field_D8;
-        __int64 field_E0;
-        __int64 field_E8;
-        __int64 field_F0;
-        __int64 field_F8;
-        __int64 field_100;
-        __int64 field_108;
-        __int64 field_110;
-        __int64 field_118;
-        __int64 field_120;
-        __int64 field_128;
-        __int64 field_130;
-        __int64 field_138;
-        __int64 field_140;
-        __int64 field_148;
-        __int64 field_150;
-        __int64 field_158;
-        __int64 field_160;
 
         ScrollBar(Control* parent, Flags flags);
         virtual ~ScrollBar() override;
diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp
index 00a13e1f..d3697f6f 100644
--- a/src/ReDIVA/x_pv_game.cpp
+++ b/src/ReDIVA/x_pv_game.cpp
@@ -1433,7 +1433,8 @@ void x_pv_game_effect::set_song_effect_time_inner(int32_t index, int64_t time, b
             next_change_field_time = *key;
 
         if (next_change_field_time >= 0)
-            max_frame = (float_t)((double_t)std::abs(*key - song_effect.time) * 0.000000001) * 60.0f - 1.0f;
+            max_frame = (float_t)((double_t)std::abs(next_change_field_time
+                - song_effect.time) * 0.000000001) * 60.0f - 1.0f;
     }
 
     for (x_pv_game_song_effect_auth_3d& i : song_effect.auth_3d) {
@@ -1887,7 +1888,8 @@ void x_pv_game_chara_effect::set_chara_effect(int32_t chara_id, int32_t index, i
             next_change_field_time = *key;
 
         if (next_change_field_time >= 0)
-            max_frame = (float_t)((double_t)std::abs(*key - auth_3d[index].time) * 0.000000001) * 60.0f - 1.0f;
+            max_frame = (float_t)((double_t)std::abs(next_change_field_time
+                - auth_3d[index].time) * 0.000000001) * 60.0f - 1.0f;
     }
 
     id.set_max_frame(max_frame);