Permalink
Browse files

Remove palette remnants.

git-svn-id: svn+ssh://jay/var/svn/wolf/trunk@127 32837ae5-38f0-4cfd-8401-3ff76d8497c4
  • Loading branch information...
1 parent 256877a commit 8c3df8279fc9c2d9899eaccf33c304148afce67a paul committed Aug 19, 2007
Showing with 22 additions and 8 deletions.
  1. +2 −0 id_vh.c
  2. +5 −0 id_vh.h
  3. +1 −3 objs.c
  4. +2 −2 vi_bare.c
  5. +4 −0 vi_comm.h
  6. +2 −0 wl_act2.c
  7. +2 −0 wl_game.c
  8. +4 −3 wl_play.c
View
@@ -82,6 +82,7 @@ void VL_FadeOut(myint start, myint end, myint red, myint green, myint blue, myin
screenfaded = true;
}
+#ifndef LUMINARY
/*
=================
=
@@ -121,6 +122,7 @@ void VL_FadeIn(myint start, myint end, const byte *palette, myint steps)
#endif
screenfaded = false;
}
+#endif
void VL_CacheScreen(myint chunk)
{
View
@@ -31,8 +31,13 @@ extern boolean screenfaded;
#define VW_Hlin(x,z,y,c) VL_Hlin(x,y,(z)-(x)+1,c)
#define VW_Vlin(y,z,x,c) VL_Vlin(x,y,(z)-(y)+1,c)
#define VW_WaitVBL VL_WaitVBL
+#ifdef LUMINARY
+#define VW_FadeIn() do {} while (0)
+#define VW_FadeOut() do {} while (0)
+#else
#define VW_FadeIn() VL_FadeIn(0,255,gamepal,30);
#define VW_FadeOut() VL_FadeOut(0,255,0,0,0,30);
+#endif
void VW_MeasurePropString(const char *string, word *width, word *height);
void VW_DrawPropString(const char *string);
View
@@ -1,8 +1,6 @@
#include "wl_def.h"
-#if defined(LUMINARY) && !defined(HOST)
-const unsigned char gamepal[1];
-#else
+#if defined(HOST) || !defined(LUMINARY)
#ifndef SPEAR
View
@@ -429,9 +429,9 @@ void VW_UpdateScreen()
#endif
}
+#ifdef INTEGRATOR
void VL_SetPalette(const byte *palette)
{
-#ifdef INTEGRATOR
int i;
uint32_t val;
const byte *p = palette;
@@ -445,13 +445,13 @@ void VL_SetPalette(const byte *palette)
val |= (*(p++) & 0x3e) << 25;
clcdc[i + 0x80] = val;
}
-#endif
}
void VL_GetPalette(byte *palette)
{
FIXME();
}
+#endif
#ifdef DEBUG
void Quit(const char *error)
View
@@ -18,8 +18,12 @@ void VL_Shutdown();
void VL_WaitVBL(myint vbls);
void VW_UpdateScreen();
+#ifdef LUMINARY
+#define VL_SetPalette(p) do {} while(0)
+#else
void VL_SetPalette(const byte *palette);
void VL_GetPalette(byte *palette);
+#endif
void VL_MemToScreen(const byte *source, myint width, myint height, myint x, myint y);
View
@@ -2413,7 +2413,9 @@ void A_StartDeathCam(objtype *ob)
long xmove,ymove;
long dist;
+#ifdef ENABLE_FLASHES
FinishPaletteShifts();
+#endif
VW_WaitVBL(100);
View
@@ -1036,10 +1036,12 @@ void Died()
} while (curangle != iangle);
}
+#ifdef ENABLE_FLASHES
//
// fade to red
//
FinishPaletteShifts();
+#endif
FizzleFade(false, 70, 4);
View
@@ -1101,6 +1101,7 @@ void UpdatePaletteShifts()
}
+#ifdef ENABLE_FLASHES
/*
=====================
=
@@ -1113,15 +1114,13 @@ void UpdatePaletteShifts()
void FinishPaletteShifts()
{
-#ifdef ENABLE_FLASHES
if (palshifted)
{
palshifted = 0;
VL_SetPalette(gamepal);
}
-#endif
-
}
+#endif
/*
@@ -1339,6 +1338,8 @@ void PlayLoop()
} while (!playstate && !startgame);
+#ifdef ENABLE_FLASHES
if (playstate != ex_died)
FinishPaletteShifts();
+#endif
}

0 comments on commit 8c3df82

Please sign in to comment.