+Release Version 2.0.1 [19 MAR 2002]
+-----------------------------------
+ - bug in explosion code fixed that broke level 24 of "Baby Ghost Mine"
+ - several Supaplex emulation bugs fixed (thanks to Mihail Milushev):
+ + orange disk does not fall off from slippery elements
+ + infotrons kill electrons and snik snaks and trigger orange disks
+ + explosion chain reactions are now a bit slower than murphy
+ - behaviour of robots adjusted to make them less aggressive
+ (needed for quite some Emerald Mine Club levels)
+ - icon for Windows executable added
+ - bug when selecting default level series fixed
+ - new IFF style file format for level and tape files
+ - bug in storing amoeba content fixed
+ - nasty tape bugs fixed (completely reworked tape stuff)
+ - fullscreen mode now works with Windows (workaround for bug in SDL)
+ - /dev/dsp support for NetBSD added (thanks to Krister Walfridsson)
+ - file permissions when saving files and creating directories changed
+ - some small sound bugs fixed
+ - added new contributed levels from the following players:
+ + Arno Luppold
+ + Barak Shacked
+ + Ben Braithwaite
+ + Dominik Seichter
+ + Emilio Hemken
+ + Glenn Alexander
+ + Helge Hafting
+ + Paul Sutton
+
Release Version 2.0.0 [01 JAN 2001]
-----------------------------------
- major code redesign to maintain generic game functions in a separate
- can be compiled with SDL library to build native Windows version
- DOS and Windows versions can be compiled with gcc cross-compiler
- trying to open already busy audio device does not block the game
- - fixed network playing bug (patch from web site)
+ - bug in network playing code fixed (patch from web site)
- SDL version can load and play music modules
- - fixed element description in level editor for EM doors and keys
+ - bug in level editor fixed for EM doors and keys element description
+ - sound sample frequency raised from 8 kHz to 22 kHz
Release Version 1.4.0 [27 OCT 1999]
-----------------------------------
@$(MAKE_CMD) TARGET=sdl
solaris:
- @$(MAKE_CMD) PLATFORM=solaris
+ @$(MAKE_CMD) PLATFORM=solaris TARGET=x11
+
+solaris-sdl:
+ @$(MAKE_CMD) PLATFORM=solaris TARGET=sdl
msdos:
@$(MAKE_CMD) PLATFORM=msdos
dist-win32:
./Scripts/make_dist.sh win .
-dist: dist-unix dist-msdos dist-win32
+dist-clean:
+ @$(MAKE_CMD) dist-clean
+
+dist-build-all:
+ $(MAKE) clean
+ @BUILD_DIST=TRUE $(MAKE) x11 ; $(MAKE) dist-clean
+ @BUILD_DIST=TRUE $(MAKE) cross-win32 ; $(MAKE) dist-clean
+ @BUILD_DIST=TRUE $(MAKE) cross-msdos ; $(MAKE) dist-clean
+
+dist-all: dist-build-all dist-unix dist-msdos dist-win32
depend dep:
$(MAKE_CMD) depend
AR = ar
RANLIB = ranlib
+BMP2ICO = bmp2ico
+WINDRES = windres
+
ifeq ($(PLATFORM),msdos) # MS-DOS native compiling
RM = del
-PROGNAME = ../rocks.exe
+
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
SYS_CFLAGS = -DTARGET_X11
SYS_LDFLAGS = -s -lalleg
else # Unix or cross-compiling for MS-DOS and Win32
RM = rm -f
-PROGNAME = ../rocksndiamonds
+
+PROGBASE = rocksndiamonds
+PROGNAME = ../$(PROGBASE)
ifeq ($(PLATFORM),solaris)
EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH)
endif
ifeq ($(PLATFORM),cross-msdos)
-PROGNAME = ../rocks.exe
+PROGBASE = rocks
+PROGNAME = ../$(PROGBASE).exe
TARGET = allegro
endif
ifeq ($(PLATFORM),cross-win32)
-PROGNAME = ../rocksndiamonds.exe
+PROGNAME = ../$(PROGBASE).exe
TARGET = sdl
endif
# PROFILING = $(PROFILING_FLAGS)
# OPTIONS = $(DEBUG) -Wall # only for debugging purposes
-# OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
+OPTIONS = $(DEBUG) -O3 -Wall # only for debugging purposes
# OPTIONS = $(DEBUG) -Wall -ansi -pedantic # only for debugging purposes
# OPTIONS = -O3 -Wall -ansi -pedantic
-OPTIONS = -O3 -Wall
+# OPTIONS = -O3 -Wall
# OPTIONS = -O3
# OPTIONS = -DSYSV -Ae # may be needed for HP-UX
+ifdef BUILD_DIST # distribution build
+OPTIONS = -O3 -Wall
+endif
+
CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
LIBDIR = libgame
LIBGAME = $(LIBDIR)/libgame.a
+ICONBASE = windows_icon
+ifeq ($(PLATFORM),cross-win32)
+ICON32X32 = ../graphics/$(ICONBASE)_32x32.bmp
+ICON = $(ICONBASE).o
+endif
+
-all: $(PROGNAME)
+all: libgame_dir $(PROGNAME)
-$(PROGNAME): $(LIBGAME) $(OBJS)
- $(CC) $(PROFILING) $(OBJS) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+$(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
+ $(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
+libgame_dir:
+ @$(MAKE) -C $(LIBDIR)
$(LIBGAME):
- $(MAKE) -C $(LIBDIR)
+ @$(MAKE) -C $(LIBDIR)
+
+$(ICON):
+ $(BMP2ICO) -transparent $(ICONBASE).ico $(ICON32X32)
+ echo "$(ICONBASE) ICON $(ICONBASE).ico" | $(WINDRES) -o $(ICON)
.c.o:
$(CC) $(PROFILING) $(CFLAGS) -c $*.c
-clean:
+clean-obj:
$(MAKE) -C $(LIBDIR) clean
$(RM) $(OBJS)
$(RM) $(LIBGAME)
+
+clean-ico:
+ $(RM) $(ICONBASE).ico
+ $(RM) $(ICONBASE).o
+
+clean-bin:
$(RM) $(PROGNAME)
$(RM) ../*.exe
+clean: clean-obj clean-ico clean-bin
+
#-----------------------------------------------------------------------------#
# development only stuff #
#-----------------------------------------------------------------------------#
+dist-clean: clean-obj
+
depend:
$(MAKE) -C $(LIBDIR) depend
for i in $(SRCS); do $(CPP) $(CFLAGS) -M $$i; done > .depend
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include "tools.h"
#include "game.h"
#include "editor.h"
+#include "files.h"
#include "tape.h"
#include "joystick.h"
#include "network.h"
HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
break;
+#ifdef DEBUG
+ case KSYM_t:
+ DumpTape(&tape);
+ break;
+#endif
+
default:
break;
}
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include "tape.h"
#include "joystick.h"
-#define MAX_FILENAME_LEN 256 /* maximal filename length */
-#define MAX_LINE_LEN 1000 /* maximal input line length */
-#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
-#define LEVEL_HEADER_SIZE 80 /* size of level file header */
-#define LEVEL_HEADER_UNUSED 15 /* unused level header bytes */
-#define TAPE_HEADER_SIZE 20 /* size of tape file header */
-#define TAPE_HEADER_UNUSED 7 /* unused tape header bytes */
-#define FILE_VERSION_1_0 10 /* 1.0 file version (old) */
-#define FILE_VERSION_1_2 12 /* 1.2 file version (still in use) */
-#define FILE_VERSION_1_4 14 /* 1.4 file version (new) */
+#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
+#define CHUNK_SIZE_UNDEFINED 0 /* undefined chunk size == 0 */
+#define CHUNK_SIZE_NONE -1 /* do not write chunk size */
+#define FILE_VERS_CHUNK_SIZE 8 /* size of file version chunk */
+#define LEVEL_HEADER_SIZE 80 /* size of level file header */
+#define LEVEL_HEADER_UNUSED 15 /* unused level header bytes */
+#define LEVEL_CHUNK_CNT2_SIZE 160 /* size of level CNT2 chunk */
+#define LEVEL_CHUNK_CNT2_UNUSED 11 /* unused CNT2 chunk bytes */
+#define TAPE_HEADER_SIZE 20 /* size of tape file header */
+#define TAPE_HEADER_UNUSED 7 /* unused tape header bytes */
/* file identifier strings */
-#define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.4"
+#define LEVEL_COOKIE_TMPL "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x"
+#define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x"
#define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2"
-#define TAPE_COOKIE "ROCKSNDIAMONDS_TAPE_FILE_VERSION_1.2"
#define SETUP_COOKIE "ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2"
#define LEVELSETUP_COOKIE "ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2"
#define LEVELINFO_COOKIE "ROCKSNDIAMONDS_LEVELINFO_FILE_VERSION_1.2"
-/* old file identifiers for backward compatibility */
-#define LEVEL_COOKIE_10 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0"
-#define LEVEL_COOKIE_12 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2"
-#define TAPE_COOKIE_10 "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
/* file names and filename extensions */
#if !defined(PLATFORM_MSDOS)
#define SCOREFILE_EXTENSION "sco"
#endif
-#if defined(PLATFORM_WIN32)
-#ifndef S_IRGRP
-#define S_IRGRP S_IRUSR
-#endif
-#ifndef S_IROTH
-#define S_IROTH S_IRUSR
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP S_IWUSR
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH S_IWUSR
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP S_IXUSR
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH S_IXUSR
-#endif
-#endif /* PLATFORM_WIN32 */
-
-/* file permissions for newly written files */
-#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH)
-#define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH)
-#define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH)
-#define LEVEL_PERMS (MODE_R_ALL | MODE_W_ALL)
-#define SCORE_PERMS LEVEL_PERMS
-#define TAPE_PERMS LEVEL_PERMS
-#define SETUP_PERMS LEVEL_PERMS
-
/* sort priorities of level series (also used as level series classes) */
#define LEVELCLASS_TUTORIAL_START 10
#define LEVELCLASS_TUTORIAL_END 99
static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */
static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */
-static char *getSetupDir()
-{
- return getUserDataDir();
-}
-
static char *getUserLevelDir(char *level_subdir)
{
static char *userlevel_dir = NULL;
static void InitTapeDirectory(char *level_subdir)
{
- createDirectory(getUserDataDir(), "user data");
- createDirectory(getTapeDir(""), "main tape");
- createDirectory(getTapeDir(level_subdir), "level tape");
+ createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getTapeDir(""), "main tape", PERMS_PRIVATE);
+ createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE);
}
static void InitScoreDirectory(char *level_subdir)
{
- createDirectory(getScoreDir(""), "main score");
- createDirectory(getScoreDir(level_subdir), "level score");
+ createDirectory(getScoreDir(""), "main score", PERMS_PUBLIC);
+ createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC);
}
static void InitUserLevelDirectory(char *level_subdir)
{
if (access(getUserLevelDir(level_subdir), F_OK) != 0)
{
- createDirectory(getUserDataDir(), "user data");
- createDirectory(getUserLevelDir(""), "main user level");
- createDirectory(getUserLevelDir(level_subdir), "user level");
+ createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getUserLevelDir(""), "main user level", PERMS_PRIVATE);
+ createDirectory(getUserLevelDir(level_subdir), "user level",PERMS_PRIVATE);
SaveUserLevelInfo();
}
static void InitLevelSetupDirectory(char *level_subdir)
{
- createDirectory(getUserDataDir(), "user data");
- createDirectory(getLevelSetupDir(""), "main level setup");
- createDirectory(getLevelSetupDir(level_subdir), "level setup");
+ createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+ createDirectory(getLevelSetupDir(""), "main level setup", PERMS_PRIVATE);
+ createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE);
+}
+
+static void ReadChunk_VERS(FILE *file, int *file_version, int *game_version)
+{
+ int file_version_major, file_version_minor, file_version_patch;
+ int game_version_major, game_version_minor, game_version_patch;
+
+ file_version_major = fgetc(file);
+ file_version_minor = fgetc(file);
+ file_version_patch = fgetc(file);
+ fgetc(file); /* not used */
+
+ game_version_major = fgetc(file);
+ game_version_minor = fgetc(file);
+ game_version_patch = fgetc(file);
+ fgetc(file); /* not used */
+
+ *file_version = VERSION_IDENT(file_version_major,
+ file_version_minor,
+ file_version_patch);
+
+ *game_version = VERSION_IDENT(game_version_major,
+ game_version_minor,
+ game_version_patch);
+}
+
+static void WriteChunk_VERS(FILE *file, int file_version, int game_version)
+{
+ int file_version_major = VERSION_MAJOR(file_version);
+ int file_version_minor = VERSION_MINOR(file_version);
+ int file_version_patch = VERSION_PATCH(file_version);
+ int game_version_major = VERSION_MAJOR(game_version);
+ int game_version_minor = VERSION_MINOR(game_version);
+ int game_version_patch = VERSION_PATCH(game_version);
+
+ fputc(file_version_major, file);
+ fputc(file_version_minor, file);
+ fputc(file_version_patch, file);
+ fputc(0, file); /* not used */
+
+ fputc(game_version_major, file);
+ fputc(game_version_minor, file);
+ fputc(game_version_patch, file);
+ fputc(0, file); /* not used */
}
static void setLevelInfoToDefaults()
{
int i, x, y;
+ level.file_version = FILE_VERSION_ACTUAL;
+ level.game_version = GAME_VERSION_ACTUAL;
+
+ level.encoding_16bit_field = FALSE; /* default: only 8-bit elements */
+ level.encoding_16bit_yamyam = FALSE; /* default: only 8-bit elements */
+ level.encoding_16bit_amoeba = FALSE; /* default: only 8-bit elements */
+
lev_fieldx = level.fieldx = STD_LEV_FIELDX;
lev_fieldy = level.fieldy = STD_LEV_FIELDY;
for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
for(x=0; x<3; x++)
for(y=0; y<3; y++)
- level.yam_content[i][x][y] = EL_FELSBROCKEN;
+ level.yam_content[i][x][y] =
+ (i < STD_ELEMENT_CONTENTS ? EL_FELSBROCKEN : EL_LEERRAUM);
Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
return element;
}
-void LoadLevel(int level_nr)
+static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+ ReadChunk_VERS(file, &(level->file_version), &(level->game_version));
+
+ return chunk_size;
+}
+
+static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
{
int i, x, y;
+
+ lev_fieldx = level->fieldx = fgetc(file);
+ lev_fieldy = level->fieldy = fgetc(file);
+
+ level->time = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+ level->gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+
+ for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+ level->name[i] = fgetc(file);
+ level->name[MAX_LEVEL_NAME_LEN] = 0;
+
+ for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+ level->score[i] = fgetc(file);
+
+ level->num_yam_contents = STD_ELEMENT_CONTENTS;
+ for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ level->yam_content[i][x][y] = checkLevelElement(fgetc(file));
+
+ level->amoeba_speed = fgetc(file);
+ level->time_magic_wall = fgetc(file);
+ level->time_wheel = fgetc(file);
+ level->amoeba_content = checkLevelElement(fgetc(file));
+ level->double_speed = (fgetc(file) == 1 ? TRUE : FALSE);
+ level->gravity = (fgetc(file) == 1 ? TRUE : FALSE);
+
+ level->encoding_16bit_field = (fgetc(file) == 1 ? TRUE : FALSE);
+
+ ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED);
+
+ return chunk_size;
+}
+
+static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+ int i;
+
+ for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+ level->author[i] = fgetc(file);
+ level->author[MAX_LEVEL_NAME_LEN] = 0;
+
+ return chunk_size;
+}
+
+static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+ int i, x, y;
+ int header_size = 4;
+ int content_size = MAX_ELEMENT_CONTENTS * 3 * 3;
+ int chunk_size_expected = header_size + content_size;
+
+ /* Note: "chunk_size" was wrong before version 2.0 when elements are
+ stored with 16-bit encoding (and should be twice as big then).
+ Even worse, playfield data was stored 16-bit when only yamyam content
+ contained 16-bit elements and vice versa. */
+
+ if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+ chunk_size_expected += content_size;
+
+ if (chunk_size_expected != chunk_size)
+ {
+ ReadUnusedBytesFromFile(file, chunk_size);
+ return chunk_size_expected;
+ }
+
+ fgetc(file);
+ level->num_yam_contents = fgetc(file);
+ fgetc(file);
+ fgetc(file);
+
+ /* correct invalid number of content fields -- should never happen */
+ if (level->num_yam_contents < 1 ||
+ level->num_yam_contents > MAX_ELEMENT_CONTENTS)
+ level->num_yam_contents = STD_ELEMENT_CONTENTS;
+
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ level->yam_content[i][x][y] =
+ checkLevelElement(level->encoding_16bit_field ?
+ getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+ fgetc(file));
+ return chunk_size;
+}
+
+static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+ int x, y;
+ int chunk_size_expected = level->fieldx * level->fieldy;
+
+ /* Note: "chunk_size" was wrong before version 2.0 when elements are
+ stored with 16-bit encoding (and should be twice as big then).
+ Even worse, playfield data was stored 16-bit when only yamyam content
+ contained 16-bit elements and vice versa. */
+
+ if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0)
+ chunk_size_expected *= 2;
+
+ if (chunk_size_expected != chunk_size)
+ {
+ ReadUnusedBytesFromFile(file, chunk_size);
+ return chunk_size_expected;
+ }
+
+ for(y=0; y<level->fieldy; y++)
+ for(x=0; x<level->fieldx; x++)
+ Feld[x][y] = Ur[x][y] =
+ checkLevelElement(level->encoding_16bit_field ?
+ getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+ fgetc(file));
+ return chunk_size;
+}
+
+static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
+{
+ int i, x, y;
+ int element;
+ int num_contents, content_xsize, content_ysize;
+ int content_array[MAX_ELEMENT_CONTENTS][3][3];
+
+ element = checkLevelElement(getFile16BitInteger(file,BYTE_ORDER_BIG_ENDIAN));
+ num_contents = fgetc(file);
+ content_xsize = fgetc(file);
+ content_ysize = fgetc(file);
+ ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
+
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ content_array[i][x][y] =
+ checkLevelElement(getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN));
+
+ /* correct invalid number of content fields -- should never happen */
+ if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS)
+ num_contents = STD_ELEMENT_CONTENTS;
+
+ if (element == EL_MAMPFER)
+ {
+ level->num_yam_contents = num_contents;
+
+ for(i=0; i<num_contents; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ level->yam_content[i][x][y] = content_array[i][x][y];
+ }
+ else if (element == EL_AMOEBE_BD)
+ {
+ level->amoeba_content = content_array[0][0][0];
+ }
+ else
+ {
+ Error(ERR_WARN, "cannot load content for element '%d'", element);
+ }
+
+ return chunk_size;
+}
+
+void LoadLevel(int level_nr)
+{
char *filename = getLevelFilename(level_nr);
char cookie[MAX_LINE_LEN];
- char chunk[CHUNK_ID_LEN + 1];
- boolean encoding_16bit = FALSE; /* default: maximal 256 elements */
- int file_version = FILE_VERSION_1_4; /* last version of level files */
- int chunk_length;
+ char chunk_name[CHUNK_ID_LEN + 1];
+ int chunk_size;
FILE *file;
/* always start with reliable default values */
return;
}
- /* check file identifier */
- fgets(cookie, MAX_LINE_LEN, file);
- if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
- cookie[strlen(cookie) - 1] = '\0';
-
- if (strcmp(cookie, LEVEL_COOKIE_10) == 0) /* old 1.0 level format */
- file_version = FILE_VERSION_1_0;
- else if (strcmp(cookie, LEVEL_COOKIE_12) == 0)/* 1.2 (8 bit) level format */
- file_version = FILE_VERSION_1_2;
- else if (strcmp(cookie, LEVEL_COOKIE) != 0) /* unknown level format */
+ getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+ if (strcmp(chunk_name, "RND1") == 0)
{
- Error(ERR_WARN, "wrong file identifier of level file '%s'", filename);
- fclose(file);
- return;
- }
+ getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */
- /* read chunk "HEAD" */
- if (file_version >= FILE_VERSION_1_2)
+ getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+ if (strcmp(chunk_name, "CAVE") != 0)
+ {
+ Error(ERR_WARN, "unknown format of level file '%s'", filename);
+ fclose(file);
+ return;
+ }
+ }
+ else /* check for pre-2.0 file format with cookie string */
{
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
- if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE)
+ strcpy(cookie, chunk_name);
+ fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+ if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+ cookie[strlen(cookie) - 1] = '\0';
+
+ if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL))
{
- Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename);
+ Error(ERR_WARN, "unknown format of level file '%s'", filename);
+ fclose(file);
+ return;
+ }
+
+ if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1)
+ {
+ Error(ERR_WARN, "unsupported version of level file '%s'", filename);
fclose(file);
return;
}
}
- lev_fieldx = level.fieldx = fgetc(file);
- lev_fieldy = level.fieldy = fgetc(file);
+ if (level.file_version < FILE_VERSION_1_2)
+ {
+ /* level files from versions before 1.2.0 without chunk structure */
+ LoadLevel_HEAD(file, LEVEL_HEADER_SIZE, &level);
+ LoadLevel_BODY(file, level.fieldx * level.fieldy, &level);
+ }
+ else
+ {
+ static struct
+ {
+ char *name;
+ int size;
+ int (*loader)(FILE *, int, struct LevelInfo *);
+ }
+ chunk_info[] =
+ {
+ { "VERS", FILE_VERS_CHUNK_SIZE, LoadLevel_VERS },
+ { "HEAD", LEVEL_HEADER_SIZE, LoadLevel_HEAD },
+ { "AUTH", MAX_LEVEL_AUTHOR_LEN, LoadLevel_AUTH },
+ { "CONT", -1, LoadLevel_CONT },
+ { "BODY", -1, LoadLevel_BODY },
+ { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 },
+ { NULL, 0, NULL }
+ };
+
+ while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN))
+ {
+ int i = 0;
- level.time = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
- level.gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+ while (chunk_info[i].name != NULL &&
+ strcmp(chunk_name, chunk_info[i].name) != 0)
+ i++;
- for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
- level.name[i] = fgetc(file);
- level.name[MAX_LEVEL_NAME_LEN] = 0;
+ if (chunk_info[i].name == NULL)
+ {
+ Error(ERR_WARN, "unknown chunk '%s' in level file '%s'",
+ chunk_name, filename);
+ ReadUnusedBytesFromFile(file, chunk_size);
+ }
+ else if (chunk_info[i].size != -1 &&
+ chunk_info[i].size != chunk_size)
+ {
+ Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+ chunk_size, chunk_name, filename);
+ ReadUnusedBytesFromFile(file, chunk_size);
+ }
+ else
+ {
+ /* call function to load this level chunk */
+ int chunk_size_expected =
+ (chunk_info[i].loader)(file, chunk_size, &level);
+
+ /* the size of some chunks cannot be checked before reading other
+ chunks first (like "HEAD" and "BODY") that contain some header
+ information, so check them here */
+ if (chunk_size_expected != chunk_size)
+ {
+ Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'",
+ chunk_size, chunk_name, filename);
+ }
+ }
+ }
+ }
- for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
- level.score[i] = fgetc(file);
+ fclose(file);
- level.num_yam_contents = STD_ELEMENT_CONTENTS;
- for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) ||
+ IS_LEVELCLASS_USER(leveldir_current))
{
- for(y=0; y<3; y++)
+ /* for user contributed and private levels, use the version of
+ the game engine the levels were created for */
+ level.game_version = level.file_version;
+
+ /* player was faster than monsters in pre-1.0 levels */
+ if (level.file_version == FILE_VERSION_1_0)
{
- for(x=0; x<3; x++)
- {
- if (i < STD_ELEMENT_CONTENTS)
- level.yam_content[i][x][y] = checkLevelElement(fgetc(file));
- else
- level.yam_content[i][x][y] = EL_LEERRAUM;
- }
+ Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
+ Error(ERR_WARN, "using high speed movement for player");
+ level.double_speed = TRUE;
}
}
+ else
+ {
+ /* always use the latest version of the game engine for all but
+ user contributed and private levels */
+ level.game_version = GAME_VERSION_ACTUAL;
+ }
- level.amoeba_speed = fgetc(file);
- level.time_magic_wall = fgetc(file);
- level.time_wheel = fgetc(file);
- level.amoeba_content = checkLevelElement(fgetc(file));
- level.double_speed = (fgetc(file) == 1 ? TRUE : FALSE);
- level.gravity = (fgetc(file) == 1 ? TRUE : FALSE);
+ /* determine border element for this level */
+ SetBorderElement();
+}
- encoding_16bit = (fgetc(file) == 1 ? TRUE : FALSE);
+static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
+{
+ int i, x, y;
- for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* skip unused header bytes */
- fgetc(file);
+ fputc(level->fieldx, file);
+ fputc(level->fieldy, file);
- if (file_version >= FILE_VERSION_1_2)
- {
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
+ putFile16BitInteger(file, level->time, BYTE_ORDER_BIG_ENDIAN);
+ putFile16BitInteger(file, level->gems_needed, BYTE_ORDER_BIG_ENDIAN);
- /* look for optional author chunk */
- if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN)
- {
- for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
- level.author[i] = fgetc(file);
- level.author[MAX_LEVEL_NAME_LEN] = 0;
+ for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
+ fputc(level->name[i], file);
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
- }
+ for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
+ fputc(level->score[i], file);
- /* look for optional content chunk */
- if (strcmp(chunk, "CONT") == 0 &&
- chunk_length == 4 + MAX_ELEMENT_CONTENTS * 3 * 3)
- {
- fgetc(file);
- level.num_yam_contents = fgetc(file);
- fgetc(file);
- fgetc(file);
+ for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ fputc((level->encoding_16bit_yamyam ? EL_LEERRAUM :
+ level->yam_content[i][x][y]),
+ file);
+ fputc(level->amoeba_speed, file);
+ fputc(level->time_magic_wall, file);
+ fputc(level->time_wheel, file);
+ fputc((level->encoding_16bit_amoeba ? EL_LEERRAUM : level->amoeba_content),
+ file);
+ fputc((level->double_speed ? 1 : 0), file);
+ fputc((level->gravity ? 1 : 0), file);
+
+ fputc((level->encoding_16bit_field ? 1 : 0), file);
+
+ WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED);
+}
- if (level.num_yam_contents < 1 ||
- level.num_yam_contents > MAX_ELEMENT_CONTENTS)
- {
-#if DEBUG
- printf("WARNING: num_yam_contents == %d (corrected)\n",
- level.num_yam_contents);
-#endif
- level.num_yam_contents = STD_ELEMENT_CONTENTS;
- }
+static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
+{
+ int i;
- for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
- for(y=0; y<3; y++)
- for(x=0; x<3; x++)
- level.yam_content[i][x][y] =
- checkLevelElement(encoding_16bit ?
- getFile16BitInteger(file,
- BYTE_ORDER_BIG_ENDIAN) :
- fgetc(file));
+ for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
+ fputc(level->author[i], file);
+}
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
- }
+#if 0
+static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
+{
+ int i, x, y;
- /* next check body chunk identifier and chunk length */
- if (strcmp(chunk, "BODY") || chunk_length != lev_fieldx * lev_fieldy)
- {
- Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename);
- fclose(file);
- return;
- }
- }
+ fputc(EL_MAMPFER, file);
+ fputc(level->num_yam_contents, file);
+ fputc(0, file);
+ fputc(0, file);
- /* clear all other level fields (needed if resized in level editor later) */
- for(x=0; x<MAX_LEV_FIELDX; x++)
- for(y=0; y<MAX_LEV_FIELDY; y++)
- Feld[x][y] = Ur[x][y] = EL_LEERRAUM;
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ if (level->encoding_16bit_field)
+ putFile16BitInteger(file, level->yam_content[i][x][y],
+ BYTE_ORDER_BIG_ENDIAN);
+ else
+ fputc(level->yam_content[i][x][y], file);
+}
+#endif
- /* now read in the valid level fields from level file */
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- Feld[x][y] = Ur[x][y] =
- checkLevelElement(encoding_16bit ?
- getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
- fgetc(file));
+static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
+{
+ int x, y;
- fclose(file);
+ for(y=0; y<level->fieldy; y++)
+ for(x=0; x<level->fieldx; x++)
+ if (level->encoding_16bit_field)
+ putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN);
+ else
+ fputc(Ur[x][y], file);
+}
+
+static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
+{
+ int i, x, y;
+ int num_contents, content_xsize, content_ysize;
+ int content_array[MAX_ELEMENT_CONTENTS][3][3];
+
+ if (element == EL_MAMPFER)
+ {
+ num_contents = level->num_yam_contents;
+ content_xsize = 3;
+ content_ysize = 3;
+
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ content_array[i][x][y] = level->yam_content[i][x][y];
+ }
+ else if (element == EL_AMOEBE_BD)
+ {
+ num_contents = 1;
+ content_xsize = 1;
+ content_ysize = 1;
- /* player was faster than monsters in pre-1.0 levels */
- if (file_version == FILE_VERSION_1_0 &&
- IS_LEVELCLASS_CONTRIBUTION(leveldir_current))
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ content_array[i][x][y] = EL_LEERRAUM;
+ content_array[0][0][0] = level->amoeba_content;
+ }
+ else
{
- Error(ERR_WARN, "level file '%s' has version number 1.0", filename);
- Error(ERR_WARN, "using high speed movement for player");
- level.double_speed = TRUE;
+ /* chunk header already written -- write empty chunk data */
+ WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_SIZE);
+
+ Error(ERR_WARN, "cannot save content for element '%d'", element);
+ return;
}
- /* determine border element for this level */
- SetBorderElement();
+ putFile16BitInteger(file, element, BYTE_ORDER_BIG_ENDIAN);
+ fputc(num_contents, file);
+ fputc(content_xsize, file);
+ fputc(content_ysize, file);
+
+ WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED);
+
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
+ for(y=0; y<3; y++)
+ for(x=0; x<3; x++)
+ putFile16BitInteger(file, content_array[i][x][y],
+ BYTE_ORDER_BIG_ENDIAN);
}
void SaveLevel(int level_nr)
{
int i, x, y;
char *filename = getLevelFilename(level_nr);
- boolean encoding_16bit = FALSE; /* default: maximal 256 elements */
- char *oldest_possible_cookie;
+ int body_chunk_size;
FILE *file;
if (!(file = fopen(filename, MODE_WRITE)))
return;
}
- /* check yam content for 16-bit elements */
- for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
- for(y=0; y<3; y++)
- for(x=0; x<3; x++)
- if (level.yam_content[i][x][y] > 255)
- encoding_16bit = TRUE;
/* check level field for 16-bit elements */
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
+ level.encoding_16bit_field = FALSE;
+ for(y=0; y<level.fieldy; y++)
+ for(x=0; x<level.fieldx; x++)
if (Ur[x][y] > 255)
- encoding_16bit = TRUE;
-
- oldest_possible_cookie = (encoding_16bit ? LEVEL_COOKIE : LEVEL_COOKIE_12);
-
- fputs(oldest_possible_cookie, file); /* file identifier */
- fputc('\n', file);
-
- putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
-
- fputc(level.fieldx, file);
- fputc(level.fieldy, file);
-
- putFile16BitInteger(file, level.time, BYTE_ORDER_BIG_ENDIAN);
- putFile16BitInteger(file, level.gems_needed, BYTE_ORDER_BIG_ENDIAN);
+ level.encoding_16bit_field = TRUE;
- for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
- fputc(level.name[i], file);
- for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
- fputc(level.score[i], file);
- for(i=0; i<STD_ELEMENT_CONTENTS; i++)
+ /* check yamyam content for 16-bit elements */
+ level.encoding_16bit_yamyam = FALSE;
+ for(i=0; i<level.num_yam_contents; i++)
for(y=0; y<3; y++)
for(x=0; x<3; x++)
- fputc(encoding_16bit ? EL_LEERRAUM : level.yam_content[i][x][y], file);
- fputc(level.amoeba_speed, file);
- fputc(level.time_magic_wall, file);
- fputc(level.time_wheel, file);
- fputc(level.amoeba_content, file);
- fputc((level.double_speed ? 1 : 0), file);
- fputc((level.gravity ? 1 : 0), file);
+ if (level.yam_content[i][x][y] > 255)
+ level.encoding_16bit_yamyam = TRUE;
- fputc((encoding_16bit ? 1 : 0), file);
+ /* check amoeba content for 16-bit elements */
+ level.encoding_16bit_amoeba = FALSE;
+ if (level.amoeba_content > 255)
+ level.encoding_16bit_amoeba = TRUE;
- for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* set unused header bytes to zero */
- fputc(0, file);
+ body_chunk_size =
+ level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1);
- putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
+ putFileChunk(file, "RND1", CHUNK_SIZE_UNDEFINED, BYTE_ORDER_BIG_ENDIAN);
+ putFileChunk(file, "CAVE", CHUNK_SIZE_NONE, BYTE_ORDER_BIG_ENDIAN);
- for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
- fputc(level.author[i], file);
+ putFileChunk(file, "VERS", FILE_VERS_CHUNK_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ WriteChunk_VERS(file, FILE_VERSION_ACTUAL, GAME_VERSION_ACTUAL);
- putFileChunk(file, "CONT", 4 + MAX_ELEMENT_CONTENTS * 3 * 3,
- BYTE_ORDER_BIG_ENDIAN);
+ putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ SaveLevel_HEAD(file, &level);
- fputc(EL_MAMPFER, file);
- fputc(level.num_yam_contents, file);
- fputc(0, file);
- fputc(0, file);
+ putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
+ SaveLevel_AUTH(file, &level);
- for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
- for(y=0; y<3; y++)
- for(x=0; x<3; x++)
- if (encoding_16bit)
- putFile16BitInteger(file, level.yam_content[i][x][y],
- BYTE_ORDER_BIG_ENDIAN);
- else
- fputc(level.yam_content[i][x][y], file);
+ putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN);
+ SaveLevel_BODY(file, &level);
- putFileChunk(file, "BODY", lev_fieldx * lev_fieldy, BYTE_ORDER_BIG_ENDIAN);
+ if (level.encoding_16bit_yamyam ||
+ level.num_yam_contents != STD_ELEMENT_CONTENTS)
+ {
+ putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ SaveLevel_CNT2(file, &level, EL_MAMPFER);
+ }
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (encoding_16bit)
- putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN);
- else
- fputc(Ur[x][y], file);
+ if (level.encoding_16bit_amoeba)
+ {
+ putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ SaveLevel_CNT2(file, &level, EL_AMOEBE_BD);
+ }
fclose(file);
- chmod(filename, LEVEL_PERMS);
+ SetFilePermissions(filename, PERMS_PRIVATE);
}
-void LoadTape(int level_nr)
+static void setTapeInfoToDefaults()
{
- int i, j;
- char *filename = getTapeFilename(level_nr);
- char cookie[MAX_LINE_LEN];
- char chunk[CHUNK_ID_LEN + 1];
- FILE *file;
- int num_participating_players;
- int file_version = FILE_VERSION_1_2; /* last version of tape files */
- int chunk_length;
+ int i;
/* always start with reliable default values (empty tape) */
+ tape.file_version = FILE_VERSION_ACTUAL;
+ tape.game_version = GAME_VERSION_ACTUAL;
TapeErase();
/* default values (also for pre-1.2 tapes) with only the first player */
tape.player_participates[i] = FALSE;
/* at least one (default: the first) player participates in every tape */
- num_participating_players = 1;
+ tape.num_participating_players = 1;
- if (!(file = fopen(filename, MODE_READ)))
- return;
+ tape.level_nr = level_nr;
+ tape.counter = 0;
+ tape.changed = FALSE;
- /* check file identifier */
- fgets(cookie, MAX_LINE_LEN, file);
- if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
- cookie[strlen(cookie) - 1] = '\0';
+ tape.recording = FALSE;
+ tape.playing = FALSE;
+ tape.pausing = FALSE;
+}
- if (strcmp(cookie, TAPE_COOKIE_10) == 0) /* old 1.0 tape format */
- file_version = FILE_VERSION_1_0;
- else if (strcmp(cookie, TAPE_COOKIE) != 0) /* unknown tape format */
- {
- Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename);
- fclose(file);
- return;
- }
+static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+ ReadChunk_VERS(file, &(tape->file_version), &(tape->game_version));
- /* read chunk "HEAD" */
- if (file_version >= FILE_VERSION_1_2)
- {
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
- if (strcmp(chunk, "HEAD") || chunk_length != TAPE_HEADER_SIZE)
- {
- Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename);
- fclose(file);
- return;
- }
- }
+ return chunk_size;
+}
+
+static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+ int i;
- tape.random_seed = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
- tape.date = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
- tape.length = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+ tape->random_seed = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+ tape->date = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
+ tape->length = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN);
/* read header fields that are new since version 1.2 */
- if (file_version >= FILE_VERSION_1_2)
+ if (tape->file_version >= FILE_VERSION_1_2)
{
byte store_participating_players = fgetc(file);
- for(i=0; i<TAPE_HEADER_UNUSED; i++) /* skip unused header bytes */
- fgetc(file);
+ ReadUnusedBytesFromFile(file, TAPE_HEADER_UNUSED);
/* since version 1.2, tapes store which players participate in the tape */
- num_participating_players = 0;
+ tape->num_participating_players = 0;
for(i=0; i<MAX_PLAYERS; i++)
{
- tape.player_participates[i] = FALSE;
+ tape->player_participates[i] = FALSE;
if (store_participating_players & (1 << i))
{
- tape.player_participates[i] = TRUE;
- num_participating_players++;
+ tape->player_participates[i] = TRUE;
+ tape->num_participating_players++;
+ }
+ }
+ }
+
+ return chunk_size;
+}
+
+static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
+{
+ int i, j;
+ int chunk_size_expected =
+ (tape->num_participating_players + 1) * tape->length;
+
+ if (chunk_size_expected != chunk_size)
+ {
+ ReadUnusedBytesFromFile(file, chunk_size);
+ return chunk_size_expected;
+ }
+
+ for(i=0; i<tape->length; i++)
+ {
+ if (i >= MAX_TAPELEN)
+ break;
+
+ for(j=0; j<MAX_PLAYERS; j++)
+ {
+ tape->pos[i].action[j] = MV_NO_MOVING;
+
+ if (tape->player_participates[j])
+ tape->pos[i].action[j] = fgetc(file);
+ }
+
+ tape->pos[i].delay = fgetc(file);
+
+ if (tape->file_version == FILE_VERSION_1_0)
+ {
+ /* eliminate possible diagonal moves in old tapes */
+ /* this is only for backward compatibility */
+
+ byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
+ byte action = tape->pos[i].action[0];
+ int k, num_moves = 0;
+
+ for (k=0; k<4; k++)
+ {
+ if (action & joy_dir[k])
+ {
+ tape->pos[i + num_moves].action[0] = joy_dir[k];
+ if (num_moves > 0)
+ tape->pos[i + num_moves].delay = 0;
+ num_moves++;
+ }
+ }
+
+ if (num_moves > 1)
+ {
+ num_moves--;
+ i += num_moves;
+ tape->length += num_moves;
+ }
+ }
+ else if (tape->file_version < FILE_VERSION_2_0)
+ {
+ if (tape->pos[i].delay > 1)
+ {
+ /* action part */
+ tape->pos[i + 1] = tape->pos[i];
+ tape->pos[i + 1].delay = 1;
+
+ /* delay part */
+ for(j=0; j<MAX_PLAYERS; j++)
+ tape->pos[i].action[j] = MV_NO_MOVING;
+ tape->pos[i].delay--;
+
+ i++;
+ tape->length++;
}
}
+
+ if (feof(file))
+ break;
}
- tape.level_nr = level_nr;
- tape.counter = 0;
- tape.changed = FALSE;
+ if (i != tape->length)
+ chunk_size = (tape->num_participating_players + 1) * i;
+
+ return chunk_size;
+}
+
+void LoadTape(int level_nr)
+{
+ char *filename = getTapeFilename(level_nr);
+ char cookie[MAX_LINE_LEN];
+ char chunk_name[CHUNK_ID_LEN + 1];
+ FILE *file;
+ int chunk_size;
+
+ /* always start with reliable default values */
+ setTapeInfoToDefaults();
- tape.recording = FALSE;
- tape.playing = FALSE;
- tape.pausing = FALSE;
+ if (!(file = fopen(filename, MODE_READ)))
+ return;
- /* read chunk "BODY" */
- if (file_version >= FILE_VERSION_1_2)
+ getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+ if (strcmp(chunk_name, "RND1") == 0)
{
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
- if (strcmp(chunk, "BODY") ||
- chunk_length != (num_participating_players + 1) * tape.length)
+ getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */
+
+ getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN);
+ if (strcmp(chunk_name, "TAPE") != 0)
{
- Error(ERR_WARN, "wrong 'BODY' chunk of tape file '%s'", filename);
+ Error(ERR_WARN, "unknown format of tape file '%s'", filename);
fclose(file);
return;
}
}
-
- for(i=0; i<tape.length; i++)
+ else /* check for pre-2.0 file format with cookie string */
{
- if (i >= MAX_TAPELEN)
- break;
+ strcpy(cookie, chunk_name);
+ fgets(&cookie[4], MAX_LINE_LEN - 4, file);
+ if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
+ cookie[strlen(cookie) - 1] = '\0';
- for(j=0; j<MAX_PLAYERS; j++)
+ if (!checkCookieString(cookie, TAPE_COOKIE_TMPL))
{
- tape.pos[i].action[j] = MV_NO_MOVING;
+ Error(ERR_WARN, "unknown format of tape file '%s'", filename);
+ fclose(file);
+ return;
+ }
- if (tape.player_participates[j])
- tape.pos[i].action[j] = fgetc(file);
+ if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1)
+ {
+ Error(ERR_WARN, "unsupported version of tape file '%s'", filename);
+ fclose(file);
+ return;
}
+ }
- tape.pos[i].delay = fgetc(file);
+ tape.game_version = tape.file_version;
- if (file_version == FILE_VERSION_1_0)
+ if (tape.file_version < FILE_VERSION_1_2)
+ {
+ /* tape files from versions before 1.2.0 without chunk structure */
+ LoadTape_HEAD(file, TAPE_HEADER_SIZE, &tape);
+ LoadTape_BODY(file, 2 * tape.length, &tape);
+ }
+ else
+ {
+ static struct
{
- /* eliminate possible diagonal moves in old tapes */
- /* this is only for backward compatibility */
+ char *name;
+ int size;
+ int (*loader)(FILE *, int, struct TapeInfo *);
+ }
+ chunk_info[] =
+ {
+ { "VERS", FILE_VERS_CHUNK_SIZE, LoadTape_VERS },
+ { "HEAD", TAPE_HEADER_SIZE, LoadTape_HEAD },
+ { "BODY", -1, LoadTape_BODY },
+ { NULL, 0, NULL }
+ };
- byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN };
- byte action = tape.pos[i].action[0];
- int k, num_moves = 0;
+ while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN))
+ {
+ int i = 0;
- for (k=0; k<4; k++)
+ while (chunk_info[i].name != NULL &&
+ strcmp(chunk_name, chunk_info[i].name) != 0)
+ i++;
+
+ if (chunk_info[i].name == NULL)
{
- if (action & joy_dir[k])
- {
- tape.pos[i + num_moves].action[0] = joy_dir[k];
- if (num_moves > 0)
- tape.pos[i + num_moves].delay = 0;
- num_moves++;
- }
+ Error(ERR_WARN, "unknown chunk '%s' in tape file '%s'",
+ chunk_name, filename);
+ ReadUnusedBytesFromFile(file, chunk_size);
}
-
- if (num_moves > 1)
+ else if (chunk_info[i].size != -1 &&
+ chunk_info[i].size != chunk_size)
{
- num_moves--;
- i += num_moves;
- tape.length += num_moves;
+ Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
+ chunk_size, chunk_name, filename);
+ ReadUnusedBytesFromFile(file, chunk_size);
+ }
+ else
+ {
+ /* call function to load this tape chunk */
+ int chunk_size_expected =
+ (chunk_info[i].loader)(file, chunk_size, &tape);
+
+ /* the size of some chunks cannot be checked before reading other
+ chunks first (like "HEAD" and "BODY") that contain some header
+ information, so check them here */
+ if (chunk_size_expected != chunk_size)
+ {
+ Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'",
+ chunk_size, chunk_name, filename);
+ }
}
}
-
- if (feof(file))
- break;
}
fclose(file);
- if (i != tape.length)
- Error(ERR_WARN, "level recording file '%s' corrupted", filename);
-
tape.length_seconds = GetTapeLength();
}
+static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
+{
+ int i;
+ byte store_participating_players = 0;
+
+ /* set bits for participating players for compact storage */
+ for(i=0; i<MAX_PLAYERS; i++)
+ if (tape->player_participates[i])
+ store_participating_players |= (1 << i);
+
+ putFile32BitInteger(file, tape->random_seed, BYTE_ORDER_BIG_ENDIAN);
+ putFile32BitInteger(file, tape->date, BYTE_ORDER_BIG_ENDIAN);
+ putFile32BitInteger(file, tape->length, BYTE_ORDER_BIG_ENDIAN);
+
+ fputc(store_participating_players, file);
+
+ WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED);
+}
+
+static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
+{
+ int i, j;
+
+ for(i=0; i<tape->length; i++)
+ {
+ for(j=0; j<MAX_PLAYERS; j++)
+ if (tape->player_participates[j])
+ fputc(tape->pos[i].action[j], file);
+
+ fputc(tape->pos[i].delay, file);
+ }
+}
+
void SaveTape(int level_nr)
{
int i;
char *filename = getTapeFilename(level_nr);
FILE *file;
boolean new_tape = TRUE;
- byte store_participating_players;
- int num_participating_players;
+ int num_participating_players = 0;
+ int body_chunk_size;
InitTapeDirectory(leveldir_current->filename);
return;
}
- /* count number of players and set corresponding bits for compact storage */
- store_participating_players = 0;
- num_participating_players = 0;
- for(i=0; i<MAX_PLAYERS; i++)
- {
- if (tape.player_participates[i])
- {
- num_participating_players++;
- store_participating_players |= (1 << i);
- }
- }
-
if (!(file = fopen(filename, MODE_WRITE)))
{
Error(ERR_WARN, "cannot save level recording file '%s'", filename);
return;
}
- fputs(TAPE_COOKIE, file); /* file identifier */
- fputc('\n', file);
+ /* count number of participating players */
+ for(i=0; i<MAX_PLAYERS; i++)
+ if (tape.player_participates[i])
+ num_participating_players++;
+
+ body_chunk_size = (num_participating_players + 1) * tape.length;
+
+ putFileChunk(file, "RND1", CHUNK_SIZE_UNDEFINED, BYTE_ORDER_BIG_ENDIAN);
+ putFileChunk(file, "TAPE", CHUNK_SIZE_NONE, BYTE_ORDER_BIG_ENDIAN);
+
+ putFileChunk(file, "VERS", FILE_VERS_CHUNK_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ WriteChunk_VERS(file, FILE_VERSION_ACTUAL, GAME_VERSION_ACTUAL);
putFileChunk(file, "HEAD", TAPE_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
+ SaveTape_HEAD(file, &tape);
- putFile32BitInteger(file, tape.random_seed, BYTE_ORDER_BIG_ENDIAN);
- putFile32BitInteger(file, tape.date, BYTE_ORDER_BIG_ENDIAN);
- putFile32BitInteger(file, tape.length, BYTE_ORDER_BIG_ENDIAN);
+ putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN);
+ SaveTape_BODY(file, &tape);
- fputc(store_participating_players, file);
+ fclose(file);
- for(i=0; i<TAPE_HEADER_UNUSED; i++) /* set unused header bytes to zero */
- fputc(0, file);
+ SetFilePermissions(filename, PERMS_PRIVATE);
- putFileChunk(file, "BODY", (num_participating_players + 1) * tape.length,
- BYTE_ORDER_BIG_ENDIAN);
+ tape.changed = FALSE;
- for(i=0; i<tape.length; i++)
- {
- int j;
+ if (new_tape)
+ Request("tape saved !", REQ_CONFIRM);
+}
- for(j=0; j<MAX_PLAYERS; j++)
- if (tape.player_participates[j])
- fputc(tape.pos[i].action[j], file);
+void DumpTape(struct TapeInfo *tape)
+{
+ int i, j;
- fputc(tape.pos[i].delay, file);
+ if (TAPE_IS_EMPTY(*tape))
+ {
+ Error(ERR_WARN, "no tape available for level %d", tape->level_nr);
+ return;
}
- fclose(file);
+ printf("\n");
+ printf("-------------------------------------------------------------------------------\n");
+ printf("Tape of Level %d (file version %06d, game version %06d\n",
+ tape->level_nr, tape->file_version, tape->game_version);
+ printf("-------------------------------------------------------------------------------\n");
- chmod(filename, TAPE_PERMS);
+ for(i=0; i<tape->length; i++)
+ {
+ if (i >= MAX_TAPELEN)
+ break;
- tape.changed = FALSE;
+ for(j=0; j<MAX_PLAYERS; j++)
+ {
+ if (tape->player_participates[j])
+ {
+ int action = tape->pos[i].action[j];
+
+ printf("%d:%02x ", j, action);
+ printf("[%c%c%c%c|%c%c] - ",
+ (action & JOY_LEFT ? '<' : ' '),
+ (action & JOY_RIGHT ? '>' : ' '),
+ (action & JOY_UP ? '^' : ' '),
+ (action & JOY_DOWN ? 'v' : ' '),
+ (action & JOY_BUTTON_1 ? '1' : ' '),
+ (action & JOY_BUTTON_2 ? '2' : ' '));
+ }
+ }
- if (new_tape)
- Request("tape saved !", REQ_CONFIRM);
+ printf("(%03d)\n", tape->pos[i].delay);
+ }
+
+ printf("-------------------------------------------------------------------------------\n");
}
void LoadScore(int level_nr)
if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n')
cookie[strlen(cookie) - 1] = '\0';
- if (strcmp(cookie, SCORE_COOKIE) != 0)
+ if (!checkCookieString(cookie, SCORE_COOKIE))
{
- Error(ERR_WARN, "wrong file identifier of score file '%s'", filename);
+ Error(ERR_WARN, "unknown format of score file '%s'", filename);
fclose(file);
return;
}
fclose(file);
- chmod(filename, SCORE_PERMS);
+ SetFilePermissions(filename, PERMS_PUBLIC);
}
-#define TOKEN_STR_FILE_IDENTIFIER "file_identifier"
+/* ------------------------------------------------------------------------- */
+/* setup file stuff */
+/* ------------------------------------------------------------------------- */
+
#define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series"
#define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level"
#define TOKEN_STR_HANDICAP_LEVEL "handicap_level"
#define TOKEN_STR_PLAYER_PREFIX "player_"
-#define TOKEN_VALUE_POSITION 30
-
/* global setup */
#define SETUP_TOKEN_PLAYER_NAME 0
#define SETUP_TOKEN_SOUND 1
#define SETUP_TOKEN_SOUND_LOOPS 2
#define SETUP_TOKEN_SOUND_MUSIC 3
#define SETUP_TOKEN_SOUND_SIMPLE 4
-
-#if 0
-#define SETUP_TOKEN_TOONS 5
-#define SETUP_TOKEN_DOUBLE_BUFFERING 6
-#endif
-
#define SETUP_TOKEN_SCROLL_DELAY 5
#define SETUP_TOKEN_SOFT_SCROLLING 6
#define SETUP_TOKEN_FADING 7
#define FIRST_LEVELINFO_TOKEN LEVELINFO_TOKEN_NAME
#define LAST_LEVELINFO_TOKEN LEVELINFO_TOKEN_READONLY
-#define TYPE_BOOLEAN 1
-#define TYPE_SWITCH 2
-#define TYPE_KEY 3
-#define TYPE_INTEGER 4
-#define TYPE_STRING 5
-
static struct SetupInfo si;
static struct SetupInputInfo sii;
static struct LevelDirInfo ldi;
-static struct
-{
- int type;
- void *value;
- char *text;
-} token_info[] =
+static struct TokenInfo token_info[] =
{
/* global setup */
{ TYPE_STRING, &si.player_name, "player_name" },
{ TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" },
{ TYPE_SWITCH, &si.sound_music, "background_music" },
{ TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" },
-
-#if 0
- { TYPE_SWITCH, &si.toons, "toons" },
- { TYPE_SWITCH, &si.double_buffering, "double_buffering" },
-#endif
-
{ TYPE_SWITCH, &si.scroll_delay, "scroll_delay" },
{ TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" },
{ TYPE_SWITCH, &si.fading, "screen_fading" },
{ TYPE_BOOLEAN, &ldi.readonly, "readonly" }
};
-static char *string_tolower(char *s)
-{
- static char s_lower[100];
- int i;
-
- if (strlen(s) >= 100)
- return s;
-
- strcpy(s_lower, s);
-
- for (i=0; i<strlen(s_lower); i++)
- s_lower[i] = tolower(s_lower[i]);
-
- return s_lower;
-}
-
-static int get_string_integer_value(char *s)
-{
- static char *number_text[][3] =
- {
- { "0", "zero", "null", },
- { "1", "one", "first" },
- { "2", "two", "second" },
- { "3", "three", "third" },
- { "4", "four", "fourth" },
- { "5", "five", "fifth" },
- { "6", "six", "sixth" },
- { "7", "seven", "seventh" },
- { "8", "eight", "eighth" },
- { "9", "nine", "ninth" },
- { "10", "ten", "tenth" },
- { "11", "eleven", "eleventh" },
- { "12", "twelve", "twelfth" },
- };
-
- int i, j;
-
- for (i=0; i<13; i++)
- for (j=0; j<3; j++)
- if (strcmp(string_tolower(s), number_text[i][j]) == 0)
- return i;
-
- return atoi(s);
-}
-
-static boolean get_string_boolean_value(char *s)
-{
- if (strcmp(string_tolower(s), "true") == 0 ||
- strcmp(string_tolower(s), "yes") == 0 ||
- strcmp(string_tolower(s), "on") == 0 ||
- get_string_integer_value(s) == 1)
- return TRUE;
- else
- return FALSE;
-}
-
-static char *getFormattedSetupEntry(char *token, char *value)
-{
- int i;
- static char entry[MAX_LINE_LEN];
-
- sprintf(entry, "%s:", token);
- for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
- entry[i] = ' ';
- entry[i] = '\0';
-
- strcat(entry, value);
-
- return entry;
-}
-
-static void freeSetupFileList(struct SetupFileList *setup_file_list)
-{
- if (!setup_file_list)
- return;
-
- if (setup_file_list->token)
- free(setup_file_list->token);
- if (setup_file_list->value)
- free(setup_file_list->value);
- if (setup_file_list->next)
- freeSetupFileList(setup_file_list->next);
- free(setup_file_list);
-}
-
-static struct SetupFileList *newSetupFileList(char *token, char *value)
-{
- struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
-
- new->token = checked_malloc(strlen(token) + 1);
- strcpy(new->token, token);
-
- new->value = checked_malloc(strlen(value) + 1);
- strcpy(new->value, value);
-
- new->next = NULL;
-
- return new;
-}
-
-static char *getTokenValue(struct SetupFileList *setup_file_list,
- char *token)
-{
- if (!setup_file_list)
- return NULL;
-
- if (strcmp(setup_file_list->token, token) == 0)
- return setup_file_list->value;
- else
- return getTokenValue(setup_file_list->next, token);
-}
-
-static void setTokenValue(struct SetupFileList *setup_file_list,
- char *token, char *value)
-{
- if (!setup_file_list)
- return;
-
- if (strcmp(setup_file_list->token, token) == 0)
- {
- free(setup_file_list->value);
- setup_file_list->value = checked_malloc(strlen(value) + 1);
- strcpy(setup_file_list->value, value);
- }
- else if (setup_file_list->next == NULL)
- setup_file_list->next = newSetupFileList(token, value);
- else
- setTokenValue(setup_file_list->next, token, value);
-}
-
-#ifdef DEBUG
-static void printSetupFileList(struct SetupFileList *setup_file_list)
-{
- if (!setup_file_list)
- return;
-
- printf("token: '%s'\n", setup_file_list->token);
- printf("value: '%s'\n", setup_file_list->value);
-
- printSetupFileList(setup_file_list->next);
-}
-#endif
-
-static struct SetupFileList *loadSetupFileList(char *filename)
-{
- int line_len;
- char line[MAX_LINE_LEN];
- char *token, *value, *line_ptr;
- struct SetupFileList *setup_file_list = newSetupFileList("", "");
- struct SetupFileList *first_valid_list_entry;
-
- FILE *file;
-
- if (!(file = fopen(filename, MODE_READ)))
- {
- Error(ERR_WARN, "cannot open configuration file '%s'", filename);
- return NULL;
- }
-
- while(!feof(file))
- {
- /* read next line of input file */
- if (!fgets(line, MAX_LINE_LEN, file))
- break;
-
- /* cut trailing comment or whitespace from input line */
- for (line_ptr = line; *line_ptr; line_ptr++)
- {
- if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
- {
- *line_ptr = '\0';
- break;
- }
- }
-
- /* cut trailing whitespaces from input line */
- for (line_ptr = &line[strlen(line)]; line_ptr > line; line_ptr--)
- if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0')
- *line_ptr = '\0';
-
- /* ignore empty lines */
- if (*line == '\0')
- continue;
-
- line_len = strlen(line);
-
- /* cut leading whitespaces from token */
- for (token = line; *token; token++)
- if (*token != ' ' && *token != '\t')
- break;
-
- /* find end of token */
- for (line_ptr = token; *line_ptr; line_ptr++)
- {
- if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
- {
- *line_ptr = '\0';
- break;
- }
- }
-
- if (line_ptr < line + line_len)
- value = line_ptr + 1;
- else
- value = "\0";
-
- /* cut leading whitespaces from value */
- for (; *value; value++)
- if (*value != ' ' && *value != '\t')
- break;
-
- if (*token && *value)
- setTokenValue(setup_file_list, token, value);
- }
-
- fclose(file);
-
- first_valid_list_entry = setup_file_list->next;
-
- /* free empty list header */
- setup_file_list->next = NULL;
- freeSetupFileList(setup_file_list);
-
- if (first_valid_list_entry == NULL)
- Error(ERR_WARN, "configuration file '%s' is empty", filename);
-
- return first_valid_list_entry;
-}
-
-static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
- char *identifier)
-{
- if (!setup_file_list)
- return;
-
- if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
- {
- if (strcmp(setup_file_list->value, identifier) != 0)
- {
- Error(ERR_WARN, "configuration file has wrong version");
- return;
- }
- else
- return;
- }
-
- if (setup_file_list->next)
- checkSetupFileListIdentifier(setup_file_list->next, identifier);
- else
- {
- Error(ERR_WARN, "configuration file has no version information");
- return;
- }
-}
-
static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
{
ldi->filename = NULL;
fclose(file);
free(filename);
- chmod(filename, SETUP_PERMS);
+ SetFilePermissions(filename, PERMS_PRIVATE);
}
void LoadSetup()
fclose(file);
free(filename);
- chmod(filename, SETUP_PERMS);
+ SetFilePermissions(filename, PERMS_PRIVATE);
}
void LoadLevelSetup_LastSeries()
struct SetupFileList *level_setup_list = NULL;
/* always start with reliable default values */
- leveldir_current = leveldir_first;
+ leveldir_current = getFirstValidLevelSeries(leveldir_first);
/* ----------------------------------------------------------------------- */
/* ~/.rocksndiamonds/levelsetup.conf */
fclose(file);
free(filename);
- chmod(filename, SETUP_PERMS);
+ SetFilePermissions(filename, PERMS_PRIVATE);
}
static void checkSeriesInfo()
fclose(file);
free(filename);
- chmod(filename, SETUP_PERMS);
+ SetFilePermissions(filename, PERMS_PRIVATE);
}
-/* LocalWords: Rocks'n
- */
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
void LoadTape(int);
void SaveTape(int);
+void DumpTape(struct TapeInfo *);
void LoadScore(int);
void SaveScore(int);
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/* this switch controls how rocks move horizontally */
#define OLD_GAME_BEHAVIOUR FALSE
+/* EXPERIMENTAL STUFF */
+#define USE_NEW_AMOEBA_CODE FALSE
+
/* for DigField() */
#define DF_NO_PUSH 0
#define DF_DIG 1
/* for Explode() */
#define EX_PHASE_START 0
-#define EX_NORMAL 0
-#define EX_CENTER 1
-#define EX_BORDER 2
+#define EX_NO_EXPLOSION 0
+#define EX_NORMAL 1
+#define EX_CENTER 2
+#define EX_BORDER 3
/* special positions in the game control window (relative to control window) */
#define XX_LEVEL 37
StorePlayer[x][y] = Feld[x][y];
- if (options.verbose)
+ if (options.debug)
{
printf("Player %d activated.\n", player->element_nr);
printf("[Local player is %d and currently %s.]\n",
boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */
boolean emulate_sp = TRUE; /* unless non-SUPAPLEX elements found */
+#if DEBUG
+#if USE_NEW_AMOEBA_CODE
+ printf("Using new amoeba code.\n");
+#else
+ printf("Using old amoeba code.\n");
+#endif
+#endif
+
/* don't play tapes over network */
network_playing = (options.network && !tape.playing);
player->move_delay = 0;
player->last_move_dir = MV_NO_MOVING;
+ player->is_moving = FALSE;
player->move_delay_value =
(level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
game.timegate_time_left = 0;
game.switchgate_pos = 0;
game.balloon_dir = MV_NO_MOVING;
+ game.explosions_delayed = TRUE;
for (i=0; i<4; i++)
{
AmoebaNr[x][y] = 0;
JustStopped[x][y] = 0;
Stop[x][y] = FALSE;
+ ExplodeField[x][y] = EX_NO_EXPLOSION;
}
}
tape.player_participates[i] = TRUE;
}
- if (options.verbose)
+ if (options.debug)
{
for (i=0; i<MAX_PLAYERS; i++)
{
}
}
+ game.version = (tape.playing ? tape.game_version : level.game_version);
game.emulation = (emulate_bd ? EMU_BOULDERDASH :
emulate_sb ? EMU_SOKOBAN :
emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
+ /* dynamically adjust element properties according to game engine version */
+ {
+ static int ep_slippery[] =
+ {
+ EL_BETON,
+ EL_MAUERWERK,
+ EL_MAUER_LEBT,
+ EL_MAUER_X,
+ EL_MAUER_Y,
+ EL_MAUER_XY
+ };
+ static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+
+ for (i=0; i<ep_slippery_num; i++)
+ {
+ if (game.version >= GAME_VERSION_2_0)
+ Elementeigenschaften2[ep_slippery[i]] |= EP_BIT_SLIPPERY_GEMS;
+ else
+ Elementeigenschaften2[ep_slippery[i]] &= ~EP_BIT_SLIPPERY_GEMS;
+ }
+ }
+
if (BorderElement == EL_LEERRAUM)
{
SBX_Left = 0;
KeyboardAutoRepeatOff();
- if (options.verbose)
+ if (options.debug)
{
for (i=0; i<4; i++)
printf("Player %d %sactive.\n",
if (TimeLeft)
{
- if (setup.sound_loops)
+ if (!tape.playing && setup.sound_loops)
PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
while(TimeLeft > 0)
{
- if (!setup.sound_loops)
+ if (!tape.playing && !setup.sound_loops)
PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
if (TimeLeft > 0 && !(TimeLeft % 10))
RaiseScore(level.score[SC_ZEITBONUS]);
TimeLeft--;
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
BackToFront();
- Delay(10);
+
+ if (!tape.playing)
+ Delay(10);
}
- if (setup.sound_loops)
+ if (!tape.playing && setup.sound_loops)
StopSound(SND_SIRR);
}
else if (level.time == 0) /* level without time limit */
{
- if (setup.sound_loops)
+ if (!tape.playing && setup.sound_loops)
PlaySoundExt(SND_SIRR, PSND_MAX_VOLUME, PSND_MAX_RIGHT, PSND_LOOP);
while(TimePlayed < 999)
{
- if (!setup.sound_loops)
+ if (!tape.playing && !setup.sound_loops)
PlaySoundStereo(SND_SIRR, PSND_MAX_RIGHT);
if (TimePlayed < 999 && !(TimePlayed % 10))
RaiseScore(level.score[SC_ZEITBONUS]);
TimePlayed++;
DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FS_SMALL, FC_YELLOW);
BackToFront();
- Delay(10);
+
+ if (!tape.playing)
+ Delay(10);
}
- if (setup.sound_loops)
+ if (!tape.playing && setup.sound_loops)
StopSound(SND_SIRR);
}
game_status = HALLOFFAME;
DrawHallOfFame(hi_pos);
if (raise_level)
+ {
level_nr++;
+ TapeErase();
+ }
}
else
{
game_status = MAINMENU;
if (raise_level)
+ {
level_nr++;
+ TapeErase();
+ }
DrawMainMenu();
}
}
if (Feld[x][y] == EL_BLOCKED &&
- (Store[oldx][oldy] == EL_MORAST_LEER ||
- Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY ||
- Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY ||
- Store[oldx][oldy] == EL_AMOEBE_NASS))
- {
- Feld[oldx][oldy] = Store[oldx][oldy];
- Store[oldx][oldy] = Store2[oldx][oldy] = 0;
- }
+ (Feld[oldx][oldy] == EL_QUICKSAND_EMPTYING ||
+ Feld[oldx][oldy] == EL_MAGIC_WALL_EMPTYING ||
+ Feld[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTYING ||
+ Feld[oldx][oldy] == EL_AMOEBA_DRIPPING))
+ Feld[oldx][oldy] = get_next_element(Feld[oldx][oldy]);
else
Feld[oldx][oldy] = EL_LEERRAUM;
+ Store[oldx][oldy] = Store2[oldx][oldy] = 0;
+
Feld[newx][newy] = EL_LEERRAUM;
MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0;
MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0;
void Explode(int ex, int ey, int phase, int mode)
{
int x, y;
- int num_phase = 9, delay = 2;
+ int num_phase = 9, delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
int last_phase = num_phase * delay;
int half_phase = (num_phase / 2) * delay;
int first_phase_after_start = EX_PHASE_START + 1;
+ if (game.explosions_delayed)
+ {
+ ExplodeField[ex][ey] = mode;
+ return;
+ }
+
if (phase == EX_PHASE_START) /* initialize 'Store[][]' field */
{
int center_element = Feld[ex][ey];
if (CAN_MOVE(element) || COULD_MOVE(element))
InitMovDir(x, y);
DrawLevelField(x, y);
+
+ if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present)
+ StorePlayer[x][y] = 0;
}
else if (!(phase % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
{
if (phase == delay)
ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
- DrawGraphic(SCREENX(x), SCREENY(y), graphic + (phase / delay - 1));
+ graphic += (phase / delay - 1);
+
+ if (IS_PFORTE(Store[x][y]))
+ {
+ DrawLevelElement(x, y, Store[x][y]);
+ DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic);
+ }
+ else
+ DrawGraphic(SCREENX(x), SCREENY(y), graphic);
}
}
return;
}
}
+ else if ((element == EL_SP_INFOTRON || element == EL_SP_ZONK) &&
+ (smashed == EL_SP_SNIKSNAK || smashed == EL_SP_ELECTRON ||
+ smashed == EL_SP_DISK_ORANGE))
+ {
+ Bang(x, y+1);
+ return;
+ }
else if (element == EL_FELSBROCKEN ||
element == EL_SP_ZONK ||
element == EL_BD_ROCK)
if (element == EL_KAEFER || element == EL_BUTTERFLY)
{
- TestIfBadThingHitsOtherBadThing(x, y);
+ TestIfBadThingTouchesOtherBadThing(x, y);
if (IN_LEV_FIELD(right_x, right_y) &&
IS_FREE(right_x, right_y))
else if (element == EL_FLIEGER || element == EL_FIREFLY ||
element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON)
{
- TestIfBadThingHitsOtherBadThing(x, y);
+ TestIfBadThingTouchesOtherBadThing(x, y);
if (IN_LEV_FIELD(left_x, left_y) &&
IS_FREE(left_x, left_y))
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
- Feld[x][y] = EL_FELSBROCKEN;
- Store[x][y] = EL_MORAST_LEER;
+ Feld[x][y] = EL_QUICKSAND_EMPTYING;
+ Store[x][y] = EL_FELSBROCKEN;
}
else if (Feld[x][y+1] == EL_MORAST_LEER)
{
Feld[x][y] = EL_MORAST_LEER;
Feld[x][y+1] = EL_MORAST_VOLL;
+ Store[x][y+1] = Store[x][y];
+ Store[x][y] = 0;
}
}
else if ((element == EL_FELSBROCKEN || element == EL_BD_ROCK) &&
Feld[x][y+1] == EL_MORAST_LEER)
{
InitMovingField(x, y, MV_DOWN);
- Store[x][y] = EL_MORAST_VOLL;
+ Feld[x][y] = EL_QUICKSAND_FILLING;
+ Store[x][y] = element;
}
else if (element == EL_MAGIC_WALL_FULL)
{
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
- Feld[x][y] = EL_CHANGED(Store2[x][y]);
- Store[x][y] = EL_MAGIC_WALL_EMPTY;
+ Feld[x][y] = EL_MAGIC_WALL_EMPTYING;
+ Store[x][y] = EL_CHANGED(Store[x][y]);
}
else if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY)
{
Feld[x][y] = EL_MAGIC_WALL_EMPTY;
Feld[x][y+1] = EL_MAGIC_WALL_FULL;
- Store2[x][y+1] = EL_CHANGED(Store2[x][y]);
- Store2[x][y] = 0;
+ Store[x][y+1] = EL_CHANGED(Store[x][y]);
+ Store[x][y] = 0;
}
}
else if (element == EL_MAGIC_WALL_BD_FULL)
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
- Feld[x][y] = EL_CHANGED2(Store2[x][y]);
- Store[x][y] = EL_MAGIC_WALL_BD_EMPTY;
+ Feld[x][y] = EL_MAGIC_WALL_BD_EMPTYING;
+ Store[x][y] = EL_CHANGED2(Store[x][y]);
}
else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)
{
Feld[x][y] = EL_MAGIC_WALL_BD_EMPTY;
Feld[x][y+1] = EL_MAGIC_WALL_BD_FULL;
- Store2[x][y+1] = EL_CHANGED2(Store2[x][y]);
- Store2[x][y] = 0;
+ Store[x][y+1] = EL_CHANGED2(Store[x][y]);
+ Store[x][y] = 0;
}
}
else if (CAN_CHANGE(element) &&
Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
InitMovingField(x, y, MV_DOWN);
- Store[x][y] =
- (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FULL :
- EL_MAGIC_WALL_BD_FULL);
- Store2[x][y+1] = element;
+ Feld[x][y] =
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FILLING :
+ EL_MAGIC_WALL_BD_FILLING);
+ Store[x][y] = element;
}
else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE)
{
Feld[x][y] = EL_AMOEBING;
Store[x][y] = EL_AMOEBE_NASS;
}
+ /* Store[x][y+1] must be zero, because:
+ (EL_MORAST_VOLL -> EL_FELSBROCKEN): Store[x][y+1] == EL_MORAST_LEER
+ */
+#if 0
#if OLD_GAME_BEHAVIOUR
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
#else
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1] &&
!IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
element != EL_DX_SUPABOMB)
+#endif
+#else
+ else if ((IS_SLIPPERY(Feld[x][y+1]) ||
+ (IS_SLIPPERY_GEMS(Feld[x][y+1]) && IS_GEM(element))) &&
+ !IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
+ element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif
{
boolean left = (x>0 && IS_FREE(x-1, y) &&
{
#if 1
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingRunsIntoHero(x, y, MovDir[x][y]);
return;
#else
/* enemy got the player */
DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
if (DONT_TOUCH(element))
- TestIfBadThingHitsHero(x, y);
+ TestIfBadThingTouchesHero(x, y);
return;
}
int newx = x + dx, newy = y + dy;
int step = (horiz_move ? dx : dy) * TILEX / 8;
- if (element == EL_TROPFEN)
+ if (element == EL_TROPFEN || element == EL_AMOEBA_DRIPPING)
step /= 2;
- else if (Store[x][y] == EL_MORAST_VOLL || Store[x][y] == EL_MORAST_LEER)
+ else if (element == EL_QUICKSAND_FILLING ||
+ element == EL_QUICKSAND_EMPTYING)
step /= 4;
+ else if (element == EL_MAGIC_WALL_FILLING ||
+ element == EL_MAGIC_WALL_BD_FILLING ||
+ element == EL_MAGIC_WALL_EMPTYING ||
+ element == EL_MAGIC_WALL_BD_EMPTYING)
+ step /= 2;
else if (CAN_FALL(element) && horiz_move &&
y < lev_fieldy-1 && IS_BELT(Feld[x][y+1]))
step /= 2;
}
}
- if (Store[x][y] == EL_MORAST_VOLL)
+ if (element == EL_QUICKSAND_FILLING)
{
- Store[x][y] = 0;
- Feld[newx][newy] = EL_MORAST_VOLL;
- element = EL_MORAST_VOLL;
+ element = Feld[newx][newy] = get_next_element(element);
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MORAST_LEER)
+ else if (element == EL_QUICKSAND_EMPTYING)
{
- Store[x][y] = 0;
- Feld[x][y] = EL_MORAST_LEER;
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MAGIC_WALL_FULL)
+ else if (element == EL_MAGIC_WALL_FILLING)
{
- Store[x][y] = 0;
- element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_MAGIC_WALL_FULL : EL_MAGIC_WALL_DEAD);
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD;
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MAGIC_WALL_EMPTY)
+ else if (element == EL_MAGIC_WALL_EMPTYING)
{
- Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_EMPTY :
- EL_MAGIC_WALL_DEAD);
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_MAGIC_WALL_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MAGIC_WALL_BD_FULL)
+ else if (element == EL_MAGIC_WALL_BD_FILLING)
{
- Store[x][y] = 0;
- element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_MAGIC_WALL_BD_FULL :
- EL_MAGIC_WALL_BD_DEAD);
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_MAGIC_WALL_BD_DEAD;
+ Store[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
+ else if (element == EL_MAGIC_WALL_BD_EMPTYING)
{
- Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_BD_EMPTY :
- EL_MAGIC_WALL_BD_DEAD);
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_MAGIC_WALL_BD_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_SALZSAEURE)
+ else if (element == EL_AMOEBA_DRIPPING)
{
- Store[x][y] = 0;
- Feld[newx][newy] = EL_SALZSAEURE;
- element = EL_SALZSAEURE;
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
}
- else if (Store[x][y] == EL_AMOEBE_NASS)
+ else if (Store[x][y] == EL_SALZSAEURE)
{
- Store[x][y] = 0;
- Feld[x][y] = EL_AMOEBE_NASS;
+ element = Feld[newx][newy] = EL_SALZSAEURE;
}
+ Store[x][y] = 0;
MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
MovDelay[newx][newy] = 0;
if (DONT_TOUCH(element)) /* object may be nasty to player or others */
{
- TestIfBadThingHitsHero(newx, newy);
- TestIfBadThingHitsFriend(newx, newy);
- TestIfBadThingHitsOtherBadThing(newx, newy);
+ TestIfBadThingTouchesHero(newx, newy);
+ TestIfBadThingTouchesFriend(newx, newy);
+ TestIfBadThingTouchesOtherBadThing(newx, newy);
}
else if (element == EL_PINGUIN)
- TestIfFriendHitsBadThing(newx, newy);
+ TestIfFriendTouchesBadThing(newx, newy);
if (CAN_SMASH(element) && direction == MV_DOWN &&
(newy == lev_fieldy-1 || !IS_FREE(x, newy+1)))
if (element != EL_AMOEBE_NASS || neway < ay || !IS_FREE(newax, neway) ||
(neway == lev_fieldy - 1 && newax != ax))
{
- Feld[newax][neway] = EL_AMOEBING;
+ Feld[newax][neway] = EL_AMOEBING; /* simple growth of new amoeba tile */
Store[newax][neway] = element;
}
else if (neway == ay)
- Feld[newax][neway] = EL_TROPFEN;
+ Feld[newax][neway] = EL_TROPFEN; /* drop left or right from amoeba */
else
{
- InitMovingField(ax, ay, MV_DOWN);
- Feld[ax][ay] = EL_TROPFEN;
- Store[ax][ay] = EL_AMOEBE_NASS;
+ InitMovingField(ax, ay, MV_DOWN); /* drop dripping out of amoeba */
+ Feld[ax][ay] = EL_AMOEBA_DRIPPING;
+ Store[ax][ay] = EL_TROPFEN;
ContinueMoving(ax, ay);
return;
}
{
static byte stored_player_action[MAX_PLAYERS];
static int num_stored_actions = 0;
+#if 0
static boolean save_tape_entry = FALSE;
+#endif
boolean moved = FALSE, snapped = FALSE, bombed = FALSE;
- int jx = player->jx, jy = player->jy;
int left = player_action & JOY_LEFT;
int right = player_action & JOY_RIGHT;
int up = player_action & JOY_UP;
if (player_action)
{
+#if 0
save_tape_entry = TRUE;
+#endif
player->frame_reset_delay = 0;
if (button1)
moved = MoveFigure(player, dx, dy);
}
+#if 0
if (tape.recording && (moved || snapped || bombed))
{
if (bombed && !moved)
player_action &= JOY_BUTTON;
stored_player_action[player->index_nr] = player_action;
+ save_tape_entry = TRUE;
}
else if (tape.playing && snapped)
SnapField(player, 0, 0); /* stop snapping */
+#else
+ stored_player_action[player->index_nr] = player_action;
+#endif
}
else
{
SnapField(player, 0, 0);
CheckGravityMovement(player);
+#if 1
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->is_moving = FALSE;
+#endif
+#if 0
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->last_move_dir = MV_NO_MOVING;
+
+ /* !!! CHECK THIS AGAIN !!!
+ (Seems to be needed for some EL_ROBOT stuff, but breaks
+ tapes when walking through pipes!)
+ */
+
+ /* it seems that "player->last_move_dir" is misused as some sort of
+ "player->is_just_moving_in_this_moment", which is needed for the
+ robot stuff (robots don't kill players when they are moving)
+ */
+#endif
+
if (++player->frame_reset_delay > player->move_delay_value)
player->Frame = 0;
}
+#if 0
if (tape.recording && num_stored_actions >= MAX_PLAYERS && save_tape_entry)
{
TapeRecordAction(stored_player_action);
num_stored_actions = 0;
save_tape_entry = FALSE;
}
+#else
+ if (tape.recording && num_stored_actions >= MAX_PLAYERS)
+ {
+ TapeRecordAction(stored_player_action);
+ num_stored_actions = 0;
+ }
+#endif
+#if 0
if (tape.playing && !tape.pausing && !player_action &&
tape.counter < tape.length)
{
+ int jx = player->jx, jy = player->jy;
int next_joy =
tape.pos[tape.counter].action[player->index_nr] & (JOY_LEFT|JOY_RIGHT);
}
}
}
+#endif
}
void GameActions()
{
StartMoving(x, y);
- if (IS_GEM(element))
+ if (IS_GEM(element) || element == EL_SP_INFOTRON)
EdelsteinFunkeln(x, y);
}
else if (IS_MOVING(x, y))
ContinueMoving(x, y);
else if (IS_ACTIVE_BOMB(element))
CheckDynamite(x, y);
- else if (element == EL_EXPLODING)
+#if 0
+ else if (element == EL_EXPLODING && !game.explosions_delayed)
Explode(x, y, Frame[x][y], EX_NORMAL);
+#endif
else if (element == EL_AMOEBING)
AmoebeWaechst(x, y);
else if (element == EL_DEAMOEBING)
AmoebeSchrumpft(x, y);
+
+#if !USE_NEW_AMOEBA_CODE
else if (IS_AMOEBALIVE(element))
AmoebeAbleger(x, y);
+#endif
+
else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
Life(x, y);
else if (element == EL_ABLENK_EIN)
boolean sieb = FALSE;
int jx = local_player->jx, jy = local_player->jy;
- if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL ||
- Store[x][y] == EL_MAGIC_WALL_EMPTY)
+ if (element == EL_MAGIC_WALL_FULL ||
+ element == EL_MAGIC_WALL_EMPTY ||
+ element == EL_MAGIC_WALL_EMPTYING)
{
SiebAktivieren(x, y, 1);
sieb = TRUE;
}
- else if (element == EL_MAGIC_WALL_BD_EMPTY ||
- element == EL_MAGIC_WALL_BD_FULL ||
- Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
+ else if (element == EL_MAGIC_WALL_BD_FULL ||
+ element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_EMPTYING)
{
SiebAktivieren(x, y, 2);
sieb = TRUE;
}
}
+#if USE_NEW_AMOEBA_CODE
+ /* new experimental amoeba growth stuff */
+#if 1
+ if (!(FrameCounter % 8))
+#endif
+ {
+ static unsigned long random = 1684108901;
+
+ for (i = 0; i < level.amoeba_speed * 28 / 8; i++)
+ {
+#if 0
+ x = (random >> 10) % lev_fieldx;
+ y = (random >> 20) % lev_fieldy;
+#else
+ x = RND(lev_fieldx);
+ y = RND(lev_fieldy);
+#endif
+ element = Feld[x][y];
+
+ if (!IS_PLAYER(x,y) &&
+ (element == EL_LEERRAUM ||
+ element == EL_ERDREICH ||
+ element == EL_MORAST_LEER ||
+ element == EL_BLURB_LEFT ||
+ element == EL_BLURB_RIGHT))
+ {
+ if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBE_NASS) ||
+ (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBE_NASS))
+ Feld[x][y] = EL_TROPFEN;
+ }
+
+ random = random * 129 + 1;
+ }
+ }
+#endif
+
+#if 0
+ if (game.explosions_delayed)
+#endif
+ {
+ game.explosions_delayed = FALSE;
+
+ for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+ {
+ element = Feld[x][y];
+
+ if (ExplodeField[x][y])
+ Explode(x, y, EX_PHASE_START, ExplodeField[x][y]);
+ else if (element == EL_EXPLODING)
+ Explode(x, y, Frame[x][y], EX_NORMAL);
+
+ ExplodeField[x][y] = EX_NO_EXPLOSION;
+ }
+
+ game.explosions_delayed = TRUE;
+ }
+
if (game.magic_wall_active)
{
if (!(game.magic_wall_time_left % 4))
{
element = Feld[x][y];
- if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL)
+ if (element == EL_MAGIC_WALL_EMPTY ||
+ element == EL_MAGIC_WALL_FULL)
{
Feld[x][y] = EL_MAGIC_WALL_DEAD;
DrawLevelField(x, y);
BuryHero(player);
}
else
- TestIfBadThingHitsHero(new_jx, new_jy);
+ TestIfHeroRunsIntoBadThing(jx, jy, player->MovDir);
return MF_MOVING;
}
if (!player->active || (!dx && !dy))
return FALSE;
+#if 0
if (!FrameReached(&player->move_delay, player->move_delay_value) &&
!tape.playing)
return FALSE;
+#else
+ if (!FrameReached(&player->move_delay, player->move_delay_value) &&
+ !(tape.playing && tape.file_version < FILE_VERSION_2_0))
+ return FALSE;
+#endif
/* remove the last programmed player action */
player->programmed_action = 0;
DrawLevelField(jx, jy); /* for "ErdreichAnbroeckeln()" */
player->last_move_dir = player->MovDir;
+ player->is_moving = TRUE;
}
else
{
CheckGravityMovement(player);
+ /*
player->last_move_dir = MV_NO_MOVING;
+ */
+ player->is_moving = FALSE;
}
- TestIfHeroHitsBadThing(jx, jy);
+ TestIfHeroTouchesBadThing(jx, jy);
if (!player->active)
RemoveHero(player);
ScreenMovDir = MV_NO_MOVING;
}
-void TestIfGoodThingHitsBadThing(int goodx, int goody)
+void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir)
{
- int i, killx = goodx, killy = goody;
- static int xy[4][2] =
+ int i, kill_x = -1, kill_y = -1;
+ static int test_xy[4][2] =
{
{ 0, -1 },
{ -1, 0 },
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int test_dir[4] =
{
MV_UP,
MV_LEFT,
for (i=0; i<4; i++)
{
- int x, y, element;
+ int test_x, test_y, test_move_dir, test_element;
- x = goodx + xy[i][0];
- y = goody + xy[i][1];
- if (!IN_LEV_FIELD(x, y))
+ test_x = good_x + test_xy[i][0];
+ test_y = good_y + test_xy[i][1];
+ if (!IN_LEV_FIELD(test_x, test_y))
continue;
+ test_move_dir =
+ (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NO_MOVING);
+
#if 0
- element = Feld[x][y];
+ test_element = Feld[test_x][test_y];
#else
- element = MovingOrBlocked2ElementIfNotLeaving(x, y);
+ test_element = MovingOrBlocked2ElementIfNotLeaving(test_x, test_y);
#endif
- if (DONT_TOUCH(element))
+ /* 1st case: good thing is moving towards DONT_GO_TO style bad thing;
+ 2nd case: DONT_TOUCH style bad thing does not move away from good thing
+ */
+ if ((DONT_GO_TO(test_element) && good_move_dir == test_dir[i]) ||
+ (DONT_TOUCH(test_element) && test_move_dir != test_dir[i]))
{
- if (MovDir[x][y] == harmless[i])
- continue;
-
- killx = x;
- killy = y;
+ kill_x = test_x;
+ kill_y = test_y;
break;
}
}
- if (killx != goodx || killy != goody)
+ if (kill_x != -1 || kill_y != -1)
{
- if (IS_PLAYER(goodx, goody))
+ if (IS_PLAYER(good_x, good_y))
{
- struct PlayerInfo *player = PLAYERINFO(goodx, goody);
+ struct PlayerInfo *player = PLAYERINFO(good_x, good_y);
if (player->shield_active_time_left > 0)
- Bang(killx, killy);
- else if (!PLAYER_PROTECTED(goodx, goody))
+ Bang(kill_x, kill_y);
+ else if (!PLAYER_PROTECTED(good_x, good_y))
KillHero(player);
}
else
- Bang(goodx, goody);
+ Bang(good_x, good_y);
}
}
-void TestIfBadThingHitsGoodThing(int badx, int bady)
+void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir)
{
- int i, killx = badx, killy = bady;
- static int xy[4][2] =
+ int i, kill_x = -1, kill_y = -1;
+ int bad_element = Feld[bad_x][bad_y];
+ static int test_xy[4][2] =
{
{ 0, -1 },
{ -1, 0 },
{ +1, 0 },
{ 0, +1 }
};
- static int harmless[4] =
+ static int test_dir[4] =
{
MV_UP,
MV_LEFT,
MV_DOWN
};
- if (Feld[badx][bady] == EL_EXPLODING) /* skip just exploding bad things */
+ if (bad_element == EL_EXPLODING) /* skip just exploding bad things */
return;
for (i=0; i<4; i++)
{
- int x, y, element;
+ int test_x, test_y, test_move_dir, test_element;
- x = badx + xy[i][0];
- y = bady + xy[i][1];
- if (!IN_LEV_FIELD(x, y))
+ test_x = bad_x + test_xy[i][0];
+ test_y = bad_y + test_xy[i][1];
+ if (!IN_LEV_FIELD(test_x, test_y))
continue;
- element = Feld[x][y];
+ test_move_dir =
+ (IS_MOVING(test_x, test_y) ? MovDir[test_x][test_y] : MV_NO_MOVING);
- if (IS_PLAYER(x, y))
- {
- killx = x;
- killy = y;
- break;
- }
- else if (element == EL_PINGUIN)
+ test_element = Feld[test_x][test_y];
+
+ /* 1st case: good thing is moving towards DONT_GO_TO style bad thing;
+ 2nd case: DONT_TOUCH style bad thing does not move away from good thing
+ */
+ if ((DONT_GO_TO(bad_element) && bad_move_dir == test_dir[i]) ||
+ (DONT_TOUCH(bad_element) && test_move_dir != test_dir[i]))
{
- if (MovDir[x][y] == harmless[i] && IS_MOVING(x, y))
- continue;
+ /* good thing is player or penguin that does not move away */
+ if (IS_PLAYER(test_x, test_y))
+ {
+ struct PlayerInfo *player = PLAYERINFO(test_x, test_y);
- killx = x;
- killy = y;
- break;
+ if (bad_element == EL_ROBOT && player->is_moving)
+ continue; /* robot does not kill player if he is moving */
+
+ kill_x = test_x;
+ kill_y = test_y;
+ break;
+ }
+ else if (test_element == EL_PINGUIN)
+ {
+ kill_x = test_x;
+ kill_y = test_y;
+ break;
+ }
}
}
- if (killx != badx || killy != bady)
+ if (kill_x != -1 || kill_y != -1)
{
- if (IS_PLAYER(killx, killy))
+ if (IS_PLAYER(kill_x, kill_y))
{
- struct PlayerInfo *player = PLAYERINFO(killx, killy);
+ struct PlayerInfo *player = PLAYERINFO(kill_x, kill_y);
+
+#if 0
+ int dir = player->MovDir;
+ int newx = player->jx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
+ int newy = player->jy + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0);
+
+ if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
+ newx != bad_x && newy != bad_y)
+ ; /* robot does not kill player if he is moving */
+ else
+ printf("-> %d\n", player->MovDir);
+
+ if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
+ newx != bad_x && newy != bad_y)
+ ; /* robot does not kill player if he is moving */
+ else
+ ;
+#endif
if (player->shield_active_time_left > 0)
- Bang(badx, bady);
- else if (!PLAYER_PROTECTED(killx, killy))
+ Bang(bad_x, bad_y);
+ else if (!PLAYER_PROTECTED(kill_x, kill_y))
KillHero(player);
}
else
- Bang(killx, killy);
+ Bang(kill_x, kill_y);
}
}
-void TestIfHeroHitsBadThing(int x, int y)
+void TestIfHeroTouchesBadThing(int x, int y)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
}
-void TestIfBadThingHitsHero(int x, int y)
+void TestIfHeroRunsIntoBadThing(int x, int y, int move_dir)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfGoodThingHitsBadThing(x, y, move_dir);
}
-void TestIfFriendHitsBadThing(int x, int y)
+void TestIfBadThingTouchesHero(int x, int y)
{
- TestIfGoodThingHitsBadThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
}
-void TestIfBadThingHitsFriend(int x, int y)
+void TestIfBadThingRunsIntoHero(int x, int y, int move_dir)
{
- TestIfBadThingHitsGoodThing(x, y);
+ TestIfBadThingHitsGoodThing(x, y, move_dir);
}
-void TestIfBadThingHitsOtherBadThing(int badx, int bady)
+void TestIfFriendTouchesBadThing(int x, int y)
{
- int i, killx = badx, killy = bady;
+ TestIfGoodThingHitsBadThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfBadThingTouchesFriend(int x, int y)
+{
+ TestIfBadThingHitsGoodThing(x, y, MV_NO_MOVING);
+}
+
+void TestIfBadThingTouchesOtherBadThing(int bad_x, int bad_y)
+{
+ int i, kill_x = bad_x, kill_y = bad_y;
static int xy[4][2] =
{
{ 0, -1 },
{
int x, y, element;
- x=badx + xy[i][0];
- y=bady + xy[i][1];
+ x = bad_x + xy[i][0];
+ y = bad_y + xy[i][1];
if (!IN_LEV_FIELD(x, y))
continue;
if (IS_AMOEBOID(element) || element == EL_LIFE ||
element == EL_AMOEBING || element == EL_TROPFEN)
{
- killx = x;
- killy = y;
+ kill_x = x;
+ kill_y = y;
break;
}
}
- if (killx != badx || killy != bady)
- Bang(badx, bady);
+ if (kill_x != bad_x || kill_y != bad_y)
+ Bang(bad_x, bad_y);
}
void KillHero(struct PlayerInfo *player)
player->present = FALSE;
player->active = FALSE;
- StorePlayer[jx][jy] = 0;
+ if (!ExplodeField[jx][jy])
+ StorePlayer[jx][jy] = 0;
for (i=0; i<MAX_PLAYERS; i++)
if (stored_player[i].active)
if (player->push_delay == 0)
player->push_delay = FrameCounter;
+#if 0
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
!tape.playing && element != EL_SPRING)
return MF_NO_ACTION;
+#else
+ if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+ !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
+ element != EL_SPRING)
+ return MF_NO_ACTION;
+#endif
RemoveField(x, y);
Feld[x+dx][y+dy] = element;
if (player->push_delay == 0)
player->push_delay = FrameCounter;
+#if 0
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
!tape.playing && element != EL_BALLOON)
return MF_NO_ACTION;
+#else
+ if (!FrameReached(&player->push_delay, player->push_delay_value) &&
+ !(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
+ element != EL_BALLOON)
+ return MF_NO_ACTION;
+#endif
if (IS_SB_ELEMENT(element))
{
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
void ScrollFigure(struct PlayerInfo *, int);
void ScrollScreen(struct PlayerInfo *, int);
-void TestIfGoodThingHitsBadThing(int, int);
-void TestIfBadThingHitsGoodThing(int, int);
-void TestIfHeroHitsBadThing(int, int);
-void TestIfBadThingHitsHero(int, int);
-void TestIfFriendHitsBadThing(int, int);
-void TestIfBadThingHitsFriend(int, int);
-void TestIfBadThingHitsOtherBadThing(int, int);
+void TestIfGoodThingHitsBadThing(int, int, int);
+void TestIfBadThingHitsGoodThing(int, int, int);
+void TestIfHeroTouchesBadThing(int, int);
+void TestIfHeroRunsIntoBadThing(int, int, int);
+void TestIfBadThingTouchesHero(int, int);
+void TestIfBadThingRunsIntoHero(int, int, int);
+void TestIfFriendTouchesBadThing(int, int);
+void TestIfBadThingTouchesFriend(int, int);
+void TestIfBadThingTouchesOtherBadThing(int, int);
void KillHero(struct PlayerInfo *);
void BuryHero(struct PlayerInfo *);
void RemoveHero(struct PlayerInfo *);
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
EL_AMOEBE_BD,
EL_MORAST_VOLL,
EL_MORAST_LEER,
+ EL_QUICKSAND_FILLING,
+ EL_QUICKSAND_EMPTYING,
EL_MAGIC_WALL_OFF,
EL_MAGIC_WALL_EMPTY,
EL_MAGIC_WALL_FULL,
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT,
- EL_SP_INFOTRON
+ EL_DIAMANT
};
static int ep_gem_num = sizeof(ep_gem)/sizeof(int);
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
" -l, --level directory alternative level directory\n"
" -s, --serveronly only start network server\n"
" -n, --network network multiplayer game\n"
- " -v, --verbose verbose mode\n",
+ " -v, --verbose verbose mode\n"
+ " --debug display debugging information\n",
program.command_basename);
exit(0);
}
}
}
-void getFileChunk(FILE *file, char *chunk_buffer, int *chunk_length,
- int byte_order)
+boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size,
+ int byte_order)
{
- const int chunk_identifier_length = 4;
+ const int chunk_name_length = 4;
+
+ /* read chunk name */
+ fgets(chunk_name, chunk_name_length + 1, file);
- /* read chunk identifier */
- fgets(chunk_buffer, chunk_identifier_length + 1, file);
+ if (chunk_size != NULL)
+ {
+ /* read chunk size */
+ *chunk_size = getFile32BitInteger(file, byte_order);
+ }
- /* read chunk length */
- *chunk_length = getFile32BitInteger(file, byte_order);
+ return (feof(file) || ferror(file) ? FALSE : TRUE);
}
-void putFileChunk(FILE *file, char *chunk_name, int chunk_length,
+void putFileChunk(FILE *file, char *chunk_name, int chunk_size,
int byte_order)
{
- /* write chunk identifier */
+ /* write chunk name */
fputs(chunk_name, file);
- /* write chunk length */
- putFile32BitInteger(file, chunk_length, byte_order);
+ if (chunk_size >= 0)
+ {
+ /* write chunk size */
+ putFile32BitInteger(file, chunk_size, byte_order);
+ }
+}
+
+void ReadUnusedBytesFromFile(FILE *file, unsigned long bytes)
+{
+ while (bytes--)
+ fgetc(file);
+}
+
+void WriteUnusedBytesToFile(FILE *file, unsigned long bytes)
+{
+ while (bytes--)
+ fputc(0, file);
}
#define TRANSLATE_KEYSYM_TO_KEYNAME 0
/* some stuff from "files.c" */
/* ========================================================================= */
+#if defined(PLATFORM_WIN32)
+#ifndef S_IRGRP
+#define S_IRGRP S_IRUSR
+#endif
+#ifndef S_IROTH
+#define S_IROTH S_IRUSR
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP S_IWUSR
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH S_IWUSR
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP S_IXUSR
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH S_IXUSR
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG (S_IRGRP | S_IWGRP | S_IXGRP)
+#endif
+#ifndef S_ISGID
+#define S_ISGID 0
+#endif
+#endif /* PLATFORM_WIN32 */
+
+/* file permissions for newly written files */
#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH)
#define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH)
#define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH)
-#define USERDATA_DIR_MODE (MODE_R_ALL | MODE_X_ALL | S_IWUSR)
+
+#define MODE_W_PRIVATE (S_IWUSR)
+#define MODE_W_PUBLIC (S_IWUSR | S_IWGRP)
+#define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID)
+
+#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
+#define DIR_PERMS_PUBLIC (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
+
+#define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE)
+#define FILE_PERMS_PUBLIC (MODE_R_ALL | MODE_W_PUBLIC)
char *getUserDataDir(void)
{
return userdata_dir;
}
-void createDirectory(char *dir, char *text)
+char *getSetupDir()
+{
+ return getUserDataDir();
+}
+
+static mode_t posix_umask(mode_t mask)
+{
+#if defined(PLATFORM_UNIX)
+ return umask(mask);
+#else
+ return 0;
+#endif
+}
+
+static int posix_mkdir(const char *pathname, mode_t mode)
{
- if (access(dir, F_OK) != 0)
#if defined(PLATFORM_WIN32)
- if (mkdir(dir) != 0)
+ return mkdir(pathname);
#else
- if (mkdir(dir, USERDATA_DIR_MODE) != 0)
+ return mkdir(pathname, mode);
#endif
+}
+
+void createDirectory(char *dir, char *text, int permission_class)
+{
+ /* leave "other" permissions in umask untouched, but ensure group parts
+ of USERDATA_DIR_MODE are not masked */
+ mode_t dir_mode = (permission_class == PERMS_PRIVATE ?
+ DIR_PERMS_PRIVATE : DIR_PERMS_PUBLIC);
+ mode_t normal_umask = posix_umask(0);
+ mode_t group_umask = ~(dir_mode & S_IRWXG);
+ posix_umask(normal_umask & group_umask);
+
+ if (access(dir, F_OK) != 0)
+ if (posix_mkdir(dir, dir_mode) != 0)
Error(ERR_WARN, "cannot create %s directory '%s'", text, dir);
+
+ posix_umask(normal_umask); /* reset normal umask */
}
void InitUserDataDirectory()
{
- createDirectory(getUserDataDir(), "user data");
+ createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE);
+}
+
+void SetFilePermissions(char *filename, int permission_class)
+{
+ chmod(filename, (permission_class == PERMS_PRIVATE ?
+ FILE_PERMS_PRIVATE : FILE_PERMS_PUBLIC));
+}
+
+int getFileVersionFromCookieString(const char *cookie)
+{
+ const char *ptr_cookie1, *ptr_cookie2;
+ const char *pattern1 = "_FILE_VERSION_";
+ const char *pattern2 = "?.?";
+ const int len_cookie = strlen(cookie);
+ const int len_pattern1 = strlen(pattern1);
+ const int len_pattern2 = strlen(pattern2);
+ const int len_pattern = len_pattern1 + len_pattern2;
+ int version_major, version_minor;
+
+ if (len_cookie <= len_pattern)
+ return -1;
+
+ ptr_cookie1 = &cookie[len_cookie - len_pattern];
+ ptr_cookie2 = &cookie[len_cookie - len_pattern2];
+
+ if (strncmp(ptr_cookie1, pattern1, len_pattern1) != 0)
+ return -1;
+
+ if (ptr_cookie2[0] < '0' || ptr_cookie2[0] > '9' ||
+ ptr_cookie2[1] != '.' ||
+ ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
+ return -1;
+
+ version_major = ptr_cookie2[0] - '0';
+ version_minor = ptr_cookie2[2] - '0';
+
+ return VERSION_IDENT(version_major, version_minor, 0);
+}
+
+boolean checkCookieString(const char *cookie, const char *template)
+{
+ const char *pattern = "_FILE_VERSION_?.?";
+ const int len_cookie = strlen(cookie);
+ const int len_template = strlen(template);
+ const int len_pattern = strlen(pattern);
+
+ if (len_cookie != len_template)
+ return FALSE;
+
+ if (strncmp(cookie, template, len_cookie - len_pattern) != 0)
+ return FALSE;
+
+ return TRUE;
+}
+
+/* ------------------------------------------------------------------------- */
+/* setup file stuff */
+/* ------------------------------------------------------------------------- */
+
+static char *string_tolower(char *s)
+{
+ static char s_lower[100];
+ int i;
+
+ if (strlen(s) >= 100)
+ return s;
+
+ strcpy(s_lower, s);
+
+ for (i=0; i<strlen(s_lower); i++)
+ s_lower[i] = tolower(s_lower[i]);
+
+ return s_lower;
+}
+
+int get_string_integer_value(char *s)
+{
+ static char *number_text[][3] =
+ {
+ { "0", "zero", "null", },
+ { "1", "one", "first" },
+ { "2", "two", "second" },
+ { "3", "three", "third" },
+ { "4", "four", "fourth" },
+ { "5", "five", "fifth" },
+ { "6", "six", "sixth" },
+ { "7", "seven", "seventh" },
+ { "8", "eight", "eighth" },
+ { "9", "nine", "ninth" },
+ { "10", "ten", "tenth" },
+ { "11", "eleven", "eleventh" },
+ { "12", "twelve", "twelfth" },
+ };
+
+ int i, j;
+
+ for (i=0; i<13; i++)
+ for (j=0; j<3; j++)
+ if (strcmp(string_tolower(s), number_text[i][j]) == 0)
+ return i;
+
+ return atoi(s);
+}
+
+boolean get_string_boolean_value(char *s)
+{
+ if (strcmp(string_tolower(s), "true") == 0 ||
+ strcmp(string_tolower(s), "yes") == 0 ||
+ strcmp(string_tolower(s), "on") == 0 ||
+ get_string_integer_value(s) == 1)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+char *getFormattedSetupEntry(char *token, char *value)
+{
+ int i;
+ static char entry[MAX_LINE_LEN];
+
+ sprintf(entry, "%s:", token);
+ for (i=strlen(entry); i<TOKEN_VALUE_POSITION; i++)
+ entry[i] = ' ';
+ entry[i] = '\0';
+
+ strcat(entry, value);
+
+ return entry;
+}
+
+void freeSetupFileList(struct SetupFileList *setup_file_list)
+{
+ if (!setup_file_list)
+ return;
+
+ if (setup_file_list->token)
+ free(setup_file_list->token);
+ if (setup_file_list->value)
+ free(setup_file_list->value);
+ if (setup_file_list->next)
+ freeSetupFileList(setup_file_list->next);
+ free(setup_file_list);
+}
+
+static struct SetupFileList *newSetupFileList(char *token, char *value)
+{
+ struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList));
+
+ new->token = checked_malloc(strlen(token) + 1);
+ strcpy(new->token, token);
+
+ new->value = checked_malloc(strlen(value) + 1);
+ strcpy(new->value, value);
+
+ new->next = NULL;
+
+ return new;
+}
+
+char *getTokenValue(struct SetupFileList *setup_file_list, char *token)
+{
+ if (!setup_file_list)
+ return NULL;
+
+ if (strcmp(setup_file_list->token, token) == 0)
+ return setup_file_list->value;
+ else
+ return getTokenValue(setup_file_list->next, token);
+}
+
+static void setTokenValue(struct SetupFileList *setup_file_list,
+ char *token, char *value)
+{
+ if (!setup_file_list)
+ return;
+
+ if (strcmp(setup_file_list->token, token) == 0)
+ {
+ free(setup_file_list->value);
+ setup_file_list->value = checked_malloc(strlen(value) + 1);
+ strcpy(setup_file_list->value, value);
+ }
+ else if (setup_file_list->next == NULL)
+ setup_file_list->next = newSetupFileList(token, value);
+ else
+ setTokenValue(setup_file_list->next, token, value);
+}
+
+#ifdef DEBUG
+static void printSetupFileList(struct SetupFileList *setup_file_list)
+{
+ if (!setup_file_list)
+ return;
+
+ printf("token: '%s'\n", setup_file_list->token);
+ printf("value: '%s'\n", setup_file_list->value);
+
+ printSetupFileList(setup_file_list->next);
+}
+#endif
+
+struct SetupFileList *loadSetupFileList(char *filename)
+{
+ int line_len;
+ char line[MAX_LINE_LEN];
+ char *token, *value, *line_ptr;
+ struct SetupFileList *setup_file_list = newSetupFileList("", "");
+ struct SetupFileList *first_valid_list_entry;
+
+ FILE *file;
+
+ if (!(file = fopen(filename, MODE_READ)))
+ {
+ Error(ERR_WARN, "cannot open configuration file '%s'", filename);
+ return NULL;
+ }
+
+ while(!feof(file))
+ {
+ /* read next line of input file */
+ if (!fgets(line, MAX_LINE_LEN, file))
+ break;
+
+ /* cut trailing comment or whitespace from input line */
+ for (line_ptr = line; *line_ptr; line_ptr++)
+ {
+ if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r')
+ {
+ *line_ptr = '\0';
+ break;
+ }
+ }
+
+ /* cut trailing whitespaces from input line */
+ for (line_ptr = &line[strlen(line)]; line_ptr > line; line_ptr--)
+ if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0')
+ *line_ptr = '\0';
+
+ /* ignore empty lines */
+ if (*line == '\0')
+ continue;
+
+ line_len = strlen(line);
+
+ /* cut leading whitespaces from token */
+ for (token = line; *token; token++)
+ if (*token != ' ' && *token != '\t')
+ break;
+
+ /* find end of token */
+ for (line_ptr = token; *line_ptr; line_ptr++)
+ {
+ if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':')
+ {
+ *line_ptr = '\0';
+ break;
+ }
+ }
+
+ if (line_ptr < line + line_len)
+ value = line_ptr + 1;
+ else
+ value = "\0";
+
+ /* cut leading whitespaces from value */
+ for (; *value; value++)
+ if (*value != ' ' && *value != '\t')
+ break;
+
+ if (*token && *value)
+ setTokenValue(setup_file_list, token, value);
+ }
+
+ fclose(file);
+
+ first_valid_list_entry = setup_file_list->next;
+
+ /* free empty list header */
+ setup_file_list->next = NULL;
+ freeSetupFileList(setup_file_list);
+
+ if (first_valid_list_entry == NULL)
+ Error(ERR_WARN, "configuration file '%s' is empty", filename);
+
+ return first_valid_list_entry;
+}
+
+void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list,
+ char *identifier)
+{
+ if (!setup_file_list)
+ return;
+
+ if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0)
+ {
+ if (strcmp(setup_file_list->value, identifier) != 0)
+ {
+ Error(ERR_WARN, "configuration file has wrong version");
+ return;
+ }
+ else
+ return;
+ }
+
+ if (setup_file_list->next)
+ checkSetupFileListIdentifier(setup_file_list->next, identifier);
+ else
+ {
+ Error(ERR_WARN, "configuration file has no version information");
+ return;
+ }
}
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include "system.h"
+/* functions for version handling */
+#define VERSION_IDENT(x,y,z) ((x) * 10000 + (y) * 100 + (z))
+#define VERSION_MAJOR(x) ((x) / 10000)
+#define VERSION_MINOR(x) (((x) % 10000) / 100)
+#define VERSION_PATCH(x) ((x) % 100)
+
/* values for InitCounter() and Counter() */
#define INIT_COUNTER 0
#define READ_COUNTER 1
#define BYTE_ORDER_BIG_ENDIAN 0
#define BYTE_ORDER_LITTLE_ENDIAN 1
+/* values for createDirectory() */
+#define PERMS_PRIVATE 0
+#define PERMS_PUBLIC 1
+
+/* values for general file handling stuff */
+#define MAX_FILENAME_LEN 256
+#define MAX_LINE_LEN 1000
+
+/* values for setup file stuff */
+#define TYPE_BOOLEAN 1
+#define TYPE_SWITCH 2
+#define TYPE_KEY 3
+#define TYPE_INTEGER 4
+#define TYPE_STRING 5
+
+#define TOKEN_STR_FILE_IDENTIFIER "file_identifier"
+
+#define TOKEN_VALUE_POSITION 30
+
+struct SetupFileList
+{
+ char *token;
+ char *value;
+ struct SetupFileList *next;
+};
+
+struct TokenInfo
+{
+ int type;
+ void *value;
+ char *text;
+};
+
void InitCounter(void);
unsigned long Counter(void);
void Delay(unsigned long);
void putFile16BitInteger(FILE *, short, int);
int getFile32BitInteger(FILE *, int);
void putFile32BitInteger(FILE *, int, int);
-void getFileChunk(FILE *, char *, int *, int);
+boolean getFileChunk(FILE *, char *, int *, int);
void putFileChunk(FILE *, char *, int, int);
+void ReadUnusedBytesFromFile(FILE *, unsigned long);
+void WriteUnusedBytesToFile(FILE *, unsigned long);
+
char *getKeyNameFromKey(Key);
char *getX11KeyNameFromKey(Key);
Key getKeyFromX11KeyName(char *);
inline void swap_number_pairs(int *, int *, int *, int *);
char *getUserDataDir(void);
-void createDirectory(char *, char *);
+char *getSetupDir(void);
+void createDirectory(char *, char *, int);
void InitUserDataDirectory(void);
+void SetFilePermissions(char *, int);
+int getFileVersionFromCookieString(const char *);
+boolean checkCookieString(const char *, const char *);
+
+int get_string_integer_value(char *);
+boolean get_string_boolean_value(char *);
+char *getFormattedSetupEntry(char *, char *);
+void freeSetupFileList(struct SetupFileList *);
+char *getTokenValue(struct SetupFileList *, char *);
+struct SetupFileList *loadSetupFileList(char *);
+void checkSetupFileListIdentifier(struct SetupFileList *, char *);
#if !defined(PLATFORM_UNIX)
void initErrorFile();
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#define PLATFORM_FREEBSD
#endif
+#if defined(__NetBSD__)
+#define PLATFORM_NETBSD
+#endif
+
/* detecting HP-UX by the following compiler keyword definitions:
- in K&R mode (the default), the HP C compiler defines "hpux"
- in ANSI mode (-Aa or -Ae), the HP C compiler defines "__hpux"
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/* video functions */
/* ========================================================================= */
+/* functions from SGE library */
+inline void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32);
+
+#ifdef PLATFORM_WIN32
+#define FULLSCREEN_BUG
+#endif
+
+/* stuff needed to work around SDL/Windows fullscreen drawing bug */
+static int fullscreen_width;
+static int fullscreen_height;
+static int fullscreen_xoffset;
+static int fullscreen_yoffset;
+static int video_xoffset;
+static int video_yoffset;
+
inline void SDLInitVideoDisplay(void)
{
/* initialize SDL video */
inline void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
boolean fullscreen)
{
+#ifdef FULLSCREEN_BUG
+ int i;
+ static int screen_xy[][2] =
+ {
+ { 640, 480 },
+ { 800, 600 },
+ { 1024, 768 },
+ { -1, -1 }
+ };
+#endif
+
+ /* default: normal game window size */
+ fullscreen_width = video.width;
+ fullscreen_height = video.height;
+ fullscreen_xoffset = 0;
+ fullscreen_yoffset = 0;
+
+#ifdef FULLSCREEN_BUG
+ for (i=0; screen_xy[i][0] != -1; i++)
+ {
+ if (video.width <= screen_xy[i][0] && video.height <= screen_xy[i][1])
+ {
+ fullscreen_width = screen_xy[i][0];
+ fullscreen_height = screen_xy[i][1];
+ break;
+ }
+ }
+
+ fullscreen_xoffset = (fullscreen_width - video.width) / 2;
+ fullscreen_yoffset = (fullscreen_height - video.height) / 2;
+#endif
+
/* open SDL video output device (window or fullscreen mode) */
if (!SDLSetVideoMode(backbuffer, fullscreen))
Error(ERR_EXIT, "setting video mode failed");
if (fullscreen && !video.fullscreen_enabled && video.fullscreen_available)
{
+ video_xoffset = fullscreen_xoffset;
+ video_yoffset = fullscreen_yoffset;
+
/* switch display to fullscreen mode, if available */
- if ((new_surface = SDL_SetVideoMode(video.width, video.height,
+ if ((new_surface = SDL_SetVideoMode(fullscreen_width, fullscreen_height,
video.depth, surface_flags_fullscreen))
== NULL)
{
if ((!fullscreen && video.fullscreen_enabled) || new_surface == NULL)
{
+ video_xoffset = 0;
+ video_yoffset = 0;
+
/* switch display to window mode */
if ((new_surface = SDL_SetVideoMode(video.width, video.height,
video.depth, surface_flags_window))
Bitmap *real_dst_bitmap = (dst_bitmap == window ? backbuffer : dst_bitmap);
SDL_Rect src_rect, dst_rect;
+#ifdef FULLSCREEN_BUG
+ if (src_bitmap == backbuffer)
+ {
+ src_x += video_xoffset;
+ src_y += video_yoffset;
+ }
+#endif
+
src_rect.x = src_x;
src_rect.y = src_y;
src_rect.w = width;
src_rect.h = height;
+#ifdef FULLSCREEN_BUG
+ if (dst_bitmap == backbuffer || dst_bitmap == window)
+ {
+ dst_x += video_xoffset;
+ dst_y += video_yoffset;
+ }
+#endif
+
dst_rect.x = dst_x;
dst_rect.y = dst_y;
dst_rect.w = width;
unsigned int color_g = (color >> 8) && 0xff;
unsigned int color_b = (color >> 0) && 0xff;
+#ifdef FULLSCREEN_BUG
+ if (dst_bitmap == backbuffer || dst_bitmap == window)
+ {
+ x += video_xoffset;
+ y += video_yoffset;
+ }
+#endif
+
rect.x = x;
rect.y = y;
rect.w = width;
SDL_UpdateRect(backbuffer->surface, x, y, width, height);
}
-inline void SDLDrawSimpleLine(SDL_Surface *surface, int from_x, int from_y,
+inline void SDLDrawSimpleLine(Bitmap *dst_bitmap, int from_x, int from_y,
int to_x, int to_y, unsigned int color)
{
+ SDL_Surface *surface = dst_bitmap->surface;
SDL_Rect rect;
unsigned int color_r = (color >> 16) & 0xff;
unsigned int color_g = (color >> 8) & 0xff;
rect.w = (to_x - from_x + 1);
rect.h = (to_y - from_y + 1);
+#ifdef FULLSCREEN_BUG
+ if (dst_bitmap == backbuffer || dst_bitmap == window)
+ {
+ rect.x += video_xoffset;
+ rect.y += video_yoffset;
+ }
+#endif
+
SDL_FillRect(surface, &rect,
SDL_MapRGB(surface->format, color_r, color_g, color_b));
}
-inline void SDLDrawLine(SDL_Surface *surface, int from_x, int from_y,
+inline void SDLDrawLine(Bitmap *dst_bitmap, int from_x, int from_y,
int to_x, int to_y, Uint32 color)
{
- sge_Line(surface, from_x, from_y, to_x, to_y, color);
+#ifdef FULLSCREEN_BUG
+ if (dst_bitmap == backbuffer || dst_bitmap == window)
+ {
+ from_x += video_xoffset;
+ from_y += video_yoffset;
+ to_x += video_xoffset;
+ to_y += video_yoffset;
+ }
+#endif
+
+ sge_Line(dst_bitmap->surface, from_x, from_y, to_x, to_y, color);
}
#if 0
}
#endif
+inline Pixel SDLGetPixel(Bitmap *dst_bitmap, int x, int y)
+{
+ SDL_Surface *surface = dst_bitmap->surface;
+
+#ifdef FULLSCREEN_BUG
+ if (dst_bitmap == backbuffer || dst_bitmap == window)
+ {
+ x += video_xoffset;
+ y += video_yoffset;
+ }
+#endif
+
+ switch (surface->format->BytesPerPixel)
+ {
+ case 1: /* assuming 8-bpp */
+ {
+ return *((Uint8 *)surface->pixels + y * surface->pitch + x);
+ }
+ break;
+
+ case 2: /* probably 15-bpp or 16-bpp */
+ {
+ return *((Uint16 *)surface->pixels + y * surface->pitch / 2 + x);
+ }
+ break;
+
+ case 3: /* slow 24-bpp mode; usually not used */
+ {
+ /* does this work? */
+ Uint8 *pix = (Uint8 *)surface->pixels + y * surface->pitch + x * 3;
+ Uint32 color = 0;
+ int shift;
+
+ shift = surface->format->Rshift;
+ color |= *(pix + shift / 8) >> shift;
+ shift = surface->format->Gshift;
+ color |= *(pix + shift / 8) >> shift;
+ shift = surface->format->Bshift;
+ color |= *(pix + shift / 8) >> shift;
+
+ return color;
+ }
+ break;
+
+ case 4: /* probably 32-bpp */
+ {
+ return *((Uint32 *)surface->pixels + y * surface->pitch / 4 + x);
+ }
+ break;
+ }
+
+ return 0;
+}
+
/* ========================================================================= */
/* The following functions have been taken from the SGE library */
SDL_QuitSubSystem(SDL_INIT_AUDIO);
}
+
+/* ========================================================================= */
+/* event functions */
+/* ========================================================================= */
+
+inline void SDLNextEvent(Event *event)
+{
+ SDL_WaitEvent(event);
+
+#ifdef FULLSCREEN_BUG
+ if (event->type == EVENT_BUTTONPRESS ||
+ event->type == EVENT_BUTTONRELEASE)
+ {
+ if (((ButtonEvent *)event)->x > video_xoffset)
+ ((ButtonEvent *)event)->x -= video_xoffset;
+ else
+ ((ButtonEvent *)event)->x = 0;
+ if (((ButtonEvent *)event)->y > video_yoffset)
+ ((ButtonEvent *)event)->y -= video_yoffset;
+ else
+ ((ButtonEvent *)event)->y = 0;
+ }
+ else if (event->type == EVENT_MOTIONNOTIFY)
+ {
+ if (((ButtonEvent *)event)->x > video_xoffset)
+ ((ButtonEvent *)event)->x -= video_xoffset;
+ else
+ ((ButtonEvent *)event)->x = 0;
+ if (((ButtonEvent *)event)->y > video_yoffset)
+ ((ButtonEvent *)event)->y -= video_yoffset;
+ else
+ ((ButtonEvent *)event)->y = 0;
+ }
+#endif
+}
+
#endif /* TARGET_SDL */
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
-inline void SDLDrawSimpleLine(SDL_Surface *, int, int, int, int, unsigned int);
-inline void SDLDrawLine(SDL_Surface *, int, int, int, int, Uint32);
-/* functions from SGE library */
-void sge_Line(SDL_Surface *, Sint16, Sint16, Sint16, Sint16, Uint32);
+inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
+inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
+inline Pixel SDLGetPixel(Bitmap *, int, int);
Bitmap *SDLLoadImage(char *);
inline void SDLOpenAudio(void);
inline void SDLCloseAudio(void);
+inline void SDLNextEvent(Event *);
+
#endif /* SDL_H */
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#endif
-/*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
+/* ========================================================================= */
+/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
static int playing_sounds = 0;
static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
static int ulaw_to_linear(unsigned char);
#endif
-#if defined(PLATFORM_HPUX)
-static void HPUX_Audio_Control();
-#endif
-
-#if defined(PLATFORM_MSDOS)
+#if defined(AUDIO_LINUX_IOCTL)
+static boolean InitAudioDevice_Linux();
+#elif defined(PLATFORM_NETBSD)
+static boolean InitAudioDevice_NetBSD();
+#elif defined(PLATFORM_HPUX)
+static boolean InitAudioDevice_HPUX();
+#elif defined(PLATFORM_MSDOS)
static void SoundServer_InsertNewSound(struct SoundControl);
static void SoundServer_StopSound(int);
static void SoundServer_StopAllSounds();
if (audio_fd < 0)
{
- Error(ERR_WARN, "cannot open audio device - no sound");
+ Error(ERR_WARN, "cannot open audio device -- no sound");
return FALSE;
}
{
if (pipe(audio.soundserver_pipe) < 0)
{
- Error(ERR_WARN, "cannot create pipe - no sounds");
+ Error(ERR_WARN, "cannot create pipe -- no sounds");
return FALSE;
}
if ((audio.soundserver_pid = fork()) < 0)
{
- Error(ERR_WARN, "cannot create sound server process - no sounds");
+ Error(ERR_WARN, "cannot create sound server process -- no sounds");
return FALSE;
}
void StartSoundserver(void)
{
+ if (!audio.sound_available)
+ return;
+
#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
if (!ForkAudioProcess())
audio.sound_available = FALSE;
(int)sqrt((float)(PSND_MAX_LEFT2RIGHT*PSND_MAX_LEFT2RIGHT-i*i));
#if defined(PLATFORM_HPUX)
- HPUX_Audio_Control();
+ InitAudioDevice_HPUX();
#endif
FD_ZERO(&sound_fdset);
continue;
if (read(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
!= sizeof(snd_ctrl))
- Error(ERR_EXIT_SOUND_SERVER, "broken pipe - no sounds");
+ Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
#if defined(AUDIO_STREAMING_DSP)
static long max_sample_size = 0;
static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
- int stereo = TRUE;
- /* 'ioctl()' expects pointer to integer value for stereo flag
- (boolean is defined as 'char', which will not work here) */
+ boolean stereo = TRUE;
if (playing_sounds ||
(audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
{
if (!playing_sounds) /* we just opened the audio device */
{
- unsigned long fragment_spec = 0;
-
- /* determine logarithm (log2) of the fragment size */
- for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
- fragment_spec++);
-
- /* use two fragments (play one fragment, prepare the other);
- one fragment would result in interrupted audio output, more
- than two fragments would raise audio output latency to much */
- fragment_spec |= 0x00020000;
-
- /* Example for fragment specification:
- - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz)
- - (with stereo the effective buffer size will shrink to 256)
- => fragment_size = 0x00020009 */
-
- if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_spec) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set fragment size of /dev/dsp - no sounds");
-
- /* try if we can use stereo sound */
- if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
- {
-#ifdef DEBUG
- static boolean reported = FALSE;
-
- if (!reported)
- {
- Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
- reported = TRUE;
- }
+#if defined(AUDIO_LINUX_IOCTL)
+ stereo = InitAudioDevice_Linux(fragment_size, sample_rate);
+#elif defined(PLATFORM_NETBSD)
+ stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate);
#endif
- stereo = FALSE;
- }
-
- if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot set sample rate of /dev/dsp - no sounds");
-
- /* get the real fragmentation size; this should return 512 */
- if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE,&fragment_size) < 0)
- Error(ERR_EXIT_SOUND_SERVER,
- "cannot get fragment size of /dev/dsp - no sounds");
-
max_sample_size = fragment_size / (stereo ? 2 : 1);
}
/* fill the first mixing buffer with original sample */
memcpy(premix_first_buffer,sample_ptr,sample_size);
-
/* adjust volume of actual sound sample */
if (snd_ctrl.volume != PSND_MAX_VOLUME)
for(i=0;i<sample_size;i++)
#endif /* PLATFORM_MSDOS */
#endif /* !PLATFORM_WIN32 */
+
+/* ------------------------------------------------------------------------- */
+/* platform dependant audio initialization code */
+/* ------------------------------------------------------------------------- */
+
+#if defined(AUDIO_LINUX_IOCTL)
+static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
+{
+ /* "ioctl()" expects pointer to 'int' value for stereo flag
+ (boolean is defined as 'char', which will not work here) */
+ int stereo = TRUE;
+ unsigned long fragment_spec = 0;
+
+ /* determine logarithm (log2) of the fragment size */
+ for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
+ fragment_spec++);
+
+ /* use two fragments (play one fragment, prepare the other);
+ one fragment would result in interrupted audio output, more
+ than two fragments would raise audio output latency to much */
+ fragment_spec |= 0x00020000;
+
+ /* Example for fragment specification:
+ - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz)
+ - (with stereo the effective buffer size will shrink to 256)
+ => fragment_size = 0x00020009 */
+
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SETFRAGMENT, &fragment_spec) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set fragment size of /dev/dsp -- no sounds");
+
+ /* try if we can use stereo sound */
+ if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+ {
+#ifdef DEBUG
+ static boolean reported = FALSE;
+
+ if (!reported)
+ {
+ Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
+ reported = TRUE;
+ }
+#endif
+ stereo = FALSE;
+ }
+
+ if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set sample rate of /dev/dsp -- no sounds");
+
+ /* get the real fragmentation size; this should return 512 */
+ if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot get fragment size of /dev/dsp -- no sounds");
+
+ return (boolean)stereo;
+}
+#endif /* AUDIO_LINUX_IOCTL */
+
+#if defined(PLATFORM_NETBSD)
+static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
+{
+ audio_info_t a_info;
+ boolean stereo = TRUE;
+
+ AUDIO_INITINFO(&a_info);
+ a_info.play.encoding = AUDIO_ENCODING_LINEAR8;
+ a_info.play.precision = 8;
+ a_info.play.channels = 2;
+ a_info.play.sample_rate = sample_rate;
+ a_info.blocksize = fragment_size;
+
+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ {
+ /* try to disable stereo */
+ a_info.play.channels = 1;
+ stereo = FALSE;
+
+ if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
+ Error(ERR_EXIT_SOUND_SERVER,
+ "cannot set sample rate of /dev/audio -- no sounds");
+ }
+
+ return stereo;
+}
+#endif /* PLATFORM_NETBSD */
+
#if defined(PLATFORM_HPUX)
-static void HPUX_Audio_Control()
+static boolean InitAudioDevice_HPUX()
{
struct audio_describe ainfo;
int audio_ctl;
audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
if (audio_ctl == -1)
- Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl - no sounds");
+ Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds");
if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "no audio info - no sounds");
+ Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds");
if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
- Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available - no sounds");
+ Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds");
ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
close(audio_ctl);
+
+ return TRUE; /* to provide common interface for InitAudioDevice_...() */
}
#endif /* PLATFORM_HPUX */
}
#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */
-/*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
-/*===========================================================================*/
+/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */
+/* ========================================================================= */
+/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */
-/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/
#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
#define WAV_HEADER_SIZE 20 /* size of WAV file header */
#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
byte sound_header_buffer[WAV_HEADER_SIZE];
char chunk[CHUNK_ID_LEN + 1];
- int chunk_length, dummy;
+ int chunk_size, dummy;
FILE *file;
int i;
#endif
+ if (!audio.sound_available)
+ return FALSE;
+
num_sounds++;
Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo));
if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
return FALSE;
}
if ((file = fopen(filename, MODE_READ)) == NULL)
{
- Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "cannot open sound file '%s' -- no sounds", filename);
return FALSE;
}
/* read chunk "RIFF" */
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
if (strcmp(chunk, "RIFF") != 0)
{
Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
sound_header_buffer[i] = fgetc(file);
/* read chunk "data" */
- getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
if (strcmp(chunk, "data") != 0)
{
Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
return FALSE;
}
- snd_info->data_len = chunk_length;
+ snd_info->data_len = chunk_size;
snd_info->data_ptr = checked_malloc(snd_info->data_len);
/* read sound data */
if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
snd_info->data_len)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
fclose(file);
return FALSE;
}
snd_info->sample_ptr = load_sample(filename);
if (!snd_info->sample_ptr)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
return FALSE;
}
if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL)
{
- Error(ERR_WARN, "cannot read music file '%s' - no music", filename);
+ Error(ERR_WARN, "cannot read music file '%s' -- no music", filename);
return FALSE;
}
int num_wav_music = 0;
int num_mod_music = 0;
+ if (!audio.sound_available)
+ return 0;
+
if ((dir = opendir(music_directory)) == NULL)
{
Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
#if defined(TARGET_SDL)
if (audio.mods_available) /* play MOD music */
{
- Mix_VolumeMusic(SOUND_MAX_VOLUME);
Mix_PlayMusic(Mod[nr].mix_music, -1);
+ Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */
}
else /* play WAV music loop */
{
#elif defined(PLATFORM_UNIX)
if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
- Error(ERR_WARN, "cannot pipe to child process - no sounds");
+ Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
return;
}
void FadeMusic(void)
{
#if defined(TARGET_SDL)
+ if (!audio.sound_available)
+ return;
+
if (audio.mods_available)
Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
else
void StopMusic(void)
{
#if defined(TARGET_SDL)
+ if (!audio.sound_available)
+ return;
+
if (audio.mods_available)
Mix_HaltMusic();
else
#if !defined(PLATFORM_MSDOS)
if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
{
- Error(ERR_WARN, "cannot pipe to child process - no sounds");
+ Error(ERR_WARN, "cannot pipe to child process -- no sounds");
audio.sound_available = audio.sound_enabled = FALSE;
return;
}
#endif
}
-/*** THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS ***/
+/* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */
+/* ========================================================================= */
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include <linux/soundcard.h>
#elif defined(PLATFORM_FREEBSD)
#include <machine/soundcard.h>
+#elif defined(PLATFORM_NETBSD)
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
#elif defined(PLATFORM_HPUX)
#include <sys/audio.h>
#endif
#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
+#define AUDIO_LINUX_IOCTL
+#endif
+
+#if defined(AUDIO_LINUX_IOCTL) || defined(PLATFORM_NETBSD)
#define AUDIO_STREAMING_DSP
#endif
#if defined(TARGET_SDL)
/* one second fading interval == 1000 ticks (milliseconds) */
#define SOUND_FADING_INTERVAL 1000
-#define SOUND_MAX_VOLUME (SDL_MIX_MAXVOLUME / 4)
+#define SOUND_MAX_VOLUME SDL_MIX_MAXVOLUME
#endif
#if defined(AUDIO_STREAMING_DSP)
#endif
#endif
+#if 0
struct SoundHeader_SUN
{
unsigned long magic;
unsigned long chunk_size;
char magic_8SVX[4];
};
+#endif
struct SampleInfo
{
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
int to_x, int to_y)
{
#ifdef TARGET_SDL
- SDLDrawSimpleLine(bitmap->surface, from_x, from_y, to_x, to_y, 0xffffff);
+ SDLDrawSimpleLine(bitmap, from_x, from_y, to_x, to_y, 0xffffff);
#else
XSetForeground(display, bitmap->gc, WhitePixel(display, screen));
XDrawLine(display, bitmap->drawable, bitmap->gc, from_x, from_y, to_x, to_y);
continue;
#if defined(TARGET_SDL)
- sge_Line(bitmap->surface,
- from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel);
+ SDLDrawLine(bitmap,
+ from_x + dx, from_y + dy, to_x + dx, to_y + dy, pixel);
#elif defined(TARGET_ALLEGRO)
AllegroDrawLine(bitmap->drawable, from_x + dx, from_y + dy,
to_x + dx, to_y + dy, pixel);
#endif
}
+inline Pixel GetPixel(Bitmap *bitmap, int x, int y)
+{
+#if defined(TARGET_SDL)
+ return SDLGetPixel(bitmap, x, y);
+#elif defined(TARGET_ALLEGRO)
+ return AllegroGetPixel(bitmap->drawable, x, y);
+#else
+ unsigned long pixel_value;
+ XImage *pixel_image;
+
+ pixel_image = XGetImage(display, bitmap->drawable, x, y, 1, 1,
+ AllPlanes, ZPixmap);
+ pixel_value = XGetPixel(pixel_image, 0, 0);
+
+ XDestroyImage(pixel_image);
+
+ return pixel_value;
+#endif
+}
+
inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
unsigned int color_g, unsigned int color_b)
{
inline void NextEvent(Event *event)
{
#ifdef TARGET_SDL
- SDL_WaitEvent(event);
+ SDLNextEvent(event);
#else
XNextEvent(display, event);
#endif
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
+inline Pixel GetPixel(Bitmap *, int, int);
inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Artsoft Retro-Game Library *
*----------------------------------------------------------*
-* (c) 1994-2000 Artsoft Entertainment *
+* (c) 1994-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
unsigned long Elementeigenschaften1[MAX_ELEMENTS];
unsigned long Elementeigenschaften2[MAX_ELEMENTS];
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#define EP_BIT_BELT (1 << 0)
#define EP_BIT_BELT_SWITCH (1 << 1)
#define EP_BIT_TUBE (1 << 2)
+#define EP_BIT_SLIPPERY_GEMS (1 << 3)
#define IS_AMOEBALIVE(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE)
#define IS_AMOEBOID(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBOID)
#define IS_BELT(e) (Elementeigenschaften2[e] & EP_BIT_BELT)
#define IS_BELT_SWITCH(e) (Elementeigenschaften2[e] & EP_BIT_BELT_SWITCH)
#define IS_TUBE(e) (Elementeigenschaften2[e] & EP_BIT_TUBE)
+#define IS_SLIPPERY_GEMS(e) (Elementeigenschaften2[e] & EP_BIT_SLIPPERY_GEMS)
#define IS_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y]))
struct SetupInputInfo input[MAX_PLAYERS];
};
-struct SetupFileList
-{
- char *token;
- char *value;
- struct SetupFileList *next;
-};
-
struct PlayerInfo
{
boolean present; /* player present in level playfield */
int index_nr, client_nr, element_nr;
byte action; /* action from local input device */
- byte effective_action; /* action aknowledged from network server
+ byte effective_action; /* action acknowledged from network server
or summarized over all configured input
devices when in single player mode */
byte programmed_action; /* action forced by game itself (like moving
int move_delay_value;
int last_move_dir;
+ int is_moving;
unsigned long push_delay;
unsigned long push_delay_value;
struct LevelInfo
{
+ int file_version; /* version of file the level was stored with */
+ int game_version; /* version of game engine to play this level */
+ boolean encoding_16bit_field; /* level contains 16-bit elements */
+ boolean encoding_16bit_yamyam; /* yamyam contains 16-bit elements */
+ boolean encoding_16bit_amoeba; /* amoeba contains 16-bit elements */
+
int fieldx;
int fieldy;
int time;
struct TapeInfo
{
+ int file_version; /* version of file this level tape was stored with */
+ int game_version; /* version of game engine to play this tape´s level */
+ int version;
int level_nr;
unsigned long random_seed;
unsigned long date;
boolean fast_forward;
boolean changed;
boolean player_participates[MAX_PLAYERS];
+ int num_participating_players;
struct
{
byte action[MAX_PLAYERS];
struct GameInfo
{
+ int version;
int emulation;
int yam_content_nr;
boolean magic_wall_active;
int belt_dir_nr[4];
int switchgate_pos;
int balloon_dir;
+ boolean explosions_delayed;
};
struct GlobalInfo
extern short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+extern short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern unsigned long Elementeigenschaften1[MAX_ELEMENTS];
extern unsigned long Elementeigenschaften2[MAX_ELEMENTS];
#define EL_TRAP_ACTIVE 522
#define EL_SPRING_MOVING 523
#define EL_SP_MURPHY_CLONE 524
+#define EL_QUICKSAND_EMPTYING 525
+#define EL_MAGIC_WALL_EMPTYING 526
+#define EL_MAGIC_WALL_BD_EMPTYING 527
+#define EL_AMOEBA_DRIPPING 528
/* "unreal" (and therefore not drawable) runtime elements */
#define EL_BLOCKED 600
#define EL_MAUERND 607
#define EL_BURNING 608
#define EL_PLAYER_IS_LEAVING 609
+#define EL_QUICKSAND_FILLING 610
+#define EL_MAGIC_WALL_FILLING 611
+#define EL_MAGIC_WALL_BD_FILLING 612
/* game graphics:
** 0 - 255: graphics from "RocksScreen"
#define SETUPINPUT 9
#define CALIBRATION 10
-#define PROGRAM_VERSION_STRING "2.0.0"
+#define PROGRAM_VERSION_MAJOR 2
+#define PROGRAM_VERSION_MINOR 0
+#define PROGRAM_VERSION_PATCH 1
+#define PROGRAM_VERSION_STRING "2.0.1"
+
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
-#define PROGRAM_RIGHTS_STRING "Copyright ^1995-2000 by"
+#define PROGRAM_RIGHTS_STRING "Copyright ^1995-2001 by"
#define PROGRAM_DOS_PORT_STRING "DOS port done by Guido Schulz"
#define PROGRAM_IDENT_STRING PROGRAM_VERSION_STRING " " TARGET_STRING
#define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_IDENT_STRING
#define X11_ICONMASK_FILENAME "rocks_iconmask.xbm"
#define MSDOS_POINTER_FILENAME "mouse.pcx"
+/* file version numbers for resource files (levels, tapes, score, setup, etc.)
+** currently supported/known file version numbers:
+** 1.0 (old)
+** 1.2 (still in use)
+** 1.4 (still in use)
+** 2.0 (actual)
+*/
+#define FILE_VERSION_1_0 VERSION_IDENT(1,0,0)
+#define FILE_VERSION_1_2 VERSION_IDENT(1,2,0)
+#define FILE_VERSION_1_4 VERSION_IDENT(1,4,0)
+#define FILE_VERSION_2_0 VERSION_IDENT(2,0,0)
+
+/* file version does not change for every program version, but is changed
+ when new features are introduced that are incompatible with older file
+ versions, so that they can be treated accordingly */
+#define FILE_VERSION_ACTUAL FILE_VERSION_2_0
+
+#define GAME_VERSION_1_0 FILE_VERSION_1_0
+#define GAME_VERSION_1_2 FILE_VERSION_1_2
+#define GAME_VERSION_1_4 FILE_VERSION_1_4
+#define GAME_VERSION_2_0 FILE_VERSION_2_0
+
+#define GAME_VERSION_ACTUAL VERSION_IDENT(PROGRAM_VERSION_MAJOR, \
+ PROGRAM_VERSION_MINOR, \
+ PROGRAM_VERSION_PATCH)
+
/* for DrawGraphicAnimation() [tools.c] and AnimateToon() [cartoons.c] */
#define ANIM_NORMAL 0
#define ANIM_OSCILLATE 1
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
node_cursor->cl_first = leveldir_current->cl_first;
node_cursor->cl_cursor = leveldir_current->cl_cursor;
leveldir_current = node_cursor->node_group;
+
DrawChooseLevel();
}
else if (node_cursor->parent_link)
{
leveldir_current = node_cursor->node_parent;
+
DrawChooseLevel();
}
else
{
+ node_cursor->cl_first = leveldir_current->cl_first;
+ node_cursor->cl_cursor = leveldir_current->cl_cursor;
leveldir_current = node_cursor;
LoadLevelSetup_SeriesInfo();
void DrawHallOfFame(int highlight_position)
{
UnmapAllGadgets();
+ FadeSounds();
CloseDoor(DOOR_CLOSE_2);
if (highlight_position < 0)
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
#include "tools.h"
#include "files.h"
#include "network.h"
+#include "cartoons.h"
/* tape button identifiers */
#define TAPE_CTRL_ID_EJECT 0
#define VIDEO_TIME_YSIZE 16
/* special */
-#define VIDEO_PBEND_LABEL_XPOS 6
+#define VIDEO_PBEND_LABEL_XPOS 5
#define VIDEO_PBEND_LABEL_YPOS 220
#define VIDEO_PBEND_LABEL_XSIZE 35
#define VIDEO_PBEND_LABEL_YSIZE 30
void TapeStopRecording()
{
+#if 0
int i;
+#endif
if (!tape.recording)
return;
+#if 0
for(i=0; i<MAX_PLAYERS; i++)
tape.pos[tape.counter].action[i] = 0;
+#endif
tape.counter++;
tape.length = tape.counter;
DrawVideoDisplay(VIDEO_STATE_REC_OFF, 0);
}
+#if 0
void TapeRecordAction(byte joy[MAX_PLAYERS])
{
int i;
tape.pos[tape.counter].delay = 0;
}
+#else
+
+void TapeRecordAction(byte action[MAX_PLAYERS])
+{
+ int i;
+
+ if (!tape.recording || tape.pausing)
+ return;
+
+ if (tape.counter >= MAX_TAPELEN-1)
+ {
+ TapeStopRecording();
+ return;
+ }
+
+ if (tape.pos[tape.counter].delay > 0) /* already stored action */
+ {
+ boolean changed_events = FALSE;
+
+ for(i=0; i<MAX_PLAYERS; i++)
+ if (tape.pos[tape.counter].action[i] != action[i])
+ changed_events = TRUE;
+
+ if (changed_events || tape.pos[tape.counter].delay >= 255)
+ {
+ tape.counter++;
+ tape.pos[tape.counter].delay = 0;
+ }
+ else
+ tape.pos[tape.counter].delay++;
+ }
+
+ if (tape.pos[tape.counter].delay == 0) /* store new action */
+ {
+ for(i=0; i<MAX_PLAYERS; i++)
+ tape.pos[tape.counter].action[i] = action[i];
+
+ tape.pos[tape.counter].delay++;
+ }
+}
+#endif
+
+#if 0
void TapeRecordDelay()
{
int i;
}
}
+#else
+
+void TapeRecordDelay()
+{
+}
+#endif
+
void TapeTogglePause()
{
unsigned long state;
DrawVideoDisplay(VIDEO_STATE_PLAY_OFF, 0);
}
+#if 0
byte *TapePlayAction()
{
static byte joy[MAX_PLAYERS];
return(joy);
}
+#else
+
+byte *TapePlayAction()
+{
+ static byte action[MAX_PLAYERS];
+ int i;
+
+ if (!tape.playing || tape.pausing)
+ return NULL;
+
+ if (tape.pause_before_death) /* STOP 10s BEFORE PLAYER GETS KILLED... */
+ {
+ if (!(FrameCounter % 20))
+ {
+ if ((FrameCounter / 20) % 2)
+ DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
+ else
+ DrawVideoDisplay(VIDEO_STATE_PBEND_OFF, VIDEO_DISPLAY_LABEL_ONLY);
+ }
+
+ if (TimePlayed > tape.length_seconds - TAPE_PAUSE_SECONDS_BEFORE_DEATH)
+ {
+ TapeTogglePause();
+ return NULL;
+ }
+ }
+
+ if (tape.counter >= tape.length)
+ {
+ TapeStop();
+ return NULL;
+ }
+
+ for(i=0; i<MAX_PLAYERS; i++)
+ action[i] = tape.pos[tape.counter].action[i];
+
+ tape.delay_played++;
+ if (tape.delay_played >= tape.pos[tape.counter].delay)
+ {
+ tape.counter++;
+ tape.delay_played = 0;
+ }
+
+ return action;
+}
+#endif
+
+#if 0
boolean TapePlayDelay()
{
if (!tape.playing || tape.pausing)
return(FALSE);
}
+#else
+
+boolean TapePlayDelay()
+{
+ return TRUE|FALSE; /* ...it doesn't matter at all */
+}
+#endif
+
void TapeStop()
{
TapeStopRecording();
#endif
{
game_status = PLAYING;
+ StopAnimation();
InitGame();
}
}
TapeStartPlaying();
game_status = PLAYING;
+ StopAnimation();
InitGame();
}
else if (tape.playing)
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element))
{
DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]);
- DrawLevelFieldThruMask(last_jx, last_jy);
+ if (last_element == EL_DYNAMITE_ACTIVE)
+ DrawDynamite(last_jx, last_jy);
+ else
+ DrawLevelFieldThruMask(last_jx, last_jy);
}
else if (last_element == EL_DYNAMITE_ACTIVE)
DrawDynamite(last_jx, last_jy);
DrawLevelElement(jx, jy, Store[jx][jy]);
else if (!IS_ACTIVE_BOMB(element))
DrawLevelField(jx, jy);
+ else
+ DrawLevelElement(jx, jy, EL_LEERRAUM);
/* draw player himself */
else if ((element == EL_FELSBROCKEN ||
element == EL_SP_ZONK ||
element == EL_BD_ROCK ||
- IS_GEM(element)) && !cut_mode)
+ element == EL_SP_INFOTRON ||
+ IS_GEM(element))
+ && !cut_mode)
{
if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
{
}
}
else if (element == EL_MAGIC_WALL_EMPTY ||
+ element == EL_MAGIC_WALL_EMPTYING ||
element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_EMPTYING ||
element == EL_MAGIC_WALL_FULL ||
element == EL_MAGIC_WALL_BD_FULL)
{
graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
}
- else if (IS_AMOEBOID(element))
+ else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
{
graphic = (element == EL_AMOEBE_TOT ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
graphic += (x + 2 * y + 4) % 4;
void DrawScreenField(int x, int y)
{
int ux = LEVELX(x), uy = LEVELY(y);
- int element;
+ int element, content;
if (!IN_LEV_FIELD(ux, uy))
{
}
element = Feld[ux][uy];
+ content = Store[ux][uy];
if (IS_MOVING(ux, uy))
{
int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT);
boolean cut_mode = NO_CUTTING;
- if (Store[ux][uy] == EL_MORAST_LEER ||
- Store[ux][uy] == EL_MAGIC_WALL_EMPTY ||
- Store[ux][uy] == EL_MAGIC_WALL_BD_EMPTY ||
- Store[ux][uy] == EL_AMOEBE_NASS)
+ if (element == EL_QUICKSAND_EMPTYING ||
+ element == EL_MAGIC_WALL_EMPTYING ||
+ element == EL_MAGIC_WALL_BD_EMPTYING ||
+ element == EL_AMOEBA_DRIPPING)
cut_mode = CUT_ABOVE;
- else if (Store[ux][uy] == EL_MORAST_VOLL ||
- Store[ux][uy] == EL_MAGIC_WALL_FULL ||
- Store[ux][uy] == EL_MAGIC_WALL_BD_FULL)
+ else if (element == EL_QUICKSAND_FILLING ||
+ element == EL_MAGIC_WALL_FILLING ||
+ element == EL_MAGIC_WALL_BD_FILLING)
cut_mode = CUT_BELOW;
if (cut_mode == CUT_ABOVE)
- DrawScreenElementShifted(x, y, 0, 0, Store[ux][uy], NO_CUTTING);
+ DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
else
DrawScreenElement(x, y, EL_LEERRAUM);
if (horiz_move)
DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
- else
+ else if (cut_mode == NO_CUTTING)
DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
+ else
+ DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
- if (Store[ux][uy] == EL_SALZSAEURE)
+ if (content == EL_SALZSAEURE)
DrawLevelElementThruMask(ux, uy + 1, EL_SALZSAEURE);
}
else if (IS_BLOCKED(ux, uy))
int sx, sy;
int horiz_move;
boolean cut_mode = NO_CUTTING;
+ int element_old, content_old;
Blocked2Moving(ux, uy, &oldx, &oldy);
sx = SCREENX(oldx);
horiz_move = (MovDir[oldx][oldy] == MV_LEFT ||
MovDir[oldx][oldy] == MV_RIGHT);
- if (Store[oldx][oldy] == EL_MORAST_LEER ||
- Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY ||
- Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY ||
- Store[oldx][oldy] == EL_AMOEBE_NASS)
+ element_old = Feld[oldx][oldy];
+ content_old = Store[oldx][oldy];
+
+ if (element_old == EL_QUICKSAND_EMPTYING ||
+ element_old == EL_MAGIC_WALL_EMPTYING ||
+ element_old == EL_MAGIC_WALL_BD_EMPTYING ||
+ element_old == EL_AMOEBA_DRIPPING)
cut_mode = CUT_ABOVE;
DrawScreenElement(x, y, EL_LEERRAUM);
- element = Feld[oldx][oldy];
if (horiz_move)
- DrawScreenElementShifted(sx,sy, MovPos[oldx][oldy],0,element,NO_CUTTING);
+ DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
+ NO_CUTTING);
+ else if (cut_mode == NO_CUTTING)
+ DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
+ cut_mode);
else
- DrawScreenElementShifted(sx,sy, 0,MovPos[oldx][oldy],element,cut_mode);
+ DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
+ cut_mode);
}
else if (IS_DRAWABLE(element))
DrawScreenElement(x, y, element);
request_gadget_id = gi->custom_id;
}
+int get_next_element(int element)
+{
+ switch(element)
+ {
+ case EL_QUICKSAND_FILLING: return EL_MORAST_VOLL;
+ case EL_QUICKSAND_EMPTYING: return EL_MORAST_LEER;
+ case EL_MAGIC_WALL_FILLING: return EL_MAGIC_WALL_FULL;
+ case EL_MAGIC_WALL_EMPTYING: return EL_MAGIC_WALL_EMPTY;
+ case EL_MAGIC_WALL_BD_FILLING: return EL_MAGIC_WALL_BD_FULL;
+ case EL_MAGIC_WALL_BD_EMPTYING: return EL_MAGIC_WALL_BD_EMPTY;
+ case EL_AMOEBA_DRIPPING: return EL_AMOEBE_NASS;
+
+ default: return element;
+ }
+}
+
int el2gfx(int element)
{
switch(element)
case EL_DIAMANT: return GFX_DIAMANT;
case EL_MORAST_LEER: return GFX_MORAST_LEER;
case EL_MORAST_VOLL: return GFX_MORAST_VOLL;
+ case EL_QUICKSAND_EMPTYING: return GFX_MORAST_LEER;
case EL_TROPFEN: return GFX_TROPFEN;
case EL_BOMBE: return GFX_BOMBE;
case EL_MAGIC_WALL_OFF: return GFX_MAGIC_WALL_OFF;
case EL_MAGIC_WALL_EMPTY: return GFX_MAGIC_WALL_EMPTY;
+ case EL_MAGIC_WALL_EMPTYING:return GFX_MAGIC_WALL_EMPTY;
case EL_MAGIC_WALL_FULL: return GFX_MAGIC_WALL_FULL;
case EL_MAGIC_WALL_DEAD: return GFX_MAGIC_WALL_DEAD;
case EL_SALZSAEURE: return GFX_SALZSAEURE;
case EL_AMOEBE_VOLL: return GFX_AMOEBE_VOLL;
case EL_AMOEBE_BD: return GFX_AMOEBE_BD;
case EL_AMOEBA2DIAM: return GFX_AMOEBA2DIAM;
+ case EL_AMOEBA_DRIPPING: return GFX_AMOEBE_NASS;
case EL_KOKOSNUSS: return GFX_KOKOSNUSS;
case EL_LIFE: return GFX_LIFE;
case EL_LIFE_ASYNC: return GFX_LIFE_ASYNC;
case EL_MAMPFER2: return GFX_MAMPFER2;
case EL_MAGIC_WALL_BD_OFF: return GFX_MAGIC_WALL_BD_OFF;
case EL_MAGIC_WALL_BD_EMPTY:return GFX_MAGIC_WALL_BD_EMPTY;
+ case EL_MAGIC_WALL_BD_EMPTYING:return GFX_MAGIC_WALL_BD_EMPTY;
case EL_MAGIC_WALL_BD_FULL: return GFX_MAGIC_WALL_BD_FULL;
case EL_MAGIC_WALL_BD_DEAD: return GFX_MAGIC_WALL_BD_DEAD;
case EL_DYNABOMB_ACTIVE_1: return GFX_DYNABOMB;
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-2000 Artsoft Entertainment *
+* (c) 1995-2001 Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
void CreateToolButtons();
+int get_next_element(int);
int el2gfx(int);
#endif /* TOOLS_H */
projects / rocksndiamonds.git / commitdiff