From e6ab6a2d9a668c90bedfb593c99946ae9aac8af0 Mon Sep 17 00:00:00 2001
From: johns <>
Date: Sun, 23 Apr 2000 21:40:02 +0000
Subject: [PATCH] struct Palette > typedef Palette
---
src/video/svgalib.cpp | 4 ++--
src/video/video.cpp | 11 ++++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/video/svgalib.cpp b/src/video/svgalib.cpp
index e098d6431..fe9b55b34 100644
--- a/src/video/svgalib.cpp
+++ b/src/video/svgalib.cpp
@@ -68,7 +68,7 @@ global VMemType8 Pixels8[256];
global VMemType16 Pixels16[256];
global VMemType32 Pixels32[256];
-global struct Palette GlobalPalette[256];
+global Palette GlobalPalette[256];
local int old_button;
local int mouse_x;
@@ -953,7 +953,7 @@ global void WaitEventsAndKeepSync(void)
/**
** Create palette.
*/
-global void VideoCreatePalette(const struct Palette* palette)
+global void VideoCreatePalette(const Palette* palette)
{
int i;
diff --git a/src/video/video.cpp b/src/video/video.cpp
index 902a6a422..fe8860396 100644
--- a/src/video/video.cpp
+++ b/src/video/video.cpp
@@ -30,6 +30,7 @@ global unsigned AllocatedGraphicMemory;
global unsigned CompressedGraphicMemory;
#endif
+#ifndef NEW_VIDEO // { should be removed with new video code final
/*----------------------------------------------------------------------------
-- Clipping
@@ -1622,13 +1623,15 @@ global void LoadRGB(Palette *pal, const char *name)
/**
** Create palette.
*/
-global void VideoCreatePalette(const struct Palette* palette)
+global void VideoCreatePalette(const Palette* palette)
{
- GraphicData * temp = VideoCreateNewPalette(palette);
+ GraphicData * temp;
+
+ temp = VideoCreateNewPalette(palette);
// -> Video
switch( VideoDepth ) {
case 8:
- Pixels8 = (VMemType8 *)temp;
+ Pixels8 =(VMemType8 *)temp;
break;
case 15:
case 16:
@@ -1646,4 +1649,6 @@ global void VideoCreatePalette(const struct Palette* palette)
SetPlayersPalette();
}
+#endif // } !NEW_VIDEO
+
//@}