diff options
| author | James Haley | 2011-02-12 05:00:43 +0000 |
|---|---|---|
| committer | James Haley | 2011-02-12 05:00:43 +0000 |
| commit | a7a435cb7d5756ebff87d5f965b27fcc28fd96f6 (patch) | |
| tree | 76009d5e2107e10042116e7e397d84827f7e62d2 /src/strife/d_main.c | |
| parent | a24944d4e45da4bf0ba808a40c9e0eca15fb8b41 (diff) | |
| download | chocolate-doom-a7a435cb7d5756ebff87d5f965b27fcc28fd96f6.tar.gz chocolate-doom-a7a435cb7d5756ebff87d5f965b27fcc28fd96f6.tar.bz2 chocolate-doom-a7a435cb7d5756ebff87d5f965b27fcc28fd96f6.zip | |
Savegame code complete, hubs functional. Chocolate Strife is playable!
Subversion-branch: /branches/strife-branch
Subversion-revision: 2255
Diffstat (limited to 'src/strife/d_main.c')
| -rw-r--r-- | src/strife/d_main.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c index dd2a55df..4260ca7d 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -682,7 +682,7 @@ void D_DoAdvanceDemo (void) wipegamestate = -1; break; case 8: // demo - //ClearTmp(); STRIFE-TODO + ClearTmp(); pagetic = 9*TICRATE; G_DeferedPlayDemo(DEH_String("demo1")); break; @@ -1284,23 +1284,20 @@ static void D_InitIntroSequence(void) // Draw the background D_IntroBackground(); } + /* + // STRIFE-FIXME: This was actually displayed on a special textmode + // screen with ANSI color codes... else { puts(DEH_String("Conversation ON")); - puts("\n"); puts(DEH_String("Rogue Entertainment")); - puts("\n"); puts(DEH_String("and")); - puts("\n"); puts(DEH_String("Velocity Games")); - puts("\n"); puts(DEH_String("present")); - puts("\n"); puts(DEH_String("S T R I F E")); - puts("\n"); puts(DEH_String("Loading...")); - puts("\n"); } + */ } // @@ -1987,8 +1984,8 @@ void D_DoomMain (void) if (startloadgame >= 0) { - strcpy(file, P_SaveGameFile(startloadgame)); - G_LoadGame (file); + // [STRIFE]: different, for hubs + M_LoadSelect(startloadgame); } D_IntroTick(); // [STRIFE] |