Changeset 868

Timestamp:

02/21/10 04:15:24 (5 months ago)

Author:

zoogie

Message:

Refactored intro movie bits from GameApp into IntroMovie.

Location:

trunk/client

Files:

• client.vcproj (modified) (3 diffs)
• Game2/GameApp.cpp (modified) (10 diffs)
• Game2/GameApp.h (modified) (3 diffs)
• Game2/IntroMovie.cpp (added)
• Game2/IntroMovie.h (added)

trunk/client/client.vcproj

@@ -69 +69 @@
                 Name="VCLinkerTool"
                 AdditionalOptions="/MACHINE:I386"
-                AdditionalDependencies="Vfw32.lib wsock32.lib winmm.lib version.lib comctl32.lib libcurld.lib LiteUnzip.lib intl.lib lua5.1D.lib OIS_d.lib"
+                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurld.lib LiteUnzip.lib intl.lib lua5.1D.lib OIS_d.lib"
                 OutputFile="..\Debug\HoverRace.exe"
                 LinkIncremental="1"
@@ -152 +152 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="vfw32.lib wsock32.lib winmm.lib version.lib comctl32.lib libcurl.lib LiteUnzip.lib intl.lib lua5.1.lib OIS.lib"
+                AdditionalDependencies="wsock32.lib winmm.lib version.lib comctl32.lib libcurl.lib LiteUnzip.lib intl.lib lua5.1.lib OIS.lib"
                 OutputFile=".\..\Release\HoverRace.exe"
                 LinkIncremental="1"
@@ -317 +317 @@
             </File>
             <File
+                RelativePath=".\Game2\IntroMovie.cpp"
+                >
+            </File>
+            <File
+                RelativePath=".\Game2\IntroMovie.h"
+                >
+            </File>
+            <File
                 RelativePath=".\Game2\main.cpp"
                 >

trunk/client/Game2/GameApp.cpp

@@ -34 +34 @@
 #include "HighConsole.h"
 #include "HighObserver.h"
+#include "IntroMovie.h"
 #include "TrackSelect.h"
 #include "TrackDownloadDialog.h"
@@ -49 +50 @@
 #include "CheckUpdateServerDialog.h"
 
-#include <vfw.h>
+#include <mmsystem.h>
 
 using namespace HoverRace::Client;
@@ -563 +564 @@
 }
 
-MR_GameApp::MR_GameApp(HINSTANCE pInstance, bool safeMode)
+MR_GameApp::MR_GameApp(HINSTANCE pInstance, bool safeMode) :
+    introMovie(NULL)
 {
     This = this;
@@ -569 +571 @@
     mMainWindow = NULL;
     mBadVideoModeDlg = NULL;
-    mMovieWnd = NULL;
     mAccelerators = NULL;
     mVideoBuffer = NULL;
@@ -1181 +1182 @@
     // play the opening movie
     if(lReturnValue && cfg->misc.introMovie) {
-        mMovieWnd = MCIWndCreate(
-            mMainWindow, mInstance, 
-            WS_CHILD | MCIWNDF_NOMENU | MCIWNDF_NOPLAYBAR, 
-            cfg->GetMediaPath("Intro.avi").c_str());
-
-        // Fill the client area.
-        RECT clientRect;
-        GetClientRect(mMainWindow, &clientRect);
-        MoveWindow(mMovieWnd, 0, 0,
-            clientRect.right - clientRect.left,
-            clientRect.bottom - clientRect.top,
-            TRUE);
-        
-        MCIWndPlay(mMovieWnd);
-
+        introMovie = new IntroMovie(mMainWindow, mInstance);
+        introMovie->Play();
     }
 
@@ -1434 +1422 @@
             POINT lUpperLeft = { lClientRect.left, lClientRect.top };
             POINT lLowerRight = { lClientRect.right, lClientRect.bottom };
-            RECT lMovieRect;
             RECT lBadModeRect;
 
@@ -1452 +1439 @@
             }
 
-            if(GetWindowRect(mMovieWnd, &lMovieRect)) {
-                SetWindowPos(mMovieWnd, HWND_TOP,
-                    0, 0,
-                    lClientRect.right - lClientRect.left,
-                    lClientRect.bottom - lClientRect.top,
-                    SWP_SHOWWINDOW);
-            }
+            if (introMovie != NULL)
+                introMovie->ResetSize();
         }
     }
@@ -1500 +1482 @@
     if(mPaletteChangeAllowed) {
         if(This->mGameThread == NULL) {
-            if(mMovieWnd != NULL)
-                MCIWndRealize(mMovieWnd, FALSE);
+            if (introMovie != NULL)
+                introMovie->ResetPalette();
         }
         else {
@@ -1512 +1494 @@
 void MR_GameApp::DeleteMovieWnd()
 {
-    if(mMovieWnd != NULL) {
-
-        MCIWndClose(mMovieWnd);
-        Sleep(1000);
-        MCIWndDestroy(mMovieWnd);
-        mMovieWnd = NULL;
+    if (introMovie != NULL) {
+        delete introMovie;
+        introMovie = NULL;
     }
 }
@@ -2002 +1981 @@
 
         case WM_PALETTECHANGED:
-            if(This->mMovieWnd != NULL) {
-                MCIWndRealize(This->mMovieWnd, TRUE);
-            }
+            if (This->introMovie != NULL)
+                This->introMovie->ResetPalette(true);
             break;
 

trunk/client/Game2/GameApp.h

@@ -33 +33 @@
     namespace Client {
         class FullscreenTest;
+        class IntroMovie;
     }
 }
@@ -69 +70 @@
         HWND mMainWindow;
         HWND mBadVideoModeDlg;
-        HWND mMovieWnd;
         HACCEL mAccelerators;
         MR_VideoBuffer *mVideoBuffer;
@@ -78 +78 @@
         HighObserver *highObserver;
         HoverRace::HighConsole *highConsole;
+        HoverRace::Client::IntroMovie *introMovie;
         HoverRace::Client::FullscreenTest *fullscreenTest;
         MR_ClientSession *mCurrentSession;