From e4ccb4cd9767a3f4d9f7d2b58ee512293560d0b9 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Sun, 21 May 2000 21:30:26 +0000
Subject: [PATCH] Removed VMemType here.
---
src/include/video.h | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/include/video.h b/src/include/video.h
index b15dccfe3..06f6e99eb 100644
--- a/src/include/video.h
+++ b/src/include/video.h
@@ -30,10 +30,6 @@
-- Declarations
----------------------------------------------------------------------------*/
-typedef unsigned long VMemType32; /// 32 bpp modes pointer
-typedef unsigned short VMemType16; /// 16 bpp modes pointer
-typedef unsigned char VMemType8; /// 8 bpp modes pointer
-
/// MACRO defines speed of colorcycling
#define COLOR_CYCLE_SPEED (FRAMES_PER_SECOND/4)
@@ -112,7 +108,6 @@ extern void DrawRleSpriteClippedX(RleSprite* sprite,unsigned frame,int x,int y);
extern void FreeRleSprite(RleSprite *sprite);
//@}
-#endif // } !NEW_VIDEO
/** Set clipping for nearly all vector primitives. Functions which support
clipping will be marked CLIPPED. Set system-wide clipping rectangle.
@@ -123,6 +118,8 @@ extern void FreeRleSprite(RleSprite *sprite);
*/
extern void SetClipping(int left,int top,int right,int bottom);
+#endif // } !NEW_VIDEO
+
/** Architecture-dependant videomemory. Set by InitVideoXXX.
@see InitVideo
@see InitVideoX11
@@ -145,9 +142,11 @@ extern int VideoDepth;
/// 32 bpp modes video memory address
#define VideoMemory32 ((VMemType32*)VideoMemory)
+ /// 24 bpp modes video memory address
+#define VideoMemory24 ((VMemType24*)VideoMemory)
/// 16 bpp modes video memory address
#define VideoMemory16 ((VMemType16*)VideoMemory)
- ///8 bpp modes video memory address
+ /// 8 bpp modes video memory address
#define VideoMemory8 ((VMemType8*)VideoMemory)
/** Architecture-dependant system palette. Applies as conversion between
@@ -157,6 +156,7 @@ extern int VideoDepth;
*/
extern VMemType8 * Pixels8; /// 8 bpp
extern VMemType16 * Pixels16; /// 16 bpp
+extern VMemType24 * Pixels24; /// 24 bpp
extern VMemType32 * Pixels32; /// 32 bpp
/** Set videomode. Tries to set choosen videomode. Only 640x480, 800x600
@@ -245,11 +245,6 @@ extern volatile int VideoInterrupts;
*/
extern int VideoSyncSpeed;
-/**
-** Wanted videomode, fullscreen or windowed.
-*/
-extern int VideoFullScreen;
-
//@}
#endif // !__VIDEO_H__