diff --git a/desmume/src/windows/colorconv.h b/desmume/src/windows/colorconv.h deleted file mode 100644 index 6a66eb264..000000000 --- a/desmume/src/windows/colorconv.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef COLORCONV_H -#define COLORCONV_H - -// Convert B5G5R5 color format into R8G8B8 color format -unsigned int ColorConv_B5R5R5ToR8G8B8(const unsigned int color) -{ - return (((color&31)<<16)<<3) | // red - ((((color>>5)&31)<<8)<<3) | // green - (((color>>10)&31)<<3); // blue -} - -#endif // COLORCONV_H diff --git a/desmume/src/windows/lightView.cpp b/desmume/src/windows/lightView.cpp index 3d962c7c7..e5c8b8359 100644 --- a/desmume/src/windows/lightView.cpp +++ b/desmume/src/windows/lightView.cpp @@ -20,11 +20,18 @@ #include "lightView.h" #include "commctrl.h" #include "colorctrl.h" -#include "colorconv.h" #include "gfx3d.h" #include "resource.h" #include "debug.h" +// Convert B5G5R5 color format into R8G8B8 color format +unsigned int ColorConv_B5R5R5ToR8G8B8(const unsigned int color) +{ + return (((color&31)<<16)<<3) | // red + ((((color>>5)&31)<<8)<<3) | // green + (((color>>10)&31)<<3); // blue +} + typedef struct { u32 autoup_secs;