foxygit / doom Log in
commit acf1f779d12fa2e7ac87a77f063cc8b084d5b7ee
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Wed Sep 24 20:15:25 2008 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Wed Sep 24 20:15:25 2008 +0000

    Add I_EnableLoadingDisk function to enable Doom's "loading disk" - it is
    not present in Heretic.

    Subversion-branch: /branches/raven-branch
    Subversion-revision: 1279
---
 src/doom/d_main.c | 3 ++-
 src/i_video.c     | 6 +-----
 src/i_video.h     | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/doom/d_main.c b/src/doom/d_main.c
index 3188ece3..408d968a 100644
--- a/src/doom/d_main.c
+++ b/src/doom/d_main.c
@@ -412,7 +412,8 @@ void D_DoomLoop (void)

     TryRunTics();

-    I_InitGraphics ();
+    I_InitGraphics();
+    I_EnableLoadingDisk();
     I_SetGrabMouseCallback(D_GrabMouseCallback);
     I_SetWindowTitle(gamedescription);

diff --git a/src/i_video.c b/src/i_video.c
index 30938eb9..bcfbf270 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -273,7 +273,7 @@ static void UpdateFocus(void)
     screenvisible = (state & SDL_APPACTIVE) != 0;
 }

-static void LoadDiskImage(void)
+void I_EnableLoadingDisk(void)
 {
     patch_t *disk;
     char *disk_name;
@@ -1619,10 +1619,6 @@ void I_InitGraphics(void)

     V_RestoreBuffer();

-    // "Loading from disk" icon
-
-    LoadDiskImage();
-
     // Clear the screen to black.

     memset(I_VideoBuffer, 0, SCREENWIDTH * SCREENHEIGHT);
diff --git a/src/i_video.h b/src/i_video.h
index 07c2842b..5af31e92 100644
--- a/src/i_video.h
+++ b/src/i_video.h
@@ -112,6 +112,10 @@ void I_StartFrame (void);

 void I_StartTic (void);

+// Enable the loading disk image displayed when reading from disk.
+
+void I_EnableLoadingDisk(void);
+
 extern char *video_driver;
 extern boolean screenvisible;
 extern float mouse_acceleration;