Changeset 2174 for trunk/src/ddraw/OS2SURFACE.H

Timestamp:

Dec 21, 1999, 2:28:20 AM (26 years ago)

Author:

hugh

Message:

Added ODIn lic header with ID to all files where missing

Cleaned up Surface handling by movefing colorfill and
colorconversion into own files and use functionpointers
setup during creation.

updated makefile to add files

removed inhertiance from IBASE in DDrectangle class

File:

• trunk/src/ddraw/OS2SURFACE.H (modified) (3 diffs)

trunk/src/ddraw/OS2SURFACE.H

@@ +1 @@
+/* $Id: OS2SURFACE.H,v 1.13 1999-12-21 01:28:19 hugh Exp $ */
+
+/*
+ * Direct/X Surface class
+ *
+ * Copyright 1999 Markus Montkowski
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
+ */
+
 #ifndef __OS2SURFACE_H__
 #define __OS2SURFACE_H__
@@ -52 +63 @@
 
  private:
-        HRESULT         ColorFill(LPRECT, DWORD);
+        HRESULT         DoColorFill(LPRECT, DWORD);
         void (__cdecl *BltSolid)( char *pDBDst,
                                 char *pFBDst,
@@ -68 +79 @@
                                 DWORD dwPitchFBSrc
                                );
+        void (__cdecl *ColorConv)( char *pDB,
+                                   char *pFB,
+                                   DWORD dwTop,
+                                   DWORD dwLeft,
+                                   DWORD dwWidth,
+                                   DWORD dwHeight,
+                                   DWORD dwPitchDB,
+                                   DWORD dwPitchFB,
+                                   VOID  *pPalette
+                                   );
+        void (__cdecl *ColorFill)( char *pDBDst,
+                                   char *pFBDst,
+                                   DWORD dwDstTop,
+                                   DWORD dwDstLeft,
+                                   DWORD dwWidth,
+                                   DWORD dwHeight,
+                                   DWORD dwPitchDBDst,
+                                   DWORD dwPitchFBDst,
+                                   DWORD dwColor,
+                                   VOID  *pPalette
+                                 );
  protected:
         HRESULT                lastError;