diff options
author | James Haley | 2011-02-07 01:50:40 +0000 |
---|---|---|
committer | James Haley | 2011-02-07 01:50:40 +0000 |
commit | 808f6fd842f581f31aa0d91617a759af46fdc732 (patch) | |
tree | 9d9130b5f4e099cbe6a5a08c3bbd19f87dae3108 /src/strife/r_main.c | |
parent | 17333436188f63319625b007489c7b70029bfaba (diff) | |
download | chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.tar.gz chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.tar.bz2 chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.zip |
Added graphical intro loading screen, and -nograph parameter which
disables it. Made most D_DoomMain messages dependent on -devparm.
wipegamestate should start == 1, which is currently GS_UNKNOWN. Changed
-wart behavior. Verified *no* changes in Strife to p_sight.c.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2251
Diffstat (limited to 'src/strife/r_main.c')
-rw-r--r-- | src/strife/r_main.c | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/strife/r_main.c b/src/strife/r_main.c index b9d9f300..0a8a639b 100644 --- a/src/strife/r_main.c +++ b/src/strife/r_main.c @@ -36,6 +36,7 @@ #include "doomdef.h" #include "doomstat.h" // villsa [STRIFE] +#include "d_main.h" #include "d_net.h" #include "m_bbox.h" @@ -782,22 +783,41 @@ void R_ExecuteSetViewSize (void) void R_Init (void) { R_InitData (); - printf ("."); + if(devparm) + printf ("."); + else + D_IntroTick(); // [STRIFE] tick intro + R_InitPointToAngle (); - printf ("."); + if(devparm) + printf ("."); + R_InitTables (); // viewwidth / viewheight / detailLevel are set by the defaults - printf ("."); + if(devparm) + printf ("."); R_SetViewSize (screenblocks, detailLevel); R_InitPlanes (); - printf ("."); + if(devparm) + printf ("."); + R_InitLightTables (); - printf ("."); + if(devparm) + printf ("."); + else + D_IntroTick(); + R_InitSkyMap (); + if(!devparm) + D_IntroTick(); + R_InitTranslationTables (); - printf ("."); - + if(devparm) + printf ("."); + else + D_IntroTick(); + framecount = 0; } |