summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-12-09 20:21:44 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:37 +0200
commita2d3afb314a3b27a55f68e05f0d2c7d5dff015be (patch)
tree2597aeb6b453a212526326ba2af6dec073371642 /src/main.c
parentc69d42233364999afe5257e3ea536d6b3cd035c6 (diff)
Better error checking in winapi.c. (Tim Beckmann)
Keep track of profile timestamps. (Tim Beckmann) Implemented a few other missing bits.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 4e0572f..f366a2f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
#include "pldnet.h"
#include "cdtrackselection.h"
#include "gammacontrol.h"
+#include "version.h"
char LevelName[] = {"predbit6\0QuiteALongNameActually"}; /* the real way to load levels */
@@ -963,6 +964,9 @@ int ExitWindowsSystem()
int main(int argc, char *argv[])
{
+/*
+ printf("%s", AvPVersionString);
+*/
if (InitSDL() == -1) {
fprintf(stderr, "Could not find a sutable resolution!\n");
fprintf(stderr, "At least 512x384 is needed. Does OpenGL work?\n");
@@ -1048,9 +1052,9 @@ int main(int argc, char *argv[])
#endif
#if !(ALIEN_DEMO|PREDATOR_DEMO|MARINE_DEMO)
-while(AvP_MainMenus())
+while (AvP_MainMenus())
#else
- SetBriefingTextToBlank();
+if (AvP_MainMenus())
#endif
{
int menusActive = 0;
@@ -1209,8 +1213,11 @@ while(AvP_MainMenus())
}
ClearMemoryPool();
-
- SetSoftVideoMode(640, 480, 16);
+
+/* go back to menu mode */
+#if !(ALIEN_DEMO|PREDATOR_DEMO|MARINE_DEMO)
+ SetSoftVideoMode(640, 480, 16);
+#endif
}
SoundSys_StopAll();