Merge branch 'master' into global-anims

[rocksndiamonds.git] / src / libgame / misc.h

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index f73182d4ae53e26f3948b06206abc72af62a3982..36e1dfc4e1dcf4cb40cfa6cfce3b6dd1247d243b 100644 (file)
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -131,9 +131,14 @@ boolean getTokenValueFromString(char *, char **, char **);
 void InitCounter(void);
 unsigned int Counter(void);
 void Delay(unsigned int);
+boolean DelayReachedExt(unsigned int *, unsigned int, unsigned int);
 boolean FrameReached(unsigned int *, unsigned int);
 boolean DelayReached(unsigned int *, unsigned int);
-void WaitUntilDelayReached(unsigned int *, unsigned int);
+void ResetDelayCounterExt(unsigned int *, unsigned int);
+void ResetFrameCounter(unsigned int *);
+void ResetDelayCounter(unsigned int *);
+int WaitUntilDelayReached(unsigned int *, unsigned int);
+void SkipUntilDelayReached(unsigned int *, unsigned int, int *, int);
 
 unsigned int init_random_number(int, int);
 unsigned int get_random_number(int, int);
@@ -146,6 +151,7 @@ time_t getFileTimestampEpochSeconds(char *);
 char *getBasePath(char *);
 char *getBaseName(char *);
 char *getBaseNamePtr(char *);
+char *getBaseNameNoSuffix(char *);
 
 char *getStringCat2WithSeparator(char *, char *, char *);
 char *getStringCat3WithSeparator(char *, char *, char *, char *);
@@ -167,7 +173,7 @@ boolean strSuffix(char *, char *);
 boolean strPrefixLower(char *, char *);
 boolean strSuffixLower(char *, char *);
 
-void GetOptions(char **,
+void GetOptions(int, char **,
                void (*print_usage_function)(void),
                void (*print_version_function)(void));