Browse Source

Resolve CreatePalette name conflict

Fixes #641.
pull/646/head
Robin Eklind 6 years ago committed by Anders Jenbo
parent
commit
21e2d2f9de
  1. 2
      Source/dx.h
  2. 2
      Source/palette.cpp
  3. 2
      SourceX/dx.cpp

2
Source/dx.h

@ -13,7 +13,7 @@ void unlock_buf(BYTE idx);
void dx_cleanup();
void dx_reinit();
void CreatePalette();
void InitPalette();
void BltFast(SDL_Rect *src_rect, SDL_Rect *dst_rect);
void Blit(SDL_Surface *src, SDL_Rect *src_rect, SDL_Rect *dst_rect);
void RenderPresent();

2
Source/palette.cpp

@ -70,7 +70,7 @@ void palette_init()
{
LoadGamma();
memcpy(system_palette, orig_palette, sizeof(orig_palette));
CreatePalette();
InitPalette();
}
void LoadPalette(char *pszFileName)

2
SourceX/dx.cpp

@ -164,7 +164,7 @@ void dx_reinit()
force_redraw = 255;
}
void CreatePalette()
void InitPalette()
{
palette = SDL_AllocPalette(256);
if (palette == NULL) {

Loading…
Cancel
Save