diff options
| author | James Haley | 2010-08-28 05:35:52 +0000 |
|---|---|---|
| committer | James Haley | 2010-08-28 05:35:52 +0000 |
| commit | cbfc9c134032630b71ec2acf4abe552a7569640f (patch) | |
| tree | 19901c7157213d392931624833b04ac8bfd1b303 /src/strife/d_main.c | |
| parent | 8f24f63be140a34c9ac19463832bed0e7fabba67 (diff) | |
| download | chocolate-doom-cbfc9c134032630b71ec2acf4abe552a7569640f.tar.gz chocolate-doom-cbfc9c134032630b71ec2acf4abe552a7569640f.tar.bz2 chocolate-doom-cbfc9c134032630b71ec2acf4abe552a7569640f.zip | |
Added crossfade wipe and code to load XLATAB lump. Changes to the menu
system including working Sigil cursor, alignment changes, shortcut
character changes, and removal of items from the options menu that
Strife put elsewhere. Initial sweep for global lump name changes
completed: AMMNUM%d -> PLMNUM%d, M_DOOM -> M_STRIFE, M_OPTTTL ->
M_OPTION, STTMINUS -> STCFN045, et al. A dummy modified Strife IWAD must
be loaded over DOOM.WAD at this point in order to run.
Subversion-branch: /branches/strife-branch
Subversion-revision: 1968
Diffstat (limited to 'src/strife/d_main.c')
| -rw-r--r-- | src/strife/d_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c index 60021344..c888438a 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -343,8 +343,9 @@ void D_Display (void) I_Sleep(1); } while (tics < 3); // haleyjd 08/23/2010: [STRIFE] Changed from == 0 to < 3 + // haleyjd 08/26/10: [STRIFE] Changed to use ColorXForm wipe. wipestart = nowtime; - done = wipe_ScreenWipe(wipe_Melt + done = wipe_ScreenWipe(wipe_ColorXForm , 0, 0, SCREENWIDTH, SCREENHEIGHT, tics); I_UpdateNoBlit (); M_Drawer (); // menu is drawn even on top of wipes @@ -1099,8 +1100,8 @@ static void D_Endoom(void) return; } - // STRIFE-TODO: ENDOOM -> ENDSTRF - endoom = W_CacheLumpName(DEH_String("ENDOOM"), PU_STATIC); + // haleyjd 08/27/10: [STRIFE] ENDOOM -> ENDSTRF + endoom = W_CacheLumpName(DEH_String("ENDSTRF"), PU_STATIC); I_Endoom(endoom); } @@ -1567,7 +1568,7 @@ void D_DoomMain (void) SetSaveGameDir(iwadfile); // Check for -file in shareware - if (modifiedgame) + if (0 /*modifiedgame*/) // TEST { // These are the lumps that will be checked in IWAD, // if any one is not present, execution will be aborted. |