summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2008-10-05 21:43:28 -0700
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:37 +0200
commite69698d11edfe564cf4940714482856bd2088fd4 (patch)
tree0241d4e57c1b8cbe3ba73663acf415c2315a163f /src/main.c
parent55ddb88c8ecbf0e08fe429a0c3b48c4769217233 (diff)
Added the missing support for static on the televisions.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/main.c b/src/main.c
index 5081210..eff537f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,6 +43,7 @@
#include "progress_bar.h"
#include "scrshot.hpp"
#include "version.h"
+#include "fmv.h"
char LevelName[] = {"predbit6\0QuiteALongNameActually"}; /* the real way to load levels */
@@ -77,6 +78,13 @@ static const char * opengl_library = NULL;
/* ** */
+static void IngameKeyboardInput_ClearBuffer(void)
+{
+ // clear the keyboard state
+ memset((void*) KeyboardInput, 0, MAX_NUMBER_OF_INPUT_KEYS);
+ GotAnyKey = 0;
+}
+
void DirectReadKeyboard()
{
}
@@ -494,8 +502,7 @@ int SetSoftVideoMode(int Width, int Height, int Depth)
}
// reset input
- memset((void*) KeyboardInput, 0, MAX_NUMBER_OF_INPUT_KEYS);
- GotAnyKey = 0;
+ IngameKeyboardInput_ClearBuffer();
// force restart the video system
SDL_QuitSubSystem(SDL_INIT_VIDEO);
@@ -560,8 +567,7 @@ int SetOGLVideoMode(int Width, int Height)
}
// reset input
- memset((void*) KeyboardInput, 0, MAX_NUMBER_OF_INPUT_KEYS);
- GotAnyKey = 0;
+ IngameKeyboardInput_ClearBuffer();
// force restart the video system
SDL_QuitSubSystem(SDL_INIT_VIDEO);
@@ -1279,7 +1285,7 @@ if (AvP_MainMenus())
AvP.MainLoopRunning = 1;
-/* ScanImagesForFMVs(); NOT YET */
+ ScanImagesForFMVs();
ResetFrameCounter();
@@ -1296,7 +1302,7 @@ if (AvP_MainMenus())
TeleportNetPlayerToAStartingPosition(Player->ObStrategyBlock,1);
}
-/* IngameKeyboardInput_ClearBuffer(); NOT YET */
+ IngameKeyboardInput_ClearBuffer();
while(AvP.MainLoopRunning) {
CheckForWindowsMessages();
@@ -1322,8 +1328,6 @@ if (AvP_MainMenus())
} else {
ReadUserInput();
- /* UpdateAllFMVTextures(); NOT YET */
-
SoundSys_Management();
FlushD3DZBuffer();
@@ -1376,10 +1380,7 @@ if (AvP_MainMenus())
FixCheatModesInUserProfile(UserProfilePtr);
-/* NOT YET
- CloseFMV();
ReleaseAllFMVTextures();
-*/
CONSBIND_WriteKeyBindingsToConfigFile();