From 374ed2a0f2a354f7c527f74d0c9e944517a3e256 Mon Sep 17 00:00:00 2001 From: gewlitys Date: Fri, 25 Apr 2003 19:26:49 +0000 Subject: [PATCH] moved declaration(s) of do_subtitle to comm.h git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@936 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/sc2code/comm.c | 1 - sc2/src/sc2code/comm.h | 2 ++ sc2/src/sc2code/libs/sound/trackplayer.c | 3 +-- sc2/src/sc2code/utils.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c index 91648551d..999de4c26 100644 --- a/sc2/src/sc2code/comm.c +++ b/sc2/src/sc2code/comm.c @@ -104,7 +104,6 @@ enum }; static int subtitle_state = DONE_SUBTITLE; static Mutex subtitle_mutex; -int do_subtitles (UNICODE *pStr); static volatile UNICODE *last_subtitle; static TFB_Image *subtitle_cache; diff --git a/sc2/src/sc2code/comm.h b/sc2/src/sc2code/comm.h index 1050d98d5..9b01aa48c 100644 --- a/sc2/src/sc2code/comm.h +++ b/sc2/src/sc2code/comm.h @@ -19,5 +19,7 @@ void init_communication (void); void uninit_communication (void); +int do_subtitles (UNICODE *pStr); + #endif /* _COMM_H */ diff --git a/sc2/src/sc2code/libs/sound/trackplayer.c b/sc2/src/sc2code/libs/sound/trackplayer.c index f7adb25d9..be24028be 100644 --- a/sc2/src/sc2code/libs/sound/trackplayer.c +++ b/sc2/src/sc2code/libs/sound/trackplayer.c @@ -18,8 +18,7 @@ #include #include "sound.h" #include "libs/sound/trackplayer.h" - -extern int do_subtitles (UNICODE *pStr); +#include "comm.h" static int tct; //total number of subtitle tracks static int tcur; //currently playing subtitle track diff --git a/sc2/src/sc2code/utils.c b/sc2/src/sc2code/utils.c index e116c614e..fdad6ee12 100644 --- a/sc2/src/sc2code/utils.c +++ b/sc2/src/sc2code/utils.c @@ -18,6 +18,7 @@ #include "starcon.h" #include "commglue.h" +#include "comm.h" #include "libs/sound/trackplayer.h" void @@ -144,7 +145,6 @@ PauseGame (void) CONTEXT OldContext; FRAME F; HOT_SPOT OldHot; - extern int do_subtitles (UNICODE *pStr); if (ActivityFrame == 0 || (GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_PAUSE))