From 433b7f33159b9ee86b2ea0192869ea0bdbeb2f05 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Sat, 24 Apr 2021 01:44:52 +0300 Subject: 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 --- include/aoapplication.h | 4 ---- include/aolayer.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'include') 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; -- cgit