aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2021-04-24 01:44:52 +0300
committerCrystalwarrior <varsash@gmail.com>2021-04-24 01:44:52 +0300
commit433b7f33159b9ee86b2ea0192869ea0bdbeb2f05 (patch)
tree86ffa9f0fafc51f5f7b20a749ec50211bc727025 /include
parent0a1a47c920a10fe5960f990c48102d8bde08a6fe (diff)
Deprecate tick_ms and use actual milliseconds rather than arbitrary 60ms ticks for char.ini [Time]
Fix an extremely weird case where CharLayer::Play() was not called even on the CharLayer class (I don't understand why inheritance was straight up just ignored) Fix using preanims with static images just breaking everything Deprecate weird insanity [Time] with the % sign BS (What was this for again? Literally no one used this nor was aware of it) Fix text_stay_time timer firing even if we're immediate Just in case, stop the text delay timer when start_chat_ticking is called
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h4
-rw-r--r--include/aolayer.h4
2 files changed, 0 insertions, 8 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 493f1c9..b0f7e08 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -378,10 +378,6 @@ public:
// Returns the preanim duration of p_char's p_emote
int get_preanim_duration(QString p_char, QString p_emote);
- // Same as above, but only returns if it has a % in front(refer to Preanims
- // section in the manual)
- int get_ao2_preanim_duration(QString p_char, QString p_emote);
-
// Not in use
int get_text_delay(QString p_char, QString p_emote);
diff --git a/include/aolayer.h b/include/aolayer.h
index f42642c..f3ecebf 100644
--- a/include/aolayer.h
+++ b/include/aolayer.h
@@ -104,10 +104,6 @@ protected:
QElapsedTimer actual_time;
- // Usually used to turn seconds into milliseconds such as for [Time] tag in
- // char.ini (which is no longer used)
- const int tick_ms = 60;
-
// These are the X and Y values before they are fixed based on the sprite's
// width.
int x = 0;