From: Holger Schemel Date: Sun, 3 Aug 2003 19:10:58 +0000 (+0200) Subject: rnd-20030803-3-src X-Git-Tag: 3.0.0^2~3 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=26763b2fc3f63909fd5f97352eaffe0ae788247b;p=rocksndiamonds.git rnd-20030803-3-src --- diff --git a/Makefile b/Makefile index bdd285b5..0c22aefb 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,8 @@ CROSS_PATH_WIN32=/usr/local/cross-tools/i386-mingw32msvc SRC_DIR = src MAKE_CMD = $(MAKE) -C $(SRC_DIR) -DEFAULT_TARGET = x11 -# DEFAULT_TARGET = sdl +# DEFAULT_TARGET = x11 +DEFAULT_TARGET = sdl all: @$(MAKE_CMD) TARGET=$(DEFAULT_TARGET) diff --git a/src/conftime.h b/src/conftime.h index 2651124b..e6451325 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-08-03 17:34]" +#define COMPILE_DATE_STRING "[2003-08-03 21:10]" diff --git a/src/libgame/pcx.c b/src/libgame/pcx.c index c7b308b0..47a11d46 100644 --- a/src/libgame/pcx.c +++ b/src/libgame/pcx.c @@ -167,12 +167,11 @@ static boolean PCX_ReadBitmap(FILE *file, struct PCX_Header *pcx, Image *image) for (j = 7; j >= 0; j--) { - byte bit; + byte bit = (value >> j) & 1; if (i * 8 + j >= width) /* skip padding bits */ continue; - bit = (value >> j) & 1; bitmap_ptr[x++] |= bit << plane; } }