mirror of
https://git.code.sf.net/p/quake/quake2forge
synced 2024-11-10 15:22:16 +00:00
Moved q2icon.xbm out of the source subdir and into pixmaps/
This commit is contained in:
parent
ec6afebf98
commit
12ea33ad62
4 changed files with 3 additions and 17 deletions
|
@ -814,7 +814,7 @@ int GLimp_SetMode( unsigned int *pwidth, unsigned int *pheight, int mode, qboole
|
||||||
|
|
||||||
wmhints = XAllocWMHints();
|
wmhints = XAllocWMHints();
|
||||||
if (wmhints) {
|
if (wmhints) {
|
||||||
#include "q2icon.xbm"
|
#include "../pixmaps/q2icon.xbm"
|
||||||
|
|
||||||
Pixmap icon_pixmap, icon_mask;
|
Pixmap icon_pixmap, icon_mask;
|
||||||
unsigned long fg, bg;
|
unsigned long fg, bg;
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
#define q2icon_width 32
|
|
||||||
#define q2icon_height 32
|
|
||||||
static unsigned char q2icon_bits[] = {
|
|
||||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x03, 0xc0, 0x00,
|
|
||||||
0x80, 0x01, 0x80, 0x01, 0xc0, 0x00, 0x00, 0x03, 0x60, 0x00, 0x00, 0x06,
|
|
||||||
0x60, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c,
|
|
||||||
0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c,
|
|
||||||
0x30, 0x00, 0x00, 0x0c, 0x30, 0x00, 0x00, 0x0c, 0x70, 0x00, 0x00, 0x0e,
|
|
||||||
0x70, 0xf0, 0x0f, 0x0e, 0xe0, 0xe0, 0x07, 0x07, 0xe0, 0x61, 0x86, 0x07,
|
|
||||||
0xc0, 0x63, 0xc6, 0x03, 0x80, 0x7f, 0xfe, 0x01, 0x00, 0xff, 0xff, 0x00,
|
|
||||||
0x00, 0xfe, 0x7f, 0x00, 0x00, 0xf8, 0x1f, 0x00, 0x00, 0xe0, 0x07, 0x00,
|
|
||||||
0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00,
|
|
||||||
0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00,
|
|
||||||
0x00, 0x60, 0x06, 0x00, 0x00, 0x60, 0x06, 0x00 };
|
|
|
@ -497,7 +497,7 @@ int GLimp_Init( void *hInstance, void *wndProc )
|
||||||
|
|
||||||
static void SetSDLIcon(void)
|
static void SetSDLIcon(void)
|
||||||
{
|
{
|
||||||
#include "q2icon.xbm"
|
#include "../pixmaps/q2icon.xbm"
|
||||||
SDL_Surface *icon;
|
SDL_Surface *icon;
|
||||||
SDL_Color color;
|
SDL_Color color;
|
||||||
Uint8 *ptr;
|
Uint8 *ptr;
|
||||||
|
|
|
@ -1079,7 +1079,7 @@ static qboolean SWimp_InitGraphics( qboolean fullscreen )
|
||||||
|
|
||||||
wmhints = XAllocWMHints();
|
wmhints = XAllocWMHints();
|
||||||
if (wmhints) {
|
if (wmhints) {
|
||||||
#include "q2icon.xbm"
|
#include "../pixmaps/q2icon.xbm"
|
||||||
|
|
||||||
Pixmap icon_pixmap, icon_mask;
|
Pixmap icon_pixmap, icon_mask;
|
||||||
unsigned long fg, bg;
|
unsigned long fg, bg;
|
||||||
|
|
Loading…
Reference in a new issue