Permalink
Browse files

Remove splash screens.

git-svn-id: svn+ssh://jay/var/svn/wolf/trunk@6 32837ae5-38f0-4cfd-8401-3ff76d8497c4
  • Loading branch information...
1 parent b6a7195 commit 8f4fc1247ef652721b6fa076b35ca07340988aaf paul committed Jul 29, 2007
Showing with 2 additions and 73 deletions.
  1. +0 −4 id_us.c
  2. +0 −1 id_us.h
  3. +2 −5 wl_draw.c
  4. +0 −63 wl_main.c
View
@@ -9,7 +9,6 @@ typedef struct {
} Rect;
// Global variables
-boolean NoWait;
word PrintX,PrintY;
word WindowX,WindowY,WindowW,WindowH;
@@ -41,9 +40,6 @@ void US_Startup()
US_InitRndT(true);
- if (MS_CheckParm("nowait"))
- NoWait = true;
-
US_Started = true;
}
View
@@ -11,7 +11,6 @@ typedef struct {
#define MaxString 128 // Maximum input string size
-extern boolean NoWait;
extern word PrintX,PrintY; // Current printing location in the window
extern word WindowX,WindowY,// Current location of window
WindowW,WindowH;// Current size of window
View
@@ -403,11 +403,8 @@ static void DrawPlayerWeapon()
}
#endif
- if (gamestate.weapon != -1)
- {
- shapenum = weaponscale[gamestate.weapon]+gamestate.weaponframe;
- SimpleScaleShape(viewwidth/2,shapenum,viewheight+1);
- }
+ shapenum = weaponscale[gamestate.weapon]+gamestate.weaponframe;
+ SimpleScaleShape(viewwidth/2,shapenum,viewheight+1);
if (demorecord || demoplayback)
SimpleScaleShape(viewwidth/2,SPR_DEMO,viewheight+1);
View
@@ -1247,9 +1247,6 @@ void DemoLoop()
StartCPMusic(INTROSONG);
- if (!NoWait)
- PG13();
-
i = MS_CheckParm("playdemo");
if (i && ((i+1) < _argc)) {
i++;
@@ -1274,66 +1271,6 @@ void DemoLoop()
while (1)
{
- while (!NoWait)
- {
-//
-// title page
-//
- MM_SortMem ();
-#ifdef SPEAR
- CA_CacheGrChunk (TITLEPALETTE);
-
- CA_CacheGrChunk (TITLE1PIC);
- VWB_DrawPic (0,0,TITLE1PIC);
- CA_UnCacheGrChunk (TITLE1PIC);
-
- CA_CacheGrChunk (TITLE2PIC);
- VWB_DrawPic (0,80,TITLE2PIC);
- CA_UnCacheGrChunk(TITLE2PIC);
- VW_UpdateScreen();
- VL_FadeIn(0,255,grsegs[TITLEPALETTE],30);
-
- CA_UnCacheGrChunk (TITLEPALETTE);
-#else
- VL_CacheScreen(TITLEPIC);
- VW_UpdateScreen ();
- VW_FadeIn();
-#endif
- if (IN_UserInput(TickBase*15))
- break;
- VW_FadeOut();
-//
-// credits page
-//
- VL_CacheScreen(CREDITSPIC);
- VW_UpdateScreen();
- VW_FadeIn ();
- if (IN_UserInput(TickBase*10))
- break;
- VW_FadeOut ();
-//
-// high scores
-//
- DrawHighScores();
- VW_UpdateScreen();
- VW_FadeIn();
-
- if (IN_UserInput(TickBase*10))
- break;
-//
-// demo
-//
- #ifndef SPEARDEMO
- PlayDemo(LastDemo++%4);
- #else
- PlayDemo(0);
- #endif
-
- if (playstate == ex_abort)
- break;
- StartCPMusic(INTROSONG);
- }
-
VW_FadeOut();
if (IN_KeyDown(sc_Tab) && MS_CheckParm("debugmode"))

0 comments on commit 8f4fc12

Please sign in to comment.