+Release Version 1.3.5 [?? SEP 1999]
+-----------------------------------
+ - new Boulderdash elements for better game emulation
+ - new cool medium-sized crystal font
+ - new elements and graphics for Diamond Caves II levels
+ - new elements and graphics for Emerald Mine Club levels
+ - brushed-up (higher resolution) graphics for Supaplex elements
+ - special oversized Supaplex levels included
+ - new elements for more authentic Emerald Mine elements (doors)
+ - more level editor enhancements:
+ element list scrollbar and level number selection within editor
+ - lots of new levels converted from Emerald Mine Club disks,
+ DX-Boulderdash and Supaplex
+ - new levels created and contributed by players
+ - now over 160 level series with over 14.000 levels
+ - high score list now scrollable to see all 100 entries
+ - new 16-bit elements level format to allow more than 256 elements
+ - re-introduced level handicap for more challange (levels must be
+ solved to be able to play the next one; can be disabled in setup)
+ - new setup option to disable time limit for relaxed playing :-)
+ - GAME_DIR path split into RO_GAME_DIR and RW_GAME_DIR to allow
+ distributors to separate read-only (levels, graphics, sounds)
+ from writable (hich scores) game data
+ - new personal level setup files to store level handicap and
+ last played level for each level series
+ - removed some 32-bit dependent code; should be 64-bit clean now
+ - some little bugs fixed
+
+Release Version 1.3.0 [5 FEB 1999]
+----------------------------------
+ - strongly enhanced level editor
+ - new elements, graphics and levels for Supaplex style games
+ - completely rewritten platform independent gadget code
+ (buttons, scrollbars, text and number input gadgets)
+ - nasty sound bug fixed (showed up with Linux kernel 2.2.x)
+
Release Version 1.2.0 [5 DEC 1998]
---------------------------------------------------------
+----------------------------------
- DOS/Windows version
- - new WAV sound loader
- - new PCX graphics loader
+ - new WAV sound loader (to replace the old Amiga 8SVX files)
+ - new PCX graphics loader (to avoid GIF license problems)
- network multiplayer games with upto four players
- no separate network server needed; each client can
fork a network server at startup if there's no server
execution
Release Version 1.1 [???] [NOT RELEASED]
-----------------------------------
+----------------------------------------
- new (but broken) GIF graphics loader to be independent
- from the XPM library and replace all graphics by GIFs.
+ from the XPM library and to replace all graphics by GIF files
Release Version 1.0 [9 APR 1997] [NOT RELEASED]
----------------------------------------------
+-----------------------------------------------
- the game now contains many really playable levels,
not only a few levels for testing
- the game is now even better playable by keyboard
position
Prerelease Version 0.9b2 [21 NOV 1995] [NOT RELEASED]
----------------------------------------------------
+-----------------------------------------------------
- new game elements
Prerelease Version 0.9b [4 NOV 1995]
-----------------------------------
+------------------------------------
- the game is now completely Freeware
- the game is now better playable by keyboard
(in the last version, the player was making more than
Zucconi)
Prerelease Version 0.9 [23 OCT 1995]
-----------------------------------
+------------------------------------
- first (pre)release version
#=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2 #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de #
+# Makefile for Rocks'n'Diamonds 1.4.0 #
+# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de #
#=============================================================================#
#-----------------------------------------------------------------------------#
# PLATFORM = dos
# specify path to X11 on your system
-# if undefined, use system defaults (works fine with Linux/gcc)
-# X11_PATH = /usr/X11
+# if undefined, use system defaults (works with Linux/gcc/libc5)
+X11_PATH = /usr/X11
-# specify path to install game data (graphics, sounds, levels, scores)
+# specify directory for read-only game data (like graphics, sounds, levels)
# default is '.', so you can play without installing game data somewhere
-# GAME_DIR = /usr/local/games
+# RO_GAME_DIR = /usr/games
+
+# specify directory for writable game data (like highscore files)
+# default is '.', so you can play without installing game data somewhere
+# RW_GAME_DIR = /var/games
# uncomment this if your system has no joystick include file
# JOYSTICK = -DNO_JOYSTICK
SRC_DIR = src
MAKE_CMD = @$(MAKE) -C $(SRC_DIR)
-
all:
$(MAKE_CMD)
#=============================================================================#
-# Makefile for Rocks'n'Diamonds 1.2 #
-# (c) 1995-98 Holger Schemel, aeglos@valinor.owl.de #
+# Makefile for Rocks'n'Diamonds 1.4.0 #
+# (c) 1995-1999 Holger Schemel, aeglos@valinor.owl.de #
#=============================================================================#
-ifndef PLATFORM # platform not defined -- try auto detection
+ifndef PLATFORM # platform not specified -- try auto detection
ifdef COMSPEC
PLATFORM = dos
else
X11_LIBS = -L$(XLIB_PATH)
endif
-ifndef GAME_DIR # path to game data not defined -- try '.'
-GAME_DIR = .
-endif
-
-ifndef SCORE_ENTRIES # number of score entries per player undefined
-SCORE_ENTRIES = MANY_PER_NAME
-endif
-
-
-# The Xpm library is no longer needed to build this program,
-# but is used to load graphics if XPM_INCLUDE_FILE is defined.
-# If you want to use the Xpm library, convert the PCX files to XPM
-# files (and you need corresponding mask files in X11 Bitmap format).
-
-# XPM_INCLUDE_FILE = -DXPM_INCLUDE_FILE="<X11/xpm.h>"
-# EXTRA_X11_LIBS = -lXpm
-
ifeq ($(PLATFORM),dos) # DOS / Windows
RM = del
-PROGNAME = ..\rocks.exe
-LIBS = -lm -lalleg
+PROGNAME = ../rocks.exe
+LIBS = -s -lm -lalleg
else # Unix
endif
INCL = $(X11_INCL)
-LIBS = $(X11_LIBS) $(EXTRA_X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
+LIBS = $(X11_LIBS) -lX11 -lm $(EXTRA_LIBS)
endif
-CONFIG_GAME_DIR = -DGAME_DIR="\"$(GAME_DIR)\""
+ifdef RO_GAME_DIR # path to read-only game data specified
+CONFIG_RO_GAME_DIR = -DRO_GAME_DIR="\"$(RO_GAME_DIR)\""
+endif
+
+ifdef RW_GAME_DIR # path to writable game data specified
+CONFIG_RW_GAME_DIR = -DRW_GAME_DIR="\"$(RW_GAME_DIR)\""
+endif
+
+ifdef SCORE_ENTRIES # number of score entries per player specified
CONFIG_SCORE_ENTRIES = -D$(SCORE_ENTRIES)
+endif
+
+CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
+
-CONFIG = $(CONFIG_GAME_DIR) $(SOUNDS) $(JOYSTICK) \
- $(CONFIG_SCORE_ENTRIES) $(XPM_INCLUDE_FILE)
+CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(SOUNDS) $(JOYSTICK)
-# OPTIONS = -DDEBUG -g -Wall # only for debugging purposes
+# OPTIONS = -DDEBUG -g -Wall -ansi -pedantic # only for debugging purposes
+# OPTIONS = -DDEBUG -g -Wall # only for debugging purposes
+# OPTIONS = -O3 -Wall -ansi -pedantic
+# OPTIONS = -O3 -Wall
OPTIONS = -O3
-# SYSTEM = -DSYSV -Ae # maybe needed for HP-UX
+# SYSTEM = -DSYSV -Ae # may be needed for HP-UX
CFLAGS = $(OPTIONS) $(SYSTEM) $(INCL) $(CONFIG)
#include "tape.h"
/* some positions in the video tape control window */
-#define VIDEO_BUTTON_EJECT_XPOS (VIDEO_CONTROL_XPOS + 0 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_STOP_XPOS (VIDEO_CONTROL_XPOS + 1 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_PAUSE_XPOS (VIDEO_CONTROL_XPOS + 2 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_REC_XPOS (VIDEO_CONTROL_XPOS + 3 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_PLAY_XPOS (VIDEO_CONTROL_XPOS + 4 * VIDEO_BUTTON_XSIZE)
-#define VIDEO_BUTTON_ANY_YPOS (VIDEO_CONTROL_YPOS)
#define VIDEO_DATE_LABEL_XPOS (VIDEO_DISPLAY1_XPOS)
#define VIDEO_DATE_LABEL_YPOS (VIDEO_DISPLAY1_YPOS)
#define VIDEO_DATE_LABEL_XSIZE (VIDEO_DISPLAY_XSIZE)
#define VIDEO_DATE_LABEL_YSIZE (VIDEO_DISPLAY_YSIZE)
-#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS+1)
-#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS+14)
+#define VIDEO_DATE_XPOS (VIDEO_DISPLAY1_XPOS + 1)
+#define VIDEO_DATE_YPOS (VIDEO_DISPLAY1_YPOS + 14)
#define VIDEO_DATE_XSIZE (VIDEO_DISPLAY_XSIZE)
#define VIDEO_DATE_YSIZE 16
#define VIDEO_REC_LABEL_XPOS (VIDEO_DISPLAY2_XPOS)
#define VIDEO_REC_LABEL_YPOS (VIDEO_DISPLAY2_YPOS)
#define VIDEO_REC_LABEL_XSIZE 20
#define VIDEO_REC_LABEL_YSIZE 12
-#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS+20)
+#define VIDEO_REC_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 20)
#define VIDEO_REC_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS)
#define VIDEO_REC_SYMBOL_XSIZE 16
#define VIDEO_REC_SYMBOL_YSIZE 16
-#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS+65)
+#define VIDEO_PLAY_LABEL_XPOS (VIDEO_DISPLAY2_XPOS + 65)
#define VIDEO_PLAY_LABEL_YPOS (VIDEO_DISPLAY2_YPOS)
#define VIDEO_PLAY_LABEL_XSIZE 22
#define VIDEO_PLAY_LABEL_YSIZE 12
-#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS+52)
+#define VIDEO_PLAY_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 52)
#define VIDEO_PLAY_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS)
#define VIDEO_PLAY_SYMBOL_XSIZE 11
#define VIDEO_PLAY_SYMBOL_YSIZE 13
#define VIDEO_PAUSE_LABEL_XPOS (VIDEO_DISPLAY2_XPOS)
-#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS+20)
+#define VIDEO_PAUSE_LABEL_YPOS (VIDEO_DISPLAY2_YPOS + 20)
#define VIDEO_PAUSE_LABEL_XSIZE 35
#define VIDEO_PAUSE_LABEL_YSIZE 8
-#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS+35)
+#define VIDEO_PAUSE_SYMBOL_XPOS (VIDEO_DISPLAY2_XPOS + 35)
#define VIDEO_PAUSE_SYMBOL_YPOS (VIDEO_DISPLAY2_YPOS)
#define VIDEO_PAUSE_SYMBOL_XSIZE 17
#define VIDEO_PAUSE_SYMBOL_YSIZE 13
-#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS+38)
-#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS+14)
+#define VIDEO_TIME_XPOS (VIDEO_DISPLAY2_XPOS + 38)
+#define VIDEO_TIME_YPOS (VIDEO_DISPLAY2_YPOS + 14)
#define VIDEO_TIME_XSIZE 50
#define VIDEO_TIME_YSIZE 16
#define VIDEO_PBEND_LABEL_XSIZE 35
#define VIDEO_PBEND_LABEL_YSIZE 30
-#define ON_VIDEO_BUTTON(x,y) ((x)>=(VX+VIDEO_CONTROL_XPOS) && \
- (x)< (VX+VIDEO_CONTROL_XPOS + \
- VIDEO_CONTROL_XSIZE) && \
- (y)>=(VY+VIDEO_CONTROL_YPOS) && \
- (y)< (VY+VIDEO_CONTROL_YPOS + \
- VIDEO_CONTROL_YSIZE))
-#define VIDEO_BUTTON(x) (((x)-(VX+VIDEO_CONTROL_XPOS))/VIDEO_BUTTON_XSIZE)
-
#define VIDEO_STATE_OFF (VIDEO_STATE_PLAY_OFF | \
VIDEO_STATE_REC_OFF | \
VIDEO_STATE_PAUSE_OFF | \
VIDEO_PRESS_PAUSE_ON | \
VIDEO_PRESS_STOP_ON | \
VIDEO_PRESS_EJECT_ON)
-#define VIDEO_ALL_ON (VIDEO_STATE_ON | VIDEO_PRESS_ON)
-
-#define VIDEO_STATE (VIDEO_STATE_ON | VIDEO_STATE_OFF)
-#define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF)
-#define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF)
-
-
-/* some positions in the sound control window */
-#define SOUND_BUTTON_XSIZE 30
-#define SOUND_BUTTON_YSIZE 30
-#define SOUND_CONTROL_XPOS 5
-#define SOUND_CONTROL_YPOS 245
-#define SOUND_CONTROL_XSIZE (3*SOUND_BUTTON_XSIZE)
-#define SOUND_CONTROL_YSIZE (1*SOUND_BUTTON_YSIZE)
-#define SOUND_BUTTON_MUSIC_XPOS (SOUND_CONTROL_XPOS + 0 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_LOOPS_XPOS (SOUND_CONTROL_XPOS + 1 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_SIMPLE_XPOS (SOUND_CONTROL_XPOS + 2 * SOUND_BUTTON_XSIZE)
-#define SOUND_BUTTON_ANY_YPOS (SOUND_CONTROL_YPOS)
-
-#define ON_SOUND_BUTTON(x,y) ((x)>=(DX+SOUND_CONTROL_XPOS) && \
- (x)< (DX+SOUND_CONTROL_XPOS + \
- SOUND_CONTROL_XSIZE) && \
- (y)>=(DY+SOUND_CONTROL_YPOS) && \
- (y)< (DY+SOUND_CONTROL_YPOS + \
- SOUND_CONTROL_YSIZE))
-#define SOUND_BUTTON(x) (((x)-(DX+SOUND_CONTROL_XPOS))/SOUND_BUTTON_XSIZE)
-
-/* some positions in the game control window */
-#define GAME_BUTTON_STOP_XPOS (GAME_CONTROL_XPOS + 0 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_STOP_YPOS (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_PAUSE_XPOS (GAME_CONTROL_XPOS + 1 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_PAUSE_YPOS (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_PLAY_XPOS (GAME_CONTROL_XPOS + 2 * GAME_BUTTON_XSIZE)
-#define GAME_BUTTON_PLAY_YPOS (GAME_CONTROL_YPOS)
-#define GAME_BUTTON_ANY_YPOS (GAME_CONTROL_YPOS)
-
-#define ON_GAME_BUTTON(x,y) ((x)>=(DX+GAME_CONTROL_XPOS) && \
- (x)< (DX+GAME_CONTROL_XPOS + \
- GAME_CONTROL_XSIZE) && \
- (y)>=(DY+GAME_CONTROL_YPOS) && \
- (y)< (DY+GAME_CONTROL_YPOS + \
- GAME_CONTROL_YSIZE))
-#define GAME_BUTTON(x) (((x)-(DX+GAME_CONTROL_XPOS))/GAME_BUTTON_XSIZE)
-
-/* some positions in the asking window */
-#define OK_BUTTON_XPOS 2
-#define OK_BUTTON_YPOS 250
-#define OK_BUTTON_GFX_YPOS 0
-#define OK_BUTTON_XSIZE 46
-#define OK_BUTTON_YSIZE 28
-#define NO_BUTTON_XPOS 52
-#define NO_BUTTON_YPOS OK_BUTTON_YPOS
-#define NO_BUTTON_XSIZE OK_BUTTON_XSIZE
-#define NO_BUTTON_YSIZE OK_BUTTON_YSIZE
-#define CONFIRM_BUTTON_XPOS 2
-#define CONFIRM_BUTTON_GFX_YPOS 30
-#define CONFIRM_BUTTON_YPOS OK_BUTTON_YPOS
-#define CONFIRM_BUTTON_XSIZE 96
-#define CONFIRM_BUTTON_YSIZE OK_BUTTON_YSIZE
-
-#define ON_YESNO_BUTTON(x,y) (((x)>=(DX+OK_BUTTON_XPOS) && \
- (x)< (DX+OK_BUTTON_XPOS + \
- OK_BUTTON_XSIZE) && \
- (y)>=(DY+OK_BUTTON_YPOS) && \
- (y)< (DY+OK_BUTTON_YPOS + \
- OK_BUTTON_YSIZE)) || \
- ((x)>=(DX+NO_BUTTON_XPOS) && \
- (x)< (DX+NO_BUTTON_XPOS + \
- NO_BUTTON_XSIZE) && \
- (y)>=(DY+NO_BUTTON_YPOS) && \
- (y)< (DY+NO_BUTTON_YPOS + \
- NO_BUTTON_YSIZE)))
-#define ON_CONFIRM_BUTTON(x,y) (((x)>=(DX+CONFIRM_BUTTON_XPOS) && \
- (x)< (DX+CONFIRM_BUTTON_XPOS + \
- CONFIRM_BUTTON_XSIZE) && \
- (y)>=(DY+CONFIRM_BUTTON_YPOS) && \
- (y)< (DY+CONFIRM_BUTTON_YPOS + \
- CONFIRM_BUTTON_YSIZE)))
-#define YESNO_BUTTON(x) (((x)-(DX+OK_BUTTON_XPOS))/OK_BUTTON_XSIZE)
-
-/* some positions in the choose player window */
-#define PLAYER_BUTTON_XSIZE 30
-#define PLAYER_BUTTON_YSIZE 30
-#define PLAYER_BUTTON_GFX_XPOS 5
-#define PLAYER_BUTTON_GFX_YPOS (215-30)
-#define PLAYER_CONTROL_XPOS (5 + PLAYER_BUTTON_XSIZE/2)
-#define PLAYER_CONTROL_YPOS (215 - PLAYER_BUTTON_YSIZE/2)
-#define PLAYER_CONTROL_XSIZE (2*PLAYER_BUTTON_XSIZE)
-#define PLAYER_CONTROL_YSIZE (2*PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_1_XPOS (PLAYER_CONTROL_XPOS + 0 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_2_XPOS (PLAYER_CONTROL_XPOS + 1 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_3_XPOS (PLAYER_CONTROL_XPOS + 0 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_4_XPOS (PLAYER_CONTROL_XPOS + 1 * PLAYER_BUTTON_XSIZE)
-#define PLAYER_BUTTON_1_YPOS (PLAYER_CONTROL_YPOS + 0 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_2_YPOS (PLAYER_CONTROL_YPOS + 0 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_3_YPOS (PLAYER_CONTROL_YPOS + 1 * PLAYER_BUTTON_YSIZE)
-#define PLAYER_BUTTON_4_YPOS (PLAYER_CONTROL_YPOS + 1 * PLAYER_BUTTON_YSIZE)
-
-#define ON_PLAYER_BUTTON(x,y) ((x)>=(DX+PLAYER_CONTROL_XPOS) && \
- (x)< (DX+PLAYER_CONTROL_XPOS + \
- PLAYER_CONTROL_XSIZE) && \
- (y)>=(DY+PLAYER_CONTROL_YPOS) && \
- (y)< (DY+PLAYER_CONTROL_YPOS + \
- PLAYER_CONTROL_YSIZE))
-#define PLAYER_BUTTON(x,y) ((((x)-(DX+PLAYER_CONTROL_XPOS)) / \
- PLAYER_BUTTON_XSIZE) + 2 * \
- (((y)-(DY+PLAYER_CONTROL_YPOS)) / \
- PLAYER_BUTTON_YSIZE))
-
-
-/* some definitions for the editor control window */
-
-#define ON_EDIT_BUTTON(x,y) (((x)>=(VX+ED_BUTTON_CTRL_XPOS) && \
- (x)< (VX+ED_BUTTON_CTRL_XPOS + \
- ED_BUTTON_CTRL_XSIZE) && \
- (y)>=(VY+ED_BUTTON_CTRL_YPOS) && \
- (y)< (VY+ED_BUTTON_CTRL_YPOS + \
- ED_BUTTON_CTRL_YSIZE + \
- ED_BUTTON_FILL_YSIZE)) || \
- ((x)>=(VX+ED_BUTTON_LEFT_XPOS) && \
- (x)< (VX+ED_BUTTON_LEFT_XPOS + \
- ED_BUTTON_LEFT_XSIZE + \
- ED_BUTTON_UP_XSIZE + \
- ED_BUTTON_RIGHT_XSIZE) && \
- (y)>=(VY+ED_BUTTON_LEFT_YPOS) && \
- (y)< (VY+ED_BUTTON_LEFT_YPOS + \
- ED_BUTTON_LEFT_YSIZE)) || \
- ((x)>=(VX+ED_BUTTON_UP_XPOS) && \
- (x)< (VX+ED_BUTTON_UP_XPOS + \
- ED_BUTTON_UP_XSIZE) && \
- (y)>=(VY+ED_BUTTON_UP_YPOS) && \
- (y)< (VY+ED_BUTTON_UP_YPOS + \
- ED_BUTTON_UP_YSIZE + \
- ED_BUTTON_DOWN_YSIZE)))
-
-#define ON_CTRL_BUTTON(x,y) ((x)>=(VX+ED_BUTTON_EDIT_XPOS) && \
- (x)< (VX+ED_BUTTON_EDIT_XPOS + \
- ED_BUTTON_EDIT_XSIZE) && \
- (y)>=(VY+ED_BUTTON_EDIT_YPOS) && \
- (y)< (VY+ED_BUTTON_EDIT_YPOS + \
- ED_BUTTON_EDIT_YSIZE + \
- ED_BUTTON_CLEAR_YSIZE + \
- ED_BUTTON_UNDO_YSIZE + \
- ED_BUTTON_EXIT_YSIZE))
-
-#define ON_ELEM_BUTTON(x,y) (((x)>=(DX+ED_BUTTON_EUP_XPOS) && \
- (x)< (DX+ED_BUTTON_EUP_XPOS + \
- ED_BUTTON_EUP_XSIZE) && \
- (y)>=(DY+ED_BUTTON_EUP_YPOS) && \
- (y)< (DY+ED_BUTTON_EUP_YPOS + \
- ED_BUTTON_EUP_YSIZE)) || \
- ((x)>=(DX+ED_BUTTON_EDOWN_XPOS) && \
- (x)< (DX+ED_BUTTON_EDOWN_XPOS + \
- ED_BUTTON_EDOWN_XSIZE) && \
- (y)>=(DY+ED_BUTTON_EDOWN_YPOS) && \
- (y)< (DY+ED_BUTTON_EDOWN_YPOS + \
- ED_BUTTON_EDOWN_YSIZE)) || \
- ((x)>=(DX+ED_BUTTON_ELEM_XPOS) && \
- (x)< (DX+ED_BUTTON_ELEM_XPOS + \
- MAX_ELEM_X*ED_BUTTON_ELEM_XSIZE) && \
- (y)>=(DY+ED_BUTTON_ELEM_YPOS) && \
- (y)< (DY+ED_BUTTON_ELEM_YPOS + \
- MAX_ELEM_Y*ED_BUTTON_ELEM_YSIZE)))
-
-#define ON_COUNT_BUTTON(x,y) (((((x)>=ED_COUNT_GADGET_XPOS && \
- (x)<(ED_COUNT_GADGET_XPOS + \
- ED_BUTTON_MINUS_XSIZE)) || \
- ((x)>=(ED_COUNT_GADGET_XPOS + \
- (ED_BUTTON_PLUS_XPOS - \
- ED_BUTTON_MINUS_XPOS)) && \
- (x)<(ED_COUNT_GADGET_XPOS + \
- (ED_BUTTON_PLUS_XPOS - \
- ED_BUTTON_MINUS_XPOS) + \
- ED_BUTTON_PLUS_XSIZE))) && \
- ((y)>=ED_COUNT_GADGET_YPOS && \
- (y)<(ED_COUNT_GADGET_YPOS + \
- 16*ED_COUNT_GADGET_YSIZE)) && \
- (((y)-ED_COUNT_GADGET_YPOS) % \
- ED_COUNT_GADGET_YSIZE) < \
- ED_BUTTON_MINUS_YSIZE) || \
- ((((x)>=ED_SIZE_GADGET_XPOS && \
- (x)<(ED_SIZE_GADGET_XPOS + \
- ED_BUTTON_MINUS_XSIZE)) || \
- ((x)>=(ED_SIZE_GADGET_XPOS + \
- (ED_BUTTON_PLUS_XPOS - \
- ED_BUTTON_MINUS_XPOS)) && \
- (x)<(ED_SIZE_GADGET_XPOS + \
- (ED_BUTTON_PLUS_XPOS - \
- ED_BUTTON_MINUS_XPOS) + \
- ED_BUTTON_PLUS_XSIZE))) && \
- ((y)>=ED_SIZE_GADGET_YPOS && \
- (y)<(ED_SIZE_GADGET_YPOS + \
- 2*ED_SIZE_GADGET_YSIZE)) && \
- (((y)-ED_SIZE_GADGET_YPOS) % \
- ED_SIZE_GADGET_YSIZE) < \
- ED_BUTTON_MINUS_YSIZE))
-
-#define EDIT_BUTTON(x,y) (((y) < (VY + ED_BUTTON_CTRL_YPOS + \
- ED_BUTTON_CTRL_YSIZE)) ? 0 : \
- ((y) < (VY + ED_BUTTON_CTRL_YPOS + \
- ED_BUTTON_CTRL_YSIZE + \
- ED_BUTTON_FILL_YSIZE)) ? 1 : \
- ((x) < (VX + ED_BUTTON_LEFT_XPOS + \
- ED_BUTTON_LEFT_XSIZE) ? 2 : \
- (x) > (VX + ED_BUTTON_LEFT_XPOS + \
- ED_BUTTON_LEFT_XSIZE + \
- ED_BUTTON_UP_XSIZE) ? 5 : \
- 3+(((y)-(VY + ED_BUTTON_CTRL_YPOS + \
- ED_BUTTON_CTRL_YSIZE + \
- ED_BUTTON_FILL_YSIZE)) / \
- ED_BUTTON_UP_YSIZE)))
-
-#define CTRL_BUTTON(x,y) (((y) < (VY + ED_BUTTON_EDIT_YPOS + \
- ED_BUTTON_EDIT_YSIZE)) ? 0 : \
- 1+(((y)-(VY + ED_BUTTON_EDIT_YPOS + \
- ED_BUTTON_EDIT_YSIZE)) / \
- ED_BUTTON_CLEAR_YSIZE))
-
-#define ELEM_BUTTON(x,y) (((y) < (DY + ED_BUTTON_EUP_YPOS + \
- ED_BUTTON_EUP_YSIZE)) ? 0 : \
- ((y) > (DY + ED_BUTTON_EDOWN_YPOS)) ? 1 : \
- 2+(((y) - (DY + ED_BUTTON_ELEM_YPOS)) / \
- ED_BUTTON_ELEM_YSIZE)*MAX_ELEM_X + \
- ((x) - (DX + ED_BUTTON_ELEM_XPOS)) / \
- ED_BUTTON_ELEM_XSIZE)
-
-#define COUNT_BUTTON(x,y) ((x) < ED_SIZE_GADGET_XPOS ? \
- ((((y) - ED_COUNT_GADGET_YPOS) / \
- ED_COUNT_GADGET_YSIZE)*2 + \
- ((x) < (ED_COUNT_GADGET_XPOS + \
- ED_BUTTON_MINUS_XSIZE) ? 0 : 1)) : \
- 32+((((y) - ED_SIZE_GADGET_YPOS) / \
- ED_SIZE_GADGET_YSIZE)*2 + \
- ((x) < (ED_SIZE_GADGET_XPOS + \
- ED_BUTTON_MINUS_XSIZE) ? 0 : 1)))
-
-/****************************************************************/
-/********** drawing buttons and corresponding displays **********/
-/****************************************************************/
-
-void OLD_DrawVideoDisplay(unsigned long state, unsigned long value)
-{
- int i;
- int part_label = 0, part_symbol = 1;
- int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
- static char *monatsname[12] =
- {
- "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
- "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
- };
- static int video_pos[5][2][4] =
- {
- {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
- VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
- { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
- VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
-
- {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
- VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
- { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
- VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
-
- {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
- VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
- { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
- VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
-
- {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
- VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
- { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
- VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
-
- {{ 0,0,
- 0,0 },
- { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
- VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }}
- };
-
- if (state & VIDEO_STATE_PBEND_OFF)
- {
- int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_REC_LABEL_XPOS,
- cy + VIDEO_REC_LABEL_YPOS,
- VIDEO_PBEND_LABEL_XSIZE,
- VIDEO_PBEND_LABEL_YSIZE,
- VX + VIDEO_REC_LABEL_XPOS,
- VY + VIDEO_REC_LABEL_YPOS);
- }
-
- for(i=0;i<10;i++)
- {
- if (state & (1<<i))
- {
- int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
-
- if (i%2) /* i ungerade => STATE_ON / PRESS_OFF */
- cx = DOOR_GFX_PAGEX4;
- else
- cx = DOOR_GFX_PAGEX3; /* i gerade => STATE_OFF / PRESS_ON */
-
- if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + video_pos[pos][part_label][xpos],
- cy + video_pos[pos][part_label][ypos],
- video_pos[pos][part_label][xsize],
- video_pos[pos][part_label][ysize],
- VX + video_pos[pos][part_label][xpos],
- VY + video_pos[pos][part_label][ypos]);
- if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + video_pos[pos][part_symbol][xpos],
- cy + video_pos[pos][part_symbol][ypos],
- video_pos[pos][part_symbol][xsize],
- video_pos[pos][part_symbol][ysize],
- VX + video_pos[pos][part_symbol][xpos],
- VY + video_pos[pos][part_symbol][ypos]);
- }
- }
-
- if (state & VIDEO_STATE_FFWD_ON)
- {
- int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_PLAY_SYMBOL_XPOS,
- cy + VIDEO_PLAY_SYMBOL_YPOS,
- VIDEO_PLAY_SYMBOL_XSIZE - 2,
- VIDEO_PLAY_SYMBOL_YSIZE,
- VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
- VY + VIDEO_PLAY_SYMBOL_YPOS);
- }
-
- if (state & VIDEO_STATE_PBEND_ON)
- {
- int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_PBEND_LABEL_XPOS,
- cy + VIDEO_PBEND_LABEL_YPOS,
- VIDEO_PBEND_LABEL_XSIZE,
- VIDEO_PBEND_LABEL_YSIZE,
- VX + VIDEO_REC_LABEL_XPOS,
- VY + VIDEO_REC_LABEL_YPOS);
- }
-
- if (state & VIDEO_STATE_DATE_ON)
- {
- int tag = value % 100;
- int monat = (value/100) % 100;
- int jahr = (value/10000);
-
- DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
- int2str(tag,2),FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
- monatsname[monat],FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
- int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
- }
-
- if (state & VIDEO_STATE_TIME_ON)
- {
- int min = value / 60;
- int sec = value % 60;
-
- DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
- int2str(min,2),FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
- int2str(sec,2),FS_SMALL,FC_SPECIAL1);
- }
-
- if (state & VIDEO_STATE_DATE)
- redraw_mask |= REDRAW_VIDEO_1;
- if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
- redraw_mask |= REDRAW_VIDEO_2;
- if (state & VIDEO_PRESS)
- redraw_mask |= REDRAW_VIDEO_3;
-}
-
-void DrawVideoDisplay(unsigned long state, unsigned long value)
-{
- int i;
- int part_label = 0, part_symbol = 1;
- int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
- static char *monatsname[12] =
- {
- "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
- "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
- };
- static int video_pos[10][2][4] =
- {
- {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
- VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
- { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
- VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
-
- {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
- VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
- { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
- VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
-
- {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
- VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
- { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
- VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
-
- {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
- VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
- { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
- VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
-
- {{ 0,0,
- 0,0 },
- { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
- VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }},
-
- {{ VIDEO_BUTTON_PLAY_XPOS, VIDEO_BUTTON_ANY_YPOS,
- VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
- { 0,0,
- 0,0 }},
-
- {{ VIDEO_BUTTON_REC_XPOS, VIDEO_BUTTON_ANY_YPOS,
- VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
- { 0,0,
- 0,0 }},
-
- {{ VIDEO_BUTTON_PAUSE_XPOS, VIDEO_BUTTON_ANY_YPOS,
- VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
- { 0,0,
- 0,0 }},
-
- {{ VIDEO_BUTTON_STOP_XPOS, VIDEO_BUTTON_ANY_YPOS,
- VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
- { 0,0,
- 0,0 }},
-
- {{ VIDEO_BUTTON_EJECT_XPOS, VIDEO_BUTTON_ANY_YPOS,
- VIDEO_BUTTON_XSIZE,VIDEO_BUTTON_YSIZE },
- { 0,0,
- 0,0 }}
- };
-
- if (state & VIDEO_STATE_PBEND_OFF)
- {
- int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_REC_LABEL_XPOS,
- cy + VIDEO_REC_LABEL_YPOS,
- VIDEO_PBEND_LABEL_XSIZE,
- VIDEO_PBEND_LABEL_YSIZE,
- VX + VIDEO_REC_LABEL_XPOS,
- VY + VIDEO_REC_LABEL_YPOS);
- }
-
- for(i=0;i<20;i++)
- {
- if (state & (1<<i))
- {
- int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
-
- if (i%2) /* i ungerade => STATE_ON / PRESS_OFF */
- cx = DOOR_GFX_PAGEX4;
- else
- cx = DOOR_GFX_PAGEX3; /* i gerade => STATE_OFF / PRESS_ON */
-
- if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + video_pos[pos][part_label][xpos],
- cy + video_pos[pos][part_label][ypos],
- video_pos[pos][part_label][xsize],
- video_pos[pos][part_label][ysize],
- VX + video_pos[pos][part_label][xpos],
- VY + video_pos[pos][part_label][ypos]);
- if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + video_pos[pos][part_symbol][xpos],
- cy + video_pos[pos][part_symbol][ypos],
- video_pos[pos][part_symbol][xsize],
- video_pos[pos][part_symbol][ysize],
- VX + video_pos[pos][part_symbol][xpos],
- VY + video_pos[pos][part_symbol][ypos]);
- }
- }
-
- if (state & VIDEO_STATE_FFWD_ON)
- {
- int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_PLAY_SYMBOL_XPOS,
- cy + VIDEO_PLAY_SYMBOL_YPOS,
- VIDEO_PLAY_SYMBOL_XSIZE - 2,
- VIDEO_PLAY_SYMBOL_YSIZE,
- VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
- VY + VIDEO_PLAY_SYMBOL_YPOS);
- }
-
- if (state & VIDEO_STATE_PBEND_ON)
- {
- int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + VIDEO_PBEND_LABEL_XPOS,
- cy + VIDEO_PBEND_LABEL_YPOS,
- VIDEO_PBEND_LABEL_XSIZE,
- VIDEO_PBEND_LABEL_YSIZE,
- VX + VIDEO_REC_LABEL_XPOS,
- VY + VIDEO_REC_LABEL_YPOS);
- }
-
- if (state & VIDEO_STATE_DATE_ON)
- {
- int tag = value % 100;
- int monat = (value/100) % 100;
- int jahr = (value/10000);
-
- DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
- int2str(tag,2),FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
- monatsname[monat],FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
- int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
- }
-
- if (state & VIDEO_STATE_TIME_ON)
- {
- int min = value / 60;
- int sec = value % 60;
-
- DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
- int2str(min,2),FS_SMALL,FC_SPECIAL1);
- DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
- int2str(sec,2),FS_SMALL,FC_SPECIAL1);
- }
-
- if (state & VIDEO_STATE_DATE)
- redraw_mask |= REDRAW_VIDEO_1;
- if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
- redraw_mask |= REDRAW_VIDEO_2;
- if (state & VIDEO_PRESS)
- redraw_mask |= REDRAW_VIDEO_3;
-}
-
-void DrawCompleteVideoDisplay()
-{
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- DOOR_GFX_PAGEX3,DOOR_GFX_PAGEY2, VXSIZE,VYSIZE, VX,VY);
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- DOOR_GFX_PAGEX4+VIDEO_CONTROL_XPOS,
- DOOR_GFX_PAGEY2+VIDEO_CONTROL_YPOS,
- VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE,
- VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
-
- DrawVideoDisplay(VIDEO_ALL_OFF,0);
- if (tape.date && tape.length)
- {
- DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
- DrawVideoDisplay(VIDEO_STATE_TIME_ON,tape.length_seconds);
- }
-
- XCopyArea(display,drawto,pix[PIX_DB_DOOR],gc,
- VX,VY, VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
-}
-
-void DrawSoundDisplay(unsigned long state)
-{
- int pos, cx = DOOR_GFX_PAGEX4, cy = 0;
-
- pos = (state & BUTTON_SOUND_MUSIC ? SOUND_BUTTON_MUSIC_XPOS :
- state & BUTTON_SOUND_LOOPS ? SOUND_BUTTON_LOOPS_XPOS :
- SOUND_BUTTON_SIMPLE_XPOS);
-
- if (state & BUTTON_ON)
- cy -= SOUND_BUTTON_YSIZE;
-
- if (state & BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX3;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + pos,cy + SOUND_BUTTON_ANY_YPOS,
- SOUND_BUTTON_XSIZE,SOUND_BUTTON_YSIZE,
- DX + pos,DY + SOUND_BUTTON_ANY_YPOS);
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawGameButton(unsigned long state)
-{
- int pos, cx = DOOR_GFX_PAGEX4, cy = -GAME_BUTTON_YSIZE;
-
- pos = (state & BUTTON_GAME_STOP ? GAME_BUTTON_STOP_XPOS :
- state & BUTTON_GAME_PAUSE ? GAME_BUTTON_PAUSE_XPOS :
- GAME_BUTTON_PLAY_XPOS);
-
- if (state & BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX3;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + pos,cy + GAME_BUTTON_ANY_YPOS,
- GAME_BUTTON_XSIZE,GAME_BUTTON_YSIZE,
- DX + pos,DY + GAME_BUTTON_ANY_YPOS);
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawYesNoButton(unsigned long state, int mode)
-{
- Drawable dest_drawto;
- int dest_xoffset, dest_yoffset;
- int xpos, cx = DOOR_GFX_PAGEX4;
-
- if (mode == DB_INIT)
- {
- dest_drawto = pix[PIX_DB_DOOR];
- dest_xoffset = DOOR_GFX_PAGEX1;
- dest_yoffset = 0;
- }
- else
- {
- dest_drawto = drawto;
- dest_xoffset = DX;
- dest_yoffset = DY;
- }
-
- xpos = (state & BUTTON_OK ? OK_BUTTON_XPOS : NO_BUTTON_XPOS);
-
- if (state & BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX3;
-
- XCopyArea(display, pix[PIX_DOOR], dest_drawto, gc,
- cx + xpos, OK_BUTTON_GFX_YPOS,
- OK_BUTTON_XSIZE, OK_BUTTON_YSIZE,
- dest_xoffset + xpos, dest_yoffset + OK_BUTTON_YPOS);
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawConfirmButton(unsigned long state, int mode)
-{
- Drawable dest_drawto;
- int dest_xoffset, dest_yoffset;
- int cx = DOOR_GFX_PAGEX4;
-
- if (mode == DB_INIT)
- {
- dest_drawto = pix[PIX_DB_DOOR];
- dest_xoffset = DOOR_GFX_PAGEX1;
- dest_yoffset = 0;
- }
- else
- {
- dest_drawto = drawto;
- dest_xoffset = DX;
- dest_yoffset = DY;
- }
-
- if (state & BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX3;
-
- XCopyArea(display, pix[PIX_DOOR], dest_drawto, gc,
- cx + CONFIRM_BUTTON_XPOS, CONFIRM_BUTTON_GFX_YPOS,
- CONFIRM_BUTTON_XSIZE, CONFIRM_BUTTON_YSIZE,
- dest_xoffset + CONFIRM_BUTTON_XPOS,
- dest_yoffset + CONFIRM_BUTTON_YPOS);
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawPlayerButton(unsigned long state, int mode)
-{
- Drawable dest_drawto;
- int dest_xoffset, dest_yoffset;
- int graphic = GFX_SPIELER1; /* default */
- int graphic_offset = (PLAYER_BUTTON_XSIZE - TILEX/2)/2;
- int xpos, ypos;
- int cx = DOOR_GFX_PAGEX4, cy = 0;
-
- if (mode == DB_INIT)
- {
- dest_drawto = pix[PIX_DB_DOOR];
- dest_xoffset = DOOR_GFX_PAGEX1;
- dest_yoffset = 0;
- }
- else
- {
- dest_drawto = drawto;
- dest_xoffset = DX;
- dest_yoffset = DY;
- }
-
- if (state & BUTTON_PLAYER_1)
- graphic = GFX_SPIELER1;
- else if (state & BUTTON_PLAYER_2)
- graphic = GFX_SPIELER2;
- else if (state & BUTTON_PLAYER_3)
- graphic = GFX_SPIELER3;
- else if (state & BUTTON_PLAYER_4)
- graphic = GFX_SPIELER4;
-
- xpos = (state & BUTTON_PLAYER_1 || state & BUTTON_PLAYER_3 ?
- PLAYER_BUTTON_1_XPOS : PLAYER_BUTTON_2_XPOS);
- ypos = (state & BUTTON_PLAYER_1 || state & BUTTON_PLAYER_2 ?
- PLAYER_BUTTON_1_YPOS : PLAYER_BUTTON_3_YPOS);
-
- if (state & BUTTON_PRESSED)
- {
- cx = DOOR_GFX_PAGEX3;
- graphic_offset += 1;
- }
-
- XCopyArea(display, pix[PIX_DOOR], dest_drawto, gc,
- cx + PLAYER_BUTTON_GFX_XPOS, cy + PLAYER_BUTTON_GFX_YPOS,
- PLAYER_BUTTON_XSIZE, PLAYER_BUTTON_YSIZE,
- dest_xoffset + xpos, dest_yoffset + ypos);
- DrawMiniGraphicExt(dest_drawto,gc,
- dest_xoffset + xpos + graphic_offset,
- dest_yoffset + ypos + graphic_offset,
- graphic);
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-/* several buttons in the level editor */
-
-void DrawEditButton(unsigned long state)
-{
- int i;
- int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
- int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY2;
- static int edit_pos[6][4] =
- {
- {ED_BUTTON_CTRL_XPOS,ED_BUTTON_CTRL_YPOS,
- ED_BUTTON_CTRL_XSIZE,ED_BUTTON_CTRL_YSIZE},
-
- {ED_BUTTON_FILL_XPOS,ED_BUTTON_FILL_YPOS,
- ED_BUTTON_FILL_XSIZE,ED_BUTTON_FILL_YSIZE},
-
- {ED_BUTTON_LEFT_XPOS,ED_BUTTON_LEFT_YPOS,
- ED_BUTTON_LEFT_XSIZE,ED_BUTTON_LEFT_YSIZE},
-
- {ED_BUTTON_UP_XPOS,ED_BUTTON_UP_YPOS,
- ED_BUTTON_UP_XSIZE,ED_BUTTON_UP_YSIZE},
-
- {ED_BUTTON_DOWN_XPOS,ED_BUTTON_DOWN_YPOS,
- ED_BUTTON_DOWN_XSIZE,ED_BUTTON_DOWN_YSIZE},
-
- {ED_BUTTON_RIGHT_XPOS,ED_BUTTON_RIGHT_YPOS,
- ED_BUTTON_RIGHT_XSIZE,ED_BUTTON_RIGHT_YSIZE}
- };
-
- if (state & ED_BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX5;
-
- for(i=0;i<6;i++)
- {
- if (state & (1<<i))
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + edit_pos[i][xpos],
- cy + edit_pos[i][ypos],
- edit_pos[i][xsize],
- edit_pos[i][ysize],
- VX + edit_pos[i][xpos],
- VY + edit_pos[i][ypos]);
- }
-
- redraw_mask |= REDRAW_DOOR_2;
-}
-
-void DrawCtrlButton(unsigned long state)
-{
- int i;
- int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
- int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY1+80;
- static int edit_pos[4][4] =
- {
- {ED_BUTTON_EDIT_XPOS,ED_BUTTON_EDIT_YPOS,
- ED_BUTTON_EDIT_XSIZE,ED_BUTTON_EDIT_YSIZE},
-
- {ED_BUTTON_CLEAR_XPOS,ED_BUTTON_CLEAR_YPOS,
- ED_BUTTON_CLEAR_XSIZE,ED_BUTTON_CLEAR_YSIZE},
-
- {ED_BUTTON_UNDO_XPOS,ED_BUTTON_UNDO_YPOS,
- ED_BUTTON_UNDO_XSIZE,ED_BUTTON_UNDO_YSIZE},
-
- {ED_BUTTON_EXIT_XPOS,ED_BUTTON_EXIT_YPOS,
- ED_BUTTON_EXIT_XSIZE,ED_BUTTON_EXIT_YSIZE}
- };
-
- if (state & ED_BUTTON_PRESSED)
- cx = DOOR_GFX_PAGEX3;
-
- for(i=0;i<4;i++)
- {
- if (state & (1<<(i+6)))
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- cx + edit_pos[i][xpos],
- cy + edit_pos[i][ypos],
- edit_pos[i][xsize],
- edit_pos[i][ysize],
- VX + edit_pos[i][xpos],
- VY + edit_pos[i][ypos]);
- }
-
- redraw_mask |= REDRAW_DOOR_2;
-}
-
-void DrawElemButton(int button_nr, int button_state)
-{
- int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
- int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
- int from_x, from_y, to_x,to_y, size_x, size_y;
- static int edit_pos[3][4] =
- {
- {ED_BUTTON_EUP_XPOS,ED_BUTTON_EUP_YPOS,
- ED_BUTTON_EUP_XSIZE,ED_BUTTON_EUP_YSIZE},
-
- {ED_BUTTON_EDOWN_XPOS,ED_BUTTON_EDOWN_YPOS,
- ED_BUTTON_EDOWN_XSIZE,ED_BUTTON_EDOWN_YSIZE},
-
- {ED_BUTTON_ELEM_XPOS,ED_BUTTON_ELEM_YPOS,
- ED_BUTTON_ELEM_XSIZE,ED_BUTTON_ELEM_YSIZE}
- };
-
- if (button_nr<ED_BUTTON_ELEM)
- {
- int pos = button_nr;
-
- from_x = cx + edit_pos[pos][xpos];
- from_y = cy + edit_pos[pos][ypos];
- size_x = edit_pos[pos][xsize];
- size_y = edit_pos[pos][ysize];
- to_x = DX + edit_pos[pos][xpos];
- to_y = DY + edit_pos[pos][ypos];
-
- if (button_state & ED_BUTTON_PRESSED)
- {
- if (button_nr==ED_BUTTON_EUP)
- from_y = cy + ED_BUTTON_EUP_Y2POS;
- else
- from_y = cy + ED_BUTTON_EDOWN_Y2POS;
- }
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- from_x,from_y, size_x,size_y, to_x,to_y);
- }
- else
- {
- int pos = ED_BUTTON_ELEM;
- int elem_pos = button_nr-ED_BUTTON_ELEM;
- int x = elem_pos % MAX_ELEM_X;
- int y = elem_pos / MAX_ELEM_X;
- int graphic;
- int shift = 0;
-
- if (elem_pos+element_shift < elements_in_list)
- graphic = el2gfx(editor_element[elem_pos+element_shift]);
- else
- graphic = GFX_LEERRAUM;
-
- from_x = cx + edit_pos[pos][xpos];
- from_y = cy + edit_pos[pos][ypos];
- size_x = edit_pos[pos][xsize];
- size_y = edit_pos[pos][ysize];
- to_x = DX + edit_pos[pos][xpos] + x * ED_BUTTON_ELEM_XSIZE;
- to_y = DY + edit_pos[pos][ypos] + y * ED_BUTTON_ELEM_YSIZE;
-
- if (button_state & ED_BUTTON_PRESSED)
- {
- from_y = ED_BUTTON_ELEM_Y2POS;
- shift = 1;
- }
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- from_x,from_y, size_x,size_y, to_x,to_y);
-
- DrawMiniGraphicExt(drawto,gc,
- DX+ED_BUTTON_ELEM_XPOS+3+shift +
- (elem_pos % MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
- DY+ED_BUTTON_ELEM_YPOS+3+shift +
- (elem_pos / MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
- graphic);
- }
-
- redraw_mask |= REDRAW_DOOR_1;
-}
-
-void DrawCountButton(int button_nr, int button_state)
-{
- int from_x, from_y, to_x,to_y, size_x, size_y;
-
- from_x =
- DOOR_GFX_PAGEX4+(button_nr%2 ? ED_BUTTON_PLUS_XPOS : ED_BUTTON_MINUS_XPOS);
- from_y = DOOR_GFX_PAGEY1 + ED_BUTTON_MINUS_YPOS;
- size_x = ED_BUTTON_MINUS_XSIZE;
- size_y = ED_BUTTON_MINUS_YSIZE;
- to_x = (button_nr<32 ? ED_COUNT_GADGET_XPOS : ED_SIZE_GADGET_XPOS);
- if (button_nr % 2)
- to_x += (ED_BUTTON_PLUS_XPOS - ED_BUTTON_MINUS_XPOS);
- to_y = (button_nr<32 ? ED_COUNT_GADGET_YPOS : ED_SIZE_GADGET_YPOS) +
- ((button_nr<32 ? button_nr : button_nr-32)/2)*ED_COUNT_GADGET_YSIZE;
-
- if (button_state & ED_BUTTON_PRESSED)
- from_x -= DXSIZE;
-
- XCopyArea(display,pix[PIX_DOOR],drawto,gc,
- from_x,from_y, size_x,size_y, to_x,to_y);
- XCopyArea(display,pix[PIX_DOOR],window,gc,
- from_x,from_y, size_x,size_y, to_x,to_y);
-}
-
-/**********************************************************************/
-/********** checking buttons (and redrawing them, if needed) **********/
-/**********************************************************************/
-
-int CheckVideoButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- static int video_button[5] =
- {
- VIDEO_PRESS_EJECT_ON,
- VIDEO_PRESS_STOP_ON,
- VIDEO_PRESS_PAUSE_ON,
- VIDEO_PRESS_REC_ON,
- VIDEO_PRESS_PLAY_ON
- };
-
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_VIDEO_BUTTON(mx,my))
- {
- choice = VIDEO_BUTTON(mx);
- pressed = TRUE;
- DrawVideoDisplay(video_button[choice],0);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_VIDEO_BUTTON(mx,my) || VIDEO_BUTTON(mx)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawVideoDisplay(video_button[choice]<<1,0);
- }
- else if (ON_VIDEO_BUTTON(mx,my) && VIDEO_BUTTON(mx)==choice && !pressed)
- {
- pressed = TRUE;
- DrawVideoDisplay(video_button[choice],0);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
- {
- if (ON_VIDEO_BUTTON(mx,my) && VIDEO_BUTTON(mx)==choice && pressed)
- {
- DrawVideoDisplay(video_button[choice]<<1,0);
- return_code = choice+1;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
-
- BackToFront();
- return(return_code);
-}
-
-int CheckSoundButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- int sound_state[3];
-
- sound_state[0] = BUTTON_SOUND_MUSIC | (BUTTON_ON * setup.sound_music);
- sound_state[1] = BUTTON_SOUND_LOOPS | (BUTTON_ON * setup.sound_loops);
- sound_state[2] = BUTTON_SOUND_SIMPLE | (BUTTON_ON * setup.sound_simple);
-
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_SOUND_BUTTON(mx,my))
- {
- choice = SOUND_BUTTON(mx);
- pressed = TRUE;
- DrawSoundDisplay(sound_state[choice] | BUTTON_PRESSED);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_SOUND_BUTTON(mx,my) || SOUND_BUTTON(mx)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawSoundDisplay(sound_state[choice] | BUTTON_RELEASED);
- }
- else if (ON_SOUND_BUTTON(mx,my) && SOUND_BUTTON(mx)==choice && !pressed)
- {
- pressed = TRUE;
- DrawSoundDisplay(sound_state[choice] | BUTTON_PRESSED);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
- {
- if (ON_SOUND_BUTTON(mx,my) && SOUND_BUTTON(mx)==choice && pressed)
- {
- DrawSoundDisplay(sound_state[choice] | BUTTON_RELEASED);
- return_code = 1<<choice;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
-
- BackToFront();
- return(return_code);
-}
-
-int CheckGameButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- int game_state[3] =
- {
- BUTTON_GAME_STOP,
- BUTTON_GAME_PAUSE,
- BUTTON_GAME_PLAY
- };
-
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_GAME_BUTTON(mx,my))
- {
- choice = GAME_BUTTON(mx);
- pressed = TRUE;
- DrawGameButton(game_state[choice] | BUTTON_PRESSED);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_GAME_BUTTON(mx,my) || GAME_BUTTON(mx)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawGameButton(game_state[choice] | BUTTON_RELEASED);
- }
- else if (ON_GAME_BUTTON(mx,my) && GAME_BUTTON(mx)==choice && !pressed)
- {
- pressed = TRUE;
- DrawGameButton(game_state[choice] | BUTTON_PRESSED);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
- {
- if (ON_GAME_BUTTON(mx,my) && GAME_BUTTON(mx)==choice && pressed)
- {
- DrawGameButton(game_state[choice] | BUTTON_RELEASED);
- return_code = 1<<choice;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
-
- BackToFront();
- return(return_code);
-}
-
-int CheckYesNoButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- static int yesno_button[5] =
- {
- BUTTON_OK,
- BUTTON_NO
- };
-
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_YESNO_BUTTON(mx,my))
- {
- choice = YESNO_BUTTON(mx);
- pressed = TRUE;
- DrawYesNoButton(yesno_button[choice] | BUTTON_PRESSED, DB_NORMAL);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_YESNO_BUTTON(mx,my) || YESNO_BUTTON(mx)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawYesNoButton(yesno_button[choice] | BUTTON_RELEASED, DB_NORMAL);
- }
- else if (ON_YESNO_BUTTON(mx,my) && YESNO_BUTTON(mx)==choice && !pressed)
- {
- pressed = TRUE;
- DrawYesNoButton(yesno_button[choice] | BUTTON_PRESSED, DB_NORMAL);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
- {
- if (ON_YESNO_BUTTON(mx,my) && YESNO_BUTTON(mx)==choice && pressed)
- {
- DrawYesNoButton(yesno_button[choice] | BUTTON_RELEASED, DB_NORMAL);
- return_code = choice+1;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
-
- BackToFront();
- return(return_code);
-}
-
-int CheckConfirmButton(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
+#define VIDEO_ALL_ON (VIDEO_STATE_ON | VIDEO_PRESS_ON)
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_CONFIRM_BUTTON(mx,my))
- {
- choice = 0;
- pressed = TRUE;
- DrawConfirmButton(BUTTON_PRESSED, DB_NORMAL);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if (!ON_CONFIRM_BUTTON(mx,my) && choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawConfirmButton(BUTTON_RELEASED, DB_NORMAL);
- }
- else if (ON_CONFIRM_BUTTON(mx,my) && !pressed)
- {
- pressed = TRUE;
- DrawConfirmButton(BUTTON_PRESSED, DB_NORMAL);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
- {
- if (ON_CONFIRM_BUTTON(mx,my) && pressed)
- {
- DrawConfirmButton(BUTTON_RELEASED, DB_NORMAL);
- return_code = BUTTON_CONFIRM;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
+#define VIDEO_STATE (VIDEO_STATE_ON | VIDEO_STATE_OFF)
+#define VIDEO_PRESS (VIDEO_PRESS_ON | VIDEO_PRESS_OFF)
+#define VIDEO_ALL (VIDEO_ALL_ON | VIDEO_ALL_OFF)
- BackToFront();
- return(return_code);
-}
-int CheckPlayerButtons(int mx, int my, int button)
+void DrawVideoDisplay(unsigned long state, unsigned long value)
{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- int player_state[4] =
+ int i;
+ int part_label = 0, part_symbol = 1;
+ int xpos = 0, ypos = 1, xsize = 2, ysize = 3;
+ static char *monatsname[12] =
{
- BUTTON_PLAYER_1,
- BUTTON_PLAYER_2,
- BUTTON_PLAYER_3,
- BUTTON_PLAYER_4
+ "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
+ "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
};
-
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_PLAYER_BUTTON(mx,my))
- {
- choice = PLAYER_BUTTON(mx,my);
- pressed = TRUE;
- DrawPlayerButton(player_state[choice] | BUTTON_PRESSED, DB_NORMAL);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_PLAYER_BUTTON(mx,my) || PLAYER_BUTTON(mx,my)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawPlayerButton(player_state[choice] | BUTTON_RELEASED, DB_NORMAL);
- }
- else if (ON_PLAYER_BUTTON(mx,my) && PLAYER_BUTTON(mx,my)==choice && !pressed)
- {
- pressed = TRUE;
- DrawPlayerButton(player_state[choice] | BUTTON_PRESSED, DB_NORMAL);
- }
- }
- }
- else /* Maustaste wieder losgelassen */
+ static int video_pos[5][2][4] =
{
- if (ON_PLAYER_BUTTON(mx,my) && PLAYER_BUTTON(mx,my)==choice && pressed)
- {
- DrawPlayerButton(player_state[choice] | BUTTON_RELEASED, DB_NORMAL);
- return_code = player_state[choice];
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
- }
+ {{ VIDEO_PLAY_LABEL_XPOS, VIDEO_PLAY_LABEL_YPOS,
+ VIDEO_PLAY_LABEL_XSIZE,VIDEO_PLAY_LABEL_YSIZE },
+ { VIDEO_PLAY_SYMBOL_XPOS, VIDEO_PLAY_SYMBOL_YPOS,
+ VIDEO_PLAY_SYMBOL_XSIZE,VIDEO_PLAY_SYMBOL_YSIZE }},
- BackToFront();
- return(return_code);
-}
+ {{ VIDEO_REC_LABEL_XPOS, VIDEO_REC_LABEL_YPOS,
+ VIDEO_REC_LABEL_XSIZE,VIDEO_REC_LABEL_YSIZE },
+ { VIDEO_REC_SYMBOL_XPOS, VIDEO_REC_SYMBOL_YPOS,
+ VIDEO_REC_SYMBOL_XSIZE,VIDEO_REC_SYMBOL_YSIZE }},
+
+ {{ VIDEO_PAUSE_LABEL_XPOS, VIDEO_PAUSE_LABEL_YPOS,
+ VIDEO_PAUSE_LABEL_XSIZE,VIDEO_PAUSE_LABEL_YSIZE },
+ { VIDEO_PAUSE_SYMBOL_XPOS, VIDEO_PAUSE_SYMBOL_YPOS,
+ VIDEO_PAUSE_SYMBOL_XSIZE,VIDEO_PAUSE_SYMBOL_YSIZE }},
-/* several buttons in the level editor */
+ {{ VIDEO_DATE_LABEL_XPOS, VIDEO_DATE_LABEL_YPOS,
+ VIDEO_DATE_LABEL_XSIZE,VIDEO_DATE_LABEL_YSIZE },
+ { VIDEO_DATE_XPOS, VIDEO_DATE_YPOS,
+ VIDEO_DATE_XSIZE,VIDEO_DATE_YSIZE }},
-int CheckEditButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- static int edit_button[6] =
- {
- ED_BUTTON_CTRL,
- ED_BUTTON_FILL,
- ED_BUTTON_LEFT,
- ED_BUTTON_UP,
- ED_BUTTON_DOWN,
- ED_BUTTON_RIGHT
+ {{ 0,0,
+ 0,0 },
+ { VIDEO_TIME_XPOS, VIDEO_TIME_YPOS,
+ VIDEO_TIME_XSIZE,VIDEO_TIME_YSIZE }}
};
- if (button)
+ if (state & VIDEO_STATE_PBEND_OFF)
{
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_EDIT_BUTTON(mx,my))
- {
- choice = EDIT_BUTTON(mx,my);
- pressed = TRUE;
- DrawEditButton(edit_button[choice] | ED_BUTTON_PRESSED);
- if (edit_button[choice]!=ED_BUTTON_CTRL &&
- edit_button[choice]!=ED_BUTTON_FILL)
- return_code = 1<<choice;
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_EDIT_BUTTON(mx,my) || EDIT_BUTTON(mx,my)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawEditButton(edit_button[choice] | ED_BUTTON_RELEASED);
- }
- else if (ON_EDIT_BUTTON(mx,my) && EDIT_BUTTON(mx,my)==choice)
- {
- if (!pressed)
- DrawEditButton(edit_button[choice] | ED_BUTTON_PRESSED);
- pressed = TRUE;
- if (edit_button[choice]!=ED_BUTTON_CTRL &&
- edit_button[choice]!=ED_BUTTON_FILL)
- return_code = 1<<choice;
- }
- }
+ int cx = DOOR_GFX_PAGEX3, cy = DOOR_GFX_PAGEY2;
+
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ cx + VIDEO_REC_LABEL_XPOS,
+ cy + VIDEO_REC_LABEL_YPOS,
+ VIDEO_PBEND_LABEL_XSIZE,
+ VIDEO_PBEND_LABEL_YSIZE,
+ VX + VIDEO_REC_LABEL_XPOS,
+ VY + VIDEO_REC_LABEL_YPOS);
}
- else /* Maustaste wieder losgelassen */
+
+ for(i=0;i<10;i++)
{
- if (ON_EDIT_BUTTON(mx,my) && EDIT_BUTTON(mx,my)==choice && pressed)
- {
- DrawEditButton(edit_button[choice] | ED_BUTTON_RELEASED);
- if (edit_button[choice]==ED_BUTTON_CTRL ||
- edit_button[choice]==ED_BUTTON_FILL)
- return_code = 1<<choice;
- choice = -1;
- pressed = FALSE;
- }
- else
+ if (state & (1<<i))
{
- choice = -1;
- pressed = FALSE;
- }
- }
-
- BackToFront();
- return(return_code);
-}
+ int pos = i/2, cx, cy = DOOR_GFX_PAGEY2;
-int CheckCtrlButtons(int mx, int my, int button)
-{
- int return_code = 0;
- static int choice = -1;
- static boolean pressed = FALSE;
- static int ctrl_button[4] =
- {
- ED_BUTTON_EDIT,
- ED_BUTTON_CLEAR,
- ED_BUTTON_UNDO,
- ED_BUTTON_EXIT
- };
+ if (i%2) /* i ungerade => STATE_ON / PRESS_OFF */
+ cx = DOOR_GFX_PAGEX4;
+ else
+ cx = DOOR_GFX_PAGEX3; /* i gerade => STATE_OFF / PRESS_ON */
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_CTRL_BUTTON(mx,my))
- {
- choice = CTRL_BUTTON(mx,my);
- pressed = TRUE;
- DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_PRESSED);
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_CTRL_BUTTON(mx,my) || CTRL_BUTTON(mx,my)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_RELEASED);
- }
- else if (ON_CTRL_BUTTON(mx,my) && CTRL_BUTTON(mx,my)==choice && !pressed)
- {
- pressed = TRUE;
- DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_PRESSED);
- }
+ if (video_pos[pos][part_label][0] && value != VIDEO_DISPLAY_SYMBOL_ONLY)
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ cx + video_pos[pos][part_label][xpos],
+ cy + video_pos[pos][part_label][ypos],
+ video_pos[pos][part_label][xsize],
+ video_pos[pos][part_label][ysize],
+ VX + video_pos[pos][part_label][xpos],
+ VY + video_pos[pos][part_label][ypos]);
+ if (video_pos[pos][part_symbol][0] && value != VIDEO_DISPLAY_LABEL_ONLY)
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ cx + video_pos[pos][part_symbol][xpos],
+ cy + video_pos[pos][part_symbol][ypos],
+ video_pos[pos][part_symbol][xsize],
+ video_pos[pos][part_symbol][ysize],
+ VX + video_pos[pos][part_symbol][xpos],
+ VY + video_pos[pos][part_symbol][ypos]);
}
}
- else /* Maustaste wieder losgelassen */
+
+ if (state & VIDEO_STATE_FFWD_ON)
{
- if (ON_CTRL_BUTTON(mx,my) && CTRL_BUTTON(mx,my)==choice && pressed)
- {
- DrawCtrlButton(ctrl_button[choice] | ED_BUTTON_RELEASED);
- return_code = 1<<(choice+6);
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
+ int cx = DOOR_GFX_PAGEX4, cy = DOOR_GFX_PAGEY2;
+
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ cx + VIDEO_PLAY_SYMBOL_XPOS,
+ cy + VIDEO_PLAY_SYMBOL_YPOS,
+ VIDEO_PLAY_SYMBOL_XSIZE - 2,
+ VIDEO_PLAY_SYMBOL_YSIZE,
+ VX + VIDEO_PLAY_SYMBOL_XPOS - 9,
+ VY + VIDEO_PLAY_SYMBOL_YPOS);
}
- BackToFront();
- return(return_code);
-}
+ if (state & VIDEO_STATE_PBEND_ON)
+ {
+ int cx = DOOR_GFX_PAGEX6, cy = DOOR_GFX_PAGEY1;
-int CheckElemButtons(int mx, int my, int button)
-{
- int return_code = -1;
- static int choice = -1;
- static boolean pressed = FALSE;
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ cx + VIDEO_PBEND_LABEL_XPOS,
+ cy + VIDEO_PBEND_LABEL_YPOS,
+ VIDEO_PBEND_LABEL_XSIZE,
+ VIDEO_PBEND_LABEL_YSIZE,
+ VX + VIDEO_REC_LABEL_XPOS,
+ VY + VIDEO_REC_LABEL_YPOS);
+ }
- if (button)
+ if (state & VIDEO_STATE_DATE_ON)
{
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_ELEM_BUTTON(mx,my))
- {
- choice = ELEM_BUTTON(mx,my);
- pressed = TRUE;
- DrawElemButton(choice,ED_BUTTON_PRESSED);
- if (choice==ED_BUTTON_EUP ||
- choice==ED_BUTTON_EDOWN)
- return_code = choice;
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_ELEM_BUTTON(mx,my) || ELEM_BUTTON(mx,my)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawElemButton(choice,ED_BUTTON_RELEASED);
- }
- else if (ON_ELEM_BUTTON(mx,my) && ELEM_BUTTON(mx,my)==choice)
- {
- if (!pressed)
- DrawElemButton(choice,ED_BUTTON_PRESSED);
- pressed = TRUE;
- if (choice==ED_BUTTON_EUP ||
- choice==ED_BUTTON_EDOWN)
- return_code = choice;
- }
- }
+ int tag = value % 100;
+ int monat = (value/100) % 100;
+ int jahr = (value/10000);
+
+ DrawText(VX+VIDEO_DATE_XPOS,VY+VIDEO_DATE_YPOS,
+ int2str(tag,2),FS_SMALL,FC_SPECIAL1);
+ DrawText(VX+VIDEO_DATE_XPOS+27,VY+VIDEO_DATE_YPOS,
+ monatsname[monat],FS_SMALL,FC_SPECIAL1);
+ DrawText(VX+VIDEO_DATE_XPOS+64,VY+VIDEO_DATE_YPOS,
+ int2str(jahr,2),FS_SMALL,FC_SPECIAL1);
}
- else /* Maustaste wieder losgelassen */
+
+ if (state & VIDEO_STATE_TIME_ON)
{
- if (ON_ELEM_BUTTON(mx,my) && ELEM_BUTTON(mx,my)==choice && pressed)
- {
- DrawElemButton(choice,ED_BUTTON_RELEASED);
- if (choice!=ED_BUTTON_EUP &&
- choice!=ED_BUTTON_EDOWN)
- return_code = choice;
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
+ int min = value / 60;
+ int sec = value % 60;
+
+ DrawText(VX+VIDEO_TIME_XPOS,VY+VIDEO_TIME_YPOS,
+ int2str(min,2),FS_SMALL,FC_SPECIAL1);
+ DrawText(VX+VIDEO_TIME_XPOS+27,VY+VIDEO_TIME_YPOS,
+ int2str(sec,2),FS_SMALL,FC_SPECIAL1);
}
- BackToFront();
- return(return_code);
+ if (state & VIDEO_STATE_DATE)
+ redraw_mask |= REDRAW_VIDEO_1;
+ if ((state & ~VIDEO_STATE_DATE) & VIDEO_STATE)
+ redraw_mask |= REDRAW_VIDEO_2;
+ if (state & VIDEO_PRESS)
+ redraw_mask |= REDRAW_VIDEO_3;
}
-int CheckCountButtons(int mx, int my, int button)
+void DrawCompleteVideoDisplay()
{
- int return_code = -1;
- static int choice = -1;
- static boolean pressed = FALSE;
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ DOOR_GFX_PAGEX3,DOOR_GFX_PAGEY2, VXSIZE,VYSIZE, VX,VY);
+ XCopyArea(display,pix[PIX_DOOR],drawto,gc,
+ DOOR_GFX_PAGEX4+VIDEO_CONTROL_XPOS,
+ DOOR_GFX_PAGEY2+VIDEO_CONTROL_YPOS,
+ VIDEO_CONTROL_XSIZE,VIDEO_CONTROL_YSIZE,
+ VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS);
- if (button)
- {
- if (!motion_status) /* Maustaste neu gedrückt */
- {
- if (ON_COUNT_BUTTON(mx,my))
- {
- choice = COUNT_BUTTON(mx,my);
- pressed = TRUE;
- DrawCountButton(choice,ED_BUTTON_PRESSED);
- return_code = choice;
- }
- }
- else /* Mausbewegung bei gedrückter Maustaste */
- {
- if ((!ON_COUNT_BUTTON(mx,my) || COUNT_BUTTON(mx,my)!=choice) &&
- choice>=0 && pressed)
- {
- pressed = FALSE;
- DrawCountButton(choice,ED_BUTTON_RELEASED);
- }
- else if (ON_COUNT_BUTTON(mx,my) && COUNT_BUTTON(mx,my)==choice)
- {
- if (!pressed)
- DrawCountButton(choice,ED_BUTTON_PRESSED);
- pressed = TRUE;
- return_code = choice;
- }
- }
- }
- else /* Maustaste wieder losgelassen */
+ DrawVideoDisplay(VIDEO_ALL_OFF,0);
+ if (tape.date && tape.length)
{
- if (ON_COUNT_BUTTON(mx,my) && COUNT_BUTTON(mx,my)==choice && pressed)
- {
- DrawCountButton(choice,ED_BUTTON_RELEASED);
- choice = -1;
- pressed = FALSE;
- }
- else
- {
- choice = -1;
- pressed = FALSE;
- }
+ DrawVideoDisplay(VIDEO_STATE_DATE_ON,tape.date);
+ DrawVideoDisplay(VIDEO_STATE_TIME_ON,tape.length_seconds);
}
- BackToFront();
- return(return_code);
+ XCopyArea(display,drawto,pix[PIX_DB_DOOR],gc,
+ VX,VY, VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
}
char cursor_letter;
char cursor_string[3];
char text[MAX_GADGET_TEXTSIZE + 1];
- int font_color = FC_YELLOW;
- int border = gi->design_border;
+ int font_type = gi->text.font_type;
+ int font_width = getFontWidth(FS_SMALL, font_type);
+ int border = gi->border.size;
strcpy(text, gi->text.value);
strcat(text, " ");
/* middle part of gadget */
for (i=0; i<=gi->text.size; i++)
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x + border, gd->y, FONT2_XSIZE, gi->height,
- gi->x + border + i * FONT2_XSIZE, gi->y);
+ gd->x + border, gd->y, font_width, gi->height,
+ gi->x + border + i * font_width, gi->y);
/* right part of gadget */
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x + ED_WIN_COUNT_XSIZE - border, gd->y,
+ gd->x + gi->border.width - border, gd->y,
border, gi->height, gi->x + gi->width - border, gi->y);
/* gadget text value */
- DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_color);
+ DrawText(gi->x + border, gi->y + border, text, FS_SMALL, font_type);
cursor_letter = gi->text.value[gi->text.cursor_position];
cursor_string[0] = '~';
/* draw cursor, if active */
if (pressed)
- DrawText(gi->x + border + gi->text.cursor_position * FONT2_XSIZE,
- gi->y + border, cursor_string, FS_SMALL, font_color);
+ DrawText(gi->x + border + gi->text.cursor_position * font_width,
+ gi->y + border, cursor_string, FS_SMALL, font_type);
}
break;
int xpos = gi->x;
int ypos = gi->y + gi->scrollbar.position;
int design_full = gi->width;
- int design_body = design_full - 2 * gi->design_border;
+ int design_body = design_full - 2 * gi->border.size;
int size_full = gi->scrollbar.size;
- int size_body = size_full - 2 * gi->design_border;
+ int size_body = size_full - 2 * gi->border.size;
int num_steps = size_body / design_body;
int step_size_remain = size_body - num_steps * design_body;
/* upper part of gadget */
XCopyArea(display, gd->pixmap, drawto, gc,
gd->x, gd->y,
- gi->width, gi->design_border,
+ gi->width, gi->border.size,
xpos, ypos);
/* middle part of gadget */
for (i=0; i<num_steps; i++)
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x, gd->y + gi->design_border,
+ gd->x, gd->y + gi->border.size,
gi->width, design_body,
- xpos, ypos + gi->design_border + i * design_body);
+ xpos, ypos + gi->border.size + i * design_body);
/* remaining middle part of gadget */
if (step_size_remain > 0)
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x, gd->y + gi->design_border,
+ gd->x, gd->y + gi->border.size,
gi->width, step_size_remain,
- xpos, ypos + gi->design_border + num_steps * design_body);
+ xpos, ypos + gi->border.size + num_steps * design_body);
/* lower part of gadget */
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x, gd->y + design_full - gi->design_border,
- gi->width, gi->design_border,
- xpos, ypos + size_full - gi->design_border);
+ gd->x, gd->y + design_full - gi->border.size,
+ gi->width, gi->border.size,
+ xpos, ypos + size_full - gi->border.size);
}
break;
int xpos = gi->x + gi->scrollbar.position;
int ypos = gi->y;
int design_full = gi->height;
- int design_body = design_full - 2 * gi->design_border;
+ int design_body = design_full - 2 * gi->border.size;
int size_full = gi->scrollbar.size;
- int size_body = size_full - 2 * gi->design_border;
+ int size_body = size_full - 2 * gi->border.size;
int num_steps = size_body / design_body;
int step_size_remain = size_body - num_steps * design_body;
/* left part of gadget */
XCopyArea(display, gd->pixmap, drawto, gc,
gd->x, gd->y,
- gi->design_border, gi->height,
+ gi->border.size, gi->height,
xpos, ypos);
/* middle part of gadget */
for (i=0; i<num_steps; i++)
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x + gi->design_border, gd->y,
+ gd->x + gi->border.size, gd->y,
design_body, gi->height,
- xpos + gi->design_border + i * design_body, ypos);
+ xpos + gi->border.size + i * design_body, ypos);
/* remaining middle part of gadget */
if (step_size_remain > 0)
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x + gi->design_border, gd->y,
+ gd->x + gi->border.size, gd->y,
step_size_remain, gi->height,
- xpos + gi->design_border + num_steps * design_body, ypos);
+ xpos + gi->border.size + num_steps * design_body, ypos);
/* right part of gadget */
XCopyArea(display, gd->pixmap, drawto, gc,
- gd->x + design_full - gi->design_border, gd->y,
- gi->design_border, gi->height,
- xpos + size_full - gi->design_border, ypos);
+ gd->x + design_full - gi->border.size, gd->y,
+ gi->border.size, gi->height,
+ xpos + size_full - gi->border.size, ypos);
}
break;
gi->custom_id = va_arg(ap, int);
break;
+ case GDI_CUSTOM_TYPE_ID:
+ gi->custom_type_id = va_arg(ap, int);
+ break;
+
case GDI_INFO_TEXT:
{
int max_textsize = MAX_INFO_TEXTSIZE - 1;
gi->text.size = max_textsize;
gi->text.value[max_textsize] = '\0';
-
- if (gi->width == 0 && gi->height == 0)
- {
- gi->width = (gi->text.size + 1) * FONT2_XSIZE + 6;
- gi->height = ED_WIN_COUNT_YSIZE;
- }
}
break;
+ case GDI_TEXT_FONT:
+ gi->text.font_type = va_arg(ap, int);
+ break;
+
case GDI_DESIGN_UNPRESSED:
gi->design[GD_BUTTON_UNPRESSED].pixmap = va_arg(ap, Pixmap);
gi->design[GD_BUTTON_UNPRESSED].x = va_arg(ap, int);
gi->alt_design[GD_BUTTON_PRESSED].y = va_arg(ap, int);
break;
- case GDI_DESIGN_BORDER:
- gi->design_border = va_arg(ap, int);
+ case GDI_BORDER_SIZE:
+ gi->border.size = va_arg(ap, int);
+ break;
+
+ case GDI_TEXTINPUT_DESIGN_WIDTH:
+ gi->border.width = va_arg(ap, int);
break;
case GDI_DECORATION_DESIGN:
/* adjust gadget values in relation to other gadget values */
+ if (gi->type & GD_TYPE_TEXTINPUT)
+ {
+ int font_width = getFontWidth(FS_SMALL, gi->text.font_type);
+ int font_height = getFontHeight(FS_SMALL, gi->text.font_type);
+
+ gi->width = 2 * gi->border.size + (gi->text.size + 1) * font_width;
+ gi->height = 2 * gi->border.size + font_height;
+ }
+
if (gi->type & GD_TYPE_TEXTINPUT_NUMERIC)
{
struct GadgetTextInput *text = &gi->text;
gs->size = gs->size_max * gs->items_visible / gs->items_max;
gs->position = gs->size_max * gs->item_position / gs->items_max;
gs->position_max = gs->size_max - gs->size;
+ gs->correction = gs->size_max / gs->items_max / 2;
/* finetuning for maximal right/bottom position */
if (gs->item_position == gs->items_max - gs->items_visible)
{
if ((mode & MULTIMAP_PLAYFIELD && gi->x < SX + SXSIZE) ||
(mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y < DY + DYSIZE) ||
- (mode & MULTIMAP_DOOR_1 && gi->x >= DX && gi->y > DY + DYSIZE))
+ (mode & MULTIMAP_DOOR_2 && gi->x >= DX && gi->y > DY + DYSIZE) ||
+ (mode & MULTIMAP_ALL) == MULTIMAP_ALL)
{
if (mode & MULTIMAP_UNMAP)
{
if (new_gi == last_gi)
{
/* if mouse button pressed inside activated text gadget, set cursor */
- gi->text.cursor_position = (mx - gi->x) / FONT2_XSIZE;
+ gi->text.cursor_position =
+ (mx - gi->x - gi->border.size) /
+ getFontWidth(FS_SMALL, gi->text.font_type);
if (gi->text.cursor_position < 0)
gi->text.cursor_position = 0;
CheckRangeOfNumericInputGadget(gi);
DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+ gi->event.type = GD_EVENT_TEXT_LEAVING;
+
if (gi->event_mask & GD_EVENT_TEXT_LEAVING)
gi->callback_action(gi);
if (gadget_pressed_repeated)
{
+ gi->event.type = GD_EVENT_PRESSED;
+
if (gi->event_mask & GD_EVENT_REPEATED &&
DelayReached(&pressed_delay, GADGET_FRAME_DELAY))
gi->callback_action(gi);
if (gs->position > gs->position_max)
gs->position = gs->position_max;
- gs->item_position = gs->items_max * gs->position / gs->size_max;
+ gs->item_position =
+ gs->items_max * (gs->position + gs->correction) / gs->size_max;
+
+ if (gs->item_position < 0)
+ gs->item_position = 0;
+ if (gs->item_position > gs->items_max - 1)
+ gs->item_position = gs->items_max - 1;
if (old_item_position != gs->item_position)
{
CheckRangeOfNumericInputGadget(gi);
DrawGadget(gi, DG_UNPRESSED, DG_DIRECT);
+ gi->event.type = GD_EVENT_TEXT_RETURN;
+
if (gi->event_mask & GD_EVENT_TEXT_RETURN)
gi->callback_action(gi);
#define VIDEO_BUTTON_YSIZE 18
#define VIDEO_CONTROL_XPOS 5
#define VIDEO_CONTROL_YPOS 77
-#define VIDEO_CONTROL_XSIZE (VIDEO_DISPLAY_XSIZE)
-#define VIDEO_CONTROL_YSIZE (VIDEO_BUTTON_YSIZE)
-
-/* values for requests */
-#define BUTTON_OK (1L<<0)
-#define BUTTON_NO (1L<<1)
-#define BUTTON_CONFIRM (1L<<2)
-
-/* values for choosing network player */
-#define BUTTON_PLAYER_1 (1L<<10)
-#define BUTTON_PLAYER_2 (1L<<11)
-#define BUTTON_PLAYER_3 (1L<<12)
-#define BUTTON_PLAYER_4 (1L<<13)
-
-/* for DrawPlayerButton() */
-#define DB_INIT 0
-#define DB_NORMAL 1
-
-/* the following definitions are also used by screens.c */
-
-/* buttons of the video tape player */
-#define BUTTON_VIDEO_EJECT 1
-#define BUTTON_VIDEO_STOP 2
-#define BUTTON_VIDEO_PAUSE 3
-#define BUTTON_VIDEO_REC 4
-#define BUTTON_VIDEO_PLAY 5
+#define VIDEO_CONTROL_XSIZE VIDEO_DISPLAY_XSIZE
+#define VIDEO_CONTROL_YSIZE VIDEO_BUTTON_YSIZE
/* values for video tape control */
-#define VIDEO_STATE_PLAY_OFF (1L<<0)
-#define VIDEO_STATE_PLAY_ON (1L<<1)
+#define VIDEO_STATE_PLAY_OFF (1L << 0)
+#define VIDEO_STATE_PLAY_ON (1L << 1)
#define VIDEO_STATE_PLAY (VIDEO_STATE_PLAY_OFF | VIDEO_STATE_PLAY_ON)
-#define VIDEO_STATE_REC_OFF (1L<<2)
-#define VIDEO_STATE_REC_ON (1L<<3)
+#define VIDEO_STATE_REC_OFF (1L << 2)
+#define VIDEO_STATE_REC_ON (1L << 3)
#define VIDEO_STATE_REC (VIDEO_STATE_REC_OFF | VIDEO_STATE_REC_ON)
-#define VIDEO_STATE_PAUSE_OFF (1L<<4)
-#define VIDEO_STATE_PAUSE_ON (1L<<5)
+#define VIDEO_STATE_PAUSE_OFF (1L << 4)
+#define VIDEO_STATE_PAUSE_ON (1L << 5)
#define VIDEO_STATE_PAUSE (VIDEO_STATE_PAUSE_OFF | VIDEO_STATE_PAUSE_ON)
-#define VIDEO_STATE_DATE_OFF (1L<<6)
-#define VIDEO_STATE_DATE_ON (1L<<7)
+#define VIDEO_STATE_DATE_OFF (1L << 6)
+#define VIDEO_STATE_DATE_ON (1L << 7)
#define VIDEO_STATE_DATE (VIDEO_STATE_DATE_OFF | VIDEO_STATE_DATE_ON)
-#define VIDEO_STATE_TIME_OFF (1L<<8)
-#define VIDEO_STATE_TIME_ON (1L<<9)
+#define VIDEO_STATE_TIME_OFF (1L << 8)
+#define VIDEO_STATE_TIME_ON (1L << 9)
#define VIDEO_STATE_TIME (VIDEO_STATE_TIME_OFF | VIDEO_STATE_TIME_ON)
-#define VIDEO_PRESS_PLAY_ON (1L<<10)
-#define VIDEO_PRESS_PLAY_OFF (1L<<11)
+#define VIDEO_PRESS_PLAY_ON (1L << 10)
+#define VIDEO_PRESS_PLAY_OFF (1L << 11)
#define VIDEO_PRESS_PLAY (VIDEO_PRESS_PLAY_OFF | VIDEO_PRESS_PLAY_ON)
-#define VIDEO_PRESS_REC_ON (1L<<12)
-#define VIDEO_PRESS_REC_OFF (1L<<13)
+#define VIDEO_PRESS_REC_ON (1L << 12)
+#define VIDEO_PRESS_REC_OFF (1L << 13)
#define VIDEO_PRESS_REC (VIDEO_PRESS_REC_OFF | VIDEO_PRESS_REC_ON)
-#define VIDEO_PRESS_PAUSE_ON (1L<<14)
-#define VIDEO_PRESS_PAUSE_OFF (1L<<15)
+#define VIDEO_PRESS_PAUSE_ON (1L << 14)
+#define VIDEO_PRESS_PAUSE_OFF (1L << 15)
#define VIDEO_PRESS_PAUSE (VIDEO_PRESS_PAUSE_OFF | VIDEO_PRESS_PAUSE_ON)
-#define VIDEO_PRESS_STOP_ON (1L<<16)
-#define VIDEO_PRESS_STOP_OFF (1L<<17)
+#define VIDEO_PRESS_STOP_ON (1L << 16)
+#define VIDEO_PRESS_STOP_OFF (1L << 17)
#define VIDEO_PRESS_STOP (VIDEO_PRESS_STOP_OFF | VIDEO_PRESS_STOP_ON)
-#define VIDEO_PRESS_EJECT_ON (1L<<18)
-#define VIDEO_PRESS_EJECT_OFF (1L<<19)
+#define VIDEO_PRESS_EJECT_ON (1L << 18)
+#define VIDEO_PRESS_EJECT_OFF (1L << 19)
#define VIDEO_PRESS_EJECT (VIDEO_PRESS_EJECT_OFF | VIDEO_PRESS_EJECT_ON)
/* special */
-#define VIDEO_STATE_FFWD_OFF ((1L<<20) | VIDEO_STATE_PAUSE_OFF)
-#define VIDEO_STATE_FFWD_ON (1L<<21)
+#define VIDEO_STATE_FFWD_OFF ((1L << 20) | VIDEO_STATE_PAUSE_OFF)
+#define VIDEO_STATE_FFWD_ON (1L << 21)
#define VIDEO_STATE_FFWD (VIDEO_STATE_FFWD_OFF | VIDEO_STATE_FFWD_ON)
-#define VIDEO_STATE_PBEND_OFF (1L<<22)
-#define VIDEO_STATE_PBEND_ON (1L<<23)
+#define VIDEO_STATE_PBEND_OFF (1L << 22)
+#define VIDEO_STATE_PBEND_ON (1L << 23)
#define VIDEO_STATE_PBEND (VIDEO_STATE_PBEND_OFF | VIDEO_STATE_PBEND_ON)
/* tags to draw video display labels or symbols only */
#define VIDEO_DISPLAY_LABEL_ONLY 1
#define VIDEO_DISPLAY_SYMBOL_ONLY 2
-/* values for sound control */
-#define BUTTON_SOUND_MUSIC (1L<<0)
-#define BUTTON_SOUND_LOOPS (1L<<1)
-#define BUTTON_SOUND_SIMPLE (1L<<2)
-#define BUTTON_RELEASED 0
-#define BUTTON_PRESSED (1L<<3)
-#define BUTTON_OFF 0
-#define BUTTON_ON (1L<<4)
-#define BUTTON_SOUND_MUSIC_OFF (BUTTON_SOUND_MUSIC | BUTTON_OFF)
-#define BUTTON_SOUND_LOOPS_OFF (BUTTON_SOUND_LOOPS | BUTTON_OFF)
-#define BUTTON_SOUND_SIMPLE_OFF (BUTTON_SOUND_SIMPLE | BUTTON_OFF)
-#define BUTTON_SOUND_MUSIC_ON (BUTTON_SOUND_MUSIC | BUTTON_ON)
-#define BUTTON_SOUND_LOOPS_ON (BUTTON_SOUND_LOOPS | BUTTON_ON)
-#define BUTTON_SOUND_SIMPLE_ON (BUTTON_SOUND_SIMPLE | BUTTON_ON)
-
-/* values for game control */
-#define BUTTON_GAME_STOP (1L<<0)
-#define BUTTON_GAME_PAUSE (1L<<1)
-#define BUTTON_GAME_PLAY (1L<<2)
-
-/* the following definitions are also used by game.c */
-
-/* some positions in the game control window */
-#define GAME_BUTTON_XSIZE 30
-#define GAME_BUTTON_YSIZE 30
-#define GAME_CONTROL_XPOS 5
-#define GAME_CONTROL_YPOS 215
-#define GAME_CONTROL_XSIZE (3*GAME_BUTTON_XSIZE)
-#define GAME_CONTROL_YSIZE (1*GAME_BUTTON_YSIZE)
-
-/* the following definitions are also used by editor.c */
-
-/* some positions in the editor control window */
-#define ED_BUTTON_EUP_XPOS 35
-#define ED_BUTTON_EUP_YPOS 5
-#define ED_BUTTON_EUP_XSIZE 30
-#define ED_BUTTON_EUP_YSIZE 25
-#define ED_BUTTON_EDOWN_XPOS 35
-#define ED_BUTTON_EDOWN_YPOS 250
-#define ED_BUTTON_EDOWN_XSIZE 30
-#define ED_BUTTON_EDOWN_YSIZE 25
-#define ED_BUTTON_ELEM_XPOS 6
-#define ED_BUTTON_ELEM_YPOS 30
-#define ED_BUTTON_ELEM_XSIZE 22
-#define ED_BUTTON_ELEM_YSIZE 22
-
-#define ED_BUTTON_EUP_Y2POS 140
-#define ED_BUTTON_EDOWN_Y2POS 165
-#define ED_BUTTON_ELEM_Y2POS 190
-
-#define ED_CURSORBUTTON_XSIZE 30
-#define ED_CURSORBUTTON_YSIZE 20
-
-#define ED_BUTTON_CTRL_XPOS 5
-#define ED_BUTTON_CTRL_YPOS 5
-#define ED_BUTTON_CTRL_XSIZE 90
-#define ED_BUTTON_CTRL_YSIZE 30
-#define ED_BUTTON_FILL_XPOS 5
-#define ED_BUTTON_FILL_YPOS 35
-#define ED_BUTTON_FILL_XSIZE 90
-#define ED_BUTTON_FILL_YSIZE 20
-#define ED_BUTTON_LEFT_XPOS 5
-#define ED_BUTTON_LEFT_YPOS 65
-#define ED_BUTTON_LEFT_XSIZE ED_CURSORBUTTON_XSIZE
-#define ED_BUTTON_LEFT_YSIZE ED_CURSORBUTTON_YSIZE
-#define ED_BUTTON_UP_XPOS 35
-#define ED_BUTTON_UP_YPOS 55
-#define ED_BUTTON_UP_XSIZE ED_CURSORBUTTON_XSIZE
-#define ED_BUTTON_UP_YSIZE ED_CURSORBUTTON_YSIZE
-#define ED_BUTTON_DOWN_XPOS 35
-#define ED_BUTTON_DOWN_YPOS 75
-#define ED_BUTTON_DOWN_XSIZE ED_CURSORBUTTON_XSIZE
-#define ED_BUTTON_DOWN_YSIZE ED_CURSORBUTTON_YSIZE
-#define ED_BUTTON_RIGHT_XPOS 65
-#define ED_BUTTON_RIGHT_YPOS 65
-#define ED_BUTTON_RIGHT_XSIZE ED_CURSORBUTTON_XSIZE
-#define ED_BUTTON_RIGHT_YSIZE ED_CURSORBUTTON_YSIZE
-
-#define ED_BUTTON_EDIT_XPOS 5
-#define ED_BUTTON_EDIT_YPOS 5
-#define ED_BUTTON_EDIT_XSIZE 90
-#define ED_BUTTON_EDIT_YSIZE 30
-#define ED_BUTTON_CLEAR_XPOS 5
-#define ED_BUTTON_CLEAR_YPOS 35
-#define ED_BUTTON_CLEAR_XSIZE 90
-#define ED_BUTTON_CLEAR_YSIZE 20
-#define ED_BUTTON_UNDO_XPOS 5
-#define ED_BUTTON_UNDO_YPOS 55
-#define ED_BUTTON_UNDO_XSIZE 90
-#define ED_BUTTON_UNDO_YSIZE 20
-#define ED_BUTTON_EXIT_XPOS 5
-#define ED_BUTTON_EXIT_YPOS 75
-#define ED_BUTTON_EXIT_XSIZE 90
-#define ED_BUTTON_EXIT_YSIZE 20
-
-#define ED_BUTTON_COUNT_YPOS 60
-#define ED_BUTTON_COUNT_XSIZE 20
-#define ED_BUTTON_COUNT_YSIZE 20
-#define ED_BUTTON_MINUS_XPOS 2
-#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE
-#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE
-#define ED_WIN_COUNT_XPOS (ED_BUTTON_MINUS_XPOS+ED_BUTTON_MINUS_XSIZE+2)
-#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_WIN_COUNT_XSIZE 52
-#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE
-#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS+ED_WIN_COUNT_XSIZE+2)
-#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS
-#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE
-#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE
-
-#define ED_COUNT_GADGET_XPOS 16
-#define ED_COUNT_GADGET_YPOS (16+3*MINI_TILEY+64)
-#define ED_COUNT_GADGET_YSIZE (ED_BUTTON_MINUS_YSIZE+4)
-#define ED_COUNT_TEXT_XPOS (ED_COUNT_GADGET_XPOS+DXSIZE+10)
-#define ED_COUNT_TEXT_YPOS (ED_COUNT_GADGET_YPOS+3)
-#define ED_COUNT_TEXT_YSIZE ED_COUNT_GADGET_YSIZE
-#define ED_COUNT_VALUE_XPOS (ED_COUNT_GADGET_XPOS+ED_BUTTON_MINUS_XSIZE+7)
-#define ED_COUNT_VALUE_YPOS ED_COUNT_TEXT_YPOS
-#define ED_SIZE_GADGET_XPOS (SX+21*MINI_TILEX)
-#define ED_SIZE_GADGET_YPOS (SY+4*MINI_TILEY)
-#define ED_SIZE_GADGET_YSIZE (ED_BUTTON_MINUS_YSIZE+4)
-#define ED_SIZE_TEXT_XPOS (ED_SIZE_GADGET_XPOS+DXSIZE+10)
-#define ED_SIZE_TEXT_YPOS (ED_SIZE_GADGET_YPOS+3)
-#define ED_SIZE_TEXT_YSIZE ED_COUNT_GADGET_YSIZE
-#define ED_SIZE_VALUE_XPOS (ED_SIZE_GADGET_XPOS+ED_BUTTON_MINUS_XSIZE+7)
-#define ED_SIZE_VALUE_YPOS ED_SIZE_TEXT_YPOS
-
-/* values for asking control */
-#define ED_BUTTON_CTRL (1L<<0)
-#define ED_BUTTON_FILL (1L<<1)
-#define ED_BUTTON_LEFT (1L<<2)
-#define ED_BUTTON_UP (1L<<3)
-#define ED_BUTTON_DOWN (1L<<4)
-#define ED_BUTTON_RIGHT (1L<<5)
-#define ED_BUTTON_EDIT (1L<<6)
-#define ED_BUTTON_CLEAR (1L<<7)
-#define ED_BUTTON_UNDO (1L<<8)
-#define ED_BUTTON_EXIT (1L<<9)
-
-#define ED_BUTTON_PRESSED (1L<<10)
-#define ED_BUTTON_RELEASED (1L<<11)
-
-#define ED_BUTTON_EUP 0
-#define ED_BUTTON_EDOWN 1
-#define ED_BUTTON_ELEM 2
-
void DrawVideoDisplay(unsigned long, unsigned long);
void DrawCompleteVideoDisplay(void);
-void DrawSoundDisplay(unsigned long);
-void DrawGameButton(unsigned long);
-void DrawYesNoButton(unsigned long, int);
-void DrawConfirmButton(unsigned long, int);
-void DrawPlayerButton(unsigned long, int);
-void DrawEditButton(unsigned long state);
-void DrawCtrlButton(unsigned long state);
-void DrawElemButton(int, int);
-void DrawCountButton(int, int);
-int CheckVideoButtons(int, int, int);
-int CheckSoundButtons(int, int, int);
-int CheckGameButtons(int, int, int);
-int CheckYesNoButtons(int, int, int);
-int CheckConfirmButton(int, int, int);
-int CheckPlayerButtons(int, int, int);
-int CheckEditButtons(int, int, int);
-int CheckCtrlButtons(int, int, int);
-int CheckElemButtons(int, int, int);
-int CheckCountButtons(int, int, int);
/* NEW GADGET STUFF -------------------------------------------------------- */
-
/* gadget types */
#define GD_TYPE_NORMAL_BUTTON (1 << 0)
#define GD_TYPE_CHECK_BUTTON (1 << 1)
/* gadget creation tags */
#define GDI_END 0
#define GDI_CUSTOM_ID 1
-#define GDI_X 2
-#define GDI_Y 3
-#define GDI_WIDTH 4
-#define GDI_HEIGHT 5
-#define GDI_TYPE 6
-#define GDI_STATE 7
-#define GDI_CHECKED 8
-#define GDI_RADIO_NR 9
-#define GDI_NUMBER_VALUE 10
-#define GDI_NUMBER_MIN 11
-#define GDI_NUMBER_MAX 12
-#define GDI_TEXT_VALUE 13
-#define GDI_TEXT_SIZE 14
-#define GDI_DESIGN_UNPRESSED 15
-#define GDI_DESIGN_PRESSED 16
-#define GDI_ALT_DESIGN_UNPRESSED 17
-#define GDI_ALT_DESIGN_PRESSED 18
-#define GDI_DESIGN_BORDER 19
-#define GDI_DECORATION_DESIGN 20
-#define GDI_DECORATION_POSITION 22
-#define GDI_DECORATION_SIZE 21
-#define GDI_DECORATION_SHIFTING 23
-#define GDI_EVENT_MASK 24
-#define GDI_EVENT 25
-#define GDI_CALLBACK_INFO 26
-#define GDI_CALLBACK_ACTION 27
-#define GDI_AREA_SIZE 28
-#define GDI_ITEM_SIZE 29
-#define GDI_SCROLLBAR_ITEMS_MAX 30
-#define GDI_SCROLLBAR_ITEMS_VISIBLE 31
-#define GDI_SCROLLBAR_ITEM_POSITION 32
-#define GDI_INFO_TEXT 33
+#define GDI_CUSTOM_TYPE_ID 2
+#define GDI_X 3
+#define GDI_Y 4
+#define GDI_WIDTH 5
+#define GDI_HEIGHT 6
+#define GDI_TYPE 7
+#define GDI_STATE 8
+#define GDI_CHECKED 9
+#define GDI_RADIO_NR 10
+#define GDI_NUMBER_VALUE 11
+#define GDI_NUMBER_MIN 12
+#define GDI_NUMBER_MAX 13
+#define GDI_TEXT_VALUE 14
+#define GDI_TEXT_SIZE 15
+#define GDI_TEXT_FONT 16
+#define GDI_DESIGN_UNPRESSED 17
+#define GDI_DESIGN_PRESSED 18
+#define GDI_ALT_DESIGN_UNPRESSED 19
+#define GDI_ALT_DESIGN_PRESSED 20
+#define GDI_BORDER_SIZE 21
+#define GDI_TEXTINPUT_DESIGN_WIDTH 22
+#define GDI_DECORATION_DESIGN 23
+#define GDI_DECORATION_POSITION 24
+#define GDI_DECORATION_SIZE 25
+#define GDI_DECORATION_SHIFTING 26
+#define GDI_EVENT_MASK 27
+#define GDI_EVENT 28
+#define GDI_CALLBACK_INFO 29
+#define GDI_CALLBACK_ACTION 30
+#define GDI_AREA_SIZE 31
+#define GDI_ITEM_SIZE 32
+#define GDI_SCROLLBAR_ITEMS_MAX 33
+#define GDI_SCROLLBAR_ITEMS_VISIBLE 34
+#define GDI_SCROLLBAR_ITEM_POSITION 35
+#define GDI_INFO_TEXT 36
typedef void (*gadget_function)(void *);
+struct GadgetBorder
+{
+ int size; /* size of gadget border */
+ int width; /* for text input gadgets */
+};
+
struct GadgetDesign
{
Pixmap pixmap; /* Pixmap with gadget surface */
int number_max; /* maximal allowed numeric value */
int size; /* maximal size of input text */
int cursor_position; /* actual cursor position */
+ int font_type; /* font to use for text input */
};
struct GadgetScrollbar
int position; /* scrollbar position on screen */
int position_max; /* bottom/right scrollbar position */
int drag_position; /* drag position on scrollbar */
+ int correction; /* scrollbar position correction */
};
struct GadgetInfo
{
int id; /* internal gadget identifier */
int custom_id; /* custom gadget identifier */
+ int custom_type_id; /* custom gadget type identifier */
char info_text[MAX_INFO_TEXTSIZE]; /* short popup info text */
int x, y; /* gadget position */
int width, height; /* gadget size */
boolean checked; /* check/radio button state */
int radio_nr; /* number of radio button series */
boolean mapped; /* gadget is active */
+ struct GadgetBorder border; /* gadget border design */
struct GadgetDesign design[2]; /* 0: normal; 1: pressed */
struct GadgetDesign alt_design[2]; /* alternative design */
struct GadgetDecoration deco; /* decoration on top of gadget */
- int design_border; /* border size of gadget decoration */
unsigned long event_mask; /* possible events for this gadget */
struct GadgetEvent event; /* actual gadget event */
gadget_function callback_info; /* function for pop-up info text */
},
{
GAMETOON_XSIZE, GAMETOON_YSIZE,
- ((GFX_MAULWURF_LEFT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
- ((GFX_MAULWURF_LEFT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
+ ((GFX_MOLE_LEFT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
+ ((GFX_MOLE_LEFT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
GAMETOON_FRAMES_4,
GAMETOON_FPS,
GAMETOON_STEPSIZE,
},
{
GAMETOON_XSIZE, GAMETOON_YSIZE,
- ((GFX_MAULWURF_RIGHT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
- ((GFX_MAULWURF_RIGHT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
+ ((GFX_MOLE_RIGHT - GFX_START_ROCKSHEROES) % HEROES_PER_LINE)*TILEX,
+ ((GFX_MOLE_RIGHT - GFX_START_ROCKSHEROES) / HEROES_PER_LINE)*TILEY,
GAMETOON_FRAMES_4,
GAMETOON_FPS,
GAMETOON_STEPSIZE,
#include "tape.h"
/* positions in the level editor */
-#define ED_WIN_MB_LEFT_XPOS 7
-#define ED_WIN_MB_LEFT_YPOS 6
-#define ED_WIN_LEVELNR_XPOS 77
-#define ED_WIN_LEVELNR_YPOS 7
-#define ED_WIN_MB_MIDDLE_XPOS 7
-#define ED_WIN_MB_MIDDLE_YPOS 258
-#define ED_WIN_MB_RIGHT_XPOS 77
-#define ED_WIN_MB_RIGHT_YPOS 258
+#define ED_WIN_MB_LEFT_XPOS 6
+#define ED_WIN_MB_LEFT_YPOS 258
+#define ED_WIN_MB_MIDDLE_XPOS 42
+#define ED_WIN_MB_MIDDLE_YPOS ED_WIN_MB_LEFT_YPOS
+#define ED_WIN_MB_RIGHT_XPOS 78
+#define ED_WIN_MB_RIGHT_YPOS ED_WIN_MB_LEFT_YPOS
/* other constants for the editor */
#define ED_SCROLL_NO 0
#define MIN_SCORE 0
#define MAX_SCORE 255
-/* values for elements with content */
-#define MIN_ELEM_CONTENT 1
-#define MAX_ELEM_CONTENT 8
-
/* values for the control window */
#define ED_CTRL_BUTTONS_GFX_YPOS 236
#define ED_CTRL_BUTTONS_ALT_GFX_YPOS 142
#define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS)
/* values for the element list */
-#define ED_ELEMENTLIST_UP_XPOS 35
-#define ED_ELEMENTLIST_UP_YPOS 5
-#define ED_ELEMENTLIST_UP_ALT_YPOS 140
-#define ED_ELEMENTLIST_DOWN_XPOS 35
-#define ED_ELEMENTLIST_DOWN_YPOS 250
-#define ED_ELEMENTLIST_DOWN_ALT_YPOS 165
-#define ED_ELEMENTLIST_UPDOWN_XSIZE 30
-#define ED_ELEMENTLIST_UPDOWN_YSIZE 25
-#define ED_ELEMENTLIST_XPOS 6
+#define ED_ELEMENTLIST_XPOS 5
#define ED_ELEMENTLIST_YPOS 30
-#define ED_ELEMENTLIST_ALT_YPOS 190
-#define ED_ELEMENTLIST_XSIZE 22
-#define ED_ELEMENTLIST_YSIZE 22
+#define ED_ELEMENTLIST_XSIZE 20
+#define ED_ELEMENTLIST_YSIZE 20
#define ED_ELEMENTLIST_BUTTONS_HORIZ 4
-#define ED_ELEMENTLIST_BUTTONS_VERT 10
+#define ED_ELEMENTLIST_BUTTONS_VERT 11
#define ED_NUM_ELEMENTLIST_BUTTONS (ED_ELEMENTLIST_BUTTONS_HORIZ * \
ED_ELEMENTLIST_BUTTONS_VERT)
#define ED_AREA_RANDOM_BACKGROUND_XPOS (29 * MINI_TILEX)
#define ED_AREA_RANDOM_BACKGROUND_YPOS (31 * MINI_TILEY)
-/* values for scrolling gadgets */
+/* values for scrolling gadgets for drawing area */
#define ED_SCROLLBUTTON_XPOS 24
#define ED_SCROLLBUTTON_YPOS 0
#define ED_SCROLLBAR_XPOS 24
#define ED_SCROLL_VERTICAL_XSIZE ED_SCROLLBUTTON_XSIZE
#define ED_SCROLL_VERTICAL_YSIZE (SYSIZE - 4 * ED_SCROLLBUTTON_YSIZE)
+/* values for scrolling gadgets for element list */
+#define ED_SCROLLBUTTON2_XPOS 50
+#define ED_SCROLLBUTTON2_YPOS 0
+#define ED_SCROLLBAR2_XPOS 50
+#define ED_SCROLLBAR2_YPOS 20
+
+#define ED_SCROLLBUTTON2_XSIZE 10
+#define ED_SCROLLBUTTON2_YSIZE 10
+
+#define ED_SCROLL2_UP_XPOS 85
+#define ED_SCROLL2_UP_YPOS 30
+#define ED_SCROLL2_DOWN_XPOS ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_DOWN_YPOS (ED_SCROLL2_UP_YPOS + \
+ ED_ELEMENTLIST_BUTTONS_VERT * \
+ ED_ELEMENTLIST_YSIZE - \
+ ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XPOS ED_SCROLL2_UP_XPOS
+#define ED_SCROLL2_VERTICAL_YPOS (ED_SCROLL2_UP_YPOS + \
+ ED_SCROLLBUTTON2_YSIZE)
+#define ED_SCROLL2_VERTICAL_XSIZE ED_SCROLLBUTTON2_XSIZE
+#define ED_SCROLL2_VERTICAL_YSIZE (ED_ELEMENTLIST_BUTTONS_VERT * \
+ ED_ELEMENTLIST_YSIZE - \
+ 2 * ED_SCROLLBUTTON2_YSIZE)
+
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_XSIZE ED_BUTTON_COUNT_XSIZE
#define ED_CHECKBUTTON_YSIZE ED_BUTTON_COUNT_YSIZE
#define ED_CHECKBUTTON_UNCHECKED_XPOS ED_BUTTON_MINUS_XPOS
#define ED_CHECKBUTTON_CHECKED_XPOS ED_BUTTON_PLUS_XPOS
#define ED_CHECKBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 22)
-#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 88)
-
-#define GADGET_ID_NONE -1
+#define ED_RADIOBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 44)
+#define ED_STICKYBUTTON_YPOS (ED_BUTTON_MINUS_YPOS + 66)
+
+/* some positions in the editor control window */
+#define ED_BUTTON_ELEM_XPOS 6
+#define ED_BUTTON_ELEM_YPOS 30
+#define ED_BUTTON_ELEM_XSIZE 22
+#define ED_BUTTON_ELEM_YSIZE 22
+
+/* some values for text input and counter gadgets */
+#define ED_BUTTON_COUNT_YPOS 60
+#define ED_BUTTON_COUNT_XSIZE 20
+#define ED_BUTTON_COUNT_YSIZE 20
+#define ED_WIN_COUNT_XPOS (2 + ED_BUTTON_COUNT_XSIZE + 2)
+#define ED_WIN_COUNT_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_WIN_COUNT_XSIZE 52
+#define ED_WIN_COUNT_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_WIN_COUNT2_XPOS 27
+#define ED_WIN_COUNT2_YPOS 3
+#define ED_WIN_COUNT2_XSIZE 46
+#define ED_WIN_COUNT2_YSIZE ED_BUTTON_COUNT_YSIZE
+
+#define ED_BUTTON_MINUS_XPOS 2
+#define ED_BUTTON_MINUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_MINUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_MINUS_YSIZE ED_BUTTON_COUNT_YSIZE
+#define ED_BUTTON_PLUS_XPOS (ED_WIN_COUNT_XPOS + ED_WIN_COUNT_XSIZE + 2)
+#define ED_BUTTON_PLUS_YPOS ED_BUTTON_COUNT_YPOS
+#define ED_BUTTON_PLUS_XSIZE ED_BUTTON_COUNT_XSIZE
+#define ED_BUTTON_PLUS_YSIZE ED_BUTTON_COUNT_YSIZE
+
+/* editor gadget identifiers */
/* drawing toolbox buttons */
+#define GADGET_ID_NONE -1
#define GADGET_ID_SINGLE_ITEMS 0
#define GADGET_ID_CONNECTED_ITEMS 1
#define GADGET_ID_LINE 2
#define GADGET_ID_LEVEL_TIMESCORE_DOWN 43
#define GADGET_ID_LEVEL_TIMESCORE_TEXT 44
#define GADGET_ID_LEVEL_TIMESCORE_UP 45
+#define GADGET_ID_SELECT_LEVEL_DOWN 46
+#define GADGET_ID_SELECT_LEVEL_TEXT 47
+#define GADGET_ID_SELECT_LEVEL_UP 48
/* drawing area identifiers */
-#define GADGET_ID_DRAWING_LEVEL 46
-#define GADGET_ID_ELEM_CONTENT_0 47
-#define GADGET_ID_ELEM_CONTENT_1 48
-#define GADGET_ID_ELEM_CONTENT_2 49
-#define GADGET_ID_ELEM_CONTENT_3 50
-#define GADGET_ID_ELEM_CONTENT_4 51
-#define GADGET_ID_ELEM_CONTENT_5 52
-#define GADGET_ID_ELEM_CONTENT_6 53
-#define GADGET_ID_ELEM_CONTENT_7 54
-#define GADGET_ID_AMOEBA_CONTENT 55
+#define GADGET_ID_DRAWING_LEVEL 49
+#define GADGET_ID_ELEM_CONTENT_0 50
+#define GADGET_ID_ELEM_CONTENT_1 51
+#define GADGET_ID_ELEM_CONTENT_2 52
+#define GADGET_ID_ELEM_CONTENT_3 53
+#define GADGET_ID_ELEM_CONTENT_4 54
+#define GADGET_ID_ELEM_CONTENT_5 55
+#define GADGET_ID_ELEM_CONTENT_6 56
+#define GADGET_ID_ELEM_CONTENT_7 57
+#define GADGET_ID_AMOEBA_CONTENT 58
/* text input identifiers */
-#define GADGET_ID_LEVEL_NAME 56
-#define GADGET_ID_LEVEL_AUTHOR 57
+#define GADGET_ID_LEVEL_NAME 59
+#define GADGET_ID_LEVEL_AUTHOR 60
/* gadgets for scrolling of drawing area */
-#define GADGET_ID_SCROLL_UP 58
-#define GADGET_ID_SCROLL_DOWN 59
-#define GADGET_ID_SCROLL_LEFT 60
-#define GADGET_ID_SCROLL_RIGHT 61
-#define GADGET_ID_SCROLL_HORIZONTAL 62
-#define GADGET_ID_SCROLL_VERTICAL 63
+#define GADGET_ID_SCROLL_UP 61
+#define GADGET_ID_SCROLL_DOWN 62
+#define GADGET_ID_SCROLL_LEFT 63
+#define GADGET_ID_SCROLL_RIGHT 64
+#define GADGET_ID_SCROLL_HORIZONTAL 65
+#define GADGET_ID_SCROLL_VERTICAL 66
/* gadgets for scrolling element list */
-#define GADGET_ID_ELEMENTLIST_UP 64
-#define GADGET_ID_ELEMENTLIST_DOWN 65
-
-/* gadgets for buttons in element list */
-#define GADGET_ID_ELEMENTLIST_FIRST 66
-#define GADGET_ID_ELEMENTLIST_LAST 105
+#define GADGET_ID_SCROLL_LIST_UP 67
+#define GADGET_ID_SCROLL_LIST_DOWN 68
+#define GADGET_ID_SCROLL_LIST_VERTICAL 69
/* buttons for level settings */
-#define GADGET_ID_RANDOM_PERCENTAGE 106
-#define GADGET_ID_RANDOM_QUANTITY 107
-#define GADGET_ID_RANDOM_RESTRICTED 108
-#define GADGET_ID_DOUBLE_SPEED 109
-#define GADGET_ID_STICK_ELEMENT 110
+#define GADGET_ID_RANDOM_PERCENTAGE 70
+#define GADGET_ID_RANDOM_QUANTITY 71
+#define GADGET_ID_RANDOM_RESTRICTED 72
+#define GADGET_ID_DOUBLE_SPEED 73
+#define GADGET_ID_GRAVITY 74
+#define GADGET_ID_STICK_ELEMENT 75
/* another drawing area for random placement */
-#define GADGET_ID_RANDOM_BACKGROUND 111
+#define GADGET_ID_RANDOM_BACKGROUND 76
+
+/* gadgets for buttons in element list */
+#define GADGET_ID_ELEMENTLIST_FIRST 77
+#define GADGET_ID_ELEMENTLIST_LAST (77 + ED_NUM_ELEMENTLIST_BUTTONS - 1)
-#define NUM_EDITOR_GADGETS 112
+#define NUM_EDITOR_GADGETS (GADGET_ID_ELEMENTLIST_LAST + 1)
/* radio button numbers */
#define RADIO_NR_NONE 0
#define ED_COUNTER_ID_LEVEL_TIMELIMIT 5
#define ED_COUNTER_ID_LEVEL_TIMESCORE 6
#define ED_COUNTER_ID_LEVEL_RANDOM 7
+#define ED_COUNTER_ID_SELECT_LEVEL 8
-#define ED_NUM_COUNTERBUTTONS 8
+#define ED_NUM_COUNTERBUTTONS 9
#define ED_COUNTER_ID_LEVEL_FIRST ED_COUNTER_ID_LEVEL_XSIZE
#define ED_COUNTER_ID_LEVEL_LAST ED_COUNTER_ID_LEVEL_RANDOM
#define ED_NUM_SCROLLBUTTONS 6
+#define ED_SCROLLBUTTON_ID_AREA_FIRST ED_SCROLLBUTTON_ID_AREA_UP
+#define ED_SCROLLBUTTON_ID_AREA_LAST ED_SCROLLBUTTON_ID_AREA_RIGHT
+
/* values for scrollbar gadgets */
-#define ED_SCROLLBAR_ID_HORIZONTAL 0
-#define ED_SCROLLBAR_ID_VERTICAL 1
+#define ED_SCROLLBAR_ID_AREA_HORIZONTAL 0
+#define ED_SCROLLBAR_ID_AREA_VERTICAL 1
+#define ED_SCROLLBAR_ID_LIST_VERTICAL 2
+
+#define ED_NUM_SCROLLBARS 3
-#define ED_NUM_SCROLLBARS 2
+#define ED_SCROLLBAR_ID_AREA_FIRST ED_SCROLLBAR_ID_AREA_HORIZONTAL
+#define ED_SCROLLBAR_ID_AREA_LAST ED_SCROLLBAR_ID_AREA_VERTICAL
/* values for text input gadgets */
#define ED_TEXTINPUT_ID_LEVEL_NAME 0
/* values for checkbutton gadgets */
#define ED_CHECKBUTTON_ID_DOUBLE_SPEED 0
-#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 1
-#define ED_CHECKBUTTON_ID_STICK_ELEMENT 2
+#define ED_CHECKBUTTON_ID_GRAVITY 1
+#define ED_CHECKBUTTON_ID_RANDOM_RESTRICTED 2
+#define ED_CHECKBUTTON_ID_STICK_ELEMENT 3
-#define ED_NUM_CHECKBUTTONS 3
+#define ED_NUM_CHECKBUTTONS 4
#define ED_CHECKBUTTON_ID_LEVEL_FIRST ED_CHECKBUTTON_ID_DOUBLE_SPEED
#define ED_CHECKBUTTON_ID_LEVEL_LAST ED_CHECKBUTTON_ID_RANDOM_RESTRICTED
/* values for radiobutton gadgets */
#define ED_RADIOBUTTON_ID_PERCENTAGE 0
-#define ED_RADIOBUTTON_ID_QUANTITY 1
+#define ED_RADIOBUTTON_ID_QUANTITY 1
#define ED_NUM_RADIOBUTTONS 2
{ 'E', "exit level editor" }
};
-/* pointers to counter values */
-static int *gadget_elem_score_value = NULL;
-static int *gadget_elem_content_value = NULL;
-static int *gadget_level_xsize_value = NULL;
-static int *gadget_level_ysize_value = NULL;
-static int *gadget_level_random_value = NULL;
-static int *gadget_level_collect_value = NULL;
-static int *gadget_level_timelimit_value = NULL;
-static int *gadget_level_timescore_value = NULL;
+/* values for random placement */
+#define RANDOM_USE_PERCENTAGE 0
+#define RANDOM_USE_QUANTITY 1
+
+static int random_placement_value = 10;
+static int random_placement_method = RANDOM_USE_QUANTITY;
+static int random_placement_background_element = EL_ERDREICH;
+static boolean random_placement_background_restricted = FALSE;
+static boolean stick_element_properties_window = FALSE;
static struct
{
int min_value, max_value;
int gadget_id_down, gadget_id_up;
int gadget_id_text;
- int **counter_value;
+ int *value;
char *infotext_above, *infotext_right;
} counterbutton_info[ED_NUM_COUNTERBUTTONS] =
{
MIN_SCORE, MAX_SCORE,
GADGET_ID_ELEM_SCORE_DOWN, GADGET_ID_ELEM_SCORE_UP,
GADGET_ID_ELEM_SCORE_TEXT,
- &gadget_elem_score_value,
+ NULL, /* will be set when used */
"element score", NULL
},
{
ED_COUNT_ELEM_CONTENT_XPOS, ED_COUNT_ELEM_CONTENT_YPOS,
- MIN_ELEM_CONTENT, MAX_ELEM_CONTENT,
+ MIN_ELEMENT_CONTENTS, MAX_ELEMENT_CONTENTS,
GADGET_ID_ELEM_CONTENT_DOWN, GADGET_ID_ELEM_CONTENT_UP,
GADGET_ID_ELEM_CONTENT_TEXT,
- &gadget_elem_content_value,
+ &level.num_yam_contents,
"element content", NULL
},
{
MIN_LEV_FIELDX, MAX_LEV_FIELDX,
GADGET_ID_LEVEL_XSIZE_DOWN, GADGET_ID_LEVEL_XSIZE_UP,
GADGET_ID_LEVEL_XSIZE_TEXT,
- &gadget_level_xsize_value,
+ &level.fieldx,
"playfield size", "width",
},
{
MIN_LEV_FIELDY, MAX_LEV_FIELDY,
GADGET_ID_LEVEL_YSIZE_DOWN, GADGET_ID_LEVEL_YSIZE_UP,
GADGET_ID_LEVEL_YSIZE_TEXT,
- &gadget_level_ysize_value,
+ &level.fieldy,
NULL, "height",
},
{
0, 999,
GADGET_ID_LEVEL_COLLECT_DOWN, GADGET_ID_LEVEL_COLLECT_UP,
GADGET_ID_LEVEL_COLLECT_TEXT,
- &gadget_level_collect_value,
+ &level.gems_needed,
"number of emeralds to collect", NULL
},
{
0, 999,
GADGET_ID_LEVEL_TIMELIMIT_DOWN, GADGET_ID_LEVEL_TIMELIMIT_UP,
GADGET_ID_LEVEL_TIMELIMIT_TEXT,
- &gadget_level_timelimit_value,
+ &level.time,
"time available to solve level", "(0 => no time limit)"
},
{
0, 255,
GADGET_ID_LEVEL_TIMESCORE_DOWN, GADGET_ID_LEVEL_TIMESCORE_UP,
GADGET_ID_LEVEL_TIMESCORE_TEXT,
- &gadget_level_timescore_value,
+ &level.score[SC_ZEITBONUS],
"score for each 10 seconds left", NULL
},
{
1, 100,
GADGET_ID_LEVEL_RANDOM_DOWN, GADGET_ID_LEVEL_RANDOM_UP,
GADGET_ID_LEVEL_RANDOM_TEXT,
- &gadget_level_random_value,
+ &random_placement_value,
"random element placement", "in"
+ },
+ {
+ DX + 5 - SX, DY + 3 - SY,
+ 1, 100,
+ GADGET_ID_SELECT_LEVEL_DOWN, GADGET_ID_SELECT_LEVEL_UP,
+ GADGET_ID_SELECT_LEVEL_TEXT,
+ &level_nr,
+ NULL, NULL
}
};
"scroll level editing area right"
},
{
- ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_ALT_YPOS,
- ED_ELEMENTLIST_UP_XPOS, ED_ELEMENTLIST_UP_YPOS,
- GADGET_ID_ELEMENTLIST_UP,
+ ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 0 * ED_SCROLLBUTTON2_YSIZE,
+ ED_SCROLL2_UP_XPOS, ED_SCROLL2_UP_YPOS,
+ GADGET_ID_SCROLL_LIST_UP,
"scroll element list up ('Page Up')"
},
{
- ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_ALT_YPOS,
- ED_ELEMENTLIST_DOWN_XPOS, ED_ELEMENTLIST_DOWN_YPOS,
- GADGET_ID_ELEMENTLIST_DOWN,
+ ED_SCROLLBUTTON2_XPOS, ED_SCROLLBUTTON2_YPOS + 1 * ED_SCROLLBUTTON2_YSIZE,
+ ED_SCROLL2_DOWN_XPOS, ED_SCROLL2_DOWN_YPOS,
+ GADGET_ID_SCROLL_LIST_DOWN,
"scroll element list down ('Page Down')"
}
};
} scrollbar_info[ED_NUM_SCROLLBARS] =
{
{
- ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
- ED_SCROLL_HORIZONTAL_XPOS, ED_SCROLL_HORIZONTAL_YPOS,
- ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE,
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ SX + ED_SCROLL_HORIZONTAL_XPOS, SY + ED_SCROLL_HORIZONTAL_YPOS,
+ ED_SCROLL_HORIZONTAL_XSIZE, ED_SCROLL_HORIZONTAL_YSIZE,
GD_TYPE_SCROLLBAR_HORIZONTAL,
GADGET_ID_SCROLL_HORIZONTAL,
"scroll level editing area horizontally"
},
{
- ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
- ED_SCROLL_VERTICAL_XPOS, ED_SCROLL_VERTICAL_YPOS,
- ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE,
+ ED_SCROLLBAR_XPOS, ED_SCROLLBAR_YPOS,
+ SX + ED_SCROLL_VERTICAL_XPOS, SY + ED_SCROLL_VERTICAL_YPOS,
+ ED_SCROLL_VERTICAL_XSIZE, ED_SCROLL_VERTICAL_YSIZE,
GD_TYPE_SCROLLBAR_VERTICAL,
GADGET_ID_SCROLL_VERTICAL,
"scroll level editing area vertically"
+ },
+ {
+ ED_SCROLLBAR2_XPOS, ED_SCROLLBAR2_YPOS,
+ DX + ED_SCROLL2_VERTICAL_XPOS, DY + ED_SCROLL2_VERTICAL_YPOS,
+ ED_SCROLL2_VERTICAL_XSIZE, ED_SCROLL2_VERTICAL_YSIZE,
+ GD_TYPE_SCROLLBAR_VERTICAL,
+ GADGET_ID_SCROLL_LIST_VERTICAL,
+ "scroll element list vertically"
}
};
-/* values for random placement */
-#define RANDOM_USE_PERCENTAGE 0
-#define RANDOM_USE_QUANTITY 1
-
-static int random_placement_value = 10;
-static int random_placement_method = RANDOM_USE_QUANTITY;
-static int random_placement_background_element = EL_ERDREICH;
-static boolean random_placement_background_restricted = FALSE;
-static boolean stick_element_properties_window = FALSE;
-
static struct
{
int x, y;
&level.double_speed,
"double speed movement", "set movement speed of player"
},
+ {
+ ED_SETTINGS_XPOS + 340, ED_COUNTER_YPOS(6) - MINI_TILEY,
+ GADGET_ID_GRAVITY,
+ &level.gravity,
+ "gravity", "set level gravity"
+ },
{
ED_SETTINGS_XPOS, ED_COUNTER2_YPOS(9) - MINI_TILEY,
GADGET_ID_RANDOM_RESTRICTED,
/* actual position of level editor drawing area in level playfield */
static int level_xpos = -1, level_ypos = -1;
-#define IN_ED_FIELD(x,y) ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldx)
+#define IN_ED_FIELD(x,y) ((x)>=0 && (x)<ed_fieldx && (y)>=0 &&(y)<ed_fieldy)
/* drawing elements on the three mouse buttons */
static int new_element1 = EL_MAUERWERK;
#define BUTTON_ELEMENT(button) (button == 1 ? new_element1 : \
button == 2 ? new_element2 : \
button == 3 ? new_element3 : EL_LEERRAUM)
+#define BUTTON_STEPSIZE(button) (button == 1 ? 1 : button == 2 ? 5 : 10)
/* forward declaration for internal use */
+static void ModifyEditorCounter(int, int);
+static void ModifyEditorCounterLimits(int, int, int);
static void DrawDrawingWindow();
static void DrawLevelInfoWindow();
static void DrawPropertiesWindow();
static void CopyLevelToUndoBuffer(int);
-static void HandleControlButtons(struct GadgetInfo *);
-static void HandleCounterButtons(struct GadgetInfo *);
static void HandleDrawingAreas(struct GadgetInfo *);
-static void HandleDrawingAreaInfo(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
static void HandleTextInputGadgets(struct GadgetInfo *);
+static void HandleRadiobuttons(struct GadgetInfo *);
+static void HandleCheckbuttons(struct GadgetInfo *);
+static void HandleControlButtons(struct GadgetInfo *);
+static void HandleDrawingAreaInfo(struct GadgetInfo *);
static struct GadgetInfo *level_editor_gadget[NUM_EDITOR_GADGETS];
static boolean draw_with_brush = FALSE;
static int properties_element = 0;
-static short ElementContent[MAX_ELEM_CONTENT][3][3];
+static short ElementContent[MAX_ELEMENT_CONTENTS][3][3];
static short FieldBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY];
static int undo_buffer_position = 0;
int editor_element[] =
{
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('U' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
+ EL_CHAR('B'),
+ EL_CHAR('O'),
+ EL_CHAR('U'),
+ EL_CHAR('L'),
- EL_CHAR_MINUS,
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
+ EL_CHAR('-'),
+ EL_CHAR('D'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('S' - 'A'),
- EL_CHAR_A + ('H' - 'A'),
+ EL_CHAR('D'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
+ EL_CHAR('H'),
EL_SPIELFIGUR,
EL_LEERRAUM,
EL_ERDREICH,
EL_BETON,
- EL_FELSBODEN,
- EL_SIEB2_INAKTIV,
+ EL_BD_WALL,
+ EL_MAGIC_WALL_BD_OFF,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_EDELSTEIN_BD,
- EL_BUTTERFLY_O,
- EL_FIREFLY_O,
- EL_FELSBROCKEN,
+ EL_BUTTERFLY_UP,
+ EL_FIREFLY_UP,
+ EL_BD_ROCK,
- EL_BUTTERFLY_L,
- EL_FIREFLY_L,
- EL_BUTTERFLY_R,
- EL_FIREFLY_R,
+ EL_BUTTERFLY_LEFT,
+ EL_FIREFLY_LEFT,
+ EL_BUTTERFLY_RIGHT,
+ EL_FIREFLY_RIGHT,
EL_AMOEBE_BD,
- EL_BUTTERFLY_U,
- EL_FIREFLY_U,
+ EL_BUTTERFLY_DOWN,
+ EL_FIREFLY_DOWN,
EL_LEERRAUM,
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_MINUS,
+ EL_CHAR('E'),
+ EL_CHAR('M'),
+ EL_CHAR('E'),
+ EL_CHAR('-'),
- EL_CHAR_A + ('R' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
- EL_CHAR_A + ('D' - 'A'),
+ EL_CHAR('R'),
+ EL_CHAR('A'),
+ EL_CHAR('L'),
+ EL_CHAR('D'),
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('I' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
+ EL_CHAR('M'),
+ EL_CHAR('I'),
+ EL_CHAR('N'),
+ EL_CHAR('E'),
EL_SPIELER1,
EL_SPIELER2,
EL_BETON,
EL_MAUERWERK,
EL_FELSBODEN,
- EL_SIEB_INAKTIV,
+ EL_MAGIC_WALL_OFF,
EL_EDELSTEIN,
EL_DIAMANT,
EL_MORAST_LEER,
EL_MORAST_VOLL,
- EL_DYNAMIT_AUS,
- EL_DYNAMIT,
+ EL_DYNAMITE_INACTIVE,
+ EL_DYNAMITE_ACTIVE,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_MAMPFER,
- EL_KAEFER_O,
- EL_FLIEGER_O,
+ EL_KAEFER_UP,
+ EL_FLIEGER_UP,
EL_ROBOT,
- EL_KAEFER_L,
- EL_FLIEGER_L,
- EL_KAEFER_R,
- EL_FLIEGER_R,
+ EL_KAEFER_LEFT,
+ EL_FLIEGER_LEFT,
+ EL_KAEFER_RIGHT,
+ EL_FLIEGER_RIGHT,
EL_ABLENK_AUS,
- EL_KAEFER_U,
- EL_FLIEGER_U,
+ EL_KAEFER_DOWN,
+ EL_FLIEGER_DOWN,
EL_UNSICHTBAR,
EL_BADEWANNE1,
EL_AMOEBE_NASS,
EL_AMOEBE_NORM,
+ EL_EM_KEY_1_FILE,
+ EL_EM_KEY_2_FILE,
+ EL_EM_KEY_3_FILE,
+ EL_EM_KEY_4_FILE,
+
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+
+ EL_CHAR('M'),
+ EL_CHAR('O'),
+ EL_CHAR('R'),
+ EL_CHAR('E'),
+
EL_SCHLUESSEL1,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
EL_PFORTE3X,
EL_PFORTE4X,
- EL_CHAR_A + ('M' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
-
- EL_PFEIL_L,
- EL_PFEIL_R,
- EL_PFEIL_O,
- EL_PFEIL_U,
+ EL_PFEIL_LEFT,
+ EL_PFEIL_RIGHT,
+ EL_PFEIL_UP,
+ EL_PFEIL_DOWN,
EL_AMOEBE_VOLL,
EL_EDELSTEIN_GELB,
EL_ERZ_EDEL_LILA,
EL_LIFE,
- EL_PACMAN_O,
+ EL_PACMAN_UP,
EL_ZEIT_VOLL,
EL_ZEIT_LEER,
- EL_PACMAN_L,
+ EL_PACMAN_LEFT,
EL_MAMPFER2,
- EL_PACMAN_R,
+ EL_PACMAN_RIGHT,
EL_MAUER_LEBT,
EL_LIFE_ASYNC,
- EL_PACMAN_U,
+ EL_PACMAN_DOWN,
EL_BIRNE_AUS,
EL_BIRNE_EIN,
EL_DYNABOMB_XL,
EL_BADEWANNE,
- EL_MAULWURF,
+ EL_MOLE,
EL_PINGUIN,
EL_SCHWEIN,
EL_DRACHE,
+ EL_LEERRAUM,
+ EL_MOLE_UP,
+ EL_LEERRAUM,
+ EL_LEERRAUM,
+
+ EL_MOLE_LEFT,
+ EL_LEERRAUM,
+ EL_MOLE_RIGHT,
+ EL_LEERRAUM,
+
+ EL_LEERRAUM,
+ EL_MOLE_DOWN,
+ EL_BALLOON,
+ EL_BALLOON_SEND_ANY,
+
+ EL_BALLOON_SEND_LEFT,
+ EL_BALLOON_SEND_RIGHT,
+ EL_BALLOON_SEND_UP,
+ EL_BALLOON_SEND_DOWN,
+
EL_SONDE,
EL_MAUER_X,
EL_MAUER_Y,
EL_SPEED_PILL,
EL_BLACK_ORB,
- EL_CHAR_A + ('S' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
- EL_CHAR_A + ('K' - 'A'),
- EL_CHAR_A + ('O' - 'A'),
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
+
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
- EL_CHAR_MINUS,
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
+
+ EL_CHAR('S'),
+ EL_CHAR('O'),
+ EL_CHAR('K'),
+ EL_CHAR('O'),
+
+ EL_CHAR('-'),
+ EL_CHAR('B'),
+ EL_CHAR('A'),
+ EL_CHAR('N'),
EL_SOKOBAN_OBJEKT,
EL_SOKOBAN_FELD_LEER,
EL_SOKOBAN_FELD_VOLL,
EL_BETON,
- EL_LEERRAUM,
- EL_LEERRAUM,
- EL_LEERRAUM,
- EL_LEERRAUM,
-
EL_CHAR('S'),
EL_CHAR('U'),
EL_CHAR('P'),
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
+ EL_CHAR('D'),
+ EL_CHAR('I'),
+ EL_CHAR('A'),
+ EL_CHAR('-'),
+
+ EL_CHAR('M'),
+ EL_CHAR('O'),
+ EL_CHAR('N'),
+ EL_CHAR('D'),
+
+ EL_CHAR('C'),
+ EL_CHAR('A'),
+ EL_CHAR('V'),
+ EL_CHAR('E'),
+
+ EL_CHAR('S'),
+ EL_CHAR(' '),
+ EL_CHAR('I'),
+ EL_CHAR('I'),
+
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_WALL_PEARL,
+ EL_WALL_CRYSTAL,
+
+ EL_BELT1_LEFT,
+ EL_BELT1_MIDDLE,
+ EL_BELT1_RIGHT,
+ EL_BELT1_SWITCH_MIDDLE,
+
+ EL_BELT2_LEFT,
+ EL_BELT2_MIDDLE,
+ EL_BELT2_RIGHT,
+ EL_BELT2_SWITCH_MIDDLE,
+
+ EL_BELT3_LEFT,
+ EL_BELT3_MIDDLE,
+ EL_BELT3_RIGHT,
+ EL_BELT3_SWITCH_MIDDLE,
+
+ EL_BELT4_LEFT,
+ EL_BELT4_MIDDLE,
+ EL_BELT4_RIGHT,
+ EL_BELT4_SWITCH_MIDDLE,
+
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT4_SWITCH_LEFT,
+
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_RIGHT,
+
+ EL_SWITCHGATE_OPEN,
+ EL_SWITCHGATE_CLOSED,
+ EL_SWITCHGATE_SWITCH_1,
+ EL_ENVELOPE,
+
+ EL_TIMEGATE_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_SWITCH_OFF,
+ EL_LEERRAUM,
+
+ EL_LANDMINE,
+ EL_SAND_INVISIBLE,
+ EL_STEEL_SLANTED,
+ EL_LEERRAUM,
+
+ EL_SIGN_EXCLAMATION,
+ EL_SIGN_STOP,
+ EL_LIGHT_SWITCH_OFF,
+ EL_LIGHT_SWITCH_ON,
+
+ EL_SHIELD_PASSIVE,
+ EL_SHIELD_ACTIVE,
+ EL_EXTRA_TIME,
+ EL_LEERRAUM,
+
+ EL_CHAR('D'),
+ EL_CHAR('X'),
+ EL_CHAR('-'),
+ EL_CHAR(' '),
+
+ EL_CHAR('B'),
+ EL_CHAR('O'),
+ EL_CHAR('U'),
+ EL_CHAR('L'),
+
+ EL_CHAR('-'),
+ EL_CHAR('D'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
+
+ EL_CHAR('D'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
+ EL_CHAR('H'),
+
+ EL_SPRING,
+ EL_TUBE_RIGHT_DOWN,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_DOWN,
+
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERT_LEFT,
+
+ EL_TUBE_VERTICAL,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_LEFT_UP,
+
+ EL_TRAP_INACTIVE,
+ EL_DX_SUPABOMB,
+ EL_LEERRAUM,
+ EL_LEERRAUM,
+
/*
- EL_CHAR_A + ('D' - 'A'),
- EL_CHAR_A + ('Y' - 'A'),
- EL_CHAR_A + ('N' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
+ EL_CHAR('D'),
+ EL_CHAR('Y'),
+ EL_CHAR('N'),
+ EL_CHAR('A'),
- EL_CHAR_A + ('B' - 'A'),
- EL_CHAR_A + ('L' - 'A'),
- EL_CHAR_A + ('A' - 'A'),
- EL_CHAR_A + ('S' - 'A'),
+ EL_CHAR('B'),
+ EL_CHAR('L'),
+ EL_CHAR('A'),
+ EL_CHAR('S'),
EL_CHAR_MINUS,
- EL_CHAR_A + ('T' - 'A'),
- EL_CHAR_A + ('E' - 'A'),
- EL_CHAR_A + ('R' - 'A'),
+ EL_CHAR('T'),
+ EL_CHAR('E'),
+ EL_CHAR('R'),
*/
EL_LEERRAUM,
gd_y2 = DOOR_GFX_PAGEY1 + ED_CTRL_BUTTONS_ALT_GFX_YPOS + gd_yoffset;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, control_info[i].text,
GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- if (id == GADGET_ID_ELEMENTLIST_UP ||
- id == GADGET_ID_ELEMENTLIST_DOWN)
+ if (id == GADGET_ID_SCROLL_LIST_UP ||
+ id == GADGET_ID_SCROLL_LIST_DOWN)
{
x += DX;
y += DY;
- width = ED_ELEMENTLIST_UPDOWN_XSIZE;
- height = ED_ELEMENTLIST_UPDOWN_YSIZE;
- gd_x1 = DOOR_GFX_PAGEX6 + scrollbutton_info[i].xpos;
- gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].y;
- gd_x2 = gd_x1;
- gd_y2 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ width = ED_SCROLLBUTTON2_XSIZE;
+ height = ED_SCROLLBUTTON2_YSIZE;
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[i].xpos;
+ gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON2_XSIZE;
+ gd_y2 = gd_y1;
}
else
{
gd_y1 = DOOR_GFX_PAGEY1 + scrollbutton_info[i].ypos;
gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
gd_y2 = gd_y1;
- }
+ }
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, scrollbutton_info[i].infotext,
GDI_X, x,
GDI_Y, y,
Pixmap deco_pixmap;
int deco_x, deco_y, deco_xpos, deco_ypos;
int gd_xoffset, gd_yoffset;
- int gd_x, gd_y1, gd_y2;
+ int gd_x1, gd_x2, gd_y;
int x = i % ED_ELEMENTLIST_BUTTONS_HORIZ;
int y = i / ED_ELEMENTLIST_BUTTONS_HORIZ;
int id = GADGET_ID_ELEMENTLIST_FIRST + i;
gd_xoffset = ED_ELEMENTLIST_XPOS + x * ED_ELEMENTLIST_XSIZE;
gd_yoffset = ED_ELEMENTLIST_YPOS + y * ED_ELEMENTLIST_YSIZE;
- gd_x = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
- gd_y1 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
- gd_y2 = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_ALT_YPOS;
+ gd_x1 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS + ED_ELEMENTLIST_XSIZE;
+ gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
getMiniGraphicSource(el2gfx(editor_element[i]),
&deco_pixmap, &deco_x, &deco_y);
deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, element_info[editor_element[i]],
GDI_X, DX + gd_xoffset,
GDI_Y, DY + gd_yoffset,
GDI_HEIGHT, ED_ELEMENTLIST_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
- GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y1,
- GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y2,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
GDI_DECORATION_DESIGN, deco_pixmap, deco_x, deco_y,
GDI_DECORATION_POSITION, deco_xpos, deco_ypos,
GDI_DECORATION_SIZE, MINI_TILEX, MINI_TILEY,
counterbutton_info[i].gadget_id_up);
int gd_xoffset;
int gd_x, gd_x1, gd_x2, gd_y;
+ int x_size, y_size;
unsigned long event_mask;
char infotext[MAX_INFOTEXT_LEN + 1];
event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
- gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
- gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
- gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
- gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+ if (i == ED_COUNTER_ID_SELECT_LEVEL)
+ {
+ int sid = (j == 0 ?
+ ED_SCROLLBUTTON_ID_AREA_LEFT :
+ ED_SCROLLBUTTON_ID_AREA_RIGHT);
+
+ event_mask |= GD_EVENT_RELEASED;
+
+ if (j == 1)
+ xpos += 2 * ED_GADGET_DISTANCE;
+ ypos += ED_GADGET_DISTANCE;
+
+ gd_x1 = DOOR_GFX_PAGEX8 + scrollbutton_info[sid].xpos;
+ gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_y = DOOR_GFX_PAGEY1 + scrollbutton_info[sid].ypos;
+ x_size = ED_SCROLLBUTTON_XSIZE;
+ y_size = ED_SCROLLBUTTON_YSIZE;
+ }
+ else
+ {
+ gd_xoffset = (j == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
+ gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
+ gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
+ gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
+ x_size = ED_BUTTON_COUNT_XSIZE;
+ y_size = ED_BUTTON_COUNT_YSIZE;
+ }
sprintf(infotext, "%s counter value by 1, 5 or 10",
(j == 0 ? "decrease" : "increase"));
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, infotext,
GDI_X, xpos,
GDI_Y, ypos,
- GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
- GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
+ GDI_WIDTH, x_size,
+ GDI_HEIGHT, y_size,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
if (j == 0)
{
+ int font_type = FC_YELLOW;
+ int gd_width = ED_WIN_COUNT_XSIZE;
+
id = counterbutton_info[i].gadget_id_text;
event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
- gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+ if (i == ED_COUNTER_ID_SELECT_LEVEL)
+ {
+ font_type = FC_SPECIAL3;
+
+ xpos += 2 * ED_GADGET_DISTANCE;
+ ypos -= ED_GADGET_DISTANCE;
+
+ gd_x = DOOR_GFX_PAGEX6 + ED_WIN_COUNT2_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT2_YPOS;
+ gd_width = ED_WIN_COUNT2_XSIZE;
+ }
+ else
+ {
+ gd_x = DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS;
+ }
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, "enter counter value",
GDI_X, xpos,
GDI_Y, ypos,
GDI_NUMBER_MIN, counterbutton_info[i].min_value,
GDI_NUMBER_MAX, counterbutton_info[i].max_value,
GDI_TEXT_SIZE, 3,
+ GDI_TEXT_FONT, font_type,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
+ GDI_TEXTINPUT_DESIGN_WIDTH, gd_width,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleCounterButtons,
GDI_END);
level_editor_gadget[id] = gi;
/* ... up to eight areas for element content ... */
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
{
int gx = SX + ED_AREA_ELEM_CONTENT_XPOS + 5 * (i % 4) * MINI_TILEX;
int gy = SX + ED_AREA_ELEM_CONTENT_YPOS + 6 * (i / 4) * MINI_TILEY;
id = GADGET_ID_ELEM_CONTENT_0 + i;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_X, gx,
GDI_Y, gy,
GDI_WIDTH, 3 * MINI_TILEX,
infotext[MAX_INFOTEXT_LEN] = '\0';
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, infotext,
GDI_X, SX + textinput_info[i].x,
GDI_Y, SY + textinput_info[i].y,
GDI_TYPE, GD_TYPE_TEXTINPUT_ALPHANUMERIC,
GDI_TEXT_VALUE, textinput_info[i].value,
GDI_TEXT_SIZE, textinput_info[i].size,
+ GDI_TEXT_FONT, FC_YELLOW,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x, gd_y,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x, gd_y,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
+ GDI_TEXTINPUT_DESIGN_WIDTH, ED_WIN_COUNT_XSIZE,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleTextInputGadgets,
GDI_END);
int items_max, items_visible, item_position;
unsigned long event_mask;
- if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+ if (i == ED_SCROLLBAR_ID_LIST_VERTICAL)
{
- items_max = MAX(lev_fieldx + 2, ed_fieldx);
- items_visible = ed_fieldx;
+ items_max = elements_in_list / ED_ELEMENTLIST_BUTTONS_HORIZ;
+ items_visible = ED_ELEMENTLIST_BUTTONS_VERT;
item_position = 0;
}
- else
+ else /* drawing area scrollbars */
{
- items_max = MAX(lev_fieldy + 2, ed_fieldy);
- items_visible = ed_fieldy;
- item_position = 0;
+ if (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL)
+ {
+ items_max = MAX(lev_fieldx + 2, ed_fieldx);
+ items_visible = ed_fieldx;
+ item_position = 0;
+ }
+ else
+ {
+ items_max = MAX(lev_fieldy + 2, ed_fieldy);
+ items_visible = ed_fieldy;
+ item_position = 0;
+ }
}
event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
gd_x1 = DOOR_GFX_PAGEX8 + scrollbar_info[i].xpos;
- gd_x2 = gd_x1 - ED_SCROLLBUTTON_XSIZE;
+ gd_x2 = (gd_x1 - (scrollbar_info[i].type == GD_TYPE_SCROLLBAR_HORIZONTAL ?
+ scrollbar_info[i].height : scrollbar_info[i].width));
gd_y1 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
gd_y2 = DOOR_GFX_PAGEY1 + scrollbar_info[i].ypos;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, scrollbar_info[i].infotext,
- GDI_X, SX + scrollbar_info[i].x,
- GDI_Y, SY + scrollbar_info[i].y,
+ GDI_X, scrollbar_info[i].x,
+ GDI_Y, scrollbar_info[i].y,
GDI_WIDTH, scrollbar_info[i].width,
GDI_HEIGHT, scrollbar_info[i].height,
GDI_TYPE, scrollbar_info[i].type,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
- GDI_DESIGN_BORDER, ED_BORDER_SIZE,
+ GDI_BORDER_SIZE, ED_BORDER_SIZE,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleControlButtons,
GDI_END);
gd_x2 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_UNCHECKED_XPOS;
gd_x3 = DOOR_GFX_PAGEX4 + ED_CHECKBUTTON_CHECKED_XPOS;
gd_x4 = DOOR_GFX_PAGEX3 + ED_CHECKBUTTON_CHECKED_XPOS;
- gd_y = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
+ gd_y = DOOR_GFX_PAGEY1 + ED_RADIOBUTTON_YPOS;
for (i=0; i<ED_NUM_RADIOBUTTONS; i++)
{
(*radiobutton_info[i].value == radiobutton_info[i].checked_value);
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, radiobutton_info[i].infotext,
GDI_X, SX + radiobutton_info[i].x,
GDI_Y, SY + radiobutton_info[i].y,
GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_CALLBACK_ACTION, HandleRadiobuttons,
GDI_END);
if (gi == NULL)
gd_y = DOOR_GFX_PAGEY1 + ED_CHECKBUTTON_YPOS;
gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
GDI_INFO_TEXT, checkbutton_info[i].infotext,
GDI_X, SX + checkbutton_info[i].x,
GDI_Y, SY + checkbutton_info[i].y,
GDI_ALT_DESIGN_UNPRESSED, gd_pixmap, gd_x3, gd_y,
GDI_ALT_DESIGN_PRESSED, gd_pixmap, gd_x4, gd_y,
GDI_EVENT_MASK, event_mask,
- GDI_CALLBACK_ACTION, HandleControlButtons,
+ GDI_CALLBACK_ACTION, HandleCheckbuttons,
GDI_END);
if (gi == NULL)
CreateCheckbuttonGadgets();
}
+static void MapCounterButtons(int id)
+{
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
+ MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+}
+
static void MapControlButtons()
{
+ int counter_id;
int i;
+ /* map toolbox buttons */
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
MapGadget(level_editor_gadget[i]);
+
+ /* map buttons to select elements */
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
MapGadget(level_editor_gadget[GADGET_ID_ELEMENTLIST_FIRST + i]);
-}
-
-static void MapCounterButtons(int id)
-{
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_down]);
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_text]);
- MapGadget(level_editor_gadget[counterbutton_info[id].gadget_id_up]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_UP]);
+ MapGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_DOWN]);
+
+ /* map buttons to select level */
+ counter_id = ED_COUNTER_ID_SELECT_LEVEL;
+ ModifyEditorCounterLimits(counter_id,
+ leveldir_current->first_level,
+ leveldir_current->last_level);
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
}
static void MapDrawingArea(int id)
boolean no_vertical_scrollbar = (lev_fieldy + 2 <= ed_fieldy);
int i;
- for (i=0; i<ED_NUM_SCROLLBUTTONS; i++)
+ for (i=ED_SCROLLBUTTON_ID_AREA_FIRST; i<=ED_SCROLLBUTTON_ID_AREA_LAST; i++)
{
if (((i == ED_SCROLLBUTTON_ID_AREA_LEFT ||
i == ED_SCROLLBUTTON_ID_AREA_RIGHT) &&
MapGadget(level_editor_gadget[scrollbutton_info[i].gadget_id]);
}
- for (i=0; i<ED_NUM_SCROLLBARS; i++)
+ for (i=ED_SCROLLBAR_ID_AREA_FIRST; i<=ED_SCROLLBAR_ID_AREA_LAST; i++)
{
- if ((i == ED_SCROLLBAR_ID_HORIZONTAL && no_horizontal_scrollbar) ||
- (i == ED_SCROLLBAR_ID_VERTICAL && no_vertical_scrollbar))
+ if ((i == ED_SCROLLBAR_ID_AREA_HORIZONTAL && no_horizontal_scrollbar) ||
+ (i == ED_SCROLLBAR_ID_AREA_VERTICAL && no_vertical_scrollbar))
continue;
MapGadget(level_editor_gadget[scrollbar_info[i].gadget_id]);
int i;
for (i=0; i<NUM_EDITOR_GADGETS; i++)
- if (level_editor_gadget[i]->x < DX)
+ if (level_editor_gadget[i]->x < SX + SXSIZE)
UnmapGadget(level_editor_gadget[i]);
}
UnmapGadget(level_editor_gadget[i]);
}
-void DrawLevelEd()
+static void ResetUndoBuffer()
{
- int i, x, y, graphic;
+ undo_buffer_position = -1;
+ undo_buffer_steps = -1;
+ CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
+}
- edit_mode = ED_MODE_DRAWING;
+static void DrawEditModeWindow()
+{
+ if (edit_mode == ED_MODE_INFO)
+ DrawLevelInfoWindow();
+ else if (edit_mode == ED_MODE_PROPERTIES)
+ DrawPropertiesWindow();
+ else /* edit_mode == ED_MODE_DRAWING */
+ DrawDrawingWindow();
+}
- CloseDoor(DOOR_CLOSE_ALL);
+static boolean LevelChanged()
+{
+ boolean level_changed = FALSE;
+ int x, y;
+
+ for(y=0; y<lev_fieldy; y++)
+ for(x=0; x<lev_fieldx; x++)
+ if (Feld[x][y] != Ur[x][y])
+ level_changed = TRUE;
+
+ return level_changed;
+}
+
+static boolean LevelContainsPlayer()
+{
+ boolean player_found = FALSE;
+ int x, y;
+
+ for(y=0; y<lev_fieldy; y++)
+ for(x=0; x<lev_fieldx; x++)
+ if (Feld[x][y] == EL_SPIELFIGUR ||
+ Feld[x][y] == EL_SPIELER1 ||
+ Feld[x][y] == EL_SP_MURPHY)
+ player_found = TRUE;
+
+ return player_found;
+}
+void DrawLevelEd()
+{
+ CloseDoor(DOOR_CLOSE_ALL);
OpenDoor(DOOR_OPEN_2 | DOOR_NO_DELAY);
if (level_editor_test_game)
{
+ int x, y;
+
for(x=0; x<lev_fieldx; x++)
for(y=0; y<lev_fieldy; y++)
Feld[x][y] = Ur[x][y];
}
else
{
+ edit_mode = ED_MODE_DRAWING;
+
+ ResetUndoBuffer();
level_xpos = -1;
level_ypos = -1;
- undo_buffer_position = -1;
- undo_buffer_steps = -1;
- CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
}
- /*
- DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- FadeToFront();
- */
-
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY1,
- DXSIZE,DYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6+ED_BUTTON_ELEM_XPOS,
- DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS,
- 4*ED_BUTTON_ELEM_XSIZE,5*ED_BUTTON_ELEM_YSIZE,
- DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS,
- DOOR_GFX_PAGEY1+ED_BUTTON_EUP_Y2POS);
-
- for(i=0;i<MAX_ELEM_X*MAX_ELEM_Y;i++)
- {
- if (i < elements_in_list)
- graphic = el2gfx(editor_element[i + element_shift]);
- else
- graphic = GFX_LEERRAUM;
-
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_BUTTON_ELEM_XPOS+3 +
- (i%MAX_ELEM_X)*ED_BUTTON_ELEM_XSIZE,
- DOOR_GFX_PAGEY1+ED_BUTTON_ELEM_YPOS+3 +
- (i/MAX_ELEM_X)*ED_BUTTON_ELEM_YSIZE,
- graphic);
- }
+ /* copy default editor door content to main double buffer */
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_LEFT_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_LEFT_YPOS,
+ /* draw mouse button brush elements */
+ DrawMiniGraphicExt(drawto, gc,
+ DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
el2gfx(new_element1));
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_MIDDLE_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_MIDDLE_YPOS,
+ DrawMiniGraphicExt(drawto, gc,
+ DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
el2gfx(new_element2));
- DrawMiniGraphicExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX1+ED_WIN_MB_RIGHT_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_MB_RIGHT_YPOS,
+ DrawMiniGraphicExt(drawto, gc,
+ DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
el2gfx(new_element3));
- DrawTextExt(pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- int2str(level_nr,2),FS_SMALL,FC_SPECIAL1);
- XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+3,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- 7,FONT3_YSIZE,
- DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
- XCopyArea(display,pix[PIX_DB_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX2+ED_WIN_LEVELNR_XPOS+14,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS,
- 7,FONT3_YSIZE,
- DOOR_GFX_PAGEX1+ED_WIN_LEVELNR_XPOS+9,
- DOOR_GFX_PAGEY1+ED_WIN_LEVELNR_YPOS);
-
- XCopyArea(display,pix[PIX_DOOR],pix[PIX_DB_DOOR],gc,
- DOOR_GFX_PAGEX6,DOOR_GFX_PAGEY2,
- VXSIZE,VYSIZE,
- DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
/* draw bigger door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 0,
- 108, 64,
- EX - 4, EY - 12);
+ DrawSpecialEditorDoor();
/* draw new control window */
XCopyArea(display, pix[PIX_DOOR], drawto, gc,
redraw_mask |= REDRAW_ALL;
- OpenDoor(DOOR_OPEN_1);
+ MapControlButtons();
- strcpy(level_editor_gadget[GADGET_ID_LEVEL_NAME]->text.value, level.name);
+ /* copy actual editor door content to door double buffer for OpenDoor() */
+ XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
+ DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
- MapControlButtons();
+ DrawEditModeWindow();
/*
- MapMainDrawingArea();
+ FadeToFront();
*/
- DrawDrawingWindow();
- FadeToFront();
+
+ OpenDoor(DOOR_OPEN_1);
/*
OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_RIGHT], GDI_X, x, GDI_END);
ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_DOWN], GDI_Y, y, GDI_END);
- width = scrollbar_info[ED_SCROLLBAR_ID_HORIZONTAL].width + xoffset;
- height = scrollbar_info[ED_SCROLLBAR_ID_VERTICAL].height + yoffset;
+ width = scrollbar_info[ED_SCROLLBAR_ID_AREA_HORIZONTAL].width + xoffset;
+ height = scrollbar_info[ED_SCROLLBAR_ID_AREA_VERTICAL].height + yoffset;
ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
GDI_WIDTH, width,
static void ModifyEditorCounter(int counter_id, int new_value)
{
- int *counter_value = *counterbutton_info[counter_id].counter_value;
+ int *counter_value = counterbutton_info[counter_id].value;
int gadget_id = counterbutton_info[counter_id].gadget_id_text;
struct GadgetInfo *gi = level_editor_gadget[gadget_id];
*counter_value = gi->text.number_value;
}
+static void ModifyEditorCounterLimits(int counter_id, int min, int max)
+{
+ int gadget_id = counterbutton_info[counter_id].gadget_id_text;
+ struct GadgetInfo *gi = level_editor_gadget[gadget_id];
+
+ ModifyGadget(gi, GDI_NUMBER_MIN, min, GDI_NUMBER_MAX, max, GDI_END);
+}
+
static void PickDrawingElement(int button, int element)
{
if (button < 1 || button > 3)
{
new_element1 = element;
DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_LEFT_XPOS,
- DY + ED_WIN_MB_LEFT_YPOS,
+ DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
el2gfx(new_element1));
}
else if (button == 2)
{
new_element2 = element;
DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_MIDDLE_XPOS,
- DY + ED_WIN_MB_MIDDLE_YPOS,
+ DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
el2gfx(new_element2));
}
else
{
new_element3 = element;
DrawMiniGraphicExt(drawto, gc,
- DX + ED_WIN_MB_RIGHT_XPOS,
- DY + ED_WIN_MB_RIGHT_YPOS,
+ DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
el2gfx(new_element3));
}
DrawText(SX + ED_SETTINGS2_XPOS, SY + ED_SETTINGS2_YPOS,
"Editor Settings", FS_BIG, FC_YELLOW);
- gadget_level_xsize_value = &lev_fieldx;
- gadget_level_ysize_value = &lev_fieldy;
- gadget_level_random_value = &random_placement_value;
- gadget_level_collect_value = &level.edelsteine;
- gadget_level_timelimit_value = &level.time;
- gadget_level_timescore_value = &level.score[10];
-
/* draw counter gadgets */
for (i=ED_COUNTER_ID_LEVEL_FIRST; i<=ED_COUNTER_ID_LEVEL_LAST; i++)
{
DrawTextF(x, y, font_color, infotext);
}
- ModifyEditorCounter(i, **counterbutton_info[i].counter_value);
+ ModifyEditorCounter(i, *counterbutton_info[i].value);
MapCounterButtons(i);
}
int font_color = FC_GREEN;
int x, y;
- ElementContent[0][0][0] = level.amoebe_inhalt;
+ ElementContent[0][0][0] = level.amoeba_content;
/* draw decorative border for the object */
for (y=0; y<2; y++)
static void DrawElementContentAreas()
{
- int *num_areas = &MampferMax;
+ int counter_id = ED_COUNTER_ID_ELEM_CONTENT;
int area_x = ED_AREA_ELEM_CONTENT_XPOS / MINI_TILEX;
int area_y = ED_AREA_ELEM_CONTENT_YPOS / MINI_TILEY;
int area_sx = SX + ED_AREA_ELEM_CONTENT_XPOS;
int font_color = FC_GREEN;
int i, x, y;
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
for (y=0; y<3; y++)
for (x=0; x<3; x++)
- ElementContent[i][x][y] = level.mampfer_inhalt[i][x][y];
+ ElementContent[i][x][y] = level.yam_content[i][x][y];
- for (i=0; i<MAX_ELEM_CONTENT; i++)
+ for (i=0; i<MAX_ELEMENT_CONTENTS; i++)
UnmapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
/* display counter to choose number of element content areas */
- gadget_elem_content_value = num_areas;
-
- x = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].x + xoffset_right;
- y = counterbutton_info[ED_COUNTER_ID_ELEM_CONTENT].y + yoffset_right;
+ x = counterbutton_info[counter_id].x + xoffset_right;
+ y = counterbutton_info[counter_id].y + yoffset_right;
DrawTextF(x, y, font_color, "number of content areas");
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT, *gadget_elem_content_value);
- MapCounterButtons(ED_COUNTER_ID_ELEM_CONTENT);
+
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
/* delete content areas in case of reducing number of them */
XFillRectangle(display, backbuffer, gc,
SXSIZE, 12 * MINI_TILEY);
/* draw some decorative border for the objects */
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
{
for (y=0; y<4; y++)
for (x=0; x<4; x++)
DrawText(area_sx + (5 * 4 - 1) * MINI_TILEX, area_sy + 2 * MINI_TILEY + 1,
"smashed", FS_SMALL, font_color);
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
{
for (y=0; y<3; y++)
for (x=0; x<3; x++)
font_color, "%d", i + 1);
}
- for (i=0; i<*num_areas; i++)
+ for (i=0; i<level.num_yam_contents; i++)
MapDrawingArea(GADGET_ID_ELEM_CONTENT_0 + i);
}
static void DrawPropertiesWindow()
{
+ int counter_id = ED_COUNTER_ID_ELEM_SCORE;
int num_elements_in_level;
float percentage;
int xoffset_right = counter_xsize;
static struct
{
int element;
- int *counter_value;
+ int *value;
char *text;
} elements_with_counter[] =
{
- { EL_EDELSTEIN, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_BD, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_GELB,&level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_ROT, &level.score[0], TEXT_COLLECTING },
- { EL_EDELSTEIN_LILA,&level.score[0], TEXT_COLLECTING },
- { EL_DIAMANT, &level.score[1], TEXT_COLLECTING },
- { EL_KAEFER_R, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_O, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_L, &level.score[2], TEXT_SMASHING },
- { EL_KAEFER_U, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_R, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_O, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_L, &level.score[2], TEXT_SMASHING },
- { EL_BUTTERFLY_U, &level.score[2], TEXT_SMASHING },
- { EL_FLIEGER_R, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_O, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_L, &level.score[3], TEXT_SMASHING },
- { EL_FLIEGER_U, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_R, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_O, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_L, &level.score[3], TEXT_SMASHING },
- { EL_FIREFLY_U, &level.score[3], TEXT_SMASHING },
- { EL_MAMPFER, &level.score[4], TEXT_SMASHING },
- { EL_MAMPFER2, &level.score[4], TEXT_SMASHING },
- { EL_ROBOT, &level.score[5], TEXT_SMASHING },
- { EL_PACMAN_R, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_O, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_L, &level.score[6], TEXT_SMASHING },
- { EL_PACMAN_U, &level.score[6], TEXT_SMASHING },
- { EL_KOKOSNUSS, &level.score[7], TEXT_CRACKING },
- { EL_DYNAMIT_AUS, &level.score[8], TEXT_COLLECTING },
- { EL_SCHLUESSEL1, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL2, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL3, &level.score[9], TEXT_COLLECTING },
- { EL_SCHLUESSEL4, &level.score[9], TEXT_COLLECTING },
- { EL_AMOEBE_NASS, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_NORM, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_VOLL, &level.tempo_amoebe, TEXT_SPEED },
- { EL_AMOEBE_BD, &level.tempo_amoebe, TEXT_SPEED },
- { EL_SIEB_INAKTIV, &level.dauer_sieb, TEXT_DURATION },
- { EL_ABLENK_AUS, &level.dauer_ablenk, TEXT_DURATION },
+ { EL_EDELSTEIN, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_BD, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_GELB,&level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_ROT, &level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_EDELSTEIN_LILA,&level.score[SC_EDELSTEIN], TEXT_COLLECTING },
+ { EL_DIAMANT, &level.score[SC_DIAMANT], TEXT_COLLECTING },
+ { EL_KAEFER_RIGHT, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_UP, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_LEFT, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_KAEFER_DOWN, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_RIGHT,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_UP, &level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_LEFT,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_BUTTERFLY_DOWN,&level.score[SC_KAEFER], TEXT_SMASHING },
+ { EL_FLIEGER_RIGHT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_UP, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_LEFT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FLIEGER_DOWN, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_RIGHT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_UP, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_LEFT, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_FIREFLY_DOWN, &level.score[SC_FLIEGER], TEXT_SMASHING },
+ { EL_MAMPFER, &level.score[SC_MAMPFER], TEXT_SMASHING },
+ { EL_MAMPFER2, &level.score[SC_MAMPFER], TEXT_SMASHING },
+ { EL_ROBOT, &level.score[SC_ROBOT], TEXT_SMASHING },
+ { EL_PACMAN_RIGHT, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_UP, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_LEFT, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING },
+ { EL_KOKOSNUSS, &level.score[SC_KOKOSNUSS], TEXT_CRACKING },
+ { EL_DYNAMITE_INACTIVE,&level.score[SC_DYNAMIT], TEXT_COLLECTING },
+ { EL_SCHLUESSEL1, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL2, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL3, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_SCHLUESSEL4, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_1_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_2_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_3_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_EM_KEY_4_FILE, &level.score[SC_SCHLUESSEL], TEXT_COLLECTING },
+ { EL_AMOEBE_NASS, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_NORM, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_VOLL, &level.amoeba_speed, TEXT_SPEED },
+ { EL_AMOEBE_BD, &level.amoeba_speed, TEXT_SPEED },
+ { EL_MAGIC_WALL_OFF,&level.time_magic_wall, TEXT_DURATION },
+ { EL_ABLENK_AUS, &level.time_wheel, TEXT_DURATION },
{ -1, NULL, NULL }
};
{
if (elements_with_counter[i].element == properties_element)
{
- int x = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].x + xoffset_right;
- int y = counterbutton_info[ED_COUNTER_ID_ELEM_SCORE].y + yoffset_right;
-
- gadget_elem_score_value = elements_with_counter[i].counter_value;
+ int x = counterbutton_info[counter_id].x + xoffset_right;
+ int y = counterbutton_info[counter_id].y + yoffset_right;
+ counterbutton_info[counter_id].value = elements_with_counter[i].value;
DrawTextF(x, y, font_color, elements_with_counter[i].text);
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE, *gadget_elem_score_value);
- MapCounterButtons(ED_COUNTER_ID_ELEM_SCORE);
+
+ ModifyEditorCounter(counter_id, *counterbutton_info[counter_id].value);
+ MapCounterButtons(counter_id);
break;
}
}
if (HAS_CONTENT(properties_element))
{
-
-#if 1
/* draw stickybutton gadget */
i = ED_CHECKBUTTON_ID_STICK_ELEMENT;
x = checkbutton_info[i].x + xoffset_right2;
ModifyGadget(level_editor_gadget[checkbutton_info[i].gadget_id],
GDI_CHECKED, *checkbutton_info[i].value, GDI_END);
MapCheckbuttonGadget(i);
-#endif
-
if (IS_AMOEBOID(properties_element))
DrawAmoebaContentArea();
static int brush_width, brush_height;
static int last_cursor_x = -1, last_cursor_y = -1;
static boolean delete_old_brush;
- int new_element;
+ int new_element = BUTTON_ELEMENT(button);
int x, y;
if (mode == CB_DELETE_OLD_CURSOR && !delete_old_brush)
return;
- new_element = (button == 1 ? new_element1 :
- button == 2 ? new_element2 :
- button == 3 ? new_element3 : 0);
-
if (mode == CB_AREA_TO_BRUSH)
{
int from_lx, from_ly;
}
}
- /*
- printf("%d, %d - %d, %d in level and screen\n",
- border_from_x, border_from_y, border_to_x, border_to_y);
- */
-
if (mode != CB_DELETE_OLD_CURSOR)
DrawAreaBorder(border_from_x, border_from_y, border_to_x, border_to_y);
- /*
- if (mode == CB_BRUSH_TO_LEVEL)
- CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
- */
-
last_cursor_x = cursor_x;
last_cursor_y = cursor_y;
delete_old_brush = TRUE;
for(y=0; y<lev_fieldy; y++)
UndoBuffer[undo_buffer_position][x][y] = Feld[x][y];
- /* check if change of border style was forced by drawing operation */
+ /* check if drawing operation forces change of border style */
last_border_element = BorderElement;
SetBorderElement();
if (BorderElement != last_border_element)
/* handle info callback for each invocation of action callback */
gi->callback_info(gi);
- /*
- if (edit_mode != ED_MODE_DRAWING)
- return;
- */
-
button_press_event = (gi->event.type == GD_EVENT_PRESSED);
button_release_event = (gi->event.type == GD_EVENT_RELEASED);
if (!button && !button_release_event)
return;
-
-#if 0
- if (button_release_event)
- button = 0;
-#endif
-
-#if 0
- if (!draw_level && drawing_function != GADGET_ID_SINGLE_ITEMS)
- return;
-#endif
-
/* automatically switch to 'single item' drawing mode, if needed */
actual_drawing_function =
(draw_level ? drawing_function : GADGET_ID_SINGLE_ITEMS);
el2gfx(new_element));
if (id == GADGET_ID_AMOEBA_CONTENT)
- level.amoebe_inhalt = new_element;
+ level.amoeba_content = new_element;
else if (id == GADGET_ID_RANDOM_BACKGROUND)
random_placement_background_element = new_element;
else if (id >= GADGET_ID_ELEM_CONTENT_0 &&
id <= GADGET_ID_ELEM_CONTENT_7)
- level.mampfer_inhalt[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
+ level.yam_content[id - GADGET_ID_ELEM_CONTENT_0][sx][sy] =
new_element;
}
break;
break;
case GADGET_ID_PICK_ELEMENT:
-
- /*
- if (button_press_event)
- PickDrawingElement(button, Feld[lx][ly]);
- */
-
if (button_release_event)
ClickOnGadget(level_editor_gadget[last_drawing_function], MB_LEFT);
else
static void HandleCounterButtons(struct GadgetInfo *gi)
{
- int id = gi->custom_id;
+ int gadget_id = gi->custom_id;
+ int counter_id = gi->custom_type_id;
int button = gi->event.button;
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int *counter_value = counterbutton_info[counter_id].value;
+ int step = BUTTON_STEPSIZE(button) *
+ (gadget_id == counterbutton_info[counter_id].gadget_id_down ? -1 : +1);
- switch (id)
+ if (counter_id == ED_COUNTER_ID_SELECT_LEVEL)
{
- case GADGET_ID_ELEM_SCORE_DOWN:
- case GADGET_ID_ELEM_SCORE_UP:
- step *= (id == GADGET_ID_ELEM_SCORE_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_SCORE,
- *gadget_elem_score_value + step);
- break;
- case GADGET_ID_ELEM_SCORE_TEXT:
- *gadget_elem_score_value = gi->text.number_value;
- break;
+ boolean pressed = (gi->event.type == GD_EVENT_PRESSED);
+ boolean released = (gi->event.type == GD_EVENT_RELEASED);
+ boolean level_changed = LevelChanged();
- case GADGET_ID_ELEM_CONTENT_DOWN:
- case GADGET_ID_ELEM_CONTENT_UP:
- step *= (id == GADGET_ID_ELEM_CONTENT_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_ELEM_CONTENT,
- *gadget_elem_content_value + step);
- DrawElementContentAreas();
- break;
- case GADGET_ID_ELEM_CONTENT_TEXT:
- *gadget_elem_content_value = gi->text.number_value;
- DrawElementContentAreas();
- break;
-
- case GADGET_ID_LEVEL_XSIZE_DOWN:
- case GADGET_ID_LEVEL_XSIZE_UP:
- step *= (id == GADGET_ID_LEVEL_XSIZE_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_XSIZE,
- *gadget_level_xsize_value + step);
- level.fieldx = lev_fieldx;
- break;
- case GADGET_ID_LEVEL_XSIZE_TEXT:
- *gadget_level_xsize_value = gi->text.number_value;
- level.fieldx = lev_fieldx;
- break;
+ if ((level_changed && pressed) || (!level_changed && released))
+ return;
- case GADGET_ID_LEVEL_YSIZE_DOWN:
- case GADGET_ID_LEVEL_YSIZE_UP:
- step *= (id == GADGET_ID_LEVEL_YSIZE_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_YSIZE,
- *gadget_level_ysize_value + step);
- level.fieldy = lev_fieldy;
- break;
- case GADGET_ID_LEVEL_YSIZE_TEXT:
- *gadget_level_ysize_value = gi->text.number_value;
- level.fieldy = lev_fieldy;
- break;
+ if (level_changed && !Request("Level has changed! Discard changes ?",
+ REQ_ASK))
+ {
+ if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+ ModifyEditorCounter(counter_id, *counter_value);
+ return;
+ }
+ }
- case GADGET_ID_LEVEL_RANDOM_DOWN:
- case GADGET_ID_LEVEL_RANDOM_UP:
- step *= (id == GADGET_ID_LEVEL_RANDOM_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_RANDOM,
- *gadget_level_random_value + step);
- break;
- case GADGET_ID_LEVEL_RANDOM_TEXT:
- *gadget_level_random_value = gi->text.number_value;
- break;
+ if (gadget_id == counterbutton_info[counter_id].gadget_id_text)
+ *counter_value = gi->text.number_value;
+ else
+ ModifyEditorCounter(counter_id, *counter_value + step);
- case GADGET_ID_LEVEL_COLLECT_DOWN:
- case GADGET_ID_LEVEL_COLLECT_UP:
- step *= (id == GADGET_ID_LEVEL_COLLECT_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_COLLECT,
- *gadget_level_collect_value + step);
- break;
- case GADGET_ID_LEVEL_COLLECT_TEXT:
- *gadget_level_collect_value = gi->text.number_value;
+ switch (counter_id)
+ {
+ case ED_COUNTER_ID_ELEM_CONTENT:
+ DrawElementContentAreas();
break;
- case GADGET_ID_LEVEL_TIMELIMIT_DOWN:
- case GADGET_ID_LEVEL_TIMELIMIT_UP:
- step *= (id == GADGET_ID_LEVEL_TIMELIMIT_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMELIMIT,
- *gadget_level_timelimit_value + step);
- break;
- case GADGET_ID_LEVEL_TIMELIMIT_TEXT:
- *gadget_level_timelimit_value = gi->text.number_value;
+ case ED_COUNTER_ID_LEVEL_XSIZE:
+ case ED_COUNTER_ID_LEVEL_YSIZE:
+ lev_fieldx = level.fieldx;
+ lev_fieldy = level.fieldy;
break;
- case GADGET_ID_LEVEL_TIMESCORE_DOWN:
- case GADGET_ID_LEVEL_TIMESCORE_UP:
- step *= (id == GADGET_ID_LEVEL_TIMESCORE_DOWN ? -1 : 1);
- ModifyEditorCounter(ED_COUNTER_ID_LEVEL_TIMESCORE,
- *gadget_level_timescore_value + step);
- break;
- case GADGET_ID_LEVEL_TIMESCORE_TEXT:
- *gadget_level_timescore_value = gi->text.number_value;
+ case ED_COUNTER_ID_SELECT_LEVEL:
+ LoadLevel(level_nr);
+ ResetUndoBuffer();
+ DrawEditModeWindow();
break;
default:
static void HandleTextInputGadgets(struct GadgetInfo *gi)
{
- int id = gi->custom_id;
-
- switch (id)
- {
- case GADGET_ID_LEVEL_NAME:
- strcpy(level.name, gi->text.value);
- break;
+ strcpy(textinput_info[gi->custom_type_id].value, gi->text.value);
+}
- case GADGET_ID_LEVEL_AUTHOR:
- strcpy(level.author, gi->text.value);
- break;
+static void HandleRadiobuttons(struct GadgetInfo *gi)
+{
+ *radiobutton_info[gi->custom_type_id].value =
+ radiobutton_info[gi->custom_type_id].checked_value;
+}
- default:
- break;
- }
+static void HandleCheckbuttons(struct GadgetInfo *gi)
+{
+ *checkbutton_info[gi->custom_type_id].value ^= TRUE;
}
static void HandleControlButtons(struct GadgetInfo *gi)
{
int id = gi->custom_id;
int button = gi->event.button;
- int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int step = BUTTON_STEPSIZE(button);
int new_element = BUTTON_ELEMENT(button);
- int player_present = FALSE;
- int level_changed = FALSE;
int i, x, y;
if (edit_mode == ED_MODE_DRAWING && drawing_function == GADGET_ID_TEXT)
case GADGET_ID_SCROLL_LEFT:
if (level_xpos >= 0)
{
- int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldx < ed_fieldx - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_RIGHT:
if (level_xpos <= lev_fieldx - ed_fieldx)
{
- int gadget_id = GADGET_ID_SCROLL_HORIZONTAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldx < ed_fieldx - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_UP:
if (level_ypos >= 0)
{
- int gadget_id = GADGET_ID_SCROLL_VERTICAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldy < ed_fieldy - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
case GADGET_ID_SCROLL_DOWN:
if (level_ypos <= lev_fieldy - ed_fieldy)
{
- int gadget_id = GADGET_ID_SCROLL_VERTICAL;
- struct GadgetInfo *gi = level_editor_gadget[gadget_id];
-
if (lev_fieldy < ed_fieldy - 2)
break;
else
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
- ModifyGadget(gi, GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
}
break;
DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
break;
- case GADGET_ID_ELEMENTLIST_UP:
- case GADGET_ID_ELEMENTLIST_DOWN:
- step *= (id == GADGET_ID_ELEMENTLIST_UP ? -1 : +1);
- element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+ case GADGET_ID_SCROLL_LIST_UP:
+ case GADGET_ID_SCROLL_LIST_DOWN:
+ case GADGET_ID_SCROLL_LIST_VERTICAL:
+ if (id == GADGET_ID_SCROLL_LIST_VERTICAL)
+ element_shift = gi->event.item_position * ED_ELEMENTLIST_BUTTONS_HORIZ;
+ else
+ {
+ step *= (id == GADGET_ID_SCROLL_LIST_UP ? -1 : +1);
+ element_shift += step * ED_ELEMENTLIST_BUTTONS_HORIZ;
+
+ if (element_shift < 0)
+ element_shift = 0;
+ if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
+ element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
- if (element_shift < 0)
- element_shift = 0;
- if (element_shift > elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS)
- element_shift = elements_in_list - ED_NUM_ELEMENTLIST_BUTTONS;
+ ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL],
+ GDI_SCROLLBAR_ITEM_POSITION,
+ element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END);
+ }
for (i=0; i<ED_NUM_ELEMENTLIST_BUTTONS; i++)
{
break;
case GADGET_ID_SAVE:
- if (leveldir[leveldir_nr].readonly)
+ if (leveldir_current->readonly)
{
Request("This level is read only !", REQ_CONFIRM);
break;
}
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] != Ur[x][y])
- level_changed = TRUE;
-
- if (0 && !level_changed)
- {
- Request("Level has not changed !", REQ_CONFIRM);
- break;
- }
-
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == EL_SPIELFIGUR ||
- Feld[x][y] == EL_SPIELER1 ||
- Feld[x][y] == EL_SP_MURPHY)
- player_present = TRUE;
-
- if (!player_present)
+ if (!LevelContainsPlayer)
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
else
{
break;
case GADGET_ID_TEST:
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == EL_SPIELFIGUR ||
- Feld[x][y] == EL_SPIELER1 ||
- Feld[x][y] == EL_SP_MURPHY)
- player_present = TRUE;
-
- if (!player_present)
+ if (!LevelContainsPlayer)
Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
else
{
Ur[x][y] = Feld[x][y];
UnmapLevelEditorGadgets();
-
- /* draw smaller door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 64,
- 108, 64,
- EX - 4, EY - 12);
- redraw_mask |= REDRAW_ALL;
+ UndrawSpecialEditorDoor();
CloseDoor(DOOR_CLOSE_ALL);
break;
case GADGET_ID_EXIT:
- for(y=0; y<lev_fieldy; y++)
- for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] != Ur[x][y])
- level_changed = TRUE;
-
- if (!level_changed ||
+ if (!LevelChanged() ||
Request("Level has changed! Exit without saving ?",
REQ_ASK | REQ_STAY_OPEN))
{
CloseDoor(DOOR_CLOSE_ALL);
*/
- /* draw smaller door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 64,
- 108, 64,
- EX - 4, EY - 12);
- redraw_mask |= REDRAW_ALL;
-
game_status = MAINMENU;
DrawMainMenu();
}
}
break;
- case GADGET_ID_RANDOM_PERCENTAGE:
- *radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].value =
- radiobutton_info[ED_RADIOBUTTON_ID_PERCENTAGE].checked_value;
- break;
-
- case GADGET_ID_RANDOM_QUANTITY:
- *radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].value =
- radiobutton_info[ED_RADIOBUTTON_ID_QUANTITY].checked_value;
- break;
-
- case GADGET_ID_RANDOM_RESTRICTED:
- *checkbutton_info[ED_CHECKBUTTON_ID_RANDOM_RESTRICTED].value ^= TRUE;
- break;
-
- case GADGET_ID_DOUBLE_SPEED:
- *checkbutton_info[ED_CHECKBUTTON_ID_DOUBLE_SPEED].value ^= TRUE;
- break;
-
- case GADGET_ID_STICK_ELEMENT:
- *checkbutton_info[ED_CHECKBUTTON_ID_STICK_ELEMENT].value ^= TRUE;
- break;
-
default:
if (id >= GADGET_ID_ELEMENTLIST_FIRST &&
id <= GADGET_ID_ELEMENTLIST_LAST)
id = GADGET_ID_SCROLL_DOWN;
break;
case XK_Page_Up:
- id = GADGET_ID_ELEMENTLIST_UP;
+ id = GADGET_ID_SCROLL_LIST_UP;
button = 3;
break;
case XK_Page_Down:
- id = GADGET_ID_ELEMENTLIST_DOWN;
+ id = GADGET_ID_SCROLL_LIST_DOWN;
button = 3;
break;
ClickOnGadget(level_editor_gadget[id], button);
else if (letter == '.')
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
+ else if (key == XK_space || key == XK_Return)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_TEST], button);
else
for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
if (letter && letter == control_info[i].shortcut)
{
struct GadgetInfo *gi = (struct GadgetInfo *)ptr;
char infotext[MAX_INFOTEXT_LEN + 1];
- char shortcut[20];
+ char shortcut[MAX_INFOTEXT_LEN + 1];
ClearEditorGadgetInfoText();
if (key)
{
- sprintf(shortcut, " ('%s%c')",
- (key >= 'A' && key <= 'Z' ? "Shift-" :
- gi->custom_id == GADGET_ID_SINGLE_ITEMS ? ".' or '" : ""),
- key);
+ if (gi->custom_id == GADGET_ID_SINGLE_ITEMS) /* special case 1 */
+ sprintf(shortcut, " ('.' or '%c')", key);
+ else if (gi->custom_id == GADGET_ID_TEST) /* special case 2 */
+ sprintf(shortcut, " ('Enter' or 'Shift-%c')", key);
+ else /* normal case */
+ sprintf(shortcut, " ('%s%c')",
+ (key >= 'A' && key <= 'Z' ? "Shift-" : ""), key);
if (strlen(infotext) + strlen(shortcut) <= MAX_INFOTEXT_LEN)
strcat(infotext, shortcut);
if (game_status != PLAYING)
{
XSync(display, FALSE);
- Delay(10);
+ if (!XPending(display)) /* delay only if no pending events */
+ Delay(10);
}
/* refresh window contents from drawing buffer, if needed */
would be far better) set for each X11 window individually.
The effect would be keyboard auto repeat while playing the game
(game_status == PLAYING), which is not desired.
- To avoid this special case, we just wait 1/50 second before
+ To avoid this special case, we just wait 1/10 second before
processing the 'FocusIn' event.
*/
- Delay(20);
if (game_status == PLAYING)
+ {
+ Delay(100);
XAutoRepeatOff(display);
+ }
if (old_joystick_status != -1)
joystick_status = old_joystick_status;
}
{
old_mx = mx;
old_my = my;
-
- /*
- HandleVideoButtons(mx,my, button);
- HandleSoundButtons(mx,my, button);
- HandleGameButtons(mx,my, button);
- */
}
HandleGadgets(mx, my, button);
break;
case HALLOFFAME:
- HandleHallOfFame(button);
+ HandleHallOfFame(0,0, 0,0, button);
break;
case LEVELED:
if (key_status == KEY_RELEASED)
return;
- if (key == XK_Return && game_status == PLAYING && AllPlayersGone)
+ if ((key == XK_Return || key == XK_space) &&
+ game_status == PLAYING && AllPlayersGone)
{
CloseDoor(DOOR_CLOSE_1);
game_status = MAINMENU;
/* allow quick escape to the main menu with the Escape key */
if (key == XK_Escape && game_status != MAINMENU)
{
- if (game_status == LEVELED)
- {
- /* draw smaller door */
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX7, 64,
- 108, 64,
- EX - 4, EY - 12);
- redraw_mask |= REDRAW_ALL;
- }
-
CloseDoor(DOOR_CLOSE_1 | DOOR_OPEN_2 | DOOR_NO_DELAY);
game_status = MAINMENU;
DrawMainMenu();
switch(key)
{
case XK_Return:
+ case XK_space:
if (game_status == MAINMENU)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
else if (game_status == CHOOSELEVEL)
HandleSetupInputScreen(0,0, 0,0, MB_MENU_CHOICE);
break;
+ case XK_Page_Up:
+ if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
+ break;
+
+ case XK_Page_Down:
+ if (game_status == CHOOSELEVEL)
+ HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
+ break;
+
default:
break;
}
switch(key)
{
case XK_Return:
+ case XK_space:
game_status = MAINMENU;
DrawMainMenu();
BackToFront();
break;
+ case XK_Page_Up:
+ HandleHallOfFame(0,0, 0,-SCR_FIELDY, MB_MENU_MARK);
+ break;
+
+ case XK_Page_Down:
+ HandleHallOfFame(0,0, 0,SCR_FIELDY, MB_MENU_MARK);
+ break;
+
default:
break;
}
break;
#endif
-#if 1
+#if 0
case XK_m:
if (MoveSpeed == 8)
{
}
case HALLOFFAME:
- HandleHallOfFame(!newbutton);
+ HandleHallOfFame(0,0, dx,dy, !newbutton);
break;
case HELPSCREEN:
#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 17 /* unused level header bytes */
+#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 /* old 1.0 file version */
-#define FILE_VERSION_1_2 12 /* actual file version */
+#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) */
/* file identifier strings */
-#define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2"
+#define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.4"
#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 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 */
#ifndef MSDOS
#define USERDATA_DIRECTORY ".rocksndiamonds"
+#define LEVELSETUP_DIRECTORY "levelsetup"
#define SETUP_FILENAME "setup.conf"
#define LEVELSETUP_FILENAME "levelsetup.conf"
#define LEVELINFO_FILENAME "levelinfo.conf"
#define SCOREFILE_EXTENSION "score"
#else
#define USERDATA_DIRECTORY "userdata"
+#define LEVELSETUP_DIRECTORY "lvlsetup"
#define SETUP_FILENAME "setup.cnf"
#define LEVELSETUP_FILENAME "lvlsetup.cnf"
#define LEVELINFO_FILENAME "lvlinfo.cnf"
#define LEVELCLASS_CONTRIBUTION_END 299
#define LEVELCLASS_USER_START 300
#define LEVELCLASS_USER_END 399
+#define LEVELCLASS_BD_START 400
+#define LEVELCLASS_BD_END 499
+#define LEVELCLASS_EM_START 500
+#define LEVELCLASS_EM_END 599
+#define LEVELCLASS_SP_START 600
+#define LEVELCLASS_SP_END 699
+#define LEVELCLASS_DX_START 700
+#define LEVELCLASS_DX_END 799
#define LEVELCLASS_TUTORIAL LEVELCLASS_TUTORIAL_START
#define LEVELCLASS_CLASSICS LEVELCLASS_CLASSICS_START
#define LEVELCLASS_CONTRIBUTION LEVELCLASS_CONTRIBUTION_START
#define LEVELCLASS_USER LEVELCLASS_USER_START
+#define LEVELCLASS_BD LEVELCLASS_BD_START
+#define LEVELCLASS_EM LEVELCLASS_EM_START
+#define LEVELCLASS_SP LEVELCLASS_SP_START
+#define LEVELCLASS_DX LEVELCLASS_DX_START
+
#define LEVELCLASS_UNDEFINED 999
-#define IS_LEVELCLASS_TUTORIAL(n) \
- (leveldir[n].sort_priority >= LEVELCLASS_TUTORIAL_START && \
- leveldir[n].sort_priority <= LEVELCLASS_TUTORIAL_END)
-#define IS_LEVELCLASS_CLASSICS(n) \
- (leveldir[n].sort_priority >= LEVELCLASS_CLASSICS_START && \
- leveldir[n].sort_priority <= LEVELCLASS_CLASSICS_END)
-#define IS_LEVELCLASS_CONTRIBUTION(n) \
- (leveldir[n].sort_priority >= LEVELCLASS_CONTRIBUTION_START && \
- leveldir[n].sort_priority <= LEVELCLASS_CONTRIBUTION_END)
-#define IS_LEVELCLASS_USER(n) \
- (leveldir[n].sort_priority >= LEVELCLASS_USER_START && \
- leveldir[n].sort_priority <= LEVELCLASS_USER_END)
+#define NUM_LEVELCLASS_DESC 8
+char *levelclass_desc[NUM_LEVELCLASS_DESC] =
+{
+ "Tutorial Levels",
+ "Classic Originals",
+ "Contributions",
+ "Private Levels",
+ "Boulderdash",
+ "Emerald Mine",
+ "Supaplex",
+ "DX Boulderdash"
+};
+
+#define IS_LEVELCLASS_TUTORIAL(p) \
+ ((p)->sort_priority >= LEVELCLASS_TUTORIAL_START && \
+ (p)->sort_priority <= LEVELCLASS_TUTORIAL_END)
+#define IS_LEVELCLASS_CLASSICS(p) \
+ ((p)->sort_priority >= LEVELCLASS_CLASSICS_START && \
+ (p)->sort_priority <= LEVELCLASS_CLASSICS_END)
+#define IS_LEVELCLASS_CONTRIBUTION(p) \
+ ((p)->sort_priority >= LEVELCLASS_CONTRIBUTION_START && \
+ (p)->sort_priority <= LEVELCLASS_CONTRIBUTION_END)
+#define IS_LEVELCLASS_USER(p) \
+ ((p)->sort_priority >= LEVELCLASS_USER_START && \
+ (p)->sort_priority <= LEVELCLASS_USER_END)
+#define IS_LEVELCLASS_BD(p) \
+ ((p)->sort_priority >= LEVELCLASS_BD_START && \
+ (p)->sort_priority <= LEVELCLASS_BD_END)
+#define IS_LEVELCLASS_EM(p) \
+ ((p)->sort_priority >= LEVELCLASS_EM_START && \
+ (p)->sort_priority <= LEVELCLASS_EM_END)
+#define IS_LEVELCLASS_SP(p) \
+ ((p)->sort_priority >= LEVELCLASS_SP_START && \
+ (p)->sort_priority <= LEVELCLASS_SP_END)
+#define IS_LEVELCLASS_DX(p) \
+ ((p)->sort_priority >= LEVELCLASS_DX_START && \
+ (p)->sort_priority <= LEVELCLASS_DX_END)
#define LEVELCLASS(n) (IS_LEVELCLASS_TUTORIAL(n) ? LEVELCLASS_TUTORIAL : \
IS_LEVELCLASS_CLASSICS(n) ? LEVELCLASS_CLASSICS : \
IS_LEVELCLASS_CONTRIBUTION(n) ? LEVELCLASS_CONTRIBUTION : \
IS_LEVELCLASS_USER(n) ? LEVELCLASS_USER : \
+ IS_LEVELCLASS_BD(n) ? LEVELCLASS_BD : \
+ IS_LEVELCLASS_EM(n) ? LEVELCLASS_EM : \
+ IS_LEVELCLASS_SP(n) ? LEVELCLASS_SP : \
+ IS_LEVELCLASS_DX(n) ? LEVELCLASS_DX : \
LEVELCLASS_UNDEFINED)
-#define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \
- IS_LEVELCLASS_CLASSICS(n) ? FC_YELLOW : \
- IS_LEVELCLASS_CONTRIBUTION(n) ? FC_GREEN : \
- IS_LEVELCLASS_USER(n) ? FC_RED : FC_BLUE)
+#define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \
+ IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \
+ IS_LEVELCLASS_BD(n) ? FC_GREEN : \
+ IS_LEVELCLASS_EM(n) ? FC_YELLOW : \
+ IS_LEVELCLASS_SP(n) ? FC_GREEN : \
+ IS_LEVELCLASS_DX(n) ? FC_YELLOW : \
+ IS_LEVELCLASS_CONTRIBUTION(n) ? FC_GREEN : \
+ IS_LEVELCLASS_USER(n) ? FC_RED : \
+ FC_BLUE)
+
+#define LEVELSORTING(n) (IS_LEVELCLASS_TUTORIAL(n) ? 0 : \
+ IS_LEVELCLASS_CLASSICS(n) ? 1 : \
+ IS_LEVELCLASS_BD(n) ? 2 : \
+ IS_LEVELCLASS_EM(n) ? 3 : \
+ IS_LEVELCLASS_SP(n) ? 4 : \
+ IS_LEVELCLASS_DX(n) ? 5 : \
+ IS_LEVELCLASS_CONTRIBUTION(n) ? 6 : \
+ IS_LEVELCLASS_USER(n) ? 7 : \
+ 9)
+
+char *getLevelClassDescription(struct LevelDirInfo *ldi)
+{
+ int position = ldi->sort_priority / 100;
+
+ if (position >= 0 && position < NUM_LEVELCLASS_DESC)
+ return levelclass_desc[position];
+ else
+ return "Unknown Level Class";
+}
static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */
static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */
-static char *getGlobalDataDir()
-{
- return GAME_DIR;
-}
-
char *getUserDataDir()
{
static char *userdata_dir = NULL;
static char *getScoreDir(char *level_subdir)
{
static char *score_dir = NULL;
- char *data_dir = getGlobalDataDir();
+ char *data_dir = options.rw_base_directory;
char *score_subdir = SCORES_DIRECTORY;
if (score_dir)
return score_dir;
}
+static char *getLevelSetupDir(char *level_subdir)
+{
+ static char *levelsetup_dir = NULL;
+ char *data_dir = getUserDataDir();
+ char *levelsetup_subdir = LEVELSETUP_DIRECTORY;
+
+ if (levelsetup_dir)
+ free(levelsetup_dir);
+
+ if (strlen(level_subdir) > 0)
+ levelsetup_dir = getPath3(data_dir, levelsetup_subdir, level_subdir);
+ else
+ levelsetup_dir = getPath2(data_dir, levelsetup_subdir);
+
+ return levelsetup_dir;
+}
+
static char *getLevelFilename(int nr)
{
static char *filename = NULL;
free(filename);
sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION);
- filename = getPath3((leveldir[leveldir_nr].user_defined ?
+ filename = getPath3((leveldir_current->user_defined ?
getUserLevelDir("") :
options.level_directory),
- leveldir[leveldir_nr].filename,
+ leveldir_current->fullpath,
basename);
return filename;
free(filename);
sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION);
- filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename);
+ filename = getPath2(getTapeDir(leveldir_current->filename), basename);
return filename;
}
free(filename);
sprintf(basename, "%03d.%s", nr, SCOREFILE_EXTENSION);
- filename = getPath2(getScoreDir(leveldir[leveldir_nr].filename), basename);
+ filename = getPath2(getScoreDir(leveldir_current->filename), basename);
return filename;
}
}
}
-static void getFileChunk(FILE *file, char *chunk_buffer, int *chunk_length)
+static void InitLevelSetupDirectory(char *level_subdir)
{
- fgets(chunk_buffer, CHUNK_ID_LEN + 1, file);
-
- *chunk_length =
- (fgetc(file) << 24) |
- (fgetc(file) << 16) |
- (fgetc(file) << 8) |
- (fgetc(file) << 0);
-}
-
-static void putFileChunk(FILE *file, char *chunk_name, int chunk_length)
-{
- fputs(chunk_name, file);
-
- fputc((chunk_length >> 24) & 0xff, file);
- fputc((chunk_length >> 16) & 0xff, file);
- fputc((chunk_length >> 8) & 0xff, file);
- fputc((chunk_length >> 0) & 0xff, file);
+ createDirectory(getUserDataDir(), "user data");
+ createDirectory(getLevelSetupDir(""), "main level setup");
+ createDirectory(getLevelSetupDir(level_subdir), "level setup");
}
static void setLevelInfoToDefaults()
Feld[x][y] = Ur[x][y] = EL_ERDREICH;
level.time = 100;
- level.edelsteine = 0;
- level.tempo_amoebe = 10;
- level.dauer_sieb = 10;
- level.dauer_ablenk = 10;
- level.amoebe_inhalt = EL_DIAMANT;
+ level.gems_needed = 0;
+ level.amoeba_speed = 10;
+ level.time_magic_wall = 10;
+ level.time_wheel = 10;
+ level.time_light = 10;
+ level.time_timegate = 10;
+ level.amoeba_content = EL_DIAMANT;
level.double_speed = FALSE;
+ level.gravity = FALSE;
for(i=0; i<MAX_LEVEL_NAME_LEN; i++)
level.name[i] = '\0';
for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
level.score[i] = 10;
- MampferMax = 4;
- for(i=0; i<8; i++)
+ level.num_yam_contents = STD_ELEMENT_CONTENTS;
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
for(x=0; x<3; x++)
for(y=0; y<3; y++)
- level.mampfer_inhalt[i][x][y] = EL_FELSBROCKEN;
+ level.yam_content[i][x][y] = EL_FELSBROCKEN;
Feld[0][0] = Ur[0][0] = EL_SPIELFIGUR;
Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
BorderElement = EL_BETON;
/* try to determine better author name than 'anonymous' */
- if (strcmp(leveldir[leveldir_nr].author, ANONYMOUS_NAME) != 0)
+ if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
{
- strncpy(level.author, leveldir[leveldir_nr].author, MAX_LEVEL_AUTHOR_LEN);
+ strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN);
level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
}
else
{
- switch (LEVELCLASS(leveldir_nr))
+ switch (LEVELCLASS(leveldir_current))
{
case LEVELCLASS_TUTORIAL:
- strcpy(level.author, PROGRAM_AUTHOR_STRING);
- break;
+ strcpy(level.author, PROGRAM_AUTHOR_STRING);
+ break;
case LEVELCLASS_CONTRIBUTION:
- strncpy(level.author, leveldir[leveldir_nr].name,MAX_LEVEL_AUTHOR_LEN);
- level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
- break;
+ strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN);
+ level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+ break;
case LEVELCLASS_USER:
- strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
- level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
- break;
+ strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN);
+ level.author[MAX_LEVEL_AUTHOR_LEN] = '\0';
+ break;
default:
- /* keep default value */
- break;
+ /* keep default value */
+ break;
}
}
}
+static int checkLevelElement(int element)
+{
+ if (element >= EL_FIRST_RUNTIME_EL)
+ {
+ Error(ERR_WARN, "invalid level element %d", element);
+ element = EL_CHAR_FRAGE;
+ }
+
+ return element;
+}
+
void LoadLevel(int level_nr)
{
int i, x, y;
char *filename = getLevelFilename(level_nr);
char cookie[MAX_LINE_LEN];
char chunk[CHUNK_ID_LEN + 1];
- int file_version = FILE_VERSION_1_2; /* last version of level files */
+ boolean encoding_16bit = FALSE; /* default: maximal 256 elements */
+ int file_version = FILE_VERSION_1_4; /* last version of level files */
int chunk_length;
FILE *file;
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 */
{
Error(ERR_WARN, "wrong file identifier of level file '%s'", filename);
/* read chunk "HEAD" */
if (file_version >= FILE_VERSION_1_2)
{
- getFileChunk(file, chunk, &chunk_length);
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE)
{
Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename);
lev_fieldx = level.fieldx = fgetc(file);
lev_fieldy = level.fieldy = fgetc(file);
- level.time = (fgetc(file)<<8) | fgetc(file);
- level.edelsteine = (fgetc(file)<<8) | 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[i] = fgetc(file);
level.name[MAX_LEVEL_NAME_LEN] = 0;
for(i=0; i<LEVEL_SCORE_ELEMENTS; i++)
- level.score[i] = fgetc(file);
+ level.score[i] = fgetc(file);
- MampferMax = 4;
- for(i=0; i<8; i++)
+ 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++)
{
- if (i < 4)
- level.mampfer_inhalt[i][x][y] = fgetc(file);
+ if (i < STD_ELEMENT_CONTENTS)
+ level.yam_content[i][x][y] = checkLevelElement(fgetc(file));
else
- level.mampfer_inhalt[i][x][y] = EL_LEERRAUM;
+ level.yam_content[i][x][y] = EL_LEERRAUM;
}
}
}
- level.tempo_amoebe = fgetc(file);
- level.dauer_sieb = fgetc(file);
- level.dauer_ablenk = fgetc(file);
- level.amoebe_inhalt = 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);
+
+ encoding_16bit = (fgetc(file) == 1 ? TRUE : FALSE);
for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* skip unused header bytes */
fgetc(file);
- /* read chunk "BODY" */
if (file_version >= FILE_VERSION_1_2)
{
- getFileChunk(file, chunk, &chunk_length);
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
/* look for optional author chunk */
if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN)
level.author[i] = fgetc(file);
level.author[MAX_LEVEL_NAME_LEN] = 0;
- getFileChunk(file, chunk, &chunk_length);
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
}
/* look for optional content chunk */
- if (strcmp(chunk, "CONT") == 0 && chunk_length == 4 + 8 * 3 * 3)
+ if (strcmp(chunk, "CONT") == 0 &&
+ chunk_length == 4 + MAX_ELEMENT_CONTENTS * 3 * 3)
{
fgetc(file);
- MampferMax = fgetc(file);
+ level.num_yam_contents = fgetc(file);
fgetc(file);
fgetc(file);
- for(i=0; i<8; i++)
+ 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;
+ }
+
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
for(y=0; y<3; y++)
for(x=0; x<3; x++)
- level.mampfer_inhalt[i][x][y] = fgetc(file);
+ level.yam_content[i][x][y] =
+ checkLevelElement(encoding_16bit ?
+ getFile16BitInteger(file,
+ BYTE_ORDER_BIG_ENDIAN) :
+ fgetc(file));
- getFileChunk(file, chunk, &chunk_length);
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
}
/* next check body chunk identifier and chunk length */
/* 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] = fgetc(file);
+ Feld[x][y] = Ur[x][y] =
+ checkLevelElement(encoding_16bit ?
+ getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) :
+ fgetc(file));
fclose(file);
/* player was faster than monsters in pre-1.0 levels */
if (file_version == FILE_VERSION_1_0 &&
- IS_LEVELCLASS_CONTRIBUTION(leveldir_nr))
+ IS_LEVELCLASS_CONTRIBUTION(leveldir_current))
{
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;
}
+
+ /* determine border element for this level */
+ SetBorderElement();
}
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;
FILE *file;
if (!(file = fopen(filename, "w")))
return;
}
- fputs(LEVEL_COOKIE, file); /* file identifier */
+ /* 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++)
+ 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);
+ putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
fputc(level.fieldx, file);
fputc(level.fieldy, file);
- fputc(level.time / 256, file);
- fputc(level.time % 256, file);
- fputc(level.edelsteine / 256, file);
- fputc(level.edelsteine % 256, file);
+
+ putFile16BitInteger(file, level.time, BYTE_ORDER_BIG_ENDIAN);
+ putFile16BitInteger(file, level.gems_needed, BYTE_ORDER_BIG_ENDIAN);
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<4; i++)
+ for(i=0; i<STD_ELEMENT_CONTENTS; i++)
for(y=0; y<3; y++)
for(x=0; x<3; x++)
- fputc(level.mampfer_inhalt[i][x][y], file);
- fputc(level.tempo_amoebe, file);
- fputc(level.dauer_sieb, file);
- fputc(level.dauer_ablenk, file);
- fputc(level.amoebe_inhalt, file);
+ 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);
+
+ fputc((encoding_16bit ? 1 : 0), file);
for(i=0; i<LEVEL_HEADER_UNUSED; i++) /* set unused header bytes to zero */
fputc(0, file);
- putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN);
+ putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN);
for(i=0; i<MAX_LEVEL_AUTHOR_LEN; i++)
fputc(level.author[i], file);
- putFileChunk(file, "CONT", 4 + 8 * 3 * 3);
+ putFileChunk(file, "CONT", 4 + MAX_ELEMENT_CONTENTS * 3 * 3,
+ BYTE_ORDER_BIG_ENDIAN);
fputc(EL_MAMPFER, file);
- fputc(MampferMax, file);
+ fputc(level.num_yam_contents, file);
fputc(0, file);
fputc(0, file);
- for(i=0; i<8; i++)
+ for(i=0; i<MAX_ELEMENT_CONTENTS; i++)
for(y=0; y<3; y++)
for(x=0; x<3; x++)
- fputc(level.mampfer_inhalt[i][x][y], file);
+ 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", lev_fieldx * lev_fieldy);
+ putFileChunk(file, "BODY", lev_fieldx * lev_fieldy, BYTE_ORDER_BIG_ENDIAN);
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
- fputc(Ur[x][y], file);
+ if (encoding_16bit)
+ putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN);
+ else
+ fputc(Ur[x][y], file);
fclose(file);
/* read chunk "HEAD" */
if (file_version >= FILE_VERSION_1_2)
{
- /* first check header chunk identifier and chunk length */
- fgets(chunk, CHUNK_ID_LEN + 1, file);
- chunk_length =
- (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
-
+ 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);
}
}
- tape.random_seed =
- (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
- tape.date =
- (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
- tape.length =
- (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+ 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)
/* read chunk "BODY" */
if (file_version >= FILE_VERSION_1_2)
{
- /* next check body chunk identifier and chunk length */
- fgets(chunk, CHUNK_ID_LEN + 1, file);
- chunk_length =
- (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file);
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN);
if (strcmp(chunk, "BODY") ||
chunk_length != (num_participating_players + 1) * tape.length)
{
boolean new_tape = TRUE;
byte store_participating_players;
int num_participating_players;
- int chunk_length;
- InitTapeDirectory(leveldir[leveldir_nr].filename);
+ InitTapeDirectory(leveldir_current->filename);
/* if a tape still exists, ask to overwrite it */
if (access(filename, F_OK) == 0)
fputs(TAPE_COOKIE, file); /* file identifier */
fputc('\n', file);
- fputs("HEAD", file); /* chunk identifier for file header */
-
- chunk_length = TAPE_HEADER_SIZE;
-
- fputc((chunk_length >> 24) & 0xff, file);
- fputc((chunk_length >> 16) & 0xff, file);
- fputc((chunk_length >> 8) & 0xff, file);
- fputc((chunk_length >> 0) & 0xff, file);
-
- fputc((tape.random_seed >> 24) & 0xff, file);
- fputc((tape.random_seed >> 16) & 0xff, file);
- fputc((tape.random_seed >> 8) & 0xff, file);
- fputc((tape.random_seed >> 0) & 0xff, file);
-
- fputc((tape.date >> 24) & 0xff, file);
- fputc((tape.date >> 16) & 0xff, file);
- fputc((tape.date >> 8) & 0xff, file);
- fputc((tape.date >> 0) & 0xff, file);
+ putFileChunk(file, "HEAD", TAPE_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN);
- fputc((tape.length >> 24) & 0xff, file);
- fputc((tape.length >> 16) & 0xff, file);
- fputc((tape.length >> 8) & 0xff, file);
- fputc((tape.length >> 0) & 0xff, file);
+ 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);
for(i=0; i<TAPE_HEADER_UNUSED; i++) /* set unused header bytes to zero */
fputc(0, file);
- fputs("BODY", file); /* chunk identifier for file body */
- chunk_length = (num_participating_players + 1) * tape.length;
-
- fputc((chunk_length >> 24) & 0xff, file);
- fputc((chunk_length >> 16) & 0xff, file);
- fputc((chunk_length >> 8) & 0xff, file);
- fputc((chunk_length >> 0) & 0xff, file);
+ putFileChunk(file, "BODY", (num_participating_players + 1) * tape.length,
+ BYTE_ORDER_BIG_ENDIAN);
for(i=0; i<tape.length; i++)
{
fscanf(file, "%d", &highscore[i].Score);
fgets(line, MAX_LINE_LEN, file);
- if (line[strlen(line)-1] == '\n')
- line[strlen(line)-1] = '\0';
+ if (line[strlen(line) - 1] == '\n')
+ line[strlen(line) - 1] = '\0';
for (line_ptr = line; *line_ptr; line_ptr++)
{
if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0')
{
- strncpy(highscore[i].Name, line_ptr, MAX_NAMELEN - 1);
- highscore[i].Name[MAX_NAMELEN - 1] = '\0';
+ strncpy(highscore[i].Name, line_ptr, MAX_PLAYER_NAME_LEN);
+ highscore[i].Name[MAX_PLAYER_NAME_LEN] = '\0';
break;
}
}
char *filename = getScoreFilename(level_nr);
FILE *file;
- InitScoreDirectory(leveldir[leveldir_nr].filename);
+ InitScoreDirectory(leveldir_current->filename);
if (!(file = fopen(filename, "w")))
{
#define TOKEN_STR_FILE_IDENTIFIER "file_identifier"
#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
#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
-#define SETUP_TOKEN_SCROLL_DELAY 7
-#define SETUP_TOKEN_SOFT_SCROLLING 8
-#define SETUP_TOKEN_FADING 9
-#define SETUP_TOKEN_AUTORECORD 10
-#define SETUP_TOKEN_QUICK_DOORS 11
-#define SETUP_TOKEN_TEAM_MODE 12
+#endif
+
+#define SETUP_TOKEN_SCROLL_DELAY 5
+#define SETUP_TOKEN_SOFT_SCROLLING 6
+#define SETUP_TOKEN_FADING 7
+#define SETUP_TOKEN_AUTORECORD 8
+#define SETUP_TOKEN_QUICK_DOORS 9
+#define SETUP_TOKEN_TEAM_MODE 10
+#define SETUP_TOKEN_HANDICAP 11
+#define SETUP_TOKEN_TIME_LIMIT 12
/* player setup */
#define SETUP_TOKEN_USE_JOYSTICK 13
/* level directory info */
#define LEVELINFO_TOKEN_NAME 29
-#define LEVELINFO_TOKEN_AUTHOR 30
-#define LEVELINFO_TOKEN_LEVELS 31
-#define LEVELINFO_TOKEN_FIRST_LEVEL 32
-#define LEVELINFO_TOKEN_SORT_PRIORITY 33
-#define LEVELINFO_TOKEN_READONLY 34
+#define LEVELINFO_TOKEN_NAME_SHORT 30
+#define LEVELINFO_TOKEN_NAME_SORTING 31
+#define LEVELINFO_TOKEN_AUTHOR 32
+#define LEVELINFO_TOKEN_IMPORTED_FROM 33
+#define LEVELINFO_TOKEN_LEVELS 34
+#define LEVELINFO_TOKEN_FIRST_LEVEL 35
+#define LEVELINFO_TOKEN_SORT_PRIORITY 36
+#define LEVELINFO_TOKEN_LEVEL_GROUP 37
+#define LEVELINFO_TOKEN_READONLY 38
#define FIRST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_PLAYER_NAME
-#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_TEAM_MODE
+#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_TIME_LIMIT
#define FIRST_PLAYER_SETUP_TOKEN SETUP_TOKEN_USE_JOYSTICK
#define LAST_PLAYER_SETUP_TOKEN SETUP_TOKEN_KEY_BOMB
{ 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_SWITCH, &si.autorecord, "automatic_tape_recording" },
{ TYPE_SWITCH, &si.quick_doors, "quick_doors" },
{ TYPE_SWITCH, &si.team_mode, "team_mode" },
+ { TYPE_SWITCH, &si.handicap, "handicap" },
+ { TYPE_SWITCH, &si.time_limit, "time_limit" },
/* player setup */
{ TYPE_BOOLEAN, &sii.use_joystick, ".use_joystick" },
/* level directory info */
{ TYPE_STRING, &ldi.name, "name" },
+ { TYPE_STRING, &ldi.name_short, "name_short" },
+ { TYPE_STRING, &ldi.name_sorting, "name_sorting" },
{ TYPE_STRING, &ldi.author, "author" },
+ { TYPE_STRING, &ldi.imported_from, "imported_from" },
{ TYPE_INTEGER, &ldi.levels, "levels" },
{ TYPE_INTEGER, &ldi.first_level, "first_level" },
{ TYPE_INTEGER, &ldi.sort_priority, "sort_priority" },
+ { TYPE_BOOLEAN, &ldi.level_group, "level_group" },
{ TYPE_BOOLEAN, &ldi.readonly, "readonly" }
};
static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi)
{
+ ldi->filename = NULL;
+ ldi->fullpath = NULL;
+ ldi->basepath = NULL;
ldi->name = getStringCopy(ANONYMOUS_NAME);
+ ldi->name_short = NULL;
+ ldi->name_sorting = NULL;
ldi->author = getStringCopy(ANONYMOUS_NAME);
+ ldi->imported_from = NULL;
ldi->levels = 0;
ldi->first_level = 0;
+ ldi->last_level = 0;
ldi->sort_priority = LEVELCLASS_UNDEFINED; /* default: least priority */
+ ldi->level_group = FALSE;
+ ldi->parent_link = FALSE;
+ ldi->user_defined = FALSE;
ldi->readonly = TRUE;
+ ldi->color = 0;
+ ldi->class_desc = NULL;
+ ldi->handicap_level = 0;
+ ldi->cl_first = -1;
+ ldi->cl_cursor = -1;
+
+ ldi->node_parent = NULL;
+ ldi->node_group = NULL;
+ ldi->next = NULL;
+}
+
+static void setLevelDirInfoToDefaultsFromParent(struct LevelDirInfo *ldi,
+ struct LevelDirInfo *parent)
+{
+ if (parent == NULL)
+ {
+ setLevelDirInfoToDefaults(ldi);
+ return;
+ }
+
+ /* first copy all values from the parent structure ... */
+ *ldi = *parent;
+
+ /* ... then set all fields to default that cannot be inherited from parent.
+ This is especially important for all those fields that can be set from
+ the 'levelinfo.conf' config file, because the function 'setSetupInfo()'
+ calls 'free()' for all already set token values which requires that no
+ other structure's pointer may point to them!
+ */
+
+ ldi->filename = NULL;
+ ldi->fullpath = NULL;
+ ldi->basepath = NULL;
+ ldi->name = getStringCopy(ANONYMOUS_NAME);
+ ldi->name_short = NULL;
+ ldi->name_sorting = NULL;
+ ldi->author = getStringCopy(parent->author);
+ ldi->imported_from = getStringCopy(parent->imported_from);
+
+ ldi->level_group = FALSE;
+ ldi->parent_link = FALSE;
+
+ ldi->node_parent = parent;
+ ldi->node_group = NULL;
+ ldi->next = NULL;
}
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->fading = FALSE;
si->autorecord = TRUE;
si->quick_doors = FALSE;
+ si->team_mode = FALSE;
+ si->handicap = TRUE;
+ si->time_limit = TRUE;
for (i=0; i<MAX_PLAYERS; i++)
{
}
}
-int getLevelSeriesNrFromLevelSeriesName(char *level_series_name)
-{
- int i;
-
- if (!level_series_name)
- return 0;
-
- for (i=0; i<num_leveldirs; i++)
- if (strcmp(level_series_name, leveldir[i].filename) == 0)
- return i;
-
- return 0;
-}
-
-int getLastPlayedLevelOfLevelSeries(char *level_series_name)
-{
- char *token_value;
- int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name);
- int last_level_nr = leveldir[level_series_nr].first_level;
-
- if (!level_series_name)
- return 0;
-
- token_value = getTokenValue(level_setup_list, level_series_name);
-
- if (token_value)
- {
- last_level_nr = atoi(token_value);
-
- if (last_level_nr < leveldir[level_series_nr].first_level)
- last_level_nr = leveldir[level_series_nr].first_level;
- if (last_level_nr > leveldir[level_series_nr].last_level)
- last_level_nr = leveldir[level_series_nr].last_level;
- }
-
- return last_level_nr;
-}
-
static int compareLevelDirInfoEntries(const void *object1, const void *object2)
{
- const struct LevelDirInfo *entry1 = object1;
- const struct LevelDirInfo *entry2 = object2;
+ const struct LevelDirInfo *entry1 = *((struct LevelDirInfo **)object1);
+ const struct LevelDirInfo *entry2 = *((struct LevelDirInfo **)object2);
int compare_result;
- if (entry1->sort_priority != entry2->sort_priority)
- compare_result = entry1->sort_priority - entry2->sort_priority;
- else
+ if (entry1->parent_link || entry2->parent_link)
+ compare_result = (entry1->parent_link ? -1 : +1);
+ else if (entry1->sort_priority == entry2->sort_priority)
{
- char *name1 = getStringToLower(entry1->name);
- char *name2 = getStringToLower(entry2->name);
+ char *name1 = getStringToLower(entry1->name_sorting);
+ char *name2 = getStringToLower(entry2->name_sorting);
compare_result = strcmp(name1, name2);
free(name1);
free(name2);
}
+ else if (LEVELSORTING(entry1) == LEVELSORTING(entry2))
+ compare_result = entry1->sort_priority - entry2->sort_priority;
+ else
+ compare_result = LEVELSORTING(entry1) - LEVELSORTING(entry2);
return compare_result;
}
-static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry)
+static void createParentLevelDirNode(struct LevelDirInfo *node_parent)
+{
+ struct LevelDirInfo *leveldir_new = newLevelDirInfo();
+
+ setLevelDirInfoToDefaults(leveldir_new);
+
+ leveldir_new->node_parent = node_parent;
+ leveldir_new->parent_link = TRUE;
+
+ leveldir_new->name = ".. (parent directory)";
+ leveldir_new->name_short = getStringCopy(leveldir_new->name);
+ leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
+
+ leveldir_new->filename = "..";
+ leveldir_new->fullpath = getStringCopy(node_parent->fullpath);
+
+ leveldir_new->sort_priority = node_parent->sort_priority;
+ leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
+
+ pushLevelDirInfo(&node_parent->node_group, leveldir_new);
+}
+
+static void LoadLevelInfoFromLevelDir(struct LevelDirInfo **node_first,
+ struct LevelDirInfo *node_parent,
+ char *level_directory)
{
DIR *dir;
- struct stat file_status;
- char *directory = NULL;
- char *filename = NULL;
- struct SetupFileList *setup_file_list = NULL;
struct dirent *dir_entry;
- int i, current_entry = start_entry;
+ boolean valid_entry_found = FALSE;
if ((dir = opendir(level_directory)) == NULL)
{
Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
- return current_entry;
+ return;
}
- while (current_entry < MAX_LEVDIR_ENTRIES)
+ while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */
{
- if ((dir_entry = readdir(dir)) == NULL) /* last directory entry */
- break;
+ struct SetupFileList *setup_file_list = NULL;
+ struct stat file_status;
+ char *directory_name = dir_entry->d_name;
+ char *directory_path = getPath2(level_directory, directory_name);
+ char *filename = NULL;
/* skip entries for current and parent directory */
- if (strcmp(dir_entry->d_name, ".") == 0 ||
- strcmp(dir_entry->d_name, "..") == 0)
+ if (strcmp(directory_name, ".") == 0 ||
+ strcmp(directory_name, "..") == 0)
+ {
+ free(directory_path);
continue;
+ }
/* find out if directory entry is itself a directory */
- directory = getPath2(level_directory, dir_entry->d_name);
- if (stat(directory, &file_status) != 0 || /* cannot stat file */
+ if (stat(directory_path, &file_status) != 0 || /* cannot stat file */
(file_status.st_mode & S_IFMT) != S_IFDIR) /* not a directory */
{
- free(directory);
+ free(directory_path);
continue;
}
- filename = getPath2(directory, LEVELINFO_FILENAME);
+ filename = getPath2(directory_path, LEVELINFO_FILENAME);
setup_file_list = loadSetupFileList(filename);
if (setup_file_list)
{
+ struct LevelDirInfo *leveldir_new = newLevelDirInfo();
+ int i;
+
checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE);
- setLevelDirInfoToDefaults(&leveldir[current_entry]);
+ setLevelDirInfoToDefaultsFromParent(leveldir_new, node_parent);
- ldi = leveldir[current_entry];
+ /* set all structure fields according to the token/value pairs */
+ ldi = *leveldir_new;
for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text));
- leveldir[current_entry] = ldi;
+ *leveldir_new = ldi;
+
+ DrawInitText(leveldir_new->name, 150, FC_YELLOW);
+
+ if (leveldir_new->name_short == NULL)
+ leveldir_new->name_short = getStringCopy(leveldir_new->name);
+
+ if (leveldir_new->name_sorting == NULL)
+ leveldir_new->name_sorting = getStringCopy(leveldir_new->name);
+
+ leveldir_new->filename = getStringCopy(directory_name);
+
+ if (node_parent == NULL) /* top level group */
+ {
+ leveldir_new->basepath = level_directory;
+ leveldir_new->fullpath = leveldir_new->filename;
+ }
+ else /* sub level group */
+ {
+ leveldir_new->basepath = node_parent->basepath;
+ leveldir_new->fullpath = getPath2(node_parent->fullpath,
+ directory_name);
+ }
+
+ if (leveldir_new->levels < 1)
+ leveldir_new->levels = 1;
+
+ leveldir_new->last_level =
+ leveldir_new->first_level + leveldir_new->levels - 1;
+
+ leveldir_new->user_defined =
+ (leveldir_new->basepath == options.level_directory ? FALSE : TRUE);
+
+ leveldir_new->color = LEVELCOLOR(leveldir_new);
+ leveldir_new->class_desc = getLevelClassDescription(leveldir_new);
- leveldir[current_entry].filename = getStringCopy(dir_entry->d_name);
- leveldir[current_entry].last_level =
- leveldir[current_entry].first_level +
- leveldir[current_entry].levels - 1;
- leveldir[current_entry].user_defined =
- (level_directory == options.level_directory ? FALSE : TRUE);
- leveldir[current_entry].color = LEVELCOLOR(current_entry);
+ leveldir_new->handicap_level = /* set handicap to default value */
+ (leveldir_new->user_defined ?
+ leveldir_new->last_level :
+ leveldir_new->first_level);
+
+ pushLevelDirInfo(node_first, leveldir_new);
freeSetupFileList(setup_file_list);
- current_entry++;
+ valid_entry_found = TRUE;
+
+ if (leveldir_new->level_group)
+ {
+ /* create node to link back to current level directory */
+ createParentLevelDirNode(leveldir_new);
+
+ /* step into sub-directory and look for more level series */
+ LoadLevelInfoFromLevelDir(&leveldir_new->node_group,
+ leveldir_new, directory_path);
+ }
}
else
- Error(ERR_WARN, "ignoring level directory '%s'", directory);
+ Error(ERR_WARN, "ignoring level directory '%s'", directory_path);
- free(directory);
+ free(directory_path);
free(filename);
}
- if (current_entry == MAX_LEVDIR_ENTRIES)
- Error(ERR_WARN, "using %d level directories -- ignoring the rest",
- current_entry);
-
closedir(dir);
- if (current_entry == start_entry)
+ if (!valid_entry_found)
Error(ERR_WARN, "cannot find any valid level series in directory '%s'",
level_directory);
-
- return current_entry;
}
void LoadLevelInfo()
{
InitUserLevelDirectory(getLoginName());
- num_leveldirs = 0;
- leveldir_nr = 0;
+ DrawInitText("Loading level series:", 120, FC_GREEN);
- num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory,
- num_leveldirs);
- num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""),
- num_leveldirs);
+ LoadLevelInfoFromLevelDir(&leveldir_first, NULL, options.level_directory);
+ LoadLevelInfoFromLevelDir(&leveldir_first, NULL, getUserLevelDir(""));
- if (num_leveldirs == 0)
+ leveldir_current = getFirstValidLevelSeries(leveldir_first);
+
+ if (leveldir_first == NULL)
Error(ERR_EXIT, "cannot find any valid level series in any directory");
- if (num_leveldirs > 1)
- qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo),
- compareLevelDirInfoEntries);
+ sortLevelDirInfo(&leveldir_first, compareLevelDirInfoEntries);
+
+#if 0
+ dumpLevelDirInfo(leveldir_first, 0);
+#endif
}
static void SaveUserLevelInfo()
getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE));
for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++)
- fprintf(file, "%s\n", getSetupLine("", i));
+ if (i != LEVELINFO_TOKEN_NAME_SHORT &&
+ i != LEVELINFO_TOKEN_NAME_SORTING &&
+ i != LEVELINFO_TOKEN_IMPORTED_FROM)
+ fprintf(file, "%s\n", getSetupLine("", i));
fclose(file);
free(filename);
freeSetupFileList(setup_file_list);
/* needed to work around problems with fixed length strings */
- if (strlen(setup.player_name) >= MAX_NAMELEN)
- setup.player_name[MAX_NAMELEN - 1] = '\0';
- else if (strlen(setup.player_name) < MAX_NAMELEN - 1)
+ if (strlen(setup.player_name) > MAX_PLAYER_NAME_LEN)
+ setup.player_name[MAX_PLAYER_NAME_LEN] = '\0';
+ else if (strlen(setup.player_name) < MAX_PLAYER_NAME_LEN)
{
- char *new_name = checked_malloc(MAX_NAMELEN);
+ char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
strcpy(new_name, setup.player_name);
free(setup.player_name);
chmod(filename, SETUP_PERMS);
}
-void LoadLevelSetup()
+void LoadLevelSetup_LastSeries()
{
char *filename;
+ struct SetupFileList *level_setup_list = NULL;
/* always start with reliable default values */
- leveldir_nr = 0;
- level_nr = 0;
+ leveldir_current = leveldir_first;
- filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
-
- if (level_setup_list)
- freeSetupFileList(level_setup_list);
+ /* ----------------------------------------------------------------------- */
+ /* ~/.rocksndiamonds/levelsetup.conf */
+ /* ----------------------------------------------------------------------- */
- level_setup_list = loadSetupFileList(filename);
+ filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
- if (level_setup_list)
+ if ((level_setup_list = loadSetupFileList(filename)))
{
char *last_level_series =
getTokenValue(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES);
- leveldir_nr = getLevelSeriesNrFromLevelSeriesName(last_level_series);
- level_nr = getLastPlayedLevelOfLevelSeries(last_level_series);
+ leveldir_current = getLevelDirInfoFromFilename(last_level_series);
+ if (leveldir_current == NULL)
+ leveldir_current = leveldir_first;
checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+
+ freeSetupFileList(level_setup_list);
}
else
- {
- level_setup_list = newSetupFileList(TOKEN_STR_FILE_IDENTIFIER,
- LEVELSETUP_COOKIE);
Error(ERR_WARN, "using default setup values");
- }
free(filename);
}
-void SaveLevelSetup()
+void SaveLevelSetup_LastSeries()
{
char *filename;
- struct SetupFileList *list_entry = level_setup_list;
+ char *level_subdir = leveldir_current->filename;
FILE *file;
- InitUserDataDirectory();
-
- setTokenValue(level_setup_list,
- TOKEN_STR_LAST_LEVEL_SERIES, leveldir[leveldir_nr].filename);
+ /* ----------------------------------------------------------------------- */
+ /* ~/.rocksndiamonds/levelsetup.conf */
+ /* ----------------------------------------------------------------------- */
- setTokenValue(level_setup_list,
- leveldir[leveldir_nr].filename, int2str(level_nr, 0));
+ InitUserDataDirectory();
filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME);
fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
LEVELSETUP_COOKIE));
- while (list_entry)
+ fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_LEVEL_SERIES,
+ level_subdir));
+
+ fclose(file);
+ free(filename);
+
+ chmod(filename, SETUP_PERMS);
+}
+
+static void checkSeriesInfo()
+{
+ static char *level_directory = NULL;
+ DIR *dir;
+ struct dirent *dir_entry;
+
+ /* check for more levels besides the 'levels' field of 'levelinfo.conf' */
+
+ level_directory = getPath2((leveldir_current->user_defined ?
+ getUserLevelDir("") :
+ options.level_directory),
+ leveldir_current->filename);
+
+ if ((dir = opendir(level_directory)) == NULL)
+ {
+ Error(ERR_WARN, "cannot read level directory '%s'", level_directory);
+ return;
+ }
+
+ while ((dir_entry = readdir(dir)) != NULL) /* last directory entry */
{
- if (strcmp(list_entry->token, TOKEN_STR_FILE_IDENTIFIER) != 0)
- fprintf(file, "%s\n",
- getFormattedSetupEntry(list_entry->token, list_entry->value));
+ if (strlen(dir_entry->d_name) > 4 &&
+ dir_entry->d_name[3] == '.' &&
+ strcmp(&dir_entry->d_name[4], LEVELFILE_EXTENSION) == 0)
+ {
+ char levelnum_str[4];
+ int levelnum_value;
- /* just to make things nicer :) */
- if (strcmp(list_entry->token, TOKEN_STR_LAST_LEVEL_SERIES) == 0)
- fprintf(file, "\n");
+ strncpy(levelnum_str, dir_entry->d_name, 3);
+ levelnum_str[3] = '\0';
+
+ levelnum_value = atoi(levelnum_str);
+
+ if (levelnum_value < leveldir_current->first_level)
+ {
+ Error(ERR_WARN, "additional level %d found", levelnum_value);
+ leveldir_current->first_level = levelnum_value;
+ }
+ else if (levelnum_value > leveldir_current->last_level)
+ {
+ Error(ERR_WARN, "additional level %d found", levelnum_value);
+ leveldir_current->last_level = levelnum_value;
+ }
+ }
+ }
- list_entry = list_entry->next;
+ closedir(dir);
+}
+
+void LoadLevelSetup_SeriesInfo()
+{
+ char *filename;
+ struct SetupFileList *level_setup_list = NULL;
+ char *level_subdir = leveldir_current->filename;
+
+ /* always start with reliable default values */
+ level_nr = leveldir_current->first_level;
+
+ checkSeriesInfo(leveldir_current);
+
+ /* ----------------------------------------------------------------------- */
+ /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf */
+ /* ----------------------------------------------------------------------- */
+
+ level_subdir = leveldir_current->filename;
+
+ filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
+
+ if ((level_setup_list = loadSetupFileList(filename)))
+ {
+ char *token_value;
+
+ token_value = getTokenValue(level_setup_list, TOKEN_STR_LAST_PLAYED_LEVEL);
+
+ if (token_value)
+ {
+ level_nr = atoi(token_value);
+
+ if (level_nr < leveldir_current->first_level)
+ level_nr = leveldir_current->first_level;
+ if (level_nr > leveldir_current->last_level)
+ level_nr = leveldir_current->last_level;
+ }
+
+ token_value = getTokenValue(level_setup_list, TOKEN_STR_HANDICAP_LEVEL);
+
+ if (token_value)
+ {
+ int level_nr = atoi(token_value);
+
+ if (level_nr < leveldir_current->first_level)
+ level_nr = leveldir_current->first_level;
+ if (level_nr > leveldir_current->last_level + 1)
+ level_nr = leveldir_current->last_level;
+
+ if (leveldir_current->user_defined)
+ level_nr = leveldir_current->last_level;
+
+ leveldir_current->handicap_level = level_nr;
+ }
+
+ checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE);
+
+ freeSetupFileList(level_setup_list);
+ }
+ else
+ Error(ERR_WARN, "using default setup values");
+
+ free(filename);
+}
+
+void SaveLevelSetup_SeriesInfo()
+{
+ char *filename;
+ char *level_subdir = leveldir_current->filename;
+ char *level_nr_str = int2str(level_nr, 0);
+ char *handicap_level_str = int2str(leveldir_current->handicap_level, 0);
+ FILE *file;
+
+ /* ----------------------------------------------------------------------- */
+ /* ~/.rocksndiamonds/levelsetup/<level series>/levelsetup.conf */
+ /* ----------------------------------------------------------------------- */
+
+ InitLevelSetupDirectory(level_subdir);
+
+ filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME);
+
+ if (!(file = fopen(filename, "w")))
+ {
+ Error(ERR_WARN, "cannot write setup file '%s'", filename);
+ free(filename);
+ return;
}
+ fprintf(file, "%s\n\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER,
+ LEVELSETUP_COOKIE));
+ fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_LAST_PLAYED_LEVEL,
+ level_nr_str));
+ fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_HANDICAP_LEVEL,
+ handicap_level_str));
+
fclose(file);
free(filename);
}
#ifdef MSDOS
-static boolean initErrorFile()
+void initErrorFile()
{
char *filename;
- FILE *error_file;
InitUserDataDirectory();
filename = getPath2(getUserDataDir(), ERROR_FILENAME);
- error_file = fopen(filename, "w");
+ unlink(filename);
free(filename);
-
- if (error_file == NULL)
- return FALSE;
-
- fclose(error_file);
-
- return TRUE;
}
FILE *openErrorFile()
{
- static boolean first_access = TRUE;
char *filename;
FILE *error_file;
- if (first_access)
- {
- if (!initErrorFile())
- return NULL;
-
- first_access = FALSE;
- }
-
filename = getPath2(getUserDataDir(), ERROR_FILENAME);
error_file = fopen(filename, "a");
free(filename);
void LoadScore(int);
void SaveScore(int);
-int getLastPlayedLevelOfLevelSeries(char *);
-
void LoadLevelInfo(void);
void LoadSetup(void);
void SaveSetup(void);
-void LoadLevelSetup(void);
-void SaveLevelSetup(void);
+void LoadLevelSetup_LastSeries(void);
+void SaveLevelSetup_LastSeries(void);
+void LoadLevelSetup_SeriesInfo(void);
+void SaveLevelSetup_SeriesInfo(void);
#ifdef MSDOS
+void initErrorFile();
FILE *openErrorFile();
void dumpErrorFile();
#endif
#include "joystick.h"
#include "network.h"
+/* this switch controls how rocks move horizontally */
+#define OLD_GAME_BEHAVIOUR FALSE
+
/* for DigField() */
#define DF_NO_PUSH 0
#define DF_DIG 1
(s)==SND_TYGER || (s)==SND_VOYAGER || \
(s)==SND_TWILIGHT)
-/* score for elements */
-#define SC_EDELSTEIN 0
-#define SC_DIAMANT 1
-#define SC_KAEFER 2
-#define SC_FLIEGER 3
-#define SC_MAMPFER 4
-#define SC_ROBOT 5
-#define SC_PACMAN 6
-#define SC_KOKOSNUSS 7
-#define SC_DYNAMIT 8
-#define SC_SCHLUESSEL 9
-#define SC_ZEITBONUS 10
+/* values for player movement speed (which is in fact a delay value) */
+#define MOVE_DELAY_NORMAL_SPEED 8
+#define MOVE_DELAY_HIGH_SPEED 4
+
+#define DOUBLE_MOVE_DELAY(x) (x = (x <= MOVE_DELAY_HIGH_SPEED ? x * 2 : x))
+#define HALVE_MOVE_DELAY(x) (x = (x >= MOVE_DELAY_HIGH_SPEED ? x / 2 : x))
+#define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY((p)->move_delay_value))
+#define HALVE_PLAYER_SPEED(p) (DOUBLE_MOVE_DELAY((p)->move_delay_value))
/* game button identifiers */
#define GAME_CTRL_ID_STOP 0
#define NUM_GAME_BUTTONS 6
/* forward declaration for internal use */
+static void CloseAllOpenTimegates(void);
+static void CheckGravityMovement(struct PlayerInfo *);
+static void KillHeroUnlessProtected(int, int);
+
static void MapGameButtons();
static void HandleGameButtons(struct GadgetInfo *);
checksum += mult++ * StorePlayer[x][y];
checksum += mult++ * Frame[x][y];
checksum += mult++ * AmoebaNr[x][y];
- checksum += mult++ * JustHit[x][y];
+ checksum += mult++ * JustStopped[x][y];
checksum += mult++ * Stop[x][y];
*/
}
InitJoysticks();
}
+static int getBeltNrFromElement(int element)
+{
+ return (element < EL_BELT2_LEFT ? 0 :
+ element < EL_BELT3_LEFT ? 1 :
+ element < EL_BELT4_LEFT ? 2 : 3);
+}
+
+static int getBeltNrFromSwitchElement(int element)
+{
+ return (element < EL_BELT2_SWITCH_LEFT ? 0 :
+ element < EL_BELT3_SWITCH_LEFT ? 1 :
+ element < EL_BELT4_SWITCH_LEFT ? 2 : 3);
+}
+
+static int getBeltDirNrFromSwitchElement(int element)
+{
+ static int belt_base_element[4] =
+ {
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT4_SWITCH_LEFT
+ };
+
+ int belt_nr = getBeltNrFromSwitchElement(element);
+ int belt_dir_nr = element - belt_base_element[belt_nr];
+
+ return (belt_dir_nr % 3);
+}
+
+static int getBeltDirFromSwitchElement(int element)
+{
+ static int belt_move_dir[3] =
+ {
+ MV_LEFT,
+ MV_NO_MOVING,
+ MV_RIGHT
+ };
+
+ int belt_dir_nr = getBeltDirNrFromSwitchElement(element);
+
+ return belt_move_dir[belt_dir_nr];
+}
+
static void InitField(int x, int y, boolean init_game)
{
switch (Feld[x][y])
{
- case EL_SPIELFIGUR:
case EL_SP_MURPHY:
+ if (init_game)
+ {
+ if (stored_player[0].present)
+ {
+ Feld[x][y] = EL_SP_MURPHY_CLONE;
+ break;
+ }
+ }
+ /* no break! */
+ case EL_SPIELFIGUR:
if (init_game)
Feld[x][y] = EL_SPIELER1;
/* no break! */
player->present = TRUE;
- /*
- if (!network_playing || player->connected)
- */
-
if (!options.network || player->connected)
{
player->active = TRUE;
Feld[x][y] = EL_BADEWANNE5;
break;
- case EL_KAEFER_R:
- case EL_KAEFER_O:
- case EL_KAEFER_L:
- case EL_KAEFER_U:
+ case EL_KAEFER_RIGHT:
+ case EL_KAEFER_UP:
+ case EL_KAEFER_LEFT:
+ case EL_KAEFER_DOWN:
case EL_KAEFER:
- case EL_FLIEGER_R:
- case EL_FLIEGER_O:
- case EL_FLIEGER_L:
- case EL_FLIEGER_U:
+ case EL_FLIEGER_RIGHT:
+ case EL_FLIEGER_UP:
+ case EL_FLIEGER_LEFT:
+ case EL_FLIEGER_DOWN:
case EL_FLIEGER:
- case EL_BUTTERFLY_R:
- case EL_BUTTERFLY_O:
- case EL_BUTTERFLY_L:
- case EL_BUTTERFLY_U:
+ case EL_BUTTERFLY_RIGHT:
+ case EL_BUTTERFLY_UP:
+ case EL_BUTTERFLY_LEFT:
+ case EL_BUTTERFLY_DOWN:
case EL_BUTTERFLY:
- case EL_FIREFLY_R:
- case EL_FIREFLY_O:
- case EL_FIREFLY_L:
- case EL_FIREFLY_U:
+ case EL_FIREFLY_RIGHT:
+ case EL_FIREFLY_UP:
+ case EL_FIREFLY_LEFT:
+ case EL_FIREFLY_DOWN:
case EL_FIREFLY:
- case EL_PACMAN_R:
- case EL_PACMAN_O:
- case EL_PACMAN_L:
- case EL_PACMAN_U:
+ case EL_PACMAN_RIGHT:
+ case EL_PACMAN_UP:
+ case EL_PACMAN_LEFT:
+ case EL_PACMAN_DOWN:
case EL_MAMPFER:
case EL_MAMPFER2:
case EL_ROBOT:
case EL_PACMAN:
case EL_SP_SNIKSNAK:
case EL_SP_ELECTRON:
+ case EL_MOLE_LEFT:
+ case EL_MOLE_RIGHT:
+ case EL_MOLE_UP:
+ case EL_MOLE_DOWN:
+ case EL_MOLE:
InitMovDir(x, y);
break;
}
break;
- case EL_DYNAMIT:
+ case EL_DYNAMITE_ACTIVE:
MovDelay[x][y] = 96;
break;
local_player->sokobanfields_still_needed++;
break;
- case EL_MAULWURF:
case EL_PINGUIN:
local_player->friends_still_needed++;
break;
Feld[x][y] = EL_LEERRAUM;
break;
+ case EL_EM_KEY_1_FILE:
+ Feld[x][y] = EL_EM_KEY_1;
+ break;
+ case EL_EM_KEY_2_FILE:
+ Feld[x][y] = EL_EM_KEY_2;
+ break;
+ case EL_EM_KEY_3_FILE:
+ Feld[x][y] = EL_EM_KEY_3;
+ break;
+ case EL_EM_KEY_4_FILE:
+ Feld[x][y] = EL_EM_KEY_4;
+ break;
+
+ case EL_BELT1_SWITCH_LEFT:
+ case EL_BELT1_SWITCH_MIDDLE:
+ case EL_BELT1_SWITCH_RIGHT:
+ case EL_BELT2_SWITCH_LEFT:
+ case EL_BELT2_SWITCH_MIDDLE:
+ case EL_BELT2_SWITCH_RIGHT:
+ case EL_BELT3_SWITCH_LEFT:
+ case EL_BELT3_SWITCH_MIDDLE:
+ case EL_BELT3_SWITCH_RIGHT:
+ case EL_BELT4_SWITCH_LEFT:
+ case EL_BELT4_SWITCH_MIDDLE:
+ case EL_BELT4_SWITCH_RIGHT:
+ if (init_game)
+ {
+ int belt_nr = getBeltNrFromSwitchElement(Feld[x][y]);
+ int belt_dir = getBeltDirFromSwitchElement(Feld[x][y]);
+ int belt_dir_nr = getBeltDirNrFromSwitchElement(Feld[x][y]);
+
+ if (game.belt_dir_nr[belt_nr] == 3) /* initial value */
+ {
+ game.belt_dir[belt_nr] = belt_dir;
+ game.belt_dir_nr[belt_nr] = belt_dir_nr;
+ }
+ else /* more than one switch -- set it like the first switch */
+ {
+ Feld[x][y] = Feld[x][y] - belt_dir_nr + game.belt_dir_nr[belt_nr];
+ }
+ }
+ break;
+
+ case EL_SWITCHGATE_SWITCH_2: /* always start with same switch pos */
+ if (init_game)
+ Feld[x][y] = EL_SWITCHGATE_SWITCH_1;
+ break;
+
+ case EL_LIGHT_SWITCH_ON:
+ if (init_game)
+ game.light_time_left = level.time_light * FRAMES_PER_SECOND;
+ break;
+
default:
break;
}
player->action = 0;
player->effective_action = 0;
+ player->programmed_action = 0;
player->score = 0;
- player->gems_still_needed = level.edelsteine;
+ player->gems_still_needed = level.gems_needed;
player->sokobanfields_still_needed = 0;
player->lights_still_needed = 0;
player->friends_still_needed = 0;
player->dynamite = 0;
player->dynabomb_count = 0;
- player->dynabomb_size = 0;
+ player->dynabomb_size = 1;
player->dynabombs_left = 0;
player->dynabomb_xl = FALSE;
player->MovDir = MV_NO_MOVING;
player->MovPos = 0;
player->Pushing = FALSE;
+ player->Switching = FALSE;
player->GfxPos = 0;
player->Frame = 0;
player->move_delay = 0;
player->last_move_dir = MV_NO_MOVING;
- player->snapped = FALSE;
+ player->move_delay_value =
+ (level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
- player->gone = FALSE;
+ player->snapped = FALSE;
player->last_jx = player->last_jy = 0;
player->jx = player->jy = 0;
+ player->shield_passive_time_left = 0;
+ player->shield_active_time_left = 0;
+
DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
SnapField(player, 0, 0);
ZX = ZY = -1;
- MampferNr = 0;
+ game.yam_content_nr = 0;
FrameCounter = 0;
TimeFrames = 0;
TimePlayed = 0;
ScreenMovPos = 0;
ScreenGfxPos = 0;
- MoveSpeed = (level.double_speed ? 4 : 8);
- ScrollStepSize = TILEX / MoveSpeed;
+ ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */
AllPlayersGone = FALSE;
- SiebAktiv = FALSE;
- SiebCount = 0;
+ game.magic_wall_active = FALSE;
+ game.magic_wall_time_left = 0;
+ game.light_time_left = 0;
+ game.timegate_time_left = 0;
+ game.switchgate_pos = 0;
+ game.balloon_dir = MV_NO_MOVING;
+
+ for (i=0; i<4; i++)
+ {
+ game.belt_dir[i] = MV_NO_MOVING;
+ game.belt_dir_nr[i] = 3; /* not moving, next moving left */
+ }
for (i=0; i<MAX_NUM_AMOEBA; i++)
AmoebaCnt[i] = AmoebaCnt2[i] = 0;
Store[x][y] = Store2[x][y] = StorePlayer[x][y] = 0;
Frame[x][y] = 0;
AmoebaNr[x][y] = 0;
- JustHit[x][y] = 0;
+ JustStopped[x][y] = 0;
Stop[x][y] = FALSE;
}
}
}
}
+ /* correct non-moving belts to start moving left */
+ for (i=0; i<4; i++)
+ if (game.belt_dir[i] == MV_NO_MOVING)
+ game.belt_dir_nr[i] = 3; /* not moving, next moving left */
+
/* check if any connected player was not found in playfield */
for (i=0; i<MAX_PLAYERS; i++)
{
}
}
- game_emulation = (emulate_bd ? EMU_BOULDERDASH :
+ game.emulation = (emulate_bd ? EMU_BOULDERDASH :
emulate_sb ? EMU_SOKOBAN :
emulate_sp ? EMU_SUPAPLEX : EMU_NONE);
- /* determine border element for this level */
- SetBorderElement();
-
if (BorderElement == EL_LEERRAUM)
{
SBX_Left = 0;
DrawAllPlayers();
FadeToFront();
- XCopyArea(display, pix[PIX_DOOR], pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
- DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + XX_LEVEL, DOOR_GFX_PAGEY1 + YY_LEVEL,
- int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + XX_EMERALDS, DOOR_GFX_PAGEY1 + YY_EMERALDS,
- int2str(local_player->gems_still_needed,3), FS_SMALL, FC_YELLOW);
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + XX_DYNAMITE, DOOR_GFX_PAGEY1 + YY_DYNAMITE,
- int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + XX_SCORE, DOOR_GFX_PAGEY1 + YY_SCORE,
- int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + XX_TIME, DOOR_GFX_PAGEY1 + YY_TIME,
- int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+ /* after drawing the level, corect some elements */
+ if (game.timegate_time_left == 0)
+ CloseAllOpenTimegates();
+ if (setup.soft_scrolling)
+ XCopyArea(display, fieldbuffer, backbuffer, gc,
+ FX, FY, SXSIZE, SYSIZE, SX, SY);
+
+ redraw_mask |= REDRAW_FROM_BACKBUFFER;
+
+ /* copy default game door content to main double buffer */
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
+
+ if (level_nr < 100)
+ DrawText(DX + XX_LEVEL, DY + YY_LEVEL,
+ int2str(level_nr, 2), FS_SMALL, FC_YELLOW);
+ else
+ {
+ DrawTextExt(drawto, gc, DX + XX_EMERALDS, DY + YY_EMERALDS,
+ int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3);
+ XCopyArea(display, drawto, drawto, gc,
+ DX + XX_EMERALDS, DY + YY_EMERALDS + 1,
+ FONT5_XSIZE * 3, FONT5_YSIZE - 1,
+ DX + XX_LEVEL - 1, DY + YY_LEVEL + 1);
+ }
+
+ DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
+ int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE,
+ int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_SCORE, DY + YY_SCORE,
+ int2str(local_player->score, 5), FS_SMALL, FC_YELLOW);
+ DrawText(DX + XX_TIME, DY + YY_TIME,
+ int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
-#if 0
- DrawGameButton(BUTTON_GAME_STOP);
- DrawGameButton(BUTTON_GAME_PAUSE);
- DrawGameButton(BUTTON_GAME_PLAY);
- DrawSoundDisplay(BUTTON_SOUND_MUSIC | (setup.sound_music ? BUTTON_ON : 0));
- DrawSoundDisplay(BUTTON_SOUND_LOOPS | (setup.sound_loops ? BUTTON_ON : 0));
- DrawSoundDisplay(BUTTON_SOUND_SIMPLE | (setup.sound_simple ? BUTTON_ON : 0));
-#else
UnmapGameButtons();
game_gadget[SOUND_CTRL_ID_MUSIC]->checked = setup.sound_music;
game_gadget[SOUND_CTRL_ID_LOOPS]->checked = setup.sound_loops;
game_gadget[SOUND_CTRL_ID_SIMPLE]->checked = setup.sound_simple;
MapGameButtons();
MapTapeButtons();
-#endif
+ /* copy actual game door content to door double buffer for OpenDoor() */
XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc,
- DX + GAME_CONTROL_XPOS, DY + GAME_CONTROL_YPOS,
- GAME_CONTROL_XSIZE, 2 * GAME_CONTROL_YSIZE,
- DOOR_GFX_PAGEX1 + GAME_CONTROL_XPOS,
- DOOR_GFX_PAGEY1 + GAME_CONTROL_YPOS);
-
-
+ DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
OpenDoor(DOOR_OPEN_ALL);
if (options.verbose)
{
for (i=0; i<4; i++)
- printf("Spieler %d %saktiv.\n",
- i+1, (stored_player[i].active ? "" : "nicht "));
+ printf("Player %d %sactive.\n",
+ i + 1, (stored_player[i].active ? "" : "not "));
}
}
{ 0, -1 },
{ -1, 0 }
};
- static int direction[2][4] =
+ static int direction[3][4] =
{
{ MV_RIGHT, MV_UP, MV_LEFT, MV_DOWN },
- { MV_LEFT, MV_DOWN, MV_RIGHT, MV_UP }
+ { MV_LEFT, MV_DOWN, MV_RIGHT, MV_UP },
+ { MV_LEFT, MV_RIGHT, MV_UP, MV_DOWN }
};
switch(element)
{
- case EL_KAEFER_R:
- case EL_KAEFER_O:
- case EL_KAEFER_L:
- case EL_KAEFER_U:
+ case EL_KAEFER_RIGHT:
+ case EL_KAEFER_UP:
+ case EL_KAEFER_LEFT:
+ case EL_KAEFER_DOWN:
Feld[x][y] = EL_KAEFER;
- MovDir[x][y] = direction[0][element - EL_KAEFER_R];
+ MovDir[x][y] = direction[0][element - EL_KAEFER_RIGHT];
break;
- case EL_FLIEGER_R:
- case EL_FLIEGER_O:
- case EL_FLIEGER_L:
- case EL_FLIEGER_U:
+ case EL_FLIEGER_RIGHT:
+ case EL_FLIEGER_UP:
+ case EL_FLIEGER_LEFT:
+ case EL_FLIEGER_DOWN:
Feld[x][y] = EL_FLIEGER;
- MovDir[x][y] = direction[0][element - EL_FLIEGER_R];
+ MovDir[x][y] = direction[0][element - EL_FLIEGER_RIGHT];
break;
- case EL_BUTTERFLY_R:
- case EL_BUTTERFLY_O:
- case EL_BUTTERFLY_L:
- case EL_BUTTERFLY_U:
+ case EL_BUTTERFLY_RIGHT:
+ case EL_BUTTERFLY_UP:
+ case EL_BUTTERFLY_LEFT:
+ case EL_BUTTERFLY_DOWN:
Feld[x][y] = EL_BUTTERFLY;
- MovDir[x][y] = direction[0][element - EL_BUTTERFLY_R];
+ MovDir[x][y] = direction[0][element - EL_BUTTERFLY_RIGHT];
break;
- case EL_FIREFLY_R:
- case EL_FIREFLY_O:
- case EL_FIREFLY_L:
- case EL_FIREFLY_U:
+ case EL_FIREFLY_RIGHT:
+ case EL_FIREFLY_UP:
+ case EL_FIREFLY_LEFT:
+ case EL_FIREFLY_DOWN:
Feld[x][y] = EL_FIREFLY;
- MovDir[x][y] = direction[0][element - EL_FIREFLY_R];
+ MovDir[x][y] = direction[0][element - EL_FIREFLY_RIGHT];
break;
- case EL_PACMAN_R:
- case EL_PACMAN_O:
- case EL_PACMAN_L:
- case EL_PACMAN_U:
+ case EL_PACMAN_RIGHT:
+ case EL_PACMAN_UP:
+ case EL_PACMAN_LEFT:
+ case EL_PACMAN_DOWN:
Feld[x][y] = EL_PACMAN;
- MovDir[x][y] = direction[0][element - EL_PACMAN_R];
+ MovDir[x][y] = direction[0][element - EL_PACMAN_RIGHT];
break;
case EL_SP_SNIKSNAK:
MovDir[x][y] = MV_LEFT;
break;
+ case EL_MOLE_LEFT:
+ case EL_MOLE_RIGHT:
+ case EL_MOLE_UP:
+ case EL_MOLE_DOWN:
+ Feld[x][y] = EL_MOLE;
+ MovDir[x][y] = direction[2][element - EL_MOLE_LEFT];
+ break;
+
default:
MovDir[x][y] = 1 << RND(4);
if (element != EL_KAEFER &&
void GameWon()
{
int hi_pos;
- int bumplevel = FALSE;
+ boolean raise_level = FALSE;
if (local_player->MovPos)
return;
SaveTape(tape.level_nr); /* Ask to save tape */
}
+ if (level_nr == leveldir_current->handicap_level)
+ {
+ leveldir_current->handicap_level++;
+ SaveLevelSetup_SeriesInfo();
+
+ if (level_nr < leveldir_current->last_level)
+ raise_level = TRUE;
+ }
+
if ((hi_pos = NewHiScore()) >= 0)
{
game_status = HALLOFFAME;
DrawHallOfFame(hi_pos);
- if (bumplevel && TAPE_IS_EMPTY(tape))
+ if (raise_level)
level_nr++;
}
else
{
game_status = MAINMENU;
- if (bumplevel && TAPE_IS_EMPTY(tape))
+ if (raise_level)
level_nr++;
DrawMainMenu();
}
#ifdef ONE_PER_NAME
put_into_list:
#endif
- strncpy(highscore[k].Name, setup.player_name, MAX_NAMELEN - 1);
- highscore[k].Name[MAX_NAMELEN - 1] = '\0';
+ strncpy(highscore[k].Name, setup.player_name, MAX_PLAYER_NAME_LEN);
+ highscore[k].Name[MAX_PLAYER_NAME_LEN] = '\0';
highscore[k].Score = local_player->score;
position = k;
break;
}
#ifdef ONE_PER_NAME
- else if (!strncmp(setup.player_name, highscore[k].Name, MAX_NAMELEN - 1))
+ else if (!strncmp(setup.player_name, highscore[k].Name,
+ MAX_PLAYER_NAME_LEN))
break; /* player already there with a higher score */
#endif
return element;
}
+static int MovingOrBlocked2ElementIfNotLeaving(int x, int y)
+{
+ /* like MovingOrBlocked2Element(), but if element is moving
+ and (x,y) is the field the moving element is just leaving,
+ return EL_BLOCKED instead of the element value */
+ int element = Feld[x][y];
+
+ if (IS_MOVING(x, y))
+ {
+ if (element == EL_BLOCKED)
+ {
+ int oldx, oldy;
+
+ Blocked2Moving(x, y, &oldx, &oldy);
+ return Feld[oldx][oldy];
+ }
+ else
+ return EL_BLOCKED;
+ }
+ else
+ return element;
+}
+
static void RemoveField(int x, int y)
{
Feld[x][y] = EL_LEERRAUM;
if (Feld[x][y] == EL_BLOCKED &&
(Store[oldx][oldy] == EL_MORAST_LEER ||
- Store[oldx][oldy] == EL_SIEB_LEER ||
- Store[oldx][oldy] == EL_SIEB2_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];
if (Store[x][y])
DrawGraphic(sx, sy, el2gfx(Store[x][y]));
- if (Feld[x][y] == EL_DYNAMIT)
+ if (Feld[x][y] == EL_DYNAMITE_ACTIVE)
{
if ((phase = (96 - MovDelay[x][y]) / 12) > 6)
phase = 6;
phase = 7 - phase;
}
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
DrawGraphic(sx, sy, GFX_SP_DISK_RED);
else if (Store[x][y])
DrawGraphicThruMask(sx, sy, graphic + phase);
if (!(MovDelay[x][y] % 12))
PlaySoundLevel(x, y, SND_ZISCH);
- if (Feld[x][y] == EL_DYNAMIT && !(MovDelay[x][y] % 12))
- DrawDynamite(x, y);
- else if (Feld[x][y] == EL_DYNABOMB && !(MovDelay[x][y] % 6))
- DrawDynamite(x, y);
+ if (IS_ACTIVE_BOMB(Feld[x][y]))
+ {
+ int delay = (Feld[x][y] == EL_DYNAMITE_ACTIVE ? 12 : 6);
+
+ if (!(MovDelay[x][y] % delay))
+ DrawDynamite(x, y);
+ }
return;
}
if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey))
{
+ /* put moving element to center field (and let it explode there) */
center_element = MovingOrBlocked2Element(ex, ey);
RemoveMovingField(ex, ey);
+ Feld[ex][ey] = center_element;
}
- for (y=ey-1; y<ey+2; y++) for(x=ex-1; x<ex+2; x++)
+ for (y=ey-1; y<=ey+1; y++) for(x=ex-1; x<=ex+1; x++)
{
- int element = Feld[x][y];
+ int element;
+
+ if (!IN_LEV_FIELD(x, y) ||
+ ((mode != EX_NORMAL || center_element == EL_AMOEBA2DIAM) &&
+ (x != ex || y != ey)))
+ continue;
+
+ element = Feld[x][y];
if (IS_MOVING(x, y) || IS_BLOCKED(x, y))
{
RemoveMovingField(x, y);
}
- if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(element) || element == EL_BURNING)
+ if (IS_MASSIVE(element) || element == EL_BURNING)
continue;
- if ((mode!=EX_NORMAL || center_element == EL_AMOEBA2DIAM) &&
- (x!=ex || y!=ey))
+ if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)))
+ {
+ if (IS_ACTIVE_BOMB(element))
+ {
+ /* re-activate things under the bomb like gate or penguin */
+ Feld[x][y] = (Store[x][y] ? Store[x][y] : EL_LEERRAUM);
+ Store[x][y] = 0;
+ }
+
continue;
+ }
if (element == EL_EXPLODING)
element = Store2[x][y];
- if (IS_PLAYER(ex, ey))
+ if (IS_PLAYER(ex, ey) && !PLAYER_PROTECTED(ex, ey))
{
switch(StorePlayer[ex][ey])
{
break;
}
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
Store[x][y] = EL_LEERRAUM;
}
- else if (center_element == EL_MAULWURF)
+ else if (center_element == EL_MOLE)
Store[x][y] = EL_EDELSTEIN_ROT;
else if (center_element == EL_PINGUIN)
Store[x][y] = EL_EDELSTEIN_LILA;
else if (center_element == EL_SP_ELECTRON)
Store[x][y] = EL_SP_INFOTRON;
else if (center_element == EL_MAMPFER)
- Store[x][y] = level.mampfer_inhalt[MampferNr][x-ex+1][y-ey+1];
+ Store[x][y] = level.yam_content[game.yam_content_nr][x-ex+1][y-ey+1];
else if (center_element == EL_AMOEBA2DIAM)
- Store[x][y] = level.amoebe_inhalt;
+ Store[x][y] = level.amoeba_content;
else if (element == EL_ERZ_EDEL)
Store[x][y] = EL_EDELSTEIN;
else if (element == EL_ERZ_DIAM)
Store[x][y] = EL_EDELSTEIN_ROT;
else if (element == EL_ERZ_EDEL_LILA)
Store[x][y] = EL_EDELSTEIN_LILA;
+ else if (element == EL_WALL_PEARL)
+ Store[x][y] = EL_PEARL;
+ else if (element == EL_WALL_CRYSTAL)
+ Store[x][y] = EL_CRYSTAL;
else if (!IS_PFORTE(Store[x][y]))
Store[x][y] = EL_LEERRAUM;
}
if (center_element == EL_MAMPFER)
- MampferNr = (MampferNr + 1) % MampferMax;
+ game.yam_content_nr = (game.yam_content_nr + 1) % level.num_yam_contents;
return;
}
int element = Store2[x][y];
if (IS_PLAYER(x, y))
- KillHero(PLAYERINFO(x, y));
+ KillHeroUnlessProtected(x, y);
else if (IS_EXPLOSIVE(element))
{
Feld[x][y] = Store2[x][y];
{
int graphic = GFX_EXPLOSION;
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
graphic = (Store[x][y] == EL_SP_INFOTRON ?
GFX_SP_EXPLODE_INFOTRON :
GFX_SP_EXPLODE_EMPTY);
void DynaExplode(int ex, int ey)
{
int i, j;
- struct PlayerInfo *player = &stored_player[Store2[ex][ey] - EL_SPIELER1];
+ int dynabomb_size = 1;
+ boolean dynabomb_xl = FALSE;
+ struct PlayerInfo *player;
static int xy[4][2] =
{
{ 0, -1 },
{ 0, +1 }
};
- Store2[ex][ey] = 0; /* delete player information */
+ if (IS_ACTIVE_BOMB(Feld[ex][ey]))
+ {
+ player = &stored_player[Feld[ex][ey] - EL_DYNABOMB_ACTIVE_1];
+ dynabomb_size = player->dynabomb_size;
+ dynabomb_xl = player->dynabomb_xl;
+ player->dynabombs_left++;
+ }
Explode(ex, ey, EX_PHASE_START, EX_CENTER);
for (i=0; i<4; i++)
{
- for (j=1; j<=player->dynabomb_size; j++)
+ for (j=1; j<=dynabomb_size; j++)
{
- int x = ex+j*xy[i%4][0];
- int y = ey+j*xy[i%4][1];
+ int x = ex + j * xy[i % 4][0];
+ int y = ey + j * xy[i % 4][1];
int element;
if (!IN_LEV_FIELD(x, y) || IS_MASSIVE(Feld[x][y]))
break;
element = Feld[x][y];
+
+ /* do not restart explosions of fields with active bombs */
+ if (element == EL_EXPLODING && IS_ACTIVE_BOMB(Store2[x][y]))
+ continue;
+
Explode(x, y, EX_PHASE_START, EX_BORDER);
if (element != EL_LEERRAUM &&
element != EL_ERDREICH &&
element != EL_EXPLODING &&
- !player->dynabomb_xl)
+ !dynabomb_xl)
break;
}
}
-
- player->dynabombs_left++;
}
void Bang(int x, int y)
{
int element = Feld[x][y];
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
PlaySoundLevel(x, y, SND_SP_BOOOM);
else
PlaySoundLevel(x, y, SND_ROAAAR);
+#if 0
if (IS_PLAYER(x, y)) /* remove objects that might cause smaller explosion */
element = EL_LEERRAUM;
+#endif
switch(element)
{
case EL_MAMPFER2:
case EL_ROBOT:
case EL_PACMAN:
+ case EL_MOLE:
RaiseScoreElement(element);
Explode(x, y, EX_PHASE_START, EX_NORMAL);
break;
- case EL_DYNABOMB:
+ case EL_DYNABOMB_ACTIVE_1:
+ case EL_DYNABOMB_ACTIVE_2:
+ case EL_DYNABOMB_ACTIVE_3:
+ case EL_DYNABOMB_ACTIVE_4:
case EL_DYNABOMB_NR:
case EL_DYNABOMB_SZ:
case EL_DYNABOMB_XL:
DynaExplode(x, y);
break;
- case EL_MAULWURF:
case EL_PINGUIN:
case EL_BIRNE_AUS:
case EL_BIRNE_EIN:
- Explode(x, y, EX_PHASE_START, EX_CENTER);
+ if (IS_PLAYER(x, y))
+ Explode(x, y, EX_PHASE_START, EX_NORMAL);
+ else
+ Explode(x, y, EX_PHASE_START, EX_CENTER);
break;
default:
Explode(x, y, EX_PHASE_START, EX_NORMAL);
}
}
+static void ToggleBeltSwitch(int x, int y)
+{
+ static int belt_base_element[4] =
+ {
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT4_SWITCH_LEFT
+ };
+ static int belt_move_dir[4] =
+ {
+ MV_LEFT,
+ MV_NO_MOVING,
+ MV_RIGHT,
+ MV_NO_MOVING,
+ };
+
+ int element = Feld[x][y];
+ int belt_nr = getBeltNrFromSwitchElement(element);
+ int belt_dir_nr = (game.belt_dir_nr[belt_nr] + 1) % 4;
+ int belt_dir = belt_move_dir[belt_dir_nr];
+ int xx, yy;
+
+ if (!IS_BELT_SWITCH(element))
+ return;
+
+ game.belt_dir_nr[belt_nr] = belt_dir_nr;
+ game.belt_dir[belt_nr] = belt_dir;
+
+ if (belt_dir_nr == 3)
+ belt_dir_nr = 1;
+
+ for (yy=0; yy<lev_fieldy; yy++)
+ {
+ for (xx=0; xx<lev_fieldx; xx++)
+ {
+ int element = Feld[xx][yy];
+
+ if (IS_BELT_SWITCH(element))
+ {
+ int e_belt_nr = getBeltNrFromSwitchElement(element);
+
+ if (e_belt_nr == belt_nr)
+ {
+ Feld[xx][yy] = belt_base_element[belt_nr] + belt_dir_nr;
+ DrawLevelField(xx, yy);
+ }
+ }
+ else if (belt_dir == MV_NO_MOVING && IS_BELT(element))
+ {
+ int e_belt_nr = getBeltNrFromElement(element);
+
+ if (e_belt_nr == belt_nr)
+ DrawLevelField(xx, yy); /* set belt to parking position */
+ }
+ }
+ }
+}
+
+static void ToggleSwitchgateSwitch(int x, int y)
+{
+ int xx, yy;
+
+ game.switchgate_pos = !game.switchgate_pos;
+
+ for (yy=0; yy<lev_fieldy; yy++)
+ {
+ for (xx=0; xx<lev_fieldx; xx++)
+ {
+ int element = Feld[xx][yy];
+
+ if (element == EL_SWITCHGATE_SWITCH_1 ||
+ element == EL_SWITCHGATE_SWITCH_2)
+ {
+ Feld[xx][yy] = EL_SWITCHGATE_SWITCH_1 + game.switchgate_pos;
+ DrawLevelField(xx, yy);
+ }
+ else if (element == EL_SWITCHGATE_OPEN ||
+ element == EL_SWITCHGATE_OPENING)
+ {
+ Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
+ PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ }
+ else if (element == EL_SWITCHGATE_CLOSED ||
+ element == EL_SWITCHGATE_CLOSING)
+ {
+ Feld[xx][yy] = EL_SWITCHGATE_OPENING;
+ PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ }
+ }
+ }
+}
+
+static void RedrawAllLightSwitchesAndInvisibleElements()
+{
+ int x, y;
+
+ for (y=0; y<lev_fieldy; y++)
+ {
+ for (x=0; x<lev_fieldx; x++)
+ {
+ int element = Feld[x][y];
+
+ if (element == EL_LIGHT_SWITCH_OFF &&
+ game.light_time_left > 0)
+ {
+ Feld[x][y] = EL_LIGHT_SWITCH_ON;
+ DrawLevelField(x, y);
+ }
+ else if (element == EL_LIGHT_SWITCH_ON &&
+ game.light_time_left == 0)
+ {
+ Feld[x][y] = EL_LIGHT_SWITCH_OFF;
+ DrawLevelField(x, y);
+ }
+
+ if (element == EL_INVISIBLE_STEEL ||
+ element == EL_UNSICHTBAR ||
+ element == EL_SAND_INVISIBLE)
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+static void ToggleLightSwitch(int x, int y)
+{
+ int element = Feld[x][y];
+
+ game.light_time_left =
+ (element == EL_LIGHT_SWITCH_OFF ?
+ level.time_light * FRAMES_PER_SECOND : 0);
+
+ RedrawAllLightSwitchesAndInvisibleElements();
+}
+
+static void ActivateTimegateSwitch(int x, int y)
+{
+ int xx, yy;
+
+ game.timegate_time_left = level.time_timegate * FRAMES_PER_SECOND;
+
+ for (yy=0; yy<lev_fieldy; yy++)
+ {
+ for (xx=0; xx<lev_fieldx; xx++)
+ {
+ int element = Feld[xx][yy];
+
+ if (element == EL_TIMEGATE_CLOSED ||
+ element == EL_TIMEGATE_CLOSING)
+ {
+ Feld[xx][yy] = EL_TIMEGATE_OPENING;
+ PlaySoundLevel(xx, yy, SND_OEFFNEN);
+ }
+
+ /*
+ else if (element == EL_TIMEGATE_SWITCH_ON)
+ {
+ Feld[xx][yy] = EL_TIMEGATE_SWITCH_OFF;
+ DrawLevelField(xx, yy);
+ }
+ */
+
+ }
+ }
+
+ Feld[x][y] = EL_TIMEGATE_SWITCH_ON;
+}
+
void Impact(int x, int y)
{
boolean lastline = (y == lev_fieldy-1);
return;
}
- if ((element == EL_BOMBE || element == EL_SP_DISK_ORANGE) &&
+ if ((element == EL_BOMBE ||
+ element == EL_SP_DISK_ORANGE ||
+ element == EL_DX_SUPABOMB) &&
(lastline || object_hit)) /* element is bomb */
{
Bang(x, y);
return;
}
+ else if (element == EL_PEARL)
+ {
+ Feld[x][y] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
if (element == EL_TROPFEN && (lastline || object_hit)) /* acid drop */
{
if (object_hit && IS_PLAYER(x, y+1))
- KillHero(PLAYERINFO(x, y+1));
- else if (object_hit && (smashed == EL_MAULWURF || smashed == EL_PINGUIN))
+ KillHeroUnlessProtected(x, y+1);
+ else if (object_hit && smashed == EL_PINGUIN)
Bang(x, y+1);
else
{
if (!lastline && object_hit) /* check which object was hit */
{
if (CAN_CHANGE(element) &&
- (smashed == EL_SIEB_INAKTIV || smashed == EL_SIEB2_INAKTIV))
+ (smashed == EL_MAGIC_WALL_OFF || smashed == EL_MAGIC_WALL_BD_OFF))
{
int x, y;
int activated_magic_wall =
- (smashed == EL_SIEB_INAKTIV ? EL_SIEB_LEER : EL_SIEB2_LEER);
+ (smashed == EL_MAGIC_WALL_OFF ? EL_MAGIC_WALL_EMPTY :
+ EL_MAGIC_WALL_BD_EMPTY);
/* activate magic wall / mill */
if (Feld[x][y] == smashed)
Feld[x][y] = activated_magic_wall;
- SiebCount = level.dauer_sieb * FRAMES_PER_SECOND;
- SiebAktiv = TRUE;
+ game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND;
+ game.magic_wall_active = TRUE;
}
if (IS_PLAYER(x, y+1))
{
- KillHero(PLAYERINFO(x, y+1));
+ KillHeroUnlessProtected(x, y+1);
return;
}
- else if (smashed == EL_MAULWURF || smashed == EL_PINGUIN)
+ else if (smashed == EL_PINGUIN)
{
Bang(x, y+1);
return;
return;
}
}
- else if (element == EL_FELSBROCKEN || element == EL_SP_ZONK)
+ else if (element == EL_FELSBROCKEN ||
+ element == EL_SP_ZONK ||
+ element == EL_BD_ROCK)
{
if (IS_ENEMY(smashed) ||
smashed == EL_BOMBE || smashed == EL_SP_DISK_ORANGE ||
- smashed == EL_SONDE || smashed == EL_SCHWEIN || smashed == EL_DRACHE)
+ smashed == EL_DX_SUPABOMB ||
+ smashed == EL_SONDE || smashed == EL_SCHWEIN ||
+ smashed == EL_DRACHE || smashed == EL_MOLE)
{
Bang(x, y+1);
return;
RaiseScoreElement(EL_KOKOSNUSS);
return;
}
+ else if (smashed == EL_PEARL)
+ {
+ Feld[x][y+1] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
else if (smashed == EL_DIAMANT)
{
Feld[x][y+1] = EL_LEERRAUM;
PlaySoundLevel(x, y, SND_QUIRK);
return;
}
+ else if (IS_BELT_SWITCH(smashed))
+ {
+ ToggleBeltSwitch(x, y+1);
+ }
+ else if (smashed == EL_SWITCHGATE_SWITCH_1 ||
+ smashed == EL_SWITCHGATE_SWITCH_2)
+ {
+ ToggleSwitchgateSwitch(x, y+1);
+ }
+ else if (smashed == EL_LIGHT_SWITCH_OFF ||
+ smashed == EL_LIGHT_SWITCH_ON)
+ {
+ ToggleLightSwitch(x, y+1);
+ }
}
}
}
/* play sound of magic wall / mill */
if (!lastline &&
- (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
+ Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
PlaySoundLevel(x, y, SND_QUIRK);
return;
sound = SND_KLUMPF;
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
sound = SND_KLOPF;
break;
case EL_SP_ZONK:
case EL_SCHLUESSEL2:
case EL_SCHLUESSEL3:
case EL_SCHLUESSEL4:
+ case EL_EM_KEY_1:
+ case EL_EM_KEY_2:
+ case EL_EM_KEY_3:
+ case EL_EM_KEY_4:
sound = SND_KINK;
break;
case EL_ZEIT_VOLL:
break;
}
- if (sound>=0)
+ if (sound >= 0)
PlaySoundLevel(x, y, sound);
}
}
TestIfBadThingHitsOtherBadThing(x, y);
if (IN_LEV_FIELD(right_x, right_y) &&
- IS_FREE_OR_PLAYER(right_x, right_y))
+ IS_FREE(right_x, right_y))
MovDir[x][y] = right_dir;
else if (!IN_LEV_FIELD(move_x, move_y) ||
- !IS_FREE_OR_PLAYER(move_x, move_y))
+ !IS_FREE(move_x, move_y))
MovDir[x][y] = left_dir;
if (element == EL_KAEFER && MovDir[x][y] != old_move_dir)
TestIfBadThingHitsOtherBadThing(x, y);
if (IN_LEV_FIELD(left_x, left_y) &&
- IS_FREE_OR_PLAYER(left_x, left_y))
+ IS_FREE(left_x, left_y))
MovDir[x][y] = left_dir;
else if (!IN_LEV_FIELD(move_x, move_y) ||
- !IS_FREE_OR_PLAYER(move_x, move_y))
+ !IS_FREE(move_x, move_y))
MovDir[x][y] = right_dir;
if ((element == EL_FLIEGER ||
MovDelay[x][y] = 0;
}
- else if (element == EL_ROBOT || element == EL_SONDE ||
- element == EL_MAULWURF || element == EL_PINGUIN)
+ else if (element == EL_MOLE)
+ {
+ boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE;
+
+ if (IN_LEV_FIELD(move_x, move_y) &&
+ (IS_FREE(move_x, move_y) || IS_AMOEBOID(Feld[move_x][move_y]) ||
+ Feld[move_x][move_y] == EL_DEAMOEBING))
+ can_move_on = TRUE;
+
+ if (!can_move_on)
+ {
+ if (IN_LEV_FIELD(left_x, left_y) &&
+ (IS_FREE(left_x, left_y) || IS_AMOEBOID(Feld[left_x][left_y])))
+ can_turn_left = TRUE;
+ if (IN_LEV_FIELD(right_x, right_y) &&
+ (IS_FREE(right_x, right_y) || IS_AMOEBOID(Feld[right_x][right_y])))
+ can_turn_right = TRUE;
+
+ if (can_turn_left && can_turn_right)
+ MovDir[x][y] = (RND(2) ? left_dir : right_dir);
+ else if (can_turn_left)
+ MovDir[x][y] = left_dir;
+ else
+ MovDir[x][y] = right_dir;
+ }
+
+ if (MovDir[x][y] != old_move_dir)
+ MovDelay[x][y] = 9;
+ }
+ else if (element == EL_BALLOON)
+ {
+ MovDir[x][y] = game.balloon_dir;
+ MovDelay[x][y] = 0;
+ }
+ else if (element == EL_SPRING_MOVING)
+ {
+ if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) ||
+ (IN_LEV_FIELD(x, y+1) && IS_FREE(x, y+1)))
+ {
+ Feld[x][y] = EL_SPRING;
+ MovDir[x][y] = MV_NO_MOVING;
+ }
+ MovDelay[x][y] = 0;
+ }
+ else if (element == EL_ROBOT || element == EL_SONDE || element == EL_PINGUIN)
{
int attr_x = -1, attr_y = -1;
struct PlayerInfo *player = &stored_player[i];
int jx = player->jx, jy = player->jy;
- if (!player->active || player->gone)
+ if (!player->active)
continue;
if (attr_x == -1 || ABS(jx-x)+ABS(jy-y) < ABS(attr_x-x)+ABS(attr_y-y))
attr_y = ZY;
}
- if (element == EL_MAULWURF || element == EL_PINGUIN)
+ if (element == EL_PINGUIN)
{
int i;
static int xy[4][2] =
if (IN_LEV_FIELD(newx, newy) &&
(IS_FREE(newx, newy) ||
Feld[newx][newy] == EL_SALZSAEURE ||
- ((element == EL_MAULWURF || element == EL_PINGUIN) &&
+ (element == EL_PINGUIN &&
(Feld[newx][newy] == EL_AUSGANG_AUF ||
IS_MAMPF3(Feld[newx][newy])))))
return;
if (IN_LEV_FIELD(newx, newy) &&
(IS_FREE(newx, newy) ||
Feld[newx][newy] == EL_SALZSAEURE ||
- ((element == EL_MAULWURF || element == EL_PINGUIN) &&
+ (element == EL_PINGUIN &&
(Feld[newx][newy] == EL_AUSGANG_AUF ||
IS_MAMPF3(Feld[newx][newy])))))
return;
{
struct PlayerInfo *player = &stored_player[i];
- if (player->active && !player->gone &&
- player->Pushing && player->MovPos)
+ if (player->active && player->Pushing && player->MovPos)
{
int next_jx = player->jx + (player->jx - player->last_jx);
int next_jy = player->jy + (player->jy - player->last_jy);
Feld[x][y+1] = EL_MORAST_VOLL;
}
}
- else if (element == EL_FELSBROCKEN && Feld[x][y+1] == EL_MORAST_LEER)
+ 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;
}
- else if (element == EL_SIEB_VOLL)
+ 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_SIEB_LEER;
+ Store[x][y] = EL_MAGIC_WALL_EMPTY;
}
- else if (Feld[x][y+1] == EL_SIEB_LEER)
+ else if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY)
{
if (!MovDelay[x][y])
MovDelay[x][y] = TILEY/4 + 1;
return;
}
- Feld[x][y] = EL_SIEB_LEER;
- Feld[x][y+1] = EL_SIEB_VOLL;
+ 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;
}
}
- else if (element == EL_SIEB2_VOLL)
+ 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_SIEB2_LEER;
+ Store[x][y] = EL_MAGIC_WALL_BD_EMPTY;
}
- else if (Feld[x][y+1] == EL_SIEB2_LEER)
+ else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)
{
if (!MovDelay[x][y])
MovDelay[x][y] = TILEY/4 + 1;
return;
}
- Feld[x][y] = EL_SIEB2_LEER;
- Feld[x][y+1] = EL_SIEB2_VOLL;
+ 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;
}
}
else if (CAN_CHANGE(element) &&
- (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
+ Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
InitMovingField(x, y, MV_DOWN);
Store[x][y] =
- (Feld[x][y+1] == EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL);
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FULL :
+ EL_MAGIC_WALL_BD_FULL);
Store2[x][y+1] = element;
}
else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE)
InitMovingField(x, y, MV_DOWN);
Store[x][y] = EL_SALZSAEURE;
}
- else if (CAN_SMASH(element) && Feld[x][y+1] == EL_BLOCKED && JustHit[x][y])
+ else if (CAN_SMASH(element) && Feld[x][y+1] == EL_BLOCKED &&
+ JustStopped[x][y])
{
Impact(x, y);
}
Feld[x][y] = EL_AMOEBING;
Store[x][y] = EL_AMOEBE_NASS;
}
+#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
{
boolean left = (x>0 && IS_FREE(x-1, y) &&
(IS_FREE(x-1, y+1) || Feld[x-1][y+1] == EL_SALZSAEURE));
if (left || right)
{
- if (left && right && game_emulation != EMU_BOULDERDASH)
+ if (left && right &&
+ (game.emulation != EMU_BOULDERDASH &&
+ element != EL_BD_ROCK && element != EL_EDELSTEIN_BD))
left = !(right = RND(2));
InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
}
}
+ else if (IS_BELT(Feld[x][y+1]))
+ {
+ boolean left_is_free = (x>0 && IS_FREE(x-1, y));
+ boolean right_is_free = (x<lev_fieldx-1 && IS_FREE(x+1, y));
+ int belt_nr = getBeltNrFromElement(Feld[x][y+1]);
+ int belt_dir = game.belt_dir[belt_nr];
+
+ if ((belt_dir == MV_LEFT && left_is_free) ||
+ (belt_dir == MV_RIGHT && right_is_free))
+ InitMovingField(x, y, belt_dir);
+ }
}
else if (CAN_MOVE(element))
{
int newx, newy;
- if (element == EL_SONDE && JustBeingPushed(x, y))
+ if ((element == EL_SONDE || element == EL_BALLOON ||
+ element == EL_SPRING_MOVING)
+ && JustBeingPushed(x, y))
return;
if (!MovDelay[x][y]) /* start new movement phase */
if (element!=EL_MAMPFER && element!=EL_MAMPFER2 && element!=EL_PACMAN)
{
TurnRound(x, y);
- if (MovDelay[x][y] && (element == EL_KAEFER || element == EL_FLIEGER ||
+ if (MovDelay[x][y] && (element == EL_KAEFER ||
+ element == EL_FLIEGER ||
element == EL_SP_SNIKSNAK ||
- element == EL_SP_ELECTRON))
+ element == EL_SP_ELECTRON ||
+ element == EL_MOLE))
DrawLevelField(x, y);
}
}
Moving2Blocked(x, y, &newx, &newy); /* get next screen position */
- if (IS_ENEMY(element) && IS_PLAYER(newx, newy))
+ if (IS_ENEMY(element) && IS_PLAYER(newx, newy) &&
+ !PLAYER_PROTECTED(newx, newy))
{
- /* enemy got the player */
- MovDir[x][y] = 0;
+
+#if 1
+ TestIfBadThingHitsHero(x, y);
+ return;
+#else
+ /* enemy got the player */
+ MovDir[x][y] = 0;
KillHero(PLAYERINFO(newx, newy));
return;
+#endif
+
}
- else if ((element == EL_MAULWURF || element == EL_PINGUIN ||
- element == EL_ROBOT || element == EL_SONDE) &&
+ else if ((element == EL_PINGUIN || element == EL_ROBOT ||
+ element == EL_SONDE || element == EL_BALLOON) &&
IN_LEV_FIELD(newx, newy) &&
MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_SALZSAEURE)
{
Blurb(x, y);
Store[x][y] = EL_SALZSAEURE;
}
- else if ((element == EL_MAULWURF || element == EL_PINGUIN) &&
- IN_LEV_FIELD(newx, newy))
+ else if (element == EL_PINGUIN && IN_LEV_FIELD(newx, newy))
{
if (Feld[newx][newy] == EL_AUSGANG_AUF)
{
DrawLevelField(newx, newy);
}
}
- else if (element == EL_PACMAN && IN_LEV_FIELD(newx, newy) &&
- IS_AMOEBOID(Feld[newx][newy]))
+ else if ((element == EL_PACMAN || element == EL_MOLE)
+ && IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy]))
{
if (AmoebaNr[newx][newy])
{
AmoebaCnt[AmoebaNr[newx][newy]]--;
}
- Feld[newx][newy] = EL_LEERRAUM;
- DrawLevelField(newx, newy);
+ if (element == EL_MOLE)
+ {
+ Feld[newx][newy] = EL_DEAMOEBING;
+ MovDelay[newx][newy] = 0; /* start amoeba shrinking delay */
+ return; /* wait for shrinking amoeba */
+ }
+ else /* element == EL_PACMAN */
+ {
+ Feld[newx][newy] = EL_LEERRAUM;
+ DrawLevelField(newx, newy);
+ }
+ }
+ else if (element == EL_MOLE && IN_LEV_FIELD(newx, newy) &&
+ (Feld[newx][newy] == EL_DEAMOEBING ||
+ (Feld[newx][newy] == EL_LEERRAUM && Stop[newx][newy])))
+ {
+ /* wait for shrinking amoeba to completely disappear */
+ return;
}
else if (!IN_LEV_FIELD(newx, newy) || !IS_FREE(newx, newy))
{
TurnRound(x, y);
if (element == EL_KAEFER || element == EL_FLIEGER ||
- element == EL_SP_SNIKSNAK)
+ element == EL_SP_SNIKSNAK || element == EL_MOLE)
DrawLevelField(x, y);
else if (element == EL_BUTTERFLY || element == EL_FIREFLY)
DrawGraphicAnimation(x, y, el2gfx(element), 2, 4, ANIM_NORMAL);
else if (element == EL_SP_ELECTRON)
DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_NORMAL);
+ if (DONT_TOUCH(element))
+ TestIfBadThingHitsHero(x, y);
+
return;
}
int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0);
int horiz_move = (dx!=0);
int newx = x + dx, newy = y + dy;
- int step = (horiz_move ? dx : dy) * TILEX/8;
+ int step = (horiz_move ? dx : dy) * TILEX / 8;
- if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
- step*=2;
- else if (element == EL_TROPFEN)
- step/=2;
+ if (element == EL_TROPFEN)
+ step /= 2;
else if (Store[x][y] == EL_MORAST_VOLL || Store[x][y] == EL_MORAST_LEER)
- step/=4;
+ step /= 4;
+ else if (CAN_FALL(element) && horiz_move &&
+ y < lev_fieldy-1 && IS_BELT(Feld[x][y+1]))
+ step /= 2;
+ else if (element == EL_SPRING_MOVING)
+ step*=2;
+
+#if OLD_GAME_BEHAVIOUR
+ else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
+ step*=2;
+#endif
MovPos[x][y] += step;
Feld[x][y] = EL_LEERRAUM;
Feld[newx][newy] = element;
+ if (element == EL_MOLE)
+ {
+ int i;
+ static int xy[4][2] =
+ {
+ { 0, -1 },
+ { -1, 0 },
+ { +1, 0 },
+ { 0, +1 }
+ };
+
+ Feld[x][y] = EL_ERDREICH;
+ DrawLevelField(x, y);
+
+ for(i=0; i<4; i++)
+ {
+ int xx, yy;
+
+ xx = x + xy[i][0];
+ yy = y + xy[i][1];
+
+ if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_ERDREICH)
+ DrawLevelField(xx, yy); /* for "ErdreichAnbroeckeln()" */
+ }
+ }
+
if (Store[x][y] == EL_MORAST_VOLL)
{
Store[x][y] = 0;
Store[x][y] = 0;
Feld[x][y] = EL_MORAST_LEER;
}
- else if (Store[x][y] == EL_SIEB_VOLL)
+ else if (Store[x][y] == EL_MAGIC_WALL_FULL)
{
Store[x][y] = 0;
- element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB_VOLL : EL_SIEB_TOT);
+ element = Feld[newx][newy] =
+ (game.magic_wall_active ? EL_MAGIC_WALL_FULL : EL_MAGIC_WALL_DEAD);
}
- else if (Store[x][y] == EL_SIEB_LEER)
+ else if (Store[x][y] == EL_MAGIC_WALL_EMPTY)
{
Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (SiebAktiv ? EL_SIEB_LEER : EL_SIEB_TOT);
+ Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_EMPTY :
+ EL_MAGIC_WALL_DEAD);
}
- else if (Store[x][y] == EL_SIEB2_VOLL)
+ else if (Store[x][y] == EL_MAGIC_WALL_BD_FULL)
{
Store[x][y] = 0;
- element = Feld[newx][newy] = (SiebAktiv ? EL_SIEB2_VOLL : EL_SIEB2_TOT);
+ element = Feld[newx][newy] =
+ (game.magic_wall_active ? EL_MAGIC_WALL_BD_FULL :
+ EL_MAGIC_WALL_BD_DEAD);
}
- else if (Store[x][y] == EL_SIEB2_LEER)
+ else if (Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
{
Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (SiebAktiv ? EL_SIEB2_LEER : EL_SIEB2_TOT);
+ Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_BD_EMPTY :
+ EL_MAGIC_WALL_BD_DEAD);
}
else if (Store[x][y] == EL_SALZSAEURE)
{
DrawLevelField(newx, newy);
Stop[newx][newy] = TRUE;
- JustHit[x][newy] = 3;
+ JustStopped[newx][newy] = 3;
if (DONT_TOUCH(element)) /* object may be nasty to player or others */
{
if (done)
PlaySoundLevel(ax, ay,
- (new_element == EL_FELSBROCKEN ? SND_KLOPF : SND_PLING));
+ (new_element == EL_BD_ROCK ? SND_KLOPF : SND_PLING));
}
void AmoebeWaechst(int x, int y)
}
}
+void AmoebeSchrumpft(int x, int y)
+{
+ static unsigned long sound_delay = 0;
+ static unsigned long sound_delay_value = 0;
+
+ if (!MovDelay[x][y]) /* start new shrinking cycle */
+ {
+ MovDelay[x][y] = 7;
+
+ if (DelayReached(&sound_delay, sound_delay_value))
+ {
+ PlaySoundLevel(x, y, SND_BLURB);
+ sound_delay_value = 30;
+ }
+ }
+
+ if (MovDelay[x][y]) /* wait some time before shrinking */
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y), GFX_AMOEBING + MovDelay[x][y]/2);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_LEERRAUM;
+ DrawLevelField(x, y);
+
+ /* don't let mole enter this field in this cycle;
+ (give priority to objects falling to this field from above) */
+ Stop[x][y] = TRUE;
+ }
+ }
+}
+
void AmoebeAbleger(int ax, int ay)
{
int i;
{ 0, +1 }
};
- if (!level.tempo_amoebe)
+ if (!level.amoeba_speed)
{
Feld[ax][ay] = EL_AMOEBE_TOT;
DrawLevelField(ax, ay);
}
if (!MovDelay[ax][ay]) /* start making new amoeba field */
- MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.tempo_amoebe));
+ MovDelay[ax][ay] = RND(FRAMES_PER_SECOND * 25 / (1 + level.amoeba_speed));
if (MovDelay[ax][ay]) /* wait some time before making new amoeba */
{
if (newax == ax && neway == ay) /* amoeba cannot grow */
{
- if (i == 4 && (!waiting_for_player || game_emulation == EMU_BOULDERDASH))
+ if (i == 4 && (!waiting_for_player || game.emulation == EMU_BOULDERDASH))
{
Feld[ax][ay] = EL_AMOEBE_TOT;
DrawLevelField(ax, ay);
if (element == EL_AMOEBE_VOLL)
AmoebeUmwandeln(ax, ay);
else if (element == EL_AMOEBE_BD)
- AmoebeUmwandelnBD(ax, ay, level.amoebe_inhalt);
+ AmoebeUmwandelnBD(ax, ay, level.amoeba_content);
}
}
return;
if (element == EL_AMOEBE_BD && AmoebaCnt2[new_group_nr] >= 200)
{
- AmoebeUmwandelnBD(newax, neway, EL_FELSBROCKEN);
+ AmoebeUmwandelnBD(newax, neway, EL_BD_ROCK);
return;
}
}
void Ablenk(int x, int y)
{
if (!MovDelay[x][y]) /* next animation frame */
- MovDelay[x][y] = level.dauer_ablenk * FRAMES_PER_SECOND;
+ MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
if (MovDelay[x][y]) /* wait some time before next frame */
{
ZX = ZY = -1;
}
+void TimegateWheel(int x, int y)
+{
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y])
+ {
+ if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_TIMEGATE_SWITCH + MovDelay[x][y]%4);
+ if (!(MovDelay[x][y]%4))
+ PlaySoundLevel(x, y, SND_MIEP);
+ return;
+ }
+ }
+
+ Feld[x][y] = EL_TIMEGATE_SWITCH_OFF;
+ DrawLevelField(x, y);
+ if (ZX == x && ZY == y)
+ ZX = ZY = -1;
+}
+
void Birne(int x, int y)
{
if (!MovDelay[x][y]) /* next animation frame */
{
MovDelay[x][y]--;
if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawGraphic(SCREENX(x), SCREENY(y), GFX_CRACKINGNUT+3-MovDelay[x][y]/2);
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_CRACKINGNUT + 3 - MovDelay[x][y]/2);
if (!MovDelay[x][y])
{
}
}
+void BreakingPearl(int x, int y)
+{
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 9;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_PEARL_BREAKING + 4 - MovDelay[x][y]/2);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_LEERRAUM;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
void SiebAktivieren(int x, int y, int typ)
{
- int graphic = (typ == 1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL) + 3;
+ int graphic = (typ == 1 ? GFX_MAGIC_WALL_FULL : GFX_MAGIC_WALL_BD_FULL) + 3;
DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE);
}
DrawGraphicAnimation(x, y, GFX_AUSGANG_AUF, 4, 4, ANIM_OSCILLATE);
}
+void OpenSwitchgate(int x, int y)
+{
+ int delay = 6;
+
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 5 * delay;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ int phase;
+
+ MovDelay[x][y]--;
+ phase = MovDelay[x][y] / delay;
+ if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y), GFX_SWITCHGATE_OPEN - phase);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_SWITCHGATE_OPEN;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+void CloseSwitchgate(int x, int y)
+{
+ int delay = 6;
+
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 5 * delay;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ int phase;
+
+ MovDelay[x][y]--;
+ phase = MovDelay[x][y] / delay;
+ if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y), GFX_SWITCHGATE_CLOSED + phase);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_SWITCHGATE_CLOSED;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+void OpenTimegate(int x, int y)
+{
+ int delay = 6;
+
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 5 * delay;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ int phase;
+
+ MovDelay[x][y]--;
+ phase = MovDelay[x][y] / delay;
+ if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y), GFX_TIMEGATE_OPEN - phase);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_TIMEGATE_OPEN;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+void CloseTimegate(int x, int y)
+{
+ int delay = 6;
+
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 5 * delay;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ int phase;
+
+ MovDelay[x][y]--;
+ phase = MovDelay[x][y] / delay;
+ if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y), GFX_TIMEGATE_CLOSED + phase);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_TIMEGATE_CLOSED;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+static void CloseAllOpenTimegates()
+{
+ int x, y;
+
+ for (y=0; y<lev_fieldy; y++)
+ {
+ for (x=0; x<lev_fieldx; x++)
+ {
+ int element = Feld[x][y];
+
+ if (element == EL_TIMEGATE_OPEN || element == EL_TIMEGATE_OPENING)
+ {
+ Feld[x][y] = EL_TIMEGATE_CLOSING;
+ PlaySoundLevel(x, y, SND_OEFFNEN);
+ }
+ }
+ }
+}
+
void EdelsteinFunkeln(int x, int y)
{
if (!IN_SCR_FIELD(SCREENX(x), SCREENY(y)) || IS_MOVING(x, y))
if (element == EL_SP_BUG)
{
- if (!MovDelay[x][y]) /* start activating buggy base */
+ if (!MovDelay[x][y]) /* wait some time before activating base */
MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
if (!MovDelay[x][y]) /* start activating buggy base */
MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y])
}
}
+static void CheckTrap(int x, int y)
+{
+ int element = Feld[x][y];
+
+ if (element == EL_TRAP_INACTIVE)
+ {
+ if (!MovDelay[x][y]) /* wait some time before activating trap */
+ MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y])
+ return;
+
+ Feld[x][y] = EL_TRAP_ACTIVE;
+ }
+ }
+ else if (element == EL_TRAP_ACTIVE)
+ {
+ int delay = 4;
+ int num_frames = 8;
+
+ if (!MovDelay[x][y]) /* start activating trap */
+ MovDelay[x][y] = num_frames * delay;
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+
+ if (MovDelay[x][y])
+ {
+ if (!(MovDelay[x][y] % delay))
+ {
+ int phase = MovDelay[x][y]/delay;
+
+ if (phase >= num_frames/2)
+ phase = num_frames - phase;
+
+ if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ {
+ DrawGraphic(SCREENX(x),SCREENY(y), GFX_TRAP_INACTIVE + phase - 1);
+ ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
+ }
+ }
+
+ return;
+ }
+
+ Feld[x][y] = EL_TRAP_INACTIVE;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
+static void DrawBeltAnimation(int x, int y, int element)
+{
+ int belt_nr = getBeltNrFromElement(element);
+ int belt_dir = game.belt_dir[belt_nr];
+
+ if (belt_dir != MV_NO_MOVING)
+ {
+ int delay = 2;
+ int mode = (belt_dir == MV_LEFT ? ANIM_NORMAL : ANIM_REVERSE);
+ int graphic = el2gfx(element) + (belt_dir == MV_LEFT ? 0 : 7);
+
+ DrawGraphicAnimation(x, y, graphic, 8, delay, mode);
+ }
+}
+
static void PlayerActions(struct PlayerInfo *player, byte player_action)
{
static byte stored_player_action[MAX_PLAYERS];
stored_player_action[player->index_nr] = 0;
num_stored_actions++;
- if (!player->active || player->gone || tape.pausing)
+ if (!player->active || tape.pausing)
return;
if (player_action)
player_action &= JOY_BUTTON;
stored_player_action[player->index_nr] = player_action;
-
-#if 0
- /* this allows cycled sequences of PlayerActions() */
- if (num_stored_actions >= MAX_PLAYERS)
- {
- TapeRecordAction(stored_player_action);
- num_stored_actions = 0;
- }
-#endif
-
}
else if (tape.playing && snapped)
SnapField(player, 0, 0); /* stop snapping */
}
else
{
+ /* no actions for this player (no input at player's configured device) */
+
DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
SnapField(player, 0, 0);
- if (++player->frame_reset_delay > MoveSpeed)
+ CheckGravityMovement(player);
+
+ if (++player->frame_reset_delay > player->move_delay_value)
player->Frame = 0;
}
if (IN_LEV_FIELD(jx+dx, jy) && IS_PUSHABLE(Feld[jx+dx][jy]))
{
int el = Feld[jx+dx][jy];
- int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 : 10);
+ int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 :
+ (el == EL_BALLOON || el == EL_SPRING) ? 0 : 10);
if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
{
action_delay_value =
(tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
- /*
- if (tape.playing && tape.fast_forward)
- {
- char buf[100];
-
- sprintf(buf, "FFWD: %ld ms", action_delay_value);
- print_debug(buf);
- }
- */
-
-
- /* main game synchronization point */
-
-
-
+ /* ---------- main game synchronization point ---------- */
-#if 1
WaitUntilDelayReached(&action_delay, action_delay_value);
-#else
-
- while (!DelayReached(&action_delay, action_delay_value))
- {
- char buf[100];
-
- sprintf(buf, "%ld %ld %ld",
- Counter(), action_delay, action_delay_value);
- print_debug(buf);
- }
- print_debug("done");
-
-#endif
-
-
-
if (network_playing && !network_player_action_received)
{
}
}
-
- /*
- if (tape.pausing || (tape.playing && !TapePlayDelay()))
- return;
- else if (tape.recording)
- TapeRecordDelay();
- */
-
if (tape.pausing)
return;
{
int actual_player_action = stored_player[i].effective_action;
+ if (stored_player[i].programmed_action)
+ actual_player_action = stored_player[i].programmed_action;
+
if (recorded_player_action)
actual_player_action = recorded_player_action[i];
ScrollScreen(NULL, SCROLL_GO_ON);
- /*
- if (tape.pausing || (tape.playing && !TapePlayDelay()))
- return;
- else if (tape.recording)
- TapeRecordDelay();
- */
-
-
-
-
#ifdef DEBUG
- /*
- if (TimeFrames == 0 && !local_player->gone)
+#if 0
+ if (TimeFrames == 0 && local_player->active)
{
extern unsigned int last_RND();
printf("DEBUG: %03d last RND was %d \t [state checksum is %d]\n",
- TimePlayed,
- last_RND(),
- getStateCheckSum(TimePlayed));
+ TimePlayed, last_RND(), getStateCheckSum(TimePlayed));
}
- */
#endif
-
-
+#endif
#ifdef DEBUG
- /*
+#if 0
if (GameFrameDelay >= 500)
printf("FrameCounter == %d\n", FrameCounter);
- */
#endif
-
-
+#endif
for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
{
Stop[x][y] = FALSE;
- if (JustHit[x][y]>0)
- JustHit[x][y]--;
+ if (JustStopped[x][y] > 0)
+ JustStopped[x][y]--;
#if DEBUG
if (IS_BLOCKED(x, y))
Blocked2Moving(x, y, &oldx, &oldy);
if (!IS_MOVING(oldx, oldy))
{
- printf("GameActions(): (BLOCKED=>MOVING) context corrupted!\n");
+ printf("GameActions(): (BLOCKED => MOVING) context corrupted!\n");
printf("GameActions(): BLOCKED: x = %d, y = %d\n", x, y);
printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n", oldx, oldy);
printf("GameActions(): This should never happen!\n");
}
else if (IS_MOVING(x, y))
ContinueMoving(x, y);
- else if (element == EL_DYNAMIT || element == EL_DYNABOMB)
+ else if (IS_ACTIVE_BOMB(element))
CheckDynamite(x, y);
else if (element == EL_EXPLODING)
Explode(x, y, Frame[x][y], EX_NORMAL);
else if (element == EL_AMOEBING)
AmoebeWaechst(x, y);
+ else if (element == EL_DEAMOEBING)
+ AmoebeSchrumpft(x, y);
else if (IS_AMOEBALIVE(element))
AmoebeAbleger(x, y);
else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
Life(x, y);
else if (element == EL_ABLENK_EIN)
Ablenk(x, y);
+ else if (element == EL_TIMEGATE_SWITCH_ON)
+ TimegateWheel(x, y);
else if (element == EL_SALZSAEURE)
Blubber(x, y);
else if (element == EL_BLURB_LEFT || element == EL_BLURB_RIGHT)
Blurb(x, y);
else if (element == EL_CRACKINGNUT)
NussKnacken(x, y);
+ else if (element == EL_PEARL_BREAKING)
+ BreakingPearl(x, y);
else if (element == EL_AUSGANG_ZU)
AusgangstuerPruefen(x, y);
else if (element == EL_AUSGANG_ACT)
CheckForDragon(x, y);
else if (element == EL_SP_BUG || element == EL_SP_BUG_ACTIVE)
CheckBuggyBase(x, y);
+ else if (element == EL_TRAP_INACTIVE || element == EL_TRAP_ACTIVE)
+ CheckTrap(x, y);
else if (element == EL_SP_TERMINAL)
DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL, 7, 12, ANIM_NORMAL);
else if (element == EL_SP_TERMINAL_ACTIVE)
DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL_ACTIVE, 7, 4, ANIM_NORMAL);
-
- if (SiebAktiv)
+ else if (IS_BELT(element))
+ DrawBeltAnimation(x, y, element);
+ else if (element == EL_SWITCHGATE_OPENING)
+ OpenSwitchgate(x, y);
+ else if (element == EL_SWITCHGATE_CLOSING)
+ CloseSwitchgate(x, y);
+ else if (element == EL_TIMEGATE_OPENING)
+ OpenTimegate(x, y);
+ else if (element == EL_TIMEGATE_CLOSING)
+ CloseTimegate(x, y);
+ else if (element == EL_EXTRA_TIME)
+ DrawGraphicAnimation(x, y, GFX_EXTRA_TIME, 6, 4, ANIM_NORMAL);
+ else if (element == EL_SHIELD_PASSIVE)
+ DrawGraphicAnimation(x, y, GFX_SHIELD_PASSIVE, 6, 4, ANIM_NORMAL);
+ else if (element == EL_SHIELD_ACTIVE)
+ DrawGraphicAnimation(x, y, GFX_SHIELD_ACTIVE, 6, 4, ANIM_NORMAL);
+
+ if (game.magic_wall_active)
{
boolean sieb = FALSE;
int jx = local_player->jx, jy = local_player->jy;
- if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL ||
- Store[x][y] == EL_SIEB_LEER)
+ if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL ||
+ Store[x][y] == EL_MAGIC_WALL_EMPTY)
{
SiebAktivieren(x, y, 1);
sieb = TRUE;
}
- else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL ||
- Store[x][y] == EL_SIEB2_LEER)
+ else if (element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_FULL ||
+ Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
{
SiebAktivieren(x, y, 2);
sieb = TRUE;
}
}
- if (SiebAktiv)
+ if (game.magic_wall_active)
{
- if (!(SiebCount % 4))
+ if (!(game.magic_wall_time_left % 4))
PlaySoundLevel(sieb_x, sieb_y, SND_MIEP);
- if (SiebCount > 0)
+ if (game.magic_wall_time_left > 0)
{
- SiebCount--;
- if (!SiebCount)
+ game.magic_wall_time_left--;
+ if (!game.magic_wall_time_left)
{
for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
{
element = Feld[x][y];
- if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL)
+
+ if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL)
{
- Feld[x][y] = EL_SIEB_TOT;
+ Feld[x][y] = EL_MAGIC_WALL_DEAD;
DrawLevelField(x, y);
}
- else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL)
+ else if (element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_FULL)
{
- Feld[x][y] = EL_SIEB2_TOT;
+ Feld[x][y] = EL_MAGIC_WALL_BD_DEAD;
DrawLevelField(x, y);
}
}
- SiebAktiv = FALSE;
+ game.magic_wall_active = FALSE;
+ }
+ }
+ }
+
+ if (game.light_time_left > 0)
+ {
+ game.light_time_left--;
+
+ if (game.light_time_left == 0)
+ {
+ for (y=0; y<lev_fieldy; y++) for (x=0; x<lev_fieldx; x++)
+ {
+ element = Feld[x][y];
+
+ if (element == EL_LIGHT_SWITCH_ON)
+ {
+ Feld[x][y] = EL_LIGHT_SWITCH_OFF;
+ DrawLevelField(x, y);
+ }
+ else if (element == EL_INVISIBLE_STEEL ||
+ element == EL_UNSICHTBAR ||
+ element == EL_SAND_INVISIBLE)
+ DrawLevelField(x, y);
}
}
}
- if (TimeFrames >= (1000 / GameFrameDelay) && !tape.pausing)
+ if (game.timegate_time_left > 0)
+ {
+ game.timegate_time_left--;
+
+ if (game.timegate_time_left == 0)
+ CloseAllOpenTimegates();
+ }
+
+ if (TimeFrames >= (1000 / GameFrameDelay))
{
TimeFrames = 0;
TimePlayed++;
+ for (i=0; i<MAX_PLAYERS; i++)
+ {
+ if (SHIELD_ON(&stored_player[i]))
+ {
+ stored_player[i].shield_passive_time_left--;
+
+ if (stored_player[i].shield_active_time_left > 0)
+ stored_player[i].shield_active_time_left--;
+ }
+ }
+
if (tape.recording || tape.playing)
DrawVideoDisplay(VIDEO_STATE_TIME_ON, TimePlayed);
{
TimeLeft--;
- if (TimeLeft <= 10)
+ if (TimeLeft <= 10 && setup.time_limit)
PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
- if (!TimeLeft)
+ if (!TimeLeft && setup.time_limit)
for (i=0; i<MAX_PLAYERS; i++)
KillHero(&stored_player[i]);
}
{
int jx = stored_player[i].jx, jy = stored_player[i].jy;
- if (!stored_player[i].active || stored_player[i].gone ||
- &stored_player[i] == player)
+ if (!stored_player[i].active || &stored_player[i] == player)
continue;
min_x = MIN(min_x, jx);
{
int jx = stored_player[i].jx, jy = stored_player[i].jy;
- if (!stored_player[i].active || stored_player[i].gone)
+ if (!stored_player[i].active)
continue;
if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy)))
redraw_mask |= REDRAW_FIELD;
}
+static void CheckGravityMovement(struct PlayerInfo *player)
+{
+ if (level.gravity && !player->programmed_action)
+ {
+ int move_dir_vertical = player->action & (MV_UP | MV_DOWN);
+ int move_dir_horizontal = player->action & (MV_LEFT | MV_RIGHT);
+ int move_dir =
+ (player->last_move_dir & (MV_LEFT | MV_RIGHT) ?
+ (move_dir_vertical ? move_dir_vertical : move_dir_horizontal) :
+ (move_dir_horizontal ? move_dir_horizontal : move_dir_vertical));
+ int jx = player->jx, jy = player->jy;
+ int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0);
+ int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0);
+ int new_jx = jx + dx, new_jy = jy + dy;
+ boolean field_under_player_is_free =
+ (IN_LEV_FIELD(jx, jy + 1) && IS_FREE(jx, jy + 1));
+ boolean player_is_moving_to_valid_field =
+ (IN_LEV_FIELD(new_jx, new_jy) &&
+ (Feld[new_jx][new_jy] == EL_SP_BASE ||
+ Feld[new_jx][new_jy] == EL_ERDREICH));
+
+ if (field_under_player_is_free && !player_is_moving_to_valid_field)
+ player->programmed_action = MV_DOWN;
+ }
+}
+
boolean MoveFigureOneStep(struct PlayerInfo *player,
int dx, int dy, int real_dx, int real_dy)
{
int element;
int can_move;
- if (player->gone || (!dx && !dy))
+ if (!player->active || (!dx && !dy))
return MF_NO_ACTION;
player->MovDir = (dx < 0 ? MV_LEFT :
if (!options.network && !AllPlayersInSight(player, new_jx, new_jy))
return MF_NO_ACTION;
+#if 0
element = MovingOrBlocked2Element(new_jx, new_jy);
+#else
+ element = MovingOrBlocked2ElementIfNotLeaving(new_jx, new_jy);
+#endif
if (DONT_GO_TO(element))
{
BuryHero(player);
}
else
- KillHero(player);
+ TestIfBadThingHitsHero(new_jx, new_jy);
return MF_MOVING;
}
jy = player->jy = new_jy;
StorePlayer[jx][jy] = player->element_nr;
- player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / MoveSpeed);
+ player->MovPos =
+ (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value);
ScrollFigure(player, SCROLL_INIT);
int old_jx = jx, old_jy = jy;
int moved = MF_NO_ACTION;
- if (player->gone || (!dx && !dy))
+ if (!player->active || (!dx && !dy))
return FALSE;
- if (!FrameReached(&player->move_delay, MoveSpeed) && !tape.playing)
+ if (!FrameReached(&player->move_delay, player->move_delay_value) &&
+ !tape.playing)
return FALSE;
+ /* remove the last programmed player action */
+ player->programmed_action = 0;
+
if (player->MovPos)
{
/* should only happen if pre-1.2 tape recordings are played */
/* this is only for backward compatibility */
- int old_move_speed = MoveSpeed;
+ int original_move_delay_value = player->move_delay_value;
#if DEBUG
printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n");
#endif
/* scroll remaining steps with finest movement resolution */
- MoveSpeed = 8;
+ player->move_delay_value = MOVE_DELAY_NORMAL_SPEED;
while (player->MovPos)
{
BackToFront();
}
- MoveSpeed = old_move_speed;
+ player->move_delay_value = original_move_delay_value;
}
if (player->last_move_dir & (MV_LEFT | MV_RIGHT))
player->last_move_dir = player->MovDir;
}
else
+ {
+ CheckGravityMovement(player);
+
player->last_move_dir = MV_NO_MOVING;
+ }
TestIfHeroHitsBadThing(jx, jy);
- if (player->gone)
+ if (!player->active)
RemoveHero(player);
return moved;
{
int jx = player->jx, jy = player->jy;
int last_jx = player->last_jx, last_jy = player->last_jy;
+ int move_stepsize = TILEX / player->move_delay_value;
- if (!player->active || player->gone || !player->MovPos)
+ if (!player->active || !player->MovPos)
return;
if (mode == SCROLL_INIT)
{
player->actual_frame_counter = FrameCounter;
- player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize);
+ player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
if (Feld[last_jx][last_jy] == EL_LEERRAUM)
Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING;
else if (!FrameReached(&player->actual_frame_counter, 1))
return;
- player->MovPos += (player->MovPos > 0 ? -1 : 1) * TILEX / MoveSpeed;
- player->GfxPos = ScrollStepSize * (player->MovPos / ScrollStepSize);
+ player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize;
+ player->GfxPos = move_stepsize * (player->MovPos / move_stepsize);
if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING)
Feld[last_jx][last_jy] = EL_LEERRAUM;
+ /* before DrawPlayer() to draw correct player graphic for this case */
+ if (player->MovPos == 0)
+ CheckGravityMovement(player);
+
DrawPlayer(player);
- if (!player->MovPos)
+ if (player->MovPos == 0)
{
+ if (IS_QUICK_GATE(Feld[last_jx][last_jy]))
+ {
+ /* continue with normal speed after quickly moving through gate */
+ HALVE_PLAYER_SPEED(player);
+
+ /* be able to make the next move without delay */
+ player->move_delay = 0;
+ }
+
player->last_jx = jx;
player->last_jy = jy;
if (mode == SCROLL_INIT)
{
+ /* set scrolling step size according to actual player's moving speed */
+ ScrollStepSize = TILEX / player->move_delay_value;
+
screen_frame_counter = FrameCounter;
ScreenMovDir = player->MovDir;
ScreenMovPos = player->MovPos;
if (ScreenMovPos)
{
- ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * TILEX / MoveSpeed;
+ ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * ScrollStepSize;
ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize);
redraw_mask |= REDRAW_FIELD;
}
if (!IN_LEV_FIELD(x, y))
continue;
+#if 0
element = Feld[x][y];
+#else
+ element = MovingOrBlocked2ElementIfNotLeaving(x, y);
+#endif
if (DONT_TOUCH(element))
{
if (killx != goodx || killy != goody)
{
if (IS_PLAYER(goodx, goody))
- KillHero(PLAYERINFO(goodx, goody));
+ {
+ struct PlayerInfo *player = PLAYERINFO(goodx, goody);
+
+ if (player->shield_active_time_left > 0)
+ Bang(killx, killy);
+ else if (!PLAYER_PROTECTED(goodx, goody))
+ KillHero(player);
+ }
else
Bang(goodx, goody);
}
MV_DOWN
};
+ if (Feld[badx][bady] == EL_EXPLODING) /* skip just exploding bad things */
+ return;
+
for (i=0; i<4; i++)
{
int x, y, element;
if (killx != badx || killy != bady)
{
if (IS_PLAYER(killx, killy))
- KillHero(PLAYERINFO(killx, killy));
+ {
+ struct PlayerInfo *player = PLAYERINFO(killx, killy);
+
+ if (player->shield_active_time_left > 0)
+ Bang(badx, bady);
+ else if (!PLAYER_PROTECTED(killx, killy))
+ KillHero(player);
+ }
else
Bang(killx, killy);
}
{
int jx = player->jx, jy = player->jy;
- if (player->gone)
+ if (!player->active)
return;
if (IS_PFORTE(Feld[jx][jy]))
Feld[jx][jy] = EL_LEERRAUM;
+ /* deactivate shield (else Bang()/Explode() would not work right) */
+ player->shield_passive_time_left = 0;
+ player->shield_active_time_left = 0;
+
Bang(jx, jy);
BuryHero(player);
}
+static void KillHeroUnlessProtected(int x, int y)
+{
+ if (!PLAYER_PROTECTED(x, y))
+ KillHero(PLAYERINFO(x, y));
+}
+
void BuryHero(struct PlayerInfo *player)
{
int jx = player->jx, jy = player->jy;
- if (player->gone)
+ if (!player->active)
return;
PlaySoundLevel(jx, jy, SND_AUTSCH);
int jx = player->jx, jy = player->jy;
int i, found = FALSE;
- player->gone = TRUE;
+ player->present = FALSE;
+ player->active = FALSE;
+
StorePlayer[jx][jy] = 0;
for (i=0; i<MAX_PLAYERS; i++)
- if (stored_player[i].active && !stored_player[i].gone)
+ if (stored_player[i].active)
found = TRUE;
if (!found)
{
int jx = player->jx, jy = player->jy;
int dx = x - jx, dy = y - jy;
+ int move_direction = (dx == -1 ? MV_LEFT :
+ dx == +1 ? MV_RIGHT :
+ dy == -1 ? MV_UP :
+ dy == +1 ? MV_DOWN : MV_NO_MOVING);
int element;
if (!player->MovPos)
if (mode == DF_NO_PUSH)
{
+ player->Switching = FALSE;
player->push_delay = 0;
return MF_NO_ACTION;
}
if (IS_MOVING(x, y) || IS_PLAYER(x, y))
return MF_NO_ACTION;
+ if (IS_TUBE(Feld[jx][jy]))
+ {
+ int i = 0;
+ int tube_leave_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_UP, MV_LEFT | MV_UP },
+ { EL_TUBE_LEFT_DOWN, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_UP, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_DOWN, MV_RIGHT | MV_DOWN },
+ { -1, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }
+ };
+
+ while (tube_leave_directions[i][0] != Feld[jx][jy])
+ {
+ i++;
+ if (tube_leave_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_leave_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
+
element = Feld[x][y];
- switch(element)
+ switch (element)
{
case EL_LEERRAUM:
PlaySoundLevel(x, y, SND_EMPTY);
break;
case EL_ERDREICH:
+ case EL_SAND_INVISIBLE:
+ case EL_TRAP_INACTIVE:
Feld[x][y] = EL_LEERRAUM;
PlaySoundLevel(x, y, SND_SCHLURF);
break;
case EL_EDELSTEIN_LILA:
case EL_DIAMANT:
case EL_SP_INFOTRON:
+ case EL_PEARL:
+ case EL_CRYSTAL:
RemoveField(x, y);
- local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 : 1);
+ local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 :
+ element == EL_PEARL ? 5 :
+ element == EL_CRYSTAL ? 8 : 1);
if (local_player->gems_still_needed < 0)
local_player->gems_still_needed = 0;
RaiseScoreElement(element);
case EL_SPEED_PILL:
RemoveField(x, y);
- MoveSpeed = 4;
- ScrollStepSize = TILEX/4;
+ player->move_delay_value = MOVE_DELAY_HIGH_SPEED;
+ PlaySoundLevel(x, y, SND_PONG);
+ break;
+
+ case EL_ENVELOPE:
+ Feld[x][y] = EL_LEERRAUM;
+ PlaySoundLevel(x, y, SND_PONG);
+ break;
+
+ case EL_EXTRA_TIME:
+ RemoveField(x, y);
+ if (level.time > 0)
+ {
+ TimeLeft += 10;
+ DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW);
+ }
+ PlaySoundStereo(SND_GONG, PSND_MAX_RIGHT);
+ break;
+
+ case EL_SHIELD_PASSIVE:
+ RemoveField(x, y);
+ player->shield_passive_time_left += 10;
PlaySoundLevel(x, y, SND_PONG);
break;
- case EL_DYNAMIT_AUS:
+ case EL_SHIELD_ACTIVE:
+ RemoveField(x, y);
+ player->shield_passive_time_left += 10;
+ player->shield_active_time_left += 10;
+ PlaySoundLevel(x, y, SND_PONG);
+ break;
+
+ case EL_DYNAMITE_INACTIVE:
case EL_SP_DISK_RED:
RemoveField(x, y);
player->dynamite++;
- RaiseScoreElement(EL_DYNAMIT);
+ RaiseScoreElement(EL_DYNAMITE_INACTIVE);
DrawText(DX_DYNAMITE, DY_DYNAMITE,
int2str(local_player->dynamite, 3),
FS_SMALL, FC_YELLOW);
RemoveField(x, y);
player->dynabomb_count++;
player->dynabombs_left++;
- RaiseScoreElement(EL_DYNAMIT);
+ RaiseScoreElement(EL_DYNAMITE_INACTIVE);
PlaySoundLevel(x, y, SND_PONG);
break;
case EL_DYNABOMB_SZ:
RemoveField(x, y);
player->dynabomb_size++;
- RaiseScoreElement(EL_DYNAMIT);
+ RaiseScoreElement(EL_DYNAMITE_INACTIVE);
PlaySoundLevel(x, y, SND_PONG);
break;
case EL_DYNABOMB_XL:
RemoveField(x, y);
player->dynabomb_xl = TRUE;
- RaiseScoreElement(EL_DYNAMIT);
+ RaiseScoreElement(EL_DYNAMITE_INACTIVE);
PlaySoundLevel(x, y, SND_PONG);
break;
case EL_SCHLUESSEL3:
case EL_SCHLUESSEL4:
{
- int key_nr = element-EL_SCHLUESSEL1;
+ int key_nr = element - EL_SCHLUESSEL1;
+
+ RemoveField(x, y);
+ player->key[key_nr] = TRUE;
+ RaiseScoreElement(EL_SCHLUESSEL);
+ DrawMiniGraphicExt(drawto, gc,
+ DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1+key_nr);
+ DrawMiniGraphicExt(window, gc,
+ DX_KEYS+key_nr*MINI_TILEX, DY_KEYS,
+ GFX_SCHLUESSEL1+key_nr);
+ PlaySoundLevel(x, y, SND_PONG);
+ break;
+ }
+
+ case EL_EM_KEY_1:
+ case EL_EM_KEY_2:
+ case EL_EM_KEY_3:
+ case EL_EM_KEY_4:
+ {
+ int key_nr = element - EL_EM_KEY_1;
RemoveField(x, y);
player->key[key_nr] = TRUE;
}
break;
+ case EL_BELT1_SWITCH_LEFT:
+ case EL_BELT1_SWITCH_MIDDLE:
+ case EL_BELT1_SWITCH_RIGHT:
+ case EL_BELT2_SWITCH_LEFT:
+ case EL_BELT2_SWITCH_MIDDLE:
+ case EL_BELT2_SWITCH_RIGHT:
+ case EL_BELT3_SWITCH_LEFT:
+ case EL_BELT3_SWITCH_MIDDLE:
+ case EL_BELT3_SWITCH_RIGHT:
+ case EL_BELT4_SWITCH_LEFT:
+ case EL_BELT4_SWITCH_MIDDLE:
+ case EL_BELT4_SWITCH_RIGHT:
+ if (!player->Switching)
+ {
+ player->Switching = TRUE;
+ ToggleBeltSwitch(x, y);
+ }
+ return MF_ACTION;
+ break;
+
+ case EL_SWITCHGATE_SWITCH_1:
+ case EL_SWITCHGATE_SWITCH_2:
+ if (!player->Switching)
+ {
+ player->Switching = TRUE;
+ ToggleSwitchgateSwitch(x, y);
+ }
+ return MF_ACTION;
+ break;
+
+ case EL_LIGHT_SWITCH_OFF:
+ case EL_LIGHT_SWITCH_ON:
+ if (!player->Switching)
+ {
+ player->Switching = TRUE;
+ ToggleLightSwitch(x, y);
+ }
+ return MF_ACTION;
+ break;
+
+ case EL_TIMEGATE_SWITCH_OFF:
+ ActivateTimegateSwitch(x, y);
+
+ return MF_ACTION;
+ break;
+
+ case EL_BALLOON_SEND_LEFT:
+ case EL_BALLOON_SEND_RIGHT:
+ case EL_BALLOON_SEND_UP:
+ case EL_BALLOON_SEND_DOWN:
+ case EL_BALLOON_SEND_ANY:
+ if (element == EL_BALLOON_SEND_ANY)
+ game.balloon_dir = move_direction;
+ else
+ game.balloon_dir = (element == EL_BALLOON_SEND_LEFT ? MV_LEFT :
+ element == EL_BALLOON_SEND_RIGHT ? MV_RIGHT :
+ element == EL_BALLOON_SEND_UP ? MV_UP :
+ element == EL_BALLOON_SEND_DOWN ? MV_DOWN :
+ MV_NO_MOVING);
+
+ return MF_ACTION;
+ break;
+
case EL_SP_EXIT:
if (local_player->gems_still_needed > 0)
return MF_NO_ACTION;
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
case EL_BOMBE:
+ case EL_DX_SUPABOMB:
case EL_KOKOSNUSS:
case EL_ZEIT_LEER:
case EL_SP_ZONK:
case EL_SP_DISK_ORANGE:
+ case EL_SPRING:
if (dy || mode == DF_SNAP)
return MF_NO_ACTION;
if (player->push_delay == 0)
player->push_delay = FrameCounter;
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
- !tape.playing)
+ !tape.playing && element != EL_SPRING)
return MF_NO_ACTION;
RemoveField(x, y);
Feld[x+dx][y+dy] = element;
- player->push_delay_value = 2+RND(8);
+ if (element == EL_SPRING)
+ {
+ Feld[x+dx][y+dy] = EL_SPRING_MOVING;
+ MovDir[x+dx][y+dy] = move_direction;
+ }
+
+ player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
DrawLevelField(x+dx, y+dy);
- if (element == EL_FELSBROCKEN)
+ if (element == EL_FELSBROCKEN || element == EL_BD_ROCK)
PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
else if (element == EL_KOKOSNUSS)
PlaySoundLevel(x+dx, y+dy, SND_KNURK);
else if (IS_SP_ELEMENT(element))
PlaySoundLevel(x+dx, y+dy, SND_SP_ZONKPUSH);
else
- PlaySoundLevel(x+dx, y+dy, SND_KLOPF);
+ PlaySoundLevel(x+dx, y+dy, SND_PUSCH); /* better than "SND_KLOPF" */
break;
case EL_PFORTE1:
case EL_PFORTE2:
case EL_PFORTE3:
case EL_PFORTE4:
- if (!player->key[element-EL_PFORTE1])
+ if (!player->key[element - EL_PFORTE1])
return MF_NO_ACTION;
break;
case EL_PFORTE2X:
case EL_PFORTE3X:
case EL_PFORTE4X:
- if (!player->key[element-EL_PFORTE1X])
+ if (!player->key[element - EL_PFORTE1X])
return MF_NO_ACTION;
break;
+ case EL_EM_GATE_1:
+ case EL_EM_GATE_2:
+ case EL_EM_GATE_3:
+ case EL_EM_GATE_4:
+ if (!player->key[element - EL_EM_GATE_1])
+ return MF_NO_ACTION;
+ if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
+ return MF_NO_ACTION;
+
+ /* automatically move to the next field with double speed */
+ player->programmed_action = move_direction;
+ DOUBLE_PLAYER_SPEED(player);
+
+ PlaySoundLevel(x, y, SND_GATE);
+
+ break;
+
+ case EL_EM_GATE_1X:
+ case EL_EM_GATE_2X:
+ case EL_EM_GATE_3X:
+ case EL_EM_GATE_4X:
+ if (!player->key[element - EL_EM_GATE_1X])
+ return MF_NO_ACTION;
+ if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
+ return MF_NO_ACTION;
+
+ /* automatically move to the next field with double speed */
+ player->programmed_action = move_direction;
+ DOUBLE_PLAYER_SPEED(player);
+
+ PlaySoundLevel(x, y, SND_GATE);
+
+ break;
+
+ case EL_SWITCHGATE_OPEN:
+ case EL_TIMEGATE_OPEN:
+ if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy))
+ return MF_NO_ACTION;
+
+ /* automatically move to the next field with double speed */
+ player->programmed_action = move_direction;
+ DOUBLE_PLAYER_SPEED(player);
+
+ PlaySoundLevel(x, y, SND_GATE);
+
+ break;
+
case EL_SP_PORT1_LEFT:
case EL_SP_PORT2_LEFT:
case EL_SP_PORT1_RIGHT:
!IN_LEV_FIELD(x + dx, y + dy) ||
!IS_FREE(x + dx, y + dy))
return MF_NO_ACTION;
+
+ /* automatically move to the next field with double speed */
+ player->programmed_action = move_direction;
+ DOUBLE_PLAYER_SPEED(player);
+
+ PlaySoundLevel(x, y, SND_GATE);
+ break;
+
+ case EL_TUBE_CROSS:
+ case EL_TUBE_VERTICAL:
+ case EL_TUBE_HORIZONTAL:
+ case EL_TUBE_VERT_LEFT:
+ case EL_TUBE_VERT_RIGHT:
+ case EL_TUBE_HORIZ_UP:
+ case EL_TUBE_HORIZ_DOWN:
+ case EL_TUBE_LEFT_UP:
+ case EL_TUBE_LEFT_DOWN:
+ case EL_TUBE_RIGHT_UP:
+ case EL_TUBE_RIGHT_DOWN:
+ {
+ int i = 0;
+ int tube_enter_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_LEFT_UP, MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_DOWN, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_UP, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_DOWN, MV_LEFT | MV_UP },
+ { -1, MV_NO_MOVING }
+ };
+
+ while (tube_enter_directions[i][0] != element)
+ {
+ i++;
+ if (tube_enter_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_enter_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
break;
case EL_AUSGANG_ZU:
PlaySoundLevel(x, y, SND_BUING);
- /*
- player->gone = TRUE;
- PlaySoundLevel(x, y, SND_BUING);
-
- if (!local_player->friends_still_needed)
- player->LevelSolved = player->GameOver = TRUE;
- */
-
break;
case EL_BIRNE_AUS:
case EL_SOKOBAN_OBJEKT:
case EL_SONDE:
case EL_SP_DISK_YELLOW:
+ case EL_BALLOON:
if (mode == DF_SNAP)
return MF_NO_ACTION;
if (player->push_delay == 0)
player->push_delay = FrameCounter;
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
- !tape.playing)
+ !tape.playing && element != EL_BALLOON)
return MF_NO_ACTION;
if (IS_SB_ELEMENT(element))
Feld[x+dx][y+dy] = element;
}
- player->push_delay_value = 2;
+ player->push_delay_value = (element == EL_BALLOON ? 0 : 2);
DrawLevelField(x, y);
DrawLevelField(x+dx, y+dy);
- PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
+ if (element == EL_BALLOON)
+ PlaySoundLevel(x+dx, y+dy, SND_SCHLURF);
+ else
+ PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
if (IS_SB_ELEMENT(element) &&
local_player->sokobanfields_still_needed == 0 &&
- game_emulation == EMU_SOKOBAN)
+ game.emulation == EMU_SOKOBAN)
{
player->LevelSolved = player->GameOver = TRUE;
PlaySoundLevel(x, y, SND_BUING);
break;
- case EL_MAULWURF:
case EL_PINGUIN:
case EL_SCHWEIN:
case EL_DRACHE:
int jx = player->jx, jy = player->jy;
int x = jx + dx, y = jy + dy;
- if (player->gone || !IN_LEV_FIELD(x, y))
+ if (!player->active || !IN_LEV_FIELD(x, y))
return FALSE;
if (dx && dy)
int jx = player->jx, jy = player->jy;
int element;
- if (player->gone || player->MovPos)
+ if (!player->active || player->MovPos)
return FALSE;
element = Feld[jx][jy];
if ((player->dynamite == 0 && player->dynabombs_left == 0) ||
- element == EL_DYNAMIT || element == EL_DYNABOMB ||
- element == EL_EXPLODING)
+ IS_ACTIVE_BOMB(element) || element == EL_EXPLODING)
return FALSE;
if (element != EL_LEERRAUM)
if (player->dynamite)
{
- Feld[jx][jy] = EL_DYNAMIT;
+ Feld[jx][jy] = EL_DYNAMITE_ACTIVE;
MovDelay[jx][jy] = 96;
player->dynamite--;
DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3),
FS_SMALL, FC_YELLOW);
if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
{
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
DrawGraphic(SCREENX(jx), SCREENY(jy), GFX_SP_DISK_RED);
else
DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT);
}
else
{
- Feld[jx][jy] = EL_DYNABOMB;
- Store2[jx][jy] = player->element_nr; /* for DynaExplode() */
+ Feld[jx][jy] = EL_DYNABOMB_ACTIVE_1 + (player->element_nr - EL_SPIELER1);
MovDelay[jx][jy] = 96;
player->dynabombs_left--;
if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
volume = PSND_MAX_VOLUME;
#ifndef MSDOS
- stereo = (sx-SCR_FIELDX/2)*12;
+ stereo = (sx - SCR_FIELDX/2) * 12;
#else
- stereo = PSND_MIDDLE+(2*sx-(SCR_FIELDX-1))*5;
- if(stereo > PSND_MAX_RIGHT) stereo = PSND_MAX_RIGHT;
- if(stereo < PSND_MAX_LEFT) stereo = PSND_MAX_LEFT;
+ stereo = PSND_MIDDLE + (2 * sx - (SCR_FIELDX - 1)) * 5;
+ if (stereo > PSND_MAX_RIGHT)
+ stereo = PSND_MAX_RIGHT;
+ if (stereo < PSND_MAX_LEFT)
+ stereo = PSND_MAX_LEFT;
#endif
if (!IN_SCR_FIELD(sx, sy))
{
- int dx = ABS(sx-SCR_FIELDX/2)-SCR_FIELDX/2;
- int dy = ABS(sy-SCR_FIELDY/2)-SCR_FIELDY/2;
+ int dx = ABS(sx - SCR_FIELDX/2) - SCR_FIELDX/2;
+ int dy = ABS(sy - SCR_FIELDY/2) - SCR_FIELDY/2;
- volume -= volume*(dx > dy ? dx : dy)/silence_distance;
+ volume -= volume * (dx > dy ? dx : dy) / silence_distance;
}
PlaySoundExt(sound_nr, volume, stereo, PSND_NO_LOOP);
case EL_KOKOSNUSS:
RaiseScore(level.score[SC_KOKOSNUSS]);
break;
- case EL_DYNAMIT:
+ case EL_DYNAMITE_INACTIVE:
RaiseScore(level.score[SC_DYNAMIT]);
break;
case EL_SCHLUESSEL:
break;
}
- if (Request("Do you really want to quit the game ?",
+ if (level_editor_test_game ||
+ Request("Do you really want to quit the game ?",
REQ_ASK | REQ_STAY_CLOSED))
{
#ifndef MSDOS
#include "main.h"
+/* score for elements (also used by editor.c) */
+#define SC_EDELSTEIN 0
+#define SC_DIAMANT 1
+#define SC_KAEFER 2
+#define SC_FLIEGER 3
+#define SC_MAMPFER 4
+#define SC_ROBOT 5
+#define SC_PACMAN 6
+#define SC_KOKOSNUSS 7
+#define SC_DYNAMIT 8
+#define SC_SCHLUESSEL 9
+#define SC_ZEITBONUS 10
+
void GetPlayerConfig(void);
void InitGame(void);
void InitMovDir(int, int);
/* read the graphic file in PCX format to image structure */
if ((image = Read_PCX_to_Image(filename)) == NULL)
- return PCX_FileInvalid;
+ return errno_pcx;
#if DEBUG_TIMING
printf("%s:\n", filename);
*pixmap = ximageinfo->pixmap;
*pixmap_mask = ximageinfo->pixmap_mask;
- return(PCX_Success);
+ return PCX_Success;
}
#endif /* !MSDOS */
void OpenAll(int argc, char *argv[])
{
+#ifdef MSDOS
+ initErrorFile();
+#endif
+
if (options.serveronly)
{
NetworkServer(options.server_port, options.serveronly);
exit(0);
}
- InitLevelAndPlayerInfo();
-
InitCounter();
InitSound();
InitSoundServer();
XFlush(display);
InitGfx();
- InitElementProperties();
- InitGadgets();
+ InitElementProperties(); /* initializes IS_CHAR() for el2gfx() */
+
+ InitLevelAndPlayerInfo();
+ InitGadgets(); /* needs to know number of level series */
DrawMainMenu();
local_player->connected = TRUE;
- LoadLevelInfo(); /* global level info */
- LoadSetup(); /* global setup info */
- LoadLevelSetup(); /* info about last played level */
+ LoadLevelInfo(); /* global level info */
+ LoadSetup(); /* global setup info */
+ LoadLevelSetup_LastSeries(); /* last played series info */
+ LoadLevelSetup_SeriesInfo(); /* last played level info */
}
void InitNetworkServer()
PropModePrepend, (unsigned char *) &delete_atom, 1);
sprintf(icon_filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY,
+ options.ro_base_directory, GRAPHICS_DIRECTORY,
icon_pic.picture_filename);
XReadBitmapFile(display,window,icon_filename,
&icon_width,&icon_height,
Error(ERR_EXIT, "cannot read icon bitmap file '%s'", icon_filename);
sprintf(icon_filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY,
+ options.ro_base_directory, GRAPHICS_DIRECTORY,
icon_pic.picturemask_filename);
XReadBitmapFile(display,window,icon_filename,
&icon_width,&icon_height,
gc = XCreateGC(display, window, gc_valuemask, &gc_values);
}
-void DrawInitText(char *text, int ypos, int color)
-{
- if (display && window && pix[PIX_SMALLFONT])
- {
- XFillRectangle(display,window,gc,0,ypos, WIN_XSIZE,FONT2_YSIZE);
- DrawTextExt(window,gc,(WIN_XSIZE-strlen(text)*FONT2_XSIZE)/2,
- ypos,text,FS_SMALL,color);
- XFlush(display);
- }
-}
-
void InitGfx()
{
int i,j;
{ "Door", TRUE },
{ "Heroes", TRUE },
{ "Toons", TRUE },
+ { "SP", TRUE },
+ { "DC", TRUE },
{ "More", TRUE },
{ "Font", FALSE },
- { "Font2", FALSE }
+ { "Font2", FALSE },
+ { "Font3", FALSE }
};
#else
static struct PictureFileInfo pic[NUM_PICTURES] =
{ "RocksDoor", TRUE },
{ "RocksHeroes", TRUE },
{ "RocksToons", TRUE },
+ { "RocksSP", TRUE },
+ { "RocksDC", TRUE },
{ "RocksMore", TRUE },
{ "RocksFont", FALSE },
- { "RocksFont2", FALSE }
+ { "RocksFont2", FALSE },
+ { "RocksFont3", FALSE }
};
#endif
{ GFX_SOKOBAN_OBJEKT, 1 },
{ GFX_FUNKELN_BLAU, 3 },
{ GFX_FUNKELN_WEISS, 3 },
+ { GFX2_SHIELD_PASSIVE, 3 },
+ { GFX2_SHIELD_ACTIVE, 3 },
{ -1, 0 }
};
int tile = tile_needs_clipping[i].start + j;
int graphic = tile;
int src_x, src_y;
- Pixmap src_pixmap;
-
-#if 0
- if (graphic >= GFX_START_ROCKSSCREEN &&
- graphic <= GFX_END_ROCKSSCREEN)
- {
- src_pixmap = clipmask[PIX_BACK];
- graphic -= GFX_START_ROCKSSCREEN;
- src_x = SX + (graphic % GFX_PER_LINE) * TILEX;
- src_y = SY + (graphic / GFX_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSHEROES &&
- graphic <= GFX_END_ROCKSHEROES)
- {
- src_pixmap = clipmask[PIX_HEROES];
- graphic -= GFX_START_ROCKSHEROES;
- src_x = (graphic % HEROES_PER_LINE) * TILEX;
- src_y = (graphic / HEROES_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSFONT &&
- graphic <= GFX_END_ROCKSFONT)
- {
- src_pixmap = clipmask[PIX_BIGFONT];
- graphic -= GFX_START_ROCKSFONT;
- src_x = (graphic % FONT_CHARS_PER_LINE) * TILEX;
- src_y = (graphic / FONT_CHARS_PER_LINE) * TILEY +
- FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY;
- }
- else
- break;
-#else
-
int pixmap_nr;
+ Pixmap src_pixmap;
getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
src_pixmap = clipmask[pixmap_nr];
-#endif
-
tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
XCopyArea(display,src_pixmap,tile_clipmask[tile],copy_clipmask_gc,
sprintf(basefilename, "%s%s", pic->picture_filename, picture_ext);
DrawInitText(basefilename, 150, FC_YELLOW);
sprintf(filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+ options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
#ifdef MSDOS
rest(100);
sprintf(basefilename, "%s%s", pic->picture_filename, picturemask_ext);
DrawInitText(basefilename, 150, FC_YELLOW);
sprintf(filename, "%s/%s/%s",
- options.base_directory, GRAPHICS_DIRECTORY, basefilename);
+ options.ro_base_directory, GRAPHICS_DIRECTORY, basefilename);
#if DEBUG_TIMING
debug_print_timestamp(1, NULL); /* initialize timestamp function */
CreateGameButtons();
CreateTapeButtons();
CreateToolButtons();
+ CreateScreenGadgets();
}
void InitElementProperties()
EL_SCHLUESSEL1,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
- EL_SCHLUESSEL4
+ EL_SCHLUESSEL4,
+ EL_EM_KEY_1,
+ EL_EM_KEY_2,
+ EL_EM_KEY_3,
+ EL_EM_KEY_4
};
static int ep_schluessel_num = sizeof(ep_schluessel)/sizeof(int);
EL_PFORTE1X,
EL_PFORTE2X,
EL_PFORTE3X,
- EL_PFORTE4X
+ EL_PFORTE4X,
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+ EL_SWITCHGATE_OPEN,
+ EL_SWITCHGATE_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_CLOSED,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
EL_MAUER_X,
EL_MAUER_Y,
EL_MAUER_XY,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
EL_AMOEBE_BD,
EL_MORAST_VOLL,
EL_MORAST_LEER,
- EL_SIEB_INAKTIV,
- EL_SIEB_LEER,
- EL_SIEB_VOLL,
- EL_SIEB_TOT,
- EL_SIEB2_INAKTIV,
- EL_SIEB2_LEER,
- EL_SIEB2_VOLL,
- EL_SIEB2_TOT,
+ EL_MAGIC_WALL_OFF,
+ EL_MAGIC_WALL_EMPTY,
+ EL_MAGIC_WALL_FULL,
+ EL_MAGIC_WALL_DEAD,
+ EL_MAGIC_WALL_BD_OFF,
+ EL_MAGIC_WALL_BD_EMPTY,
+ EL_MAGIC_WALL_BD_FULL,
+ EL_MAGIC_WALL_BD_DEAD,
EL_LIFE,
EL_LIFE_ASYNC,
EL_BADEWANNE1,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
EL_SP_EXIT,
- EL_INVISIBLE_STEEL
+ EL_INVISIBLE_STEEL,
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT1_SWITCH_MIDDLE,
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT2_SWITCH_MIDDLE,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT3_SWITCH_MIDDLE,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_LEFT,
+ EL_BELT4_SWITCH_MIDDLE,
+ EL_BELT4_SWITCH_RIGHT,
+ EL_SWITCHGATE_SWITCH_1,
+ EL_SWITCHGATE_SWITCH_2,
+ EL_LIGHT_SWITCH_OFF,
+ EL_LIGHT_SWITCH_ON,
+ EL_TIMEGATE_SWITCH_OFF,
+ EL_TIMEGATE_SWITCH_ON,
+ EL_SIGN_EXCLAMATION,
+ EL_SIGN_RADIOACTIVITY,
+ EL_SIGN_STOP,
+ EL_SIGN_WHEELCHAIR,
+ EL_SIGN_PARKING,
+ EL_SIGN_ONEWAY,
+ EL_SIGN_HEART,
+ EL_SIGN_TRIANGLE,
+ EL_SIGN_ROUND,
+ EL_SIGN_EXIT,
+ EL_SIGN_YINYANG,
+ EL_SIGN_OTHER,
+ EL_STEEL_SLANTED,
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_STEEL_WALL_2,
+ EL_EMC_STEEL_WALL_3,
+ EL_EMC_STEEL_WALL_4,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
+ EL_EMC_WALL_8,
+ EL_CRYSTAL,
+ EL_WALL_PEARL,
+ EL_WALL_CRYSTAL,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
EL_PFORTE2X,
EL_PFORTE3X,
EL_PFORTE4X,
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+ EL_SWITCHGATE_OPEN,
+ EL_SWITCHGATE_CLOSED,
+ EL_TIMEGATE_OPEN,
+ EL_TIMEGATE_CLOSED,
EL_SP_HARD_GRAY,
EL_SP_HARD_GREEN,
EL_SP_HARD_BLUE,
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
- EL_INVISIBLE_STEEL
+ EL_INVISIBLE_STEEL,
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT1_SWITCH_MIDDLE,
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT2_SWITCH_MIDDLE,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT3_SWITCH_MIDDLE,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_LEFT,
+ EL_BELT4_SWITCH_MIDDLE,
+ EL_BELT4_SWITCH_RIGHT,
+ EL_LIGHT_SWITCH_OFF,
+ EL_LIGHT_SWITCH_ON,
+ EL_SIGN_EXCLAMATION,
+ EL_SIGN_RADIOACTIVITY,
+ EL_SIGN_STOP,
+ EL_SIGN_WHEELCHAIR,
+ EL_SIGN_PARKING,
+ EL_SIGN_ONEWAY,
+ EL_SIGN_HEART,
+ EL_SIGN_TRIANGLE,
+ EL_SIGN_ROUND,
+ EL_SIGN_EXIT,
+ EL_SIGN_YINYANG,
+ EL_SIGN_OTHER,
+ EL_STEEL_SLANTED,
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_STEEL_WALL_2,
+ EL_EMC_STEEL_WALL_3,
+ EL_EMC_STEEL_WALL_4,
+ EL_CRYSTAL,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
};
static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
static int ep_slippery[] =
{
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_SP_CHIP_RIGHT,
EL_SP_CHIP_UPPER,
EL_SP_CHIP_LOWER,
- EL_SPEED_PILL
+ EL_SPEED_PILL,
+ EL_STEEL_SLANTED,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
EL_PFORTE2X,
EL_PFORTE3X,
EL_PFORTE4X,
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
EL_AUSGANG_ZU,
EL_AUSGANG_ACT,
EL_AUSGANG_AUF,
EL_MAUER_Y,
EL_MAUER_XY,
EL_MAUERND,
+ EL_BD_WALL,
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
EL_SP_EXIT,
- EL_INVISIBLE_STEEL
+ EL_INVISIBLE_STEEL,
+ EL_STEEL_SLANTED,
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_STEEL_WALL_2,
+ EL_EMC_STEEL_WALL_3,
+ EL_EMC_STEEL_WALL_4,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
+ EL_EMC_WALL_8
};
static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
static int ep_can_fall[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_KOKOSNUSS,
EL_TROPFEN,
EL_MORAST_VOLL,
- EL_SIEB_VOLL,
- EL_SIEB2_VOLL,
+ EL_MAGIC_WALL_FULL,
+ EL_MAGIC_WALL_BD_FULL,
EL_ZEIT_VOLL,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ EL_SP_DISK_ORANGE,
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_can_fall_num = sizeof(ep_can_fall)/sizeof(int);
static int ep_can_smash[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
EL_SCHLUESSEL4,
+ EL_EM_KEY_1,
+ EL_EM_KEY_2,
+ EL_EM_KEY_3,
+ EL_EM_KEY_4,
EL_BOMBE,
EL_KOKOSNUSS,
EL_TROPFEN,
EL_ZEIT_LEER,
EL_SP_ZONK,
EL_SP_INFOTRON,
- EL_SP_DISK_ORANGE
+ EL_SP_DISK_ORANGE,
+ EL_PEARL,
+ EL_CRYSTAL,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_can_smash_num = sizeof(ep_can_smash)/sizeof(int);
static int ep_can_change[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN,
EL_EDELSTEIN_BD,
EL_EDELSTEIN_GELB,
EL_MAMPFER2,
EL_ROBOT,
EL_PACMAN,
- EL_MAULWURF,
+ EL_MOLE,
EL_PINGUIN,
EL_SCHWEIN,
EL_DRACHE,
EL_SONDE,
EL_SP_SNIKSNAK,
- EL_SP_ELECTRON
+ EL_SP_ELECTRON,
+ EL_BALLOON,
+ EL_SPRING_MOVING
};
static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int);
static int ep_could_move[] =
{
- EL_KAEFER_R,
- EL_KAEFER_O,
- EL_KAEFER_L,
- EL_KAEFER_U,
- EL_FLIEGER_R,
- EL_FLIEGER_O,
- EL_FLIEGER_L,
- EL_FLIEGER_U,
- EL_BUTTERFLY_R,
- EL_BUTTERFLY_O,
- EL_BUTTERFLY_L,
- EL_BUTTERFLY_U,
- EL_FIREFLY_R,
- EL_FIREFLY_O,
- EL_FIREFLY_L,
- EL_FIREFLY_U,
- EL_PACMAN_R,
- EL_PACMAN_O,
- EL_PACMAN_L,
- EL_PACMAN_U
+ EL_KAEFER_RIGHT,
+ EL_KAEFER_UP,
+ EL_KAEFER_LEFT,
+ EL_KAEFER_DOWN,
+ EL_FLIEGER_RIGHT,
+ EL_FLIEGER_UP,
+ EL_FLIEGER_LEFT,
+ EL_FLIEGER_DOWN,
+ EL_BUTTERFLY_RIGHT,
+ EL_BUTTERFLY_UP,
+ EL_BUTTERFLY_LEFT,
+ EL_BUTTERFLY_DOWN,
+ EL_FIREFLY_RIGHT,
+ EL_FIREFLY_UP,
+ EL_FIREFLY_LEFT,
+ EL_FIREFLY_DOWN,
+ EL_PACMAN_RIGHT,
+ EL_PACMAN_UP,
+ EL_PACMAN_LEFT,
+ EL_PACMAN_DOWN
};
static int ep_could_move_num = sizeof(ep_could_move)/sizeof(int);
EL_SALZSAEURE,
EL_SP_SNIKSNAK,
EL_SP_ELECTRON,
- EL_SP_BUG_ACTIVE
+ EL_SP_BUG_ACTIVE,
+ EL_TRAP_ACTIVE,
+ EL_LANDMINE
};
static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int);
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT
+ EL_DIAMANT,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int);
EL_LEERRAUM,
EL_ERDREICH,
EL_FELSBODEN,
+ EL_BD_WALL,
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_EDELSTEIN_BD,
- EL_SIEB2_INAKTIV,
+ EL_MAGIC_WALL_BD_OFF,
EL_AUSGANG_ZU,
EL_AUSGANG_AUF,
EL_BETON,
EL_LEERRAUM,
EL_ERDREICH,
EL_MAUERWERK,
+ EL_BD_WALL,
EL_FELSBODEN,
EL_SCHLUESSEL,
EL_BETON,
EL_SCHLUESSEL2,
EL_SCHLUESSEL3,
EL_SCHLUESSEL4,
+ EL_EM_KEY_1,
+ EL_EM_KEY_2,
+ EL_EM_KEY_3,
+ EL_EM_KEY_4,
EL_PFORTE1,
EL_PFORTE2,
EL_PFORTE3,
EL_PFORTE2X,
EL_PFORTE3X,
EL_PFORTE4X,
- EL_DYNAMIT_AUS,
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+ EL_DYNAMITE_INACTIVE,
EL_UNSICHTBAR,
EL_BIRNE_AUS,
EL_BIRNE_EIN,
EL_BADEWANNE3,
EL_BADEWANNE4,
EL_BADEWANNE5,
- EL_SIEB_INAKTIV,
- EL_SIEB_TOT,
- EL_SIEB2_INAKTIV,
- EL_SIEB2_TOT,
+ EL_MAGIC_WALL_OFF,
+ EL_MAGIC_WALL_DEAD,
+ EL_MAGIC_WALL_BD_OFF,
+ EL_MAGIC_WALL_BD_DEAD,
EL_AMOEBA2DIAM,
EL_BLOCKED,
EL_SP_EMPTY,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_EXIT,
- EL_INVISIBLE_STEEL
+ EL_INVISIBLE_STEEL,
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT1_SWITCH_MIDDLE,
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT2_SWITCH_MIDDLE,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT3_SWITCH_MIDDLE,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_LEFT,
+ EL_BELT4_SWITCH_MIDDLE,
+ EL_BELT4_SWITCH_RIGHT,
+ EL_SIGN_EXCLAMATION,
+ EL_SIGN_RADIOACTIVITY,
+ EL_SIGN_STOP,
+ EL_SIGN_WHEELCHAIR,
+ EL_SIGN_PARKING,
+ EL_SIGN_ONEWAY,
+ EL_SIGN_HEART,
+ EL_SIGN_TRIANGLE,
+ EL_SIGN_ROUND,
+ EL_SIGN_EXIT,
+ EL_SIGN_YINYANG,
+ EL_SIGN_OTHER,
+ EL_STEEL_SLANTED,
+ EL_EMC_STEEL_WALL_1,
+ EL_EMC_STEEL_WALL_2,
+ EL_EMC_STEEL_WALL_3,
+ EL_EMC_STEEL_WALL_4,
+ EL_EMC_WALL_1,
+ EL_EMC_WALL_2,
+ EL_EMC_WALL_3,
+ EL_EMC_WALL_4,
+ EL_EMC_WALL_5,
+ EL_EMC_WALL_6,
+ EL_EMC_WALL_7,
+ EL_EMC_WALL_8
};
static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);
static int ep_explosive[] =
{
EL_BOMBE,
- EL_DYNAMIT,
- EL_DYNAMIT_AUS,
- EL_DYNABOMB,
+ EL_DYNAMITE_ACTIVE,
+ EL_DYNAMITE_INACTIVE,
+ EL_DYNABOMB_ACTIVE_1,
+ EL_DYNABOMB_ACTIVE_2,
+ EL_DYNABOMB_ACTIVE_3,
+ EL_DYNABOMB_ACTIVE_4,
EL_DYNABOMB_NR,
EL_DYNABOMB_SZ,
EL_DYNABOMB_XL,
EL_KAEFER,
- EL_MAULWURF,
+ EL_MOLE,
EL_PINGUIN,
EL_SCHWEIN,
EL_DRACHE,
EL_SP_DISK_ORANGE,
EL_SP_DISK_YELLOW,
EL_SP_SNIKSNAK,
- EL_SP_ELECTRON
+ EL_SP_ELECTRON,
+ EL_DX_SUPABOMB
};
static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int);
EL_EDELSTEIN_GELB,
EL_EDELSTEIN_ROT,
EL_EDELSTEIN_LILA,
- EL_DIAMANT
+ EL_DIAMANT,
+ EL_PEARL,
+ EL_CRYSTAL
};
static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int);
static int ep_pushable[] =
{
EL_FELSBROCKEN,
+ EL_BD_ROCK,
EL_BOMBE,
EL_KOKOSNUSS,
EL_ZEIT_LEER,
EL_SONDE,
EL_SP_ZONK,
EL_SP_DISK_ORANGE,
- EL_SP_DISK_YELLOW
+ EL_SP_DISK_YELLOW,
+ EL_BALLOON,
+ EL_SPRING,
+ EL_DX_SUPABOMB
};
static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int);
{
EL_ERDREICH,
EL_SP_BASE,
- EL_SP_BUG
+ EL_SP_BUG,
+ EL_TRAP_INACTIVE,
+ EL_SAND_INVISIBLE
};
static int ep_eatable_num = sizeof(ep_eatable)/sizeof(int);
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_CHIP_UPPER,
- EL_SP_CHIP_LOWER
+ EL_SP_CHIP_LOWER,
+ /* additional elements that appeared in newer Supaplex levels */
+ EL_UNSICHTBAR,
+ /* more than one murphy in a level results in an inactive clone */
+ EL_SP_MURPHY_CLONE
};
static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int);
- static long ep_bit[] =
+ static int ep_quick_gate[] =
+ {
+ EL_EM_GATE_1,
+ EL_EM_GATE_2,
+ EL_EM_GATE_3,
+ EL_EM_GATE_4,
+ EL_EM_GATE_1X,
+ EL_EM_GATE_2X,
+ EL_EM_GATE_3X,
+ EL_EM_GATE_4X,
+ EL_SP_PORT1_LEFT,
+ EL_SP_PORT2_LEFT,
+ EL_SP_PORT1_RIGHT,
+ EL_SP_PORT2_RIGHT,
+ EL_SP_PORT1_UP,
+ EL_SP_PORT2_UP,
+ EL_SP_PORT1_DOWN,
+ EL_SP_PORT2_DOWN,
+ EL_SP_PORT_X,
+ EL_SP_PORT_Y,
+ EL_SP_PORT_XY,
+ EL_SWITCHGATE_OPEN,
+ EL_TIMEGATE_OPEN
+ };
+ static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int);
+
+ static int ep_over_player[] =
+ {
+ EL_SP_PORT1_LEFT,
+ EL_SP_PORT2_LEFT,
+ EL_SP_PORT1_RIGHT,
+ EL_SP_PORT2_RIGHT,
+ EL_SP_PORT1_UP,
+ EL_SP_PORT2_UP,
+ EL_SP_PORT1_DOWN,
+ EL_SP_PORT2_DOWN,
+ EL_SP_PORT_X,
+ EL_SP_PORT_Y,
+ EL_SP_PORT_XY,
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
+ };
+ static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
+
+ static int ep_active_bomb[] =
+ {
+ EL_DYNAMITE_ACTIVE,
+ EL_DYNABOMB_ACTIVE_1,
+ EL_DYNABOMB_ACTIVE_2,
+ EL_DYNABOMB_ACTIVE_3,
+ EL_DYNABOMB_ACTIVE_4
+ };
+ static int ep_active_bomb_num = sizeof(ep_active_bomb)/sizeof(int);
+
+ static int ep_belt[] =
+ {
+ EL_BELT1_LEFT,
+ EL_BELT1_MIDDLE,
+ EL_BELT1_RIGHT,
+ EL_BELT2_LEFT,
+ EL_BELT2_MIDDLE,
+ EL_BELT2_RIGHT,
+ EL_BELT3_LEFT,
+ EL_BELT3_MIDDLE,
+ EL_BELT3_RIGHT,
+ EL_BELT4_LEFT,
+ EL_BELT4_MIDDLE,
+ EL_BELT4_RIGHT,
+ };
+ static int ep_belt_num = sizeof(ep_belt)/sizeof(int);
+
+ static int ep_belt_switch[] =
+ {
+ EL_BELT1_SWITCH_LEFT,
+ EL_BELT1_SWITCH_MIDDLE,
+ EL_BELT1_SWITCH_RIGHT,
+ EL_BELT2_SWITCH_LEFT,
+ EL_BELT2_SWITCH_MIDDLE,
+ EL_BELT2_SWITCH_RIGHT,
+ EL_BELT3_SWITCH_LEFT,
+ EL_BELT3_SWITCH_MIDDLE,
+ EL_BELT3_SWITCH_RIGHT,
+ EL_BELT4_SWITCH_LEFT,
+ EL_BELT4_SWITCH_MIDDLE,
+ EL_BELT4_SWITCH_RIGHT,
+ };
+ static int ep_belt_switch_num = sizeof(ep_belt_switch)/sizeof(int);
+
+ static int ep_tube[] =
+ {
+ EL_TUBE_CROSS,
+ EL_TUBE_VERTICAL,
+ EL_TUBE_HORIZONTAL,
+ EL_TUBE_VERT_LEFT,
+ EL_TUBE_VERT_RIGHT,
+ EL_TUBE_HORIZ_UP,
+ EL_TUBE_HORIZ_DOWN,
+ EL_TUBE_LEFT_UP,
+ EL_TUBE_LEFT_DOWN,
+ EL_TUBE_RIGHT_UP,
+ EL_TUBE_RIGHT_DOWN
+ };
+ static int ep_tube_num = sizeof(ep_tube)/sizeof(int);
+
+ static long ep1_bit[] =
{
EP_BIT_AMOEBALIVE,
EP_BIT_AMOEBOID,
EP_BIT_PLAYER,
EP_BIT_HAS_CONTENT,
EP_BIT_EATABLE,
- EP_BIT_SP_ELEMENT
+ EP_BIT_SP_ELEMENT,
+ EP_BIT_QUICK_GATE,
+ EP_BIT_OVER_PLAYER,
+ EP_BIT_ACTIVE_BOMB
};
- static int *ep_array[] =
+ static long ep2_bit[] =
+ {
+ EP_BIT_BELT,
+ EP_BIT_BELT_SWITCH,
+ EP_BIT_TUBE
+ };
+ static int *ep1_array[] =
{
ep_amoebalive,
ep_amoeboid,
ep_player,
ep_has_content,
ep_eatable,
- ep_sp_element
+ ep_sp_element,
+ ep_quick_gate,
+ ep_over_player,
+ ep_active_bomb
+ };
+ static int *ep2_array[] =
+ {
+ ep_belt,
+ ep_belt_switch,
+ ep_tube
};
- static int *ep_num[] =
+ static int *ep1_num[] =
{
&ep_amoebalive_num,
&ep_amoeboid_num,
&ep_player_num,
&ep_has_content_num,
&ep_eatable_num,
- &ep_sp_element_num
+ &ep_sp_element_num,
+ &ep_quick_gate_num,
+ &ep_over_player_num,
+ &ep_active_bomb_num
+ };
+ static int *ep2_num[] =
+ {
+ &ep_belt_num,
+ &ep_belt_switch_num,
+ &ep_tube_num
};
- static int num_properties = sizeof(ep_num)/sizeof(int *);
+ static int num_properties1 = sizeof(ep1_num)/sizeof(int *);
+ static int num_properties2 = sizeof(ep2_num)/sizeof(int *);
for(i=0; i<MAX_ELEMENTS; i++)
- Elementeigenschaften[i] = 0;
+ {
+ Elementeigenschaften1[i] = 0;
+ Elementeigenschaften2[i] = 0;
+ }
+
+ for(i=0; i<num_properties1; i++)
+ for(j=0; j<*(ep1_num[i]); j++)
+ Elementeigenschaften1[(ep1_array[i])[j]] |= ep1_bit[i];
+ for(i=0; i<num_properties2; i++)
+ for(j=0; j<*(ep2_num[i]); j++)
+ Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
- for(i=0; i<num_properties; i++)
- for(j=0; j<*(ep_num[i]); j++)
- Elementeigenschaften[(ep_array[i])[j]] |= ep_bit[i];
for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
- Elementeigenschaften[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
+ Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
}
void CloseAllAndExit(int exit_value)
if (joystick_nr < 0)
return 0;
- /* the allegro global variable ïnum_joysticksï contains the number
+ /* the allegro global variable 'num_joysticks' contains the number
of joysticks found at initialization under MSDOS / Windows */
#if 0
short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+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];
-unsigned long Elementeigenschaften[MAX_ELEMENTS];
+unsigned long Elementeigenschaften1[MAX_ELEMENTS];
+unsigned long Elementeigenschaften2[MAX_ELEMENTS];
-int level_nr, leveldir_nr, num_leveldirs;
+int level_nr;
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
-int FX = SX, FY = SY, ScrollStepSize = TILEX/8;
+int FX = SX, FY = SY, ScrollStepSize;
int ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
int ScreenGfxPos = 0;
int BorderElement = EL_BETON;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
-int MoveSpeed = 8;
int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
int SBX_Left, SBX_Right;
int SBY_Upper, SBY_Lower;
int ZX,ZY, ExitX,ExitY;
int AllPlayersGone;
int FrameCounter, TimeFrames, TimePlayed, TimeLeft;
-int MampferMax, MampferNr;
-boolean SiebAktiv;
-int SiebCount;
-
-int game_emulation = EMU_NONE;
boolean network_player_action_received = FALSE;
-struct LevelDirInfo leveldir[MAX_LEVDIR_ENTRIES];
+struct LevelDirInfo *leveldir_first = NULL, *leveldir_current = NULL;
struct LevelInfo level;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct TapeInfo tape;
struct OptionInfo options;
struct SetupInfo setup;
-struct SetupFileList *setup_list = NULL;
-struct SetupFileList *level_setup_list = NULL;
+struct GameInfo game;
+struct GlobalInfo global;
/* data needed for playing sounds */
char *sound_name[NUM_SOUNDS] =
"boom",
"booom",
"exit",
- "empty"
+ "empty",
+ "gate"
};
/* background music */
char *element_info[] =
{
- "empty space",
+ "empty space", /* 0 */
"sand",
"normal wall",
"round wall",
"closed exit",
"player",
"bug",
- "spaceship",
+ "spaceship", /* 10 */
"yam yam",
"robot",
"steel wall",
"quicksand with rock",
"amoeba drop",
"bomb",
- "magic wall",
+ "magic wall", /* 20 */
"speed ball",
"acid pool",
"dropping amoeba",
"biomaze",
"burning dynamite",
"unknown",
- "magic wheel",
+ "magic wheel", /* 30 */
"running wire",
"red key",
"yellow key",
"yellow door",
"green door",
"blue door",
- "grey door (opened by red key)",
- "grey door (opened by yellow key)",
- "grey door (opened by green key)",
- "grey door (opened by blue key)",
+ "gray door (opened by red key)", /* 40 */
+ "gray door (opened by yellow key)",
+ "gray door (opened by green key)",
+ "gray door (opened by blue key)",
"dynamite",
"pac man",
"invisible normal wall",
"light bulb (dark)",
"ligh bulb (glowing)",
"wall with emerald",
- "wall with diamond",
+ "wall with diamond", /* 50 */
"amoeba with content",
"amoeba (BD style)",
"time orb (full)",
"yellow emerald",
"wall with BD style diamond",
"wall with yellow emerald",
- "dark yam yam",
+ "dark yam yam", /* 60 */
"magic wall (BD style)",
"invisible steel wall",
- "dynabomb",
+ "-",
"increases number of bombs",
"increases explosion size",
"increases power of explosion",
"sokoban object",
"sokoban empty field",
"sokoban field with object",
- "butterfly (starts moving right)",
+ "butterfly (starts moving right)", /* 70 */
"butterfly (starts moving up)",
"butterfly (starts moving left)",
"butterfly (starts moving down)",
"firefly (starts moving down)",
"butterfly",
"firefly",
- "yellow player",
+ "yellow player", /* 80 */
"red player",
"green player",
"blue player",
"bug (starts moving down)",
"spaceship (starts moving right)",
"spaceship (starts moving up)",
- "spaceship (starts moving left)",
+ "spaceship (starts moving left)", /* 90 */
"spaceship (starts moving down)",
"pac man (starts moving right)",
"pac man (starts moving up)",
"violet emerald",
"wall with red emerald",
"wall with violet emerald",
+ "unknown", /* 100 */
"unknown",
"unknown",
"unknown",
"unknown",
- "unknown",
- "unknown",
- "unknown",
+ "normal wall (BD style)",
+ "rock (BD style)",
"open exit",
"unknown",
"amoeba",
- "mole",
+ "mole", /* 110 */
"penguin",
"satellite",
"arrow left",
"pig",
"fire breathing dragon",
"unknown",
- "letter ' '",
+ "letter ' '", /* 120 */
"letter '!'",
"letter '\"'",
"letter '#'",
"letter '''",
"letter '('",
"letter ')'",
- "letter '*'",
+ "letter '*'", /* 130 */
"letter '+'",
"letter ','",
"letter '-'",
"letter '1'",
"letter '2'",
"letter '3'",
- "letter '4'",
+ "letter '4'", /* 140 */
"letter '5'",
"letter '6'",
"letter '7'",
"letter ';'",
"letter '<'",
"letter '='",
- "letter '>'",
+ "letter '>'", /* 150 */
"letter '?'",
"letter '@'",
"letter 'A'",
"letter 'E'",
"letter 'F'",
"letter 'G'",
- "letter 'H'",
+ "letter 'H'", /* 160 */
"letter 'I'",
"letter 'J'",
"letter 'K'",
"letter 'O'",
"letter 'P'",
"letter 'Q'",
- "letter 'R'",
+ "letter 'R'", /* 170 */
"letter 'S'",
"letter 'T'",
"letter 'U'",
"letter 'Y'",
"letter 'Z'",
"letter 'Ä'",
- "letter 'Ö'",
+ "letter 'Ö'", /* 180 */
"letter 'Ü'",
"letter '^'",
"letter ''",
"letter ''",
"letter ''",
"letter ''",
+ "letter ''", /* 190 */
"letter ''",
"letter ''",
"letter ''",
"letter ''",
"letter ''",
"letter ''",
- "letter ''",
- "growing wall (horizontally)",
- "growing wall (vertically)",
+ "growing wall (horizontal)", /* 200 */
+ "growing wall (vertical)",
"growing wall (all directions)",
"unused",
"unused",
"unused",
"unused",
"unused",
- "empty space",
+ "empty space", /* 210 */
"zonk",
"base",
"murphy",
"exit",
"orange disk",
"port (leading right)",
- "port (leading down)",
+ "port (leading down)", /* 220 */
"port (leading left)",
"port (leading up)",
"port (leading right)",
"snik snak",
"yellow disk",
"terminal",
- "red disk",
- "port (vertically)",
- "port (horizontally)",
+ "red disk", /* 230 */
+ "port (vertical)",
+ "port (horizontal)",
"port (all directions)",
"electron",
"buggy base",
"chip (right half)",
"hardware",
"hardware",
- "hardware",
+ "hardware", /* 240 */
"hardware",
"hardware",
"hardware",
"hardware",
"chip (upper half)",
"chip (lower half)",
+ "unknown", /* 250 */
"unknown",
"unknown",
"unknown",
"unknown",
"unknown",
- "unknown"
+
+ /* 256 */
+
+ "pearl", /* (256) */
+ "crystal",
+ "wall with pearl",
+ "wall with crystal",
+ "white door", /* 260 */
+ "gray door (opened by white key)",
+ "white key",
+ "shield (passive)",
+ "extra time",
+ "switch gate (open)",
+ "switch gate (closed)",
+ "switch for switch gate",
+ "switch for switch gate",
+ "-",
+ "-", /* 270 */
+ "red conveyor belt (left)",
+ "red conveyor belt (middle)",
+ "red conveyor belt (right)",
+ "switch for red conveyor belt (left)",
+ "switch for red conveyor belt (middle)",
+ "switch for red conveyor belt (right)",
+ "yellow conveyor belt (left)",
+ "yellow conveyor belt (middle)",
+ "yellow conveyor belt (right)",
+ "switch for yellow conveyor belt (left)", /* 280 */
+ "switch for yellow conveyor belt (middle)",
+ "switch for yellow conveyor belt (right)",
+ "green conveyor belt (left)",
+ "green conveyor belt (middle)",
+ "green conveyor belt (right)",
+ "switch for green conveyor belt (left)",
+ "switch for green conveyor belt (middle)",
+ "switch for green conveyor belt (right)",
+ "blue conveyor belt (left)",
+ "blue conveyor belt (middle)", /* 290 */
+ "blue conveyor belt (right)",
+ "switch for blue conveyor belt (left)",
+ "switch for blue conveyor belt (middle)",
+ "switch for blue conveyor belt (right)",
+ "land mine",
+ "mail envelope",
+ "light switch (off)",
+ "light switch (on)",
+ "sign (exclamation)",
+ "sign (radio activity)", /* 300 */
+ "sign (stop)",
+ "sign (wheel chair)",
+ "sign (parking)",
+ "sign (one way)",
+ "sign (heart)",
+ "sign (triangle)",
+ "sign (round)",
+ "sign (exit)",
+ "sign (yin yang)",
+ "sign (other)", /* 310 */
+ "mole (starts moving left)",
+ "mole (starts moving right)",
+ "mole (starts moving up)",
+ "mole (starts moving down)",
+ "steel wall (slanted)",
+ "invisible sand",
+ "dx unknown 15",
+ "dx unknown 42",
+ "-",
+ "-", /* 320 */
+ "shield (active, kills enemies)",
+ "time gate (open)",
+ "time gate (closed)",
+ "switch for time gate",
+ "switch for time gate",
+ "balloon",
+ "send balloon to the left",
+ "send balloon to the right",
+ "send balloon up",
+ "send balloon down", /* 330 */
+ "send balloon in any direction",
+ "steel wall",
+ "steel wall",
+ "steel wall",
+ "steel wall",
+ "normal wall",
+ "normal wall",
+ "normal wall",
+ "normal wall",
+ "normal wall", /* 340 */
+ "normal wall",
+ "normal wall",
+ "normal wall",
+ "tube (all directions)",
+ "tube (vertical)",
+ "tube (horizontal)",
+ "tube (vertical & left)",
+ "tube (vertical & right)",
+ "tube (horizontal & up)",
+ "tube (horizontal & down)", /* 350 */
+ "tube (left & up)",
+ "tube (left & down)",
+ "tube (right & up)",
+ "tube (right & down)",
+ "spring",
+ "trap",
+ "stable bomb (DX style)",
+ "-"
+
+ /*
+ "-------------------------------",
+ */
};
int main(int argc, char *argv[])
#define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
#define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
+/* values for 'Elementeigenschaften1' */
#define EP_BIT_AMOEBALIVE (1 << 0)
#define EP_BIT_AMOEBOID (1 << 1)
#define EP_BIT_SCHLUESSEL (1 << 2)
#define EP_BIT_HAS_CONTENT (1 << 26)
#define EP_BIT_EATABLE (1 << 27)
#define EP_BIT_SP_ELEMENT (1 << 28)
-
-#define IS_AMOEBALIVE(e) (Elementeigenschaften[e] & EP_BIT_AMOEBALIVE)
-#define IS_AMOEBOID(e) (Elementeigenschaften[e] & EP_BIT_AMOEBOID)
-#define IS_SCHLUESSEL(e) (Elementeigenschaften[e] & EP_BIT_SCHLUESSEL)
-#define IS_PFORTE(e) (Elementeigenschaften[e] & EP_BIT_PFORTE)
-#define IS_SOLID(e) (Elementeigenschaften[e] & EP_BIT_SOLID)
-#define IS_MASSIVE(e) (Elementeigenschaften[e] & EP_BIT_MASSIVE)
-#define IS_SLIPPERY(e) (Elementeigenschaften[e] & EP_BIT_SLIPPERY)
-#define IS_ENEMY(e) (Elementeigenschaften[e] & EP_BIT_ENEMY)
-#define IS_MAUER(e) (Elementeigenschaften[e] & EP_BIT_MAUER)
-#define CAN_FALL(e) (Elementeigenschaften[e] & EP_BIT_CAN_FALL)
-#define CAN_SMASH(e) (Elementeigenschaften[e] & EP_BIT_CAN_SMASH)
-#define CAN_CHANGE(e) (Elementeigenschaften[e] & EP_BIT_CAN_CHANGE)
-#define CAN_MOVE(e) (Elementeigenschaften[e] & EP_BIT_CAN_MOVE)
-#define COULD_MOVE(e) (Elementeigenschaften[e] & EP_BIT_COULD_MOVE)
-#define DONT_TOUCH(e) (Elementeigenschaften[e] & EP_BIT_DONT_TOUCH)
-#define DONT_GO_TO(e) (Elementeigenschaften[e] & EP_BIT_DONT_GO_TO)
-#define IS_MAMPF2(e) (Elementeigenschaften[e] & EP_BIT_MAMPF2)
-#define IS_CHAR(e) (Elementeigenschaften[e] & EP_BIT_CHAR)
-#define IS_BD_ELEMENT(e) (Elementeigenschaften[e] & EP_BIT_BD_ELEMENT)
-#define IS_SB_ELEMENT(e) (Elementeigenschaften[e] & EP_BIT_SB_ELEMENT)
-#define IS_GEM(e) (Elementeigenschaften[e] & EP_BIT_GEM)
-#define IS_INACTIVE(e) (Elementeigenschaften[e] & EP_BIT_INACTIVE)
-#define IS_EXPLOSIVE(e) (Elementeigenschaften[e] & EP_BIT_EXPLOSIVE)
-#define IS_MAMPF3(e) (Elementeigenschaften[e] & EP_BIT_MAMPF3)
-#define IS_PUSHABLE(e) (Elementeigenschaften[e] & EP_BIT_PUSHABLE)
-#define ELEM_IS_PLAYER(e) (Elementeigenschaften[e] & EP_BIT_PLAYER)
-#define HAS_CONTENT(e) (Elementeigenschaften[e] & EP_BIT_HAS_CONTENT)
-#define IS_EATABLE(e) (Elementeigenschaften[e] & EP_BIT_EATABLE)
-#define IS_SP_ELEMENT(e) (Elementeigenschaften[e] & EP_BIT_SP_ELEMENT)
+#define EP_BIT_QUICK_GATE (1 << 29)
+#define EP_BIT_OVER_PLAYER (1 << 30)
+#define EP_BIT_ACTIVE_BOMB (1 << 31)
+
+/* values for 'Elementeigenschaften2' */
+#define EP_BIT_BELT (1 << 0)
+#define EP_BIT_BELT_SWITCH (1 << 1)
+#define EP_BIT_TUBE (1 << 2)
+
+#define IS_AMOEBALIVE(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBALIVE)
+#define IS_AMOEBOID(e) (Elementeigenschaften1[e] & EP_BIT_AMOEBOID)
+#define IS_SCHLUESSEL(e) (Elementeigenschaften1[e] & EP_BIT_SCHLUESSEL)
+#define IS_PFORTE(e) (Elementeigenschaften1[e] & EP_BIT_PFORTE)
+#define IS_SOLID(e) (Elementeigenschaften1[e] & EP_BIT_SOLID)
+#define IS_MASSIVE(e) (Elementeigenschaften1[e] & EP_BIT_MASSIVE)
+#define IS_SLIPPERY(e) (Elementeigenschaften1[e] & EP_BIT_SLIPPERY)
+#define IS_ENEMY(e) (Elementeigenschaften1[e] & EP_BIT_ENEMY)
+#define IS_MAUER(e) (Elementeigenschaften1[e] & EP_BIT_MAUER)
+#define CAN_FALL(e) (Elementeigenschaften1[e] & EP_BIT_CAN_FALL)
+#define CAN_SMASH(e) (Elementeigenschaften1[e] & EP_BIT_CAN_SMASH)
+#define CAN_CHANGE(e) (Elementeigenschaften1[e] & EP_BIT_CAN_CHANGE)
+#define CAN_MOVE(e) (Elementeigenschaften1[e] & EP_BIT_CAN_MOVE)
+#define COULD_MOVE(e) (Elementeigenschaften1[e] & EP_BIT_COULD_MOVE)
+#define DONT_TOUCH(e) (Elementeigenschaften1[e] & EP_BIT_DONT_TOUCH)
+#define DONT_GO_TO(e) (Elementeigenschaften1[e] & EP_BIT_DONT_GO_TO)
+#define IS_MAMPF2(e) (Elementeigenschaften1[e] & EP_BIT_MAMPF2)
+#define IS_CHAR(e) (Elementeigenschaften1[e] & EP_BIT_CHAR)
+#define IS_BD_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_BD_ELEMENT)
+#define IS_SB_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_SB_ELEMENT)
+#define IS_GEM(e) (Elementeigenschaften1[e] & EP_BIT_GEM)
+#define IS_INACTIVE(e) (Elementeigenschaften1[e] & EP_BIT_INACTIVE)
+#define IS_EXPLOSIVE(e) (Elementeigenschaften1[e] & EP_BIT_EXPLOSIVE)
+#define IS_MAMPF3(e) (Elementeigenschaften1[e] & EP_BIT_MAMPF3)
+#define IS_PUSHABLE(e) (Elementeigenschaften1[e] & EP_BIT_PUSHABLE)
+#define ELEM_IS_PLAYER(e) (Elementeigenschaften1[e] & EP_BIT_PLAYER)
+#define HAS_CONTENT(e) (Elementeigenschaften1[e] & EP_BIT_HAS_CONTENT)
+#define IS_EATABLE(e) (Elementeigenschaften1[e] & EP_BIT_EATABLE)
+#define IS_SP_ELEMENT(e) (Elementeigenschaften1[e] & EP_BIT_SP_ELEMENT)
+#define IS_QUICK_GATE(e) (Elementeigenschaften1[e] & EP_BIT_QUICK_GATE)
+#define IS_OVER_PLAYER(e) (Elementeigenschaften1[e] & EP_BIT_OVER_PLAYER)
+#define IS_ACTIVE_BOMB(e) (Elementeigenschaften1[e] & EP_BIT_ACTIVE_BOMB)
+#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_PLAYER(x,y) (ELEM_IS_PLAYER(StorePlayer[x][y]))
#define IS_FREE_OR_PLAYER(x,y) (Feld[x][y] == EL_LEERRAUM)
#define IS_MOVING(x,y) (MovPos[x][y] != 0)
+#define IS_FALLING(x,y) (MovPos[x][y] != 0 && MovDir[x][y] == MV_DOWN)
#define IS_BLOCKED(x,y) (Feld[x][y] == EL_BLOCKED)
#define EL_CHANGED(e) ((e) == EL_FELSBROCKEN ? EL_EDELSTEIN : \
+ (e) == EL_BD_ROCK ? EL_EDELSTEIN_BD : \
(e) == EL_EDELSTEIN ? EL_DIAMANT : \
(e) == EL_EDELSTEIN_GELB ? EL_DIAMANT : \
(e) == EL_EDELSTEIN_ROT ? EL_DIAMANT : \
(e) == EL_EDELSTEIN_LILA ? EL_DIAMANT : \
EL_FELSBROCKEN)
#define EL_CHANGED2(e) ((e) == EL_FELSBROCKEN ? EL_EDELSTEIN_BD : \
- EL_FELSBROCKEN)
+ (e) == EL_BD_ROCK ? EL_EDELSTEIN_BD : \
+ EL_BD_ROCK)
#define IS_DRAWABLE(e) ((e) < EL_BLOCKED)
#define IS_NOT_DRAWABLE(e) ((e) >= EL_BLOCKED)
#define TAPE_IS_EMPTY(x) ((x).length == 0)
#define TAPE_IS_STOPPED(x) (!(x).recording && !(x).playing &&!(x).pausing)
#define PLAYERINFO(x,y) (&stored_player[StorePlayer[x][y]-EL_SPIELER1])
+#define SHIELD_ON(p) ((p)->shield_passive_time_left > 0)
+#define PROTECTED_FIELD(x,y) (IS_TUBE(Feld[x][y]))
+#define PLAYER_PROTECTED(x,y) (SHIELD_ON(PLAYERINFO(x, y)) || \
+ PROTECTED_FIELD(x, y))
-/* Pixmaps with Xpm or X11 Bitmap files */
+/* Pixmaps with graphic file */
#define PIX_BACK 0
#define PIX_DOOR 1
#define PIX_HEROES 2
#define PIX_TOONS 3
-#define PIX_MORE 4
-#define PIX_BIGFONT 5
-#define PIX_SMALLFONT 6
-/* Pixmaps without them */
-#define PIX_DB_BACK 7
-#define PIX_DB_DOOR 8
-#define PIX_DB_FIELD 9
-
-#define NUM_PICTURES 7
-#define NUM_PIXMAPS 10
+#define PIX_SP 4
+#define PIX_DC 5
+#define PIX_MORE 6
+#define PIX_BIGFONT 7
+#define PIX_SMALLFONT 8
+#define PIX_MEDIUMFONT 9
+/* Pixmaps without graphic file */
+#define PIX_DB_BACK 10
+#define PIX_DB_DOOR 11
+#define PIX_DB_FIELD 12
+
+#define NUM_PICTURES 10
+#define NUM_PIXMAPS 13
/* boundaries of arrays etc. */
-#define MAX_NAMELEN (10+1)
+#define MAX_PLAYER_NAME_LEN 10
#define MAX_LEVEL_NAME_LEN 32
#define MAX_LEVEL_AUTHOR_LEN 32
#define MAX_TAPELEN (1000 * 50) /* max. time * framerate */
-#define MAX_LEVDIR_ENTRIES 100
#define MAX_SCORE_ENTRIES 100
-#define MAX_ELEMENTS 512
+#define MAX_ELEMENTS 700 /* 500 static + 200 runtime */
#define MAX_NUM_AMOEBA 100
+/* values for elements with content */
+#define MIN_ELEMENT_CONTENTS 1
+#define STD_ELEMENT_CONTENTS 4
+#define MAX_ELEMENT_CONTENTS 8
+
#define LEVEL_SCORE_ELEMENTS 16 /* level elements with score */
/* fundamental game speed values */
struct HiScore
{
- char Name[MAX_NAMELEN];
+ char Name[MAX_PLAYER_NAME_LEN + 1];
int Score;
};
char *display_name;
char *server_host;
int server_port;
- char *base_directory;
+ char *ro_base_directory;
+ char *rw_base_directory;
char *level_directory;
boolean serveronly;
boolean network;
boolean autorecord;
boolean quick_doors;
boolean team_mode;
+ boolean handicap;
+ boolean time_limit;
struct SetupInputInfo input[MAX_PLAYERS];
};
byte effective_action; /* action aknowledged 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
+ through doors); overrides other actions */
int joystick_fd; /* file descriptor of player's joystick */
int Frame;
boolean Pushing;
- boolean gone, LevelSolved, GameOver;
+ boolean Switching;
+ boolean LevelSolved, GameOver;
boolean snapped;
unsigned long move_delay;
+ int move_delay_value;
+
int last_move_dir;
unsigned long push_delay;
int key[4];
int dynamite;
int dynabomb_count, dynabomb_size, dynabombs_left, dynabomb_xl;
+ int shield_passive_time_left;
+ int shield_active_time_left;
};
struct LevelInfo
int fieldx;
int fieldy;
int time;
- int edelsteine;
+ int gems_needed;
char name[MAX_LEVEL_NAME_LEN + 1];
char author[MAX_LEVEL_AUTHOR_LEN + 1];
int score[LEVEL_SCORE_ELEMENTS];
- int mampfer_inhalt[8][3][3];
- int tempo_amoebe;
- int dauer_sieb;
- int dauer_ablenk;
- int amoebe_inhalt;
+ int yam_content[MAX_ELEMENT_CONTENTS][3][3];
+ int num_yam_contents;
+ int amoeba_speed;
+ int amoeba_content;
+ int time_magic_wall;
+ int time_wheel;
+ int time_light;
+ int time_timegate;
boolean double_speed;
+ boolean gravity;
};
struct LevelDirInfo
{
- char *filename;
- char *name;
- char *author;
- int levels;
- int first_level;
- int last_level;
- int sort_priority;
- boolean user_defined;
- boolean readonly;
- int color;
+ char *filename; /* level series single directory name */
+ char *fullpath; /* complete path relative to level directory */
+ char *basepath; /* absolute base path of level directory */
+ char *name; /* level series name, as displayed on main screen */
+ char *name_short; /* optional short name for level selection screen */
+ char *name_sorting; /* optional sorting name for correct level sorting */
+ char *author; /* level series author name levels without author */
+ char *imported_from; /* optional comment for imported level series */
+ int levels; /* number of levels in level series */
+ int first_level; /* first level number (to allow start with 0 or 1) */
+ int last_level; /* last level number (automatically calculated) */
+ int sort_priority; /* sort levels by 'sort_priority' and then by name */
+ boolean level_group; /* directory contains more level series directories */
+ boolean parent_link; /* entry links back to parent directory */
+ boolean user_defined; /* user defined levels are stored in home directory */
+ boolean readonly; /* readonly levels can not be changed with editor */
+ int color; /* color to use on selection screen for this level */
+ char *class_desc; /* description of level series class */
+ int handicap_level; /* number of the lowest unsolved level */
+ int cl_first; /* internal control field for "choose level" screen */
+ int cl_cursor; /* internal control field for "choose level" screen */
+
+ struct LevelDirInfo *node_parent; /* parent level directory info */
+ struct LevelDirInfo *node_group; /* level group sub-directory info */
+ struct LevelDirInfo *next; /* next level series structure node */
};
struct TapeInfo
} pos[MAX_TAPELEN];
};
+struct GameInfo
+{
+ int emulation;
+ int yam_content_nr;
+ boolean magic_wall_active;
+ int magic_wall_time_left;
+ int light_time_left;
+ int timegate_time_left;
+ int belt_dir[4];
+ int belt_dir_nr[4];
+ int switchgate_pos;
+ int balloon_dir;
+};
+
+struct GlobalInfo
+{
+ int dummy;
+};
+
extern Display *display;
extern Visual *visual;
extern int screen;
extern short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern short Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
extern boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern short JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+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 unsigned long Elementeigenschaften[MAX_ELEMENTS];
+extern unsigned long Elementeigenschaften1[MAX_ELEMENTS];
+extern unsigned long Elementeigenschaften2[MAX_ELEMENTS];
-extern int level_nr, leveldir_nr, num_leveldirs;
+extern int level_nr;
extern int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
extern int FX,FY, ScrollStepSize;
extern int BorderElement;
extern int GameFrameDelay;
extern int FfwdFrameDelay;
-extern int MoveSpeed;
extern int BX1,BY1, BX2,BY2;
extern int SBX_Left, SBX_Right;
extern int SBY_Upper, SBY_Lower;
extern int ZX,ZY, ExitX,ExitY;
extern int AllPlayersGone;
extern int FrameCounter, TimeFrames, TimePlayed, TimeLeft;
-extern int MampferMax, MampferNr;
extern boolean SiebAktiv;
extern int SiebCount;
-extern int game_emulation;
-
extern boolean network_player_action_received;
-extern struct LevelDirInfo leveldir[];
+extern struct LevelDirInfo *leveldir_first, *leveldir_current;
extern struct LevelInfo level;
extern struct PlayerInfo stored_player[], *local_player;
extern struct HiScore highscore[];
extern struct JoystickInfo joystick[];
extern struct OptionInfo options;
extern struct SetupInfo setup;
-extern struct SetupFileList *setup_list;
-extern struct SetupFileList *level_setup_list;
+extern struct GameInfo game;
+extern struct GlobalInfo global;
extern char *sound_name[];
extern int background_loop[];
#define FONT3_YSIZE 14
#define FONT4_XSIZE 16
#define FONT4_YSIZE 16
+#define FONT5_XSIZE 10
+#define FONT5_YSIZE 14
+#define FONT6_XSIZE 16
+#define FONT6_YSIZE 32
#define GFX_STARTX SX
#define GFX_STARTY SY
#define GFX_PER_LINE 16
#define MINI_GFX_PER_LINE 32
#define MICRO_GFX_PER_LINE 128
+
#define HEROES_PER_LINE 16
-#define MINI_MORE_STARTX 0
-#define MINI_MORE_STARTY 224
-#define MICRO_MORE_STARTX 0
-#define MICRO_MORE_STARTY 336
+
+#define MINI_SP_STARTX 0
+#define MINI_SP_STARTY 352
+#define MICRO_SP_STARTX 0
+#define MICRO_SP_STARTY 448
+#define SP_PER_LINE 16
+#define MINI_SP_PER_LINE 16
+#define MICRO_SP_PER_LINE 64
+
+#define MINI_DC_STARTX 256
+#define MINI_DC_STARTY 256
+#define MICRO_DC_STARTX 384
+#define MICRO_DC_STARTY 384
+#define DC_PER_LINE 16
+#define MINI_DC_PER_LINE 16
+#define MICRO_DC_PER_LINE 16
+
+#define MINI_MORE_STARTX 256
+#define MINI_MORE_STARTY 256
+#define MICRO_MORE_STARTX 384
+#define MICRO_MORE_STARTY 384
#define MORE_PER_LINE 16
#define MINI_MORE_PER_LINE 16
#define MICRO_MORE_PER_LINE 16
+
#define FONT_CHARS_PER_LINE 16
#define FONT_LINES_PER_FONT 4
/* game elements:
-** 0 - 255: real elements, stored in level file
-** 256 - 511: flag elements, only used at runtime
+** 0 - 499: real elements, stored in level file
+** 500 - 699: flag elements, only used at runtime
*/
/* "real" level elements */
#define EL_LEERRAUM 0
#define EL_MORAST_VOLL 17
#define EL_TROPFEN 18
#define EL_BOMBE 19
-#define EL_SIEB_INAKTIV 20
+#define EL_MAGIC_WALL_OFF 20
#define EL_SPEED_PILL 21
#define EL_SALZSAEURE 22
#define EL_AMOEBE_NASS 23
#define EL_KOKOSNUSS 25
#define EL_LIFE 26
#define EL_LIFE_ASYNC 27
-#define EL_DYNAMIT 28
+#define EL_DYNAMITE_ACTIVE 28
#define EL_BADEWANNE 29
#define EL_ABLENK_AUS 30
#define EL_ABLENK_EIN 31
#define EL_PFORTE2X 41
#define EL_PFORTE3X 42
#define EL_PFORTE4X 43
-#define EL_DYNAMIT_AUS 44
+#define EL_DYNAMITE_INACTIVE 44
#define EL_PACMAN 45
#define EL_UNSICHTBAR 46
#define EL_BIRNE_AUS 47
#define EL_ERZ_EDEL_BD 58
#define EL_ERZ_EDEL_GELB 59
#define EL_MAMPFER2 60
-#define EL_SIEB2_INAKTIV 61
+#define EL_MAGIC_WALL_BD_OFF 61
#define EL_INVISIBLE_STEEL 62
-#define EL_DYNABOMB 63
+
+#define EL_UNUSED_63 63
+
#define EL_DYNABOMB_NR 64
#define EL_DYNABOMB_SZ 65
#define EL_DYNABOMB_XL 66
#define EL_SOKOBAN_OBJEKT 67
#define EL_SOKOBAN_FELD_LEER 68
#define EL_SOKOBAN_FELD_VOLL 69
-#define EL_BUTTERFLY_R 70
-#define EL_BUTTERFLY_O 71
-#define EL_BUTTERFLY_L 72
-#define EL_BUTTERFLY_U 73
-#define EL_FIREFLY_R 74
-#define EL_FIREFLY_O 75
-#define EL_FIREFLY_L 76
-#define EL_FIREFLY_U 77
-#define EL_BUTTERFLY_1 EL_BUTTERFLY_U
-#define EL_BUTTERFLY_2 EL_BUTTERFLY_L
-#define EL_BUTTERFLY_3 EL_BUTTERFLY_O
-#define EL_BUTTERFLY_4 EL_BUTTERFLY_R
-#define EL_FIREFLY_1 EL_FIREFLY_L
-#define EL_FIREFLY_2 EL_FIREFLY_U
-#define EL_FIREFLY_3 EL_FIREFLY_R
-#define EL_FIREFLY_4 EL_FIREFLY_O
+#define EL_BUTTERFLY_RIGHT 70
+#define EL_BUTTERFLY_UP 71
+#define EL_BUTTERFLY_LEFT 72
+#define EL_BUTTERFLY_DOWN 73
+#define EL_FIREFLY_RIGHT 74
+#define EL_FIREFLY_UP 75
+#define EL_FIREFLY_LEFT 76
+#define EL_FIREFLY_DOWN 77
+#define EL_BUTTERFLY_1 EL_BUTTERFLY_DOWN
+#define EL_BUTTERFLY_2 EL_BUTTERFLY_LEFT
+#define EL_BUTTERFLY_3 EL_BUTTERFLY_UP
+#define EL_BUTTERFLY_4 EL_BUTTERFLY_RIGHT
+#define EL_FIREFLY_1 EL_FIREFLY_LEFT
+#define EL_FIREFLY_2 EL_FIREFLY_DOWN
+#define EL_FIREFLY_3 EL_FIREFLY_RIGHT
+#define EL_FIREFLY_4 EL_FIREFLY_UP
#define EL_BUTTERFLY 78
#define EL_FIREFLY 79
#define EL_SPIELER1 80
#define EL_SPIELER2 81
#define EL_SPIELER3 82
#define EL_SPIELER4 83
-#define EL_KAEFER_R 84
-#define EL_KAEFER_O 85
-#define EL_KAEFER_L 86
-#define EL_KAEFER_U 87
-#define EL_FLIEGER_R 88
-#define EL_FLIEGER_O 89
-#define EL_FLIEGER_L 90
-#define EL_FLIEGER_U 91
-#define EL_PACMAN_R 92
-#define EL_PACMAN_O 93
-#define EL_PACMAN_L 94
-#define EL_PACMAN_U 95
+#define EL_KAEFER_RIGHT 84
+#define EL_KAEFER_UP 85
+#define EL_KAEFER_LEFT 86
+#define EL_KAEFER_DOWN 87
+#define EL_FLIEGER_RIGHT 88
+#define EL_FLIEGER_UP 89
+#define EL_FLIEGER_LEFT 90
+#define EL_FLIEGER_DOWN 91
+#define EL_PACMAN_RIGHT 92
+#define EL_PACMAN_UP 93
+#define EL_PACMAN_LEFT 94
+#define EL_PACMAN_DOWN 95
#define EL_EDELSTEIN_ROT 96
#define EL_EDELSTEIN_LILA 97
#define EL_ERZ_EDEL_ROT 98
#define EL_BADEWANNE3 102
#define EL_BADEWANNE4 103
#define EL_BADEWANNE5 104
-
-#define EL_UNUSED_105 105
-#define EL_UNUSED_106 106
-
+#define EL_BD_WALL 105
+#define EL_BD_ROCK 106
#define EL_AUSGANG_AUF 107
-
#define EL_BLACK_ORB 108
-
#define EL_AMOEBA2DIAM 109
-#define EL_MAULWURF 110
+#define EL_MOLE 110
#define EL_PINGUIN 111
#define EL_SONDE 112
-#define EL_PFEIL_L 113
-#define EL_PFEIL_R 114
-#define EL_PFEIL_O 115
-#define EL_PFEIL_U 116
+#define EL_PFEIL_LEFT 113
+#define EL_PFEIL_RIGHT 114
+#define EL_PFEIL_UP 115
+#define EL_PFEIL_DOWN 116
#define EL_SCHWEIN 117
#define EL_DRACHE 118
-#define EL_UNUSED_119 119
+#define EL_EM_KEY_1_FILE 119
#define EL_CHAR_START 120
#define EL_CHAR_ASCII0 (EL_CHAR_START-32)
#define EL_MAUER_Y 201
#define EL_MAUER_XY 202
-#define EL_UNUSED_203 203
-#define EL_UNUSED_204 204
-#define EL_UNUSED_205 205
-#define EL_UNUSED_206 206
-#define EL_UNUSED_207 207
-#define EL_UNUSED_208 208
-#define EL_UNUSED_209 209
+#define EL_EM_GATE_1 203
+#define EL_EM_GATE_2 204
+#define EL_EM_GATE_3 205
+#define EL_EM_GATE_4 206
+
+#define EL_EM_KEY_2_FILE 207
+#define EL_EM_KEY_3_FILE 208
+#define EL_EM_KEY_4_FILE 209
#define EL_SP_START 210
#define EL_SP_EMPTY (EL_SP_START + 0)
#define EL_SP_CHIP_LOWER (EL_SP_START + 39)
#define EL_SP_END (EL_SP_START + 39)
-#define EL_UNUSED_250 250
-#define EL_UNUSED_251 251
-#define EL_UNUSED_252 252
-#define EL_UNUSED_253 253
+#define EL_EM_GATE_1X 250
+#define EL_EM_GATE_2X 251
+#define EL_EM_GATE_3X 252
+#define EL_EM_GATE_4X 253
+
#define EL_UNUSED_254 254
#define EL_UNUSED_255 255
+#define EL_PEARL 256
+#define EL_CRYSTAL 257
+#define EL_WALL_PEARL 258
+#define EL_WALL_CRYSTAL 259
+#define EL_DOOR_WHITE 260
+#define EL_DOOR_WHITE_GRAY 261
+#define EL_KEY_WHITE 262
+#define EL_SHIELD_PASSIVE 263
+#define EL_EXTRA_TIME 264
+#define EL_SWITCHGATE_OPEN 265
+#define EL_SWITCHGATE_CLOSED 266
+#define EL_SWITCHGATE_SWITCH_1 267
+#define EL_SWITCHGATE_SWITCH_2 268
+
+#define EL_UNUSED_269 269
+#define EL_UNUSED_270 270
+
+#define EL_BELT1_LEFT 271
+#define EL_BELT1_MIDDLE 272
+#define EL_BELT1_RIGHT 273
+#define EL_BELT1_SWITCH_LEFT 274
+#define EL_BELT1_SWITCH_MIDDLE 275
+#define EL_BELT1_SWITCH_RIGHT 276
+#define EL_BELT2_LEFT 277
+#define EL_BELT2_MIDDLE 278
+#define EL_BELT2_RIGHT 279
+#define EL_BELT2_SWITCH_LEFT 280
+#define EL_BELT2_SWITCH_MIDDLE 281
+#define EL_BELT2_SWITCH_RIGHT 282
+#define EL_BELT3_LEFT 283
+#define EL_BELT3_MIDDLE 284
+#define EL_BELT3_RIGHT 285
+#define EL_BELT3_SWITCH_LEFT 286
+#define EL_BELT3_SWITCH_MIDDLE 287
+#define EL_BELT3_SWITCH_RIGHT 288
+#define EL_BELT4_LEFT 289
+#define EL_BELT4_MIDDLE 290
+#define EL_BELT4_RIGHT 291
+#define EL_BELT4_SWITCH_LEFT 292
+#define EL_BELT4_SWITCH_MIDDLE 293
+#define EL_BELT4_SWITCH_RIGHT 294
+#define EL_LANDMINE 295
+#define EL_ENVELOPE 296
+#define EL_LIGHT_SWITCH_OFF 297
+#define EL_LIGHT_SWITCH_ON 298
+#define EL_SIGN_EXCLAMATION 299
+#define EL_SIGN_RADIOACTIVITY 300
+#define EL_SIGN_STOP 301
+#define EL_SIGN_WHEELCHAIR 302
+#define EL_SIGN_PARKING 303
+#define EL_SIGN_ONEWAY 304
+#define EL_SIGN_HEART 305
+#define EL_SIGN_TRIANGLE 306
+#define EL_SIGN_ROUND 307
+#define EL_SIGN_EXIT 308
+#define EL_SIGN_YINYANG 309
+#define EL_SIGN_OTHER 310
+#define EL_MOLE_LEFT 311
+#define EL_MOLE_RIGHT 312
+#define EL_MOLE_UP 313
+#define EL_MOLE_DOWN 314
+#define EL_STEEL_SLANTED 315
+#define EL_SAND_INVISIBLE 316
+#define EL_DX_UNKNOWN_15 317
+#define EL_DX_UNKNOWN_42 318
+
+#define EL_UNUSED_319 319
+#define EL_UNUSED_320 320
+
+#define EL_SHIELD_ACTIVE 321
+#define EL_TIMEGATE_OPEN 322
+#define EL_TIMEGATE_CLOSED 323
+#define EL_TIMEGATE_SWITCH_ON 324
+#define EL_TIMEGATE_SWITCH_OFF 325
+
+#define EL_BALLOON 326
+#define EL_BALLOON_SEND_LEFT 327
+#define EL_BALLOON_SEND_RIGHT 328
+#define EL_BALLOON_SEND_UP 329
+#define EL_BALLOON_SEND_DOWN 330
+#define EL_BALLOON_SEND_ANY 331
+
+#define EL_EMC_STEEL_WALL_1 332
+#define EL_EMC_STEEL_WALL_2 333
+#define EL_EMC_STEEL_WALL_3 334
+#define EL_EMC_STEEL_WALL_4 335
+#define EL_EMC_WALL_1 336
+#define EL_EMC_WALL_2 337
+#define EL_EMC_WALL_3 338
+#define EL_EMC_WALL_4 339
+#define EL_EMC_WALL_5 340
+#define EL_EMC_WALL_6 341
+#define EL_EMC_WALL_7 342
+#define EL_EMC_WALL_8 343
+
+#define EL_TUBE_CROSS 344
+#define EL_TUBE_VERTICAL 345
+#define EL_TUBE_HORIZONTAL 346
+#define EL_TUBE_VERT_LEFT 347
+#define EL_TUBE_VERT_RIGHT 348
+#define EL_TUBE_HORIZ_UP 349
+#define EL_TUBE_HORIZ_DOWN 350
+#define EL_TUBE_LEFT_UP 351
+#define EL_TUBE_LEFT_DOWN 352
+#define EL_TUBE_RIGHT_UP 353
+#define EL_TUBE_RIGHT_DOWN 354
+#define EL_SPRING 355
+#define EL_TRAP_INACTIVE 356
+#define EL_DX_SUPABOMB 357
+
/* "real" (and therefore drawable) runtime elements */
-#define EL_SIEB_LEER 300
-#define EL_SIEB2_LEER 301
-#define EL_SIEB_VOLL 302
-#define EL_SIEB2_VOLL 303
-#define EL_SIEB_TOT 304
-#define EL_SIEB2_TOT 305
-#define EL_AUSGANG_ACT 306
-#define EL_SP_TERMINAL_ACTIVE 307
-#define EL_SP_BUG_ACTIVE 308
+#define EL_FIRST_RUNTIME_EL 500
+
+#define EL_MAGIC_WALL_EMPTY 500
+#define EL_MAGIC_WALL_BD_EMPTY 501
+#define EL_MAGIC_WALL_FULL 502
+#define EL_MAGIC_WALL_BD_FULL 503
+#define EL_MAGIC_WALL_DEAD 504
+#define EL_MAGIC_WALL_BD_DEAD 505
+#define EL_AUSGANG_ACT 506
+#define EL_SP_TERMINAL_ACTIVE 507
+#define EL_SP_BUG_ACTIVE 508
+#define EL_EM_KEY_1 509
+#define EL_EM_KEY_2 510
+#define EL_EM_KEY_3 511
+#define EL_EM_KEY_4 512
+#define EL_DYNABOMB_ACTIVE_1 513
+#define EL_DYNABOMB_ACTIVE_2 514
+#define EL_DYNABOMB_ACTIVE_3 515
+#define EL_DYNABOMB_ACTIVE_4 516
+#define EL_SWITCHGATE_OPENING 517
+#define EL_SWITCHGATE_CLOSING 518
+#define EL_TIMEGATE_OPENING 519
+#define EL_TIMEGATE_CLOSING 520
+#define EL_PEARL_BREAKING 521
+#define EL_TRAP_ACTIVE 522
+#define EL_SPRING_MOVING 523
+#define EL_SP_MURPHY_CLONE 524
/* "unreal" (and therefore not drawable) runtime elements */
-#define EL_BLOCKED 400
-#define EL_EXPLODING 401
-#define EL_CRACKINGNUT 402
-#define EL_BLURB_LEFT 403
-#define EL_BLURB_RIGHT 404
-#define EL_AMOEBING 405
-#define EL_MAUERND 406
-#define EL_BURNING 407
-#define EL_PLAYER_IS_LEAVING 408
+#define EL_BLOCKED 600
+#define EL_EXPLODING 601
+#define EL_CRACKINGNUT 602
+#define EL_BLURB_LEFT 603
+#define EL_BLURB_RIGHT 604
+#define EL_AMOEBING 605
+#define EL_DEAMOEBING 606
+#define EL_MAUERND 607
+#define EL_BURNING 608
+#define EL_PLAYER_IS_LEAVING 609
/* game graphics:
** 0 - 255: graphics from "RocksScreen"
** 256 - 511: graphics from "RocksFont"
-** 512 - 767: graphics from "RocksMore"
-** 768 - 1023: graphics from "RocksHeroes"
+** 512 - 767: graphics from "RocksHeroes"
+** 768 - 1023: graphics from "RocksSP"
+** 1024 - 1279: graphics from "RocksDC"
+** 1280 - 1535: graphics from "RocksMore"
*/
#define GFX_START_ROCKSSCREEN 0
#define GFX_END_ROCKSSCREEN 255
#define GFX_START_ROCKSFONT 256
#define GFX_END_ROCKSFONT 511
-#define GFX_START_ROCKSMORE 512
-#define GFX_END_ROCKSMORE 767
-#define GFX_START_ROCKSHEROES 768
-#define GFX_END_ROCKSHEROES 1023
+#define GFX_START_ROCKSHEROES 512
+#define GFX_END_ROCKSHEROES 767
+#define GFX_START_ROCKSSP 768
+#define GFX_END_ROCKSSP 1023
+#define GFX_START_ROCKSDC 1024
+#define GFX_END_ROCKSDC 1279
+#define GFX_START_ROCKSMORE 1280
+#define GFX_END_ROCKSMORE 1535
-#define NUM_TILES 1024
+#define NUM_TILES 1536
/* graphics from "RocksScreen" */
/* Zeile 0 (0) */
#define GFX_DYNAMIT_AUS 48
#define GFX_DYNAMIT 49
#define GFX_FLIEGER 56
-#define GFX_FLIEGER_R 56
-#define GFX_FLIEGER_O 57
-#define GFX_FLIEGER_L 58
-#define GFX_FLIEGER_U 59
+#define GFX_FLIEGER_RIGHT 56
+#define GFX_FLIEGER_UP 57
+#define GFX_FLIEGER_LEFT 58
+#define GFX_FLIEGER_DOWN 59
/* Zeile 4 (64) */
#define GFX_EXPLOSION 64
#define GFX_KAEFER 72
-#define GFX_KAEFER_R 72
-#define GFX_KAEFER_O 73
-#define GFX_KAEFER_L 74
-#define GFX_KAEFER_U 75
+#define GFX_KAEFER_RIGHT 72
+#define GFX_KAEFER_UP 73
+#define GFX_KAEFER_LEFT 74
+#define GFX_KAEFER_DOWN 75
/* Zeile 5 (80) */
#define GFX_MAMPFER 80
#define GFX_ROBOT 84
#define GFX_PACMAN 88
-#define GFX_PACMAN_R 88
-#define GFX_PACMAN_O 89
-#define GFX_PACMAN_L 90
-#define GFX_PACMAN_U 91
+#define GFX_PACMAN_RIGHT 88
+#define GFX_PACMAN_UP 89
+#define GFX_PACMAN_LEFT 90
+#define GFX_PACMAN_DOWN 91
/* Zeile 6 (96) */
#define GFX_ABLENK 96
#define GFX_ABLENK_EIN GFX_ABLENK
#define GFX_SOKOBAN_FELD_VOLL 123
#define GFX_GEBLUBBER 124
/* Zeile 8 (128) */
-#define GFX_SIEB_INAKTIV 128
-#define GFX_SIEB_LEER GFX_SIEB_INAKTIV
-#define GFX_SIEB_VOLL GFX_SIEB_INAKTIV
-#define GFX_SIEB_TOT GFX_SIEB_INAKTIV
+#define GFX_MAGIC_WALL_OFF 128
+#define GFX_MAGIC_WALL_EMPTY GFX_MAGIC_WALL_OFF
+#define GFX_MAGIC_WALL_FULL GFX_MAGIC_WALL_OFF
+#define GFX_MAGIC_WALL_DEAD GFX_MAGIC_WALL_OFF
#define GFX_ERZ_EDEL 132
#define GFX_ERZ_DIAM 133
#define GFX_ERZ_EDEL_ROT 134
#define GFX_KUGEL_GRAU 143
/* Zeile 9 (144) */
#define GFX_PINGUIN 144
-#define GFX_MAULWURF 145
+#define GFX_MOLE 145
#define GFX_SCHWEIN 146
#define GFX_DRACHE 147
#define GFX_MAUER_XY 148
#define GFX_MAUER_L1 GFX_MAUER_LEFT
#define GFX_MAUER_L 170
#define GFX_MAUER_LEBT 171
-#define GFX_SIEB2_INAKTIV 172
-#define GFX_SIEB2_LEER GFX_SIEB2_INAKTIV
-#define GFX_SIEB2_VOLL GFX_SIEB2_INAKTIV
-#define GFX_SIEB2_TOT GFX_SIEB2_INAKTIV
+#define GFX_MAGIC_WALL_BD_OFF 172
+#define GFX_MAGIC_WALL_BD_EMPTY GFX_MAGIC_WALL_BD_OFF
+#define GFX_MAGIC_WALL_BD_FULL GFX_MAGIC_WALL_BD_OFF
+#define GFX_MAGIC_WALL_BD_DEAD GFX_MAGIC_WALL_BD_OFF
/* Zeile 11 (176) */
#define GFX_AUSGANG_ZU 176
#define GFX_AUSGANG_ACT 177
#define GFX_DYNABOMB_NR 188
#define GFX_DYNABOMB_SZ 191
/* Zeile 12 (192) */
-#define GFX_PFEIL_L 192
-#define GFX_PFEIL_R 193
-#define GFX_PFEIL_O 194
-#define GFX_PFEIL_U 195
+#define GFX_PFEIL_LEFT 192
+#define GFX_PFEIL_RIGHT 193
+#define GFX_PFEIL_UP 194
+#define GFX_PFEIL_DOWN 195
#define GFX_BUTTERFLY 196
#define GFX_FIREFLY 198
-#define GFX_BUTTERFLY_R 200
-#define GFX_BUTTERFLY_O 201
-#define GFX_BUTTERFLY_L 202
-#define GFX_BUTTERFLY_U 203
-#define GFX_FIREFLY_R 204
-#define GFX_FIREFLY_O 205
-#define GFX_FIREFLY_L 206
-#define GFX_FIREFLY_U 207
+#define GFX_BUTTERFLY_RIGHT 200
+#define GFX_BUTTERFLY_UP 201
+#define GFX_BUTTERFLY_LEFT 202
+#define GFX_BUTTERFLY_DOWN 203
+#define GFX_FIREFLY_RIGHT 204
+#define GFX_FIREFLY_UP 205
+#define GFX_FIREFLY_LEFT 206
+#define GFX_FIREFLY_DOWN 207
/* only available as size MINI_TILE */
#define GFX_VSTEEL_UPPER_LEFT 208
#define GFX_SPIELER4_PUSH_LEFT (GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 4)
#define GFX_MAUER_DOWN (GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 0)
#define GFX_MAUER_UP (GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 3)
+#define GFX2_SHIELD_PASSIVE (GFX_START_ROCKSHEROES +13*HEROES_PER_LINE + 1)
+#define GFX2_SHIELD_ACTIVE (GFX_START_ROCKSHEROES +13*HEROES_PER_LINE + 5)
#define GFX_SONDE_START (GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 8)
#define GFX_SCHWEIN_DOWN (GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 8)
#define GFX_DRACHE_UP (GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE +12)
#define GFX_DRACHE_LEFT (GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE + 8)
#define GFX_DRACHE_RIGHT (GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE +12)
-#define GFX_MAULWURF_DOWN (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 8)
-#define GFX_MAULWURF_UP (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12)
-#define GFX_MAULWURF_LEFT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8)
-#define GFX_MAULWURF_RIGHT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12)
+/*
+#define GFX_MOLE_DOWN (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 8)
+#define GFX_MOLE_UP (GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12)
+#define GFX_MOLE_LEFT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8)
+#define GFX_MOLE_RIGHT (GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12)
+*/
#define GFX_PINGUIN_DOWN (GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE + 8)
#define GFX_PINGUIN_UP (GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE +12)
#define GFX_PINGUIN_LEFT (GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 8)
#define GFX_PINGUIN_RIGHT (GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE +12)
#define GFX_BLURB_LEFT (GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 8)
#define GFX_BLURB_RIGHT (GFX_START_ROCKSHEROES +10*HEROES_PER_LINE +12)
-#define GFX_FUNKELN_BLAU (GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 8)
-#define GFX_FUNKELN_WEISS (GFX_START_ROCKSHEROES +11*HEROES_PER_LINE +12)
+#define GFX_FUNKELN_BLAU (GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 9)
+#define GFX_FUNKELN_WEISS (GFX_START_ROCKSHEROES +11*HEROES_PER_LINE +13)
#define GFX_FLAMMEN_LEFT (GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 8)
#define GFX_FLAMMEN_RIGHT (GFX_START_ROCKSHEROES +13*HEROES_PER_LINE + 8)
#define GFX_FLAMMEN_UP (GFX_START_ROCKSHEROES +14*HEROES_PER_LINE + 8)
#define GFX_FLAMMEN_DOWN (GFX_START_ROCKSHEROES +15*HEROES_PER_LINE + 8)
+/* graphics from "RocksSP" */
+#define GFX_SP_EMPTY (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 0)
+/*
+#define GFX_SP_ZONK (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 1)
+*/
+#define GFX_SP_BASE (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 2)
+#define GFX_SP_MURPHY (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 3)
+#define GFX_SP_INFOTRON (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 4)
+#define GFX_SP_CHIP_SINGLE (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 5)
+#define GFX_SP_HARD_GRAY (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 6)
+#define GFX_SP_EXIT (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 7)
+#define GFX_SP_DISK_ORANGE (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 0)
+#define GFX_SP_PORT1_RIGHT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 1)
+#define GFX_SP_PORT1_DOWN (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 2)
+#define GFX_SP_PORT1_LEFT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 3)
+#define GFX_SP_PORT1_UP (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 4)
+#define GFX_SP_PORT2_RIGHT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 5)
+#define GFX_SP_PORT2_DOWN (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 6)
+#define GFX_SP_PORT2_LEFT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 7)
+#define GFX_SP_PORT2_UP (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 0)
+#define GFX_SP_SNIKSNAK (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 1)
+#define GFX_SP_DISK_YELLOW (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 2)
+#define GFX_SP_TERMINAL (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 3)
+#define GFX_SP_DISK_RED (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 4)
+#define GFX_SP_PORT_Y (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 5)
+#define GFX_SP_PORT_X (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 6)
+#define GFX_SP_PORT_XY (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 7)
+#define GFX_SP_ELECTRON (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 0)
+#define GFX_SP_BUG (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 1)
+#define GFX_SP_CHIP_LEFT (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 2)
+#define GFX_SP_CHIP_RIGHT (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 3)
+#define GFX_SP_HARD_BASE1 (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 4)
+#define GFX_SP_HARD_GREEN (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 5)
+#define GFX_SP_HARD_BLUE (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 6)
+#define GFX_SP_HARD_RED (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 7)
+#define GFX_SP_HARD_YELLOW (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 0)
+#define GFX_SP_HARD_BASE2 (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 1)
+#define GFX_SP_HARD_BASE3 (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 2)
+#define GFX_SP_HARD_BASE4 (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 3)
+#define GFX_SP_HARD_BASE5 (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 4)
+#define GFX_SP_HARD_BASE6 (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 5)
+#define GFX_SP_CHIP_UPPER (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 6)
+#define GFX_SP_CHIP_LOWER (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 7)
+
+#define GFX_INVISIBLE_STEEL_ON (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 1)
+#define GFX_SAND_INVISIBLE_ON (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 2)
+#define GFX_INVISIBLE_STEEL (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 3)
+#define GFX_UNSICHTBAR_ON (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 5)
+#define GFX_SAND_INVISIBLE (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 6)
+#define GFX_UNSICHTBAR (GFX_START_ROCKSSP + 5 * SP_PER_LINE + 7)
+
+#define GFX_SP_ZONK (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 0)
+
+#define GFX_EM_KEY_1 (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 4)
+#define GFX_EM_KEY_2 (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 5)
+#define GFX_EM_KEY_3 (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 6)
+#define GFX_EM_KEY_4 (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 7)
+#define GFX_EM_GATE_1 (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 0)
+#define GFX_EM_GATE_2 (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 1)
+#define GFX_EM_GATE_3 (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 2)
+#define GFX_EM_GATE_4 (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 3)
+#define GFX_EM_GATE_1X (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 4)
+#define GFX_EM_GATE_2X (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 5)
+#define GFX_EM_GATE_3X (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 6)
+#define GFX_EM_GATE_4X (GFX_START_ROCKSSP + 7 * SP_PER_LINE + 7)
+
+#define GFX_MURPHY_GO_LEFT (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 8)
+#define GFX_MURPHY_ANY_LEFT (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 9)
+#define GFX_MURPHY_GO_RIGHT (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 11)
+#define GFX_MURPHY_ANY_RIGHT (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 12)
+#define GFX_MURPHY_SNAP_UP (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 14)
+#define GFX_MURPHY_SNAP_DOWN (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 15)
+#define GFX_MURPHY_SNAP_RIGHT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 8)
+#define GFX_MURPHY_SNAP_LEFT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 9)
+#define GFX_MURPHY_PUSH_RIGHT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 10)
+#define GFX_MURPHY_PUSH_LEFT (GFX_START_ROCKSSP + 1 * SP_PER_LINE + 11)
+
+#define GFX_SP_BUG_WARNING (GFX_START_ROCKSSP + 2 * SP_PER_LINE + 15)
+#define GFX_SP_EXPLODE_EMPTY (GFX_START_ROCKSSP + 3 * SP_PER_LINE + 8)
+#define GFX_SP_EXPLODE_INFOTRON (GFX_START_ROCKSSP + 4 * SP_PER_LINE + 8)
+#define GFX_SP_BUG_ACTIVE (GFX_START_ROCKSSP + 6 * SP_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_LEFT (GFX_START_ROCKSSP + 8 * SP_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_RIGHT (GFX_START_ROCKSSP + 8 * SP_PER_LINE + 12)
+#define GFX_SP_SNIKSNAK_UP (GFX_START_ROCKSSP + 9 * SP_PER_LINE + 8)
+#define GFX_SP_SNIKSNAK_DOWN (GFX_START_ROCKSSP + 9 * SP_PER_LINE + 12)
+
+#define GFX2_SP_ELECTRON (GFX_START_ROCKSSP + 10 * SP_PER_LINE + 8)
+#define GFX2_SP_TERMINAL (GFX_START_ROCKSSP + 11 * SP_PER_LINE + 8)
+#define GFX2_SP_TERMINAL_ACTIVE (GFX_START_ROCKSSP + 12 * SP_PER_LINE + 8)
+
+#define GFX_SP_MURPHY_CLONE (GFX_START_ROCKSSP + 0 * SP_PER_LINE + 3)
+
+/* graphics from "RocksDC" */
+#define GFX_BELT1_MIDDLE (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 0)
+#define GFX_BELT1_LEFT (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 0)
+#define GFX_BELT1_RIGHT (GFX_START_ROCKSDC + 2 * DC_PER_LINE + 0)
+#define GFX_BELT2_MIDDLE (GFX_START_ROCKSDC + 3 * DC_PER_LINE + 0)
+#define GFX_BELT2_LEFT (GFX_START_ROCKSDC + 4 * DC_PER_LINE + 0)
+#define GFX_BELT2_RIGHT (GFX_START_ROCKSDC + 5 * DC_PER_LINE + 0)
+#define GFX_BELT3_MIDDLE (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 0)
+#define GFX_BELT3_LEFT (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 0)
+#define GFX_BELT3_RIGHT (GFX_START_ROCKSDC + 8 * DC_PER_LINE + 0)
+#define GFX_BELT4_MIDDLE (GFX_START_ROCKSDC + 9 * DC_PER_LINE + 0)
+#define GFX_BELT4_LEFT (GFX_START_ROCKSDC + 10 * DC_PER_LINE + 0)
+#define GFX_BELT4_RIGHT (GFX_START_ROCKSDC + 11 * DC_PER_LINE + 0)
+#define GFX_BELT1_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 0)
+#define GFX_BELT2_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 1)
+#define GFX_BELT3_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 2)
+#define GFX_BELT4_SWITCH_LEFT (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 3)
+#define GFX_BELT1_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 0)
+#define GFX_BELT2_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 1)
+#define GFX_BELT3_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 2)
+#define GFX_BELT4_SWITCH_MIDDLE (GFX_START_ROCKSDC + 13 * DC_PER_LINE + 3)
+#define GFX_BELT1_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 0)
+#define GFX_BELT2_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 1)
+#define GFX_BELT3_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 2)
+#define GFX_BELT4_SWITCH_RIGHT (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 3)
+
+#define GFX_SWITCHGATE_SWITCH_1 (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 4)
+#define GFX_SWITCHGATE_SWITCH_2 (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 5)
+#define GFX_LIGHT_SWITCH_OFF (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 6)
+#define GFX_LIGHT_SWITCH_ON (GFX_START_ROCKSDC + 12 * DC_PER_LINE + 7)
+#define GFX_TIMEGATE_SWITCH (GFX_START_ROCKSDC + 15 * DC_PER_LINE + 0)
+
+#define GFX_ENVELOPE (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 4)
+#define GFX_SIGN_EXCLAMATION (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 5)
+#define GFX_SIGN_STOP (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 6)
+#define GFX_LANDMINE (GFX_START_ROCKSDC + 14 * DC_PER_LINE + 7)
+#define GFX_STEEL_SLANTED (GFX_START_ROCKSDC + 15 * DC_PER_LINE + 5)
+
+#define GFX_EXTRA_TIME (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 8)
+#define GFX_SHIELD_ACTIVE (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 8)
+#define GFX_SHIELD_PASSIVE (GFX_START_ROCKSDC + 2 * DC_PER_LINE + 8)
+#define GFX_MOLE_DOWN (GFX_START_ROCKSDC + 3 * DC_PER_LINE + 8)
+#define GFX_MOLE_UP (GFX_START_ROCKSDC + 3 * DC_PER_LINE + 12)
+#define GFX_MOLE_LEFT (GFX_START_ROCKSDC + 4 * DC_PER_LINE + 8)
+#define GFX_MOLE_RIGHT (GFX_START_ROCKSDC + 4 * DC_PER_LINE + 12)
+#define GFX_SWITCHGATE_CLOSED (GFX_START_ROCKSDC + 5 * DC_PER_LINE + 8)
+#define GFX_SWITCHGATE_OPEN (GFX_START_ROCKSDC + 5 * DC_PER_LINE + 12)
+#define GFX_TIMEGATE_CLOSED (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 8)
+#define GFX_TIMEGATE_OPEN (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 12)
+#define GFX_BALLOON_SEND_LEFT (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 8)
+#define GFX_BALLOON_SEND_RIGHT (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 9)
+#define GFX_BALLOON_SEND_UP (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 10)
+#define GFX_BALLOON_SEND_DOWN (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 11)
+#define GFX_BALLOON (GFX_START_ROCKSDC + 7 * DC_PER_LINE + 12)
+#define GFX_BALLOON_SEND_ANY (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 15)
+
+#define GFX_EMC_STEEL_WALL_1 (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 14)
+#define GFX_EMC_STEEL_WALL_2 (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 14)
+#define GFX_EMC_STEEL_WALL_3 (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 14)
+#define GFX_EMC_STEEL_WALL_4 (GFX_START_ROCKSDC + 0 * DC_PER_LINE + 14)
+#define GFX_EMC_WALL_1 (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 13)
+#define GFX_EMC_WALL_2 (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 14)
+#define GFX_EMC_WALL_3 (GFX_START_ROCKSDC + 6 * DC_PER_LINE + 15)
+#define GFX_EMC_WALL_4 (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 14)
+#define GFX_EMC_WALL_5 (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 15)
+#define GFX_EMC_WALL_6 (GFX_START_ROCKSDC + 2 * DC_PER_LINE + 14)
+#define GFX_EMC_WALL_7 (GFX_START_ROCKSDC + 2 * DC_PER_LINE + 15)
+#define GFX_EMC_WALL_8 (GFX_START_ROCKSDC + 1 * DC_PER_LINE + 14)
+
/* graphics from "RocksMore" */
-#define GFX_SP_EMPTY (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 0)
-#define GFX_SP_ZONK (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 1)
-#define GFX_SP_BASE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 2)
-#define GFX_SP_MURPHY (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 3)
-#define GFX_SP_INFOTRON (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 4)
-#define GFX_SP_CHIP_SINGLE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 5)
-#define GFX_SP_HARD_GRAY (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 6)
-#define GFX_SP_EXIT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 7)
-#define GFX_SP_DISK_ORANGE (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 0)
-#define GFX_SP_PORT1_RIGHT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 1)
-#define GFX_SP_PORT1_DOWN (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 2)
-#define GFX_SP_PORT1_LEFT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 3)
-#define GFX_SP_PORT1_UP (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 4)
-#define GFX_SP_PORT2_RIGHT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 5)
-#define GFX_SP_PORT2_DOWN (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 6)
-#define GFX_SP_PORT2_LEFT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 7)
-#define GFX_SP_PORT2_UP (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 0)
-#define GFX_SP_SNIKSNAK (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 1)
-#define GFX_SP_DISK_YELLOW (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 2)
-#define GFX_SP_TERMINAL (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 3)
-#define GFX_SP_DISK_RED (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 4)
-#define GFX_SP_PORT_Y (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 5)
-#define GFX_SP_PORT_X (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 6)
-#define GFX_SP_PORT_XY (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 7)
-#define GFX_SP_ELECTRON (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 0)
-#define GFX_SP_BUG (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 1)
-#define GFX_SP_CHIP_LEFT (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 2)
-#define GFX_SP_CHIP_RIGHT (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 3)
-#define GFX_SP_HARD_BASE1 (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 4)
-#define GFX_SP_HARD_GREEN (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 5)
-#define GFX_SP_HARD_BLUE (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 6)
-#define GFX_SP_HARD_RED (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 7)
-#define GFX_SP_HARD_YELLOW (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 0)
-#define GFX_SP_HARD_BASE2 (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 1)
-#define GFX_SP_HARD_BASE3 (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 2)
-#define GFX_SP_HARD_BASE4 (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 3)
-#define GFX_SP_HARD_BASE5 (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 4)
-#define GFX_SP_HARD_BASE6 (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 5)
-#define GFX_SP_CHIP_UPPER (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 6)
-#define GFX_SP_CHIP_LOWER (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 7)
-
-#define GFX_INVISIBLE_STEEL (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 3)
-#define GFX_UNSICHTBAR (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 7)
-
-#define GFX_MURPHY_GO_LEFT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 8)
-#define GFX_MURPHY_ANY_LEFT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 9)
-#define GFX_MURPHY_GO_RIGHT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 11)
-#define GFX_MURPHY_ANY_RIGHT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 12)
-#define GFX_MURPHY_SNAP_UP (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 14)
-#define GFX_MURPHY_SNAP_DOWN (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 15)
-#define GFX_MURPHY_SNAP_RIGHT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 8)
-#define GFX_MURPHY_SNAP_LEFT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 9)
-#define GFX_MURPHY_PUSH_RIGHT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 10)
-#define GFX_MURPHY_PUSH_LEFT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 11)
-
-#define GFX_SP_BUG_WARNING (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 15)
-#define GFX_SP_EXPLODE_EMPTY (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 8)
-#define GFX_SP_EXPLODE_INFOTRON (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 8)
-#define GFX_SP_BUG_ACTIVE (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_LEFT (GFX_START_ROCKSMORE + 8 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_RIGHT (GFX_START_ROCKSMORE + 8 * MORE_PER_LINE + 12)
-#define GFX_SP_SNIKSNAK_UP (GFX_START_ROCKSMORE + 9 * MORE_PER_LINE + 8)
-#define GFX_SP_SNIKSNAK_DOWN (GFX_START_ROCKSMORE + 9 * MORE_PER_LINE + 12)
-
-#define GFX2_SP_ELECTRON (GFX_START_ROCKSMORE + 10 * MORE_PER_LINE + 8)
-#define GFX2_SP_TERMINAL (GFX_START_ROCKSMORE + 11 * MORE_PER_LINE + 8)
-#define GFX2_SP_TERMINAL_ACTIVE (GFX_START_ROCKSMORE + 12 * MORE_PER_LINE + 8)
+#define GFX_ARROW_BLUE_LEFT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 0)
+#define GFX_ARROW_BLUE_RIGHT (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 1)
+#define GFX_ARROW_BLUE_UP (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 2)
+#define GFX_ARROW_BLUE_DOWN (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 3)
+#define GFX_ARROW_RED_LEFT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 0)
+#define GFX_ARROW_RED_RIGHT (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 1)
+#define GFX_ARROW_RED_UP (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 2)
+#define GFX_ARROW_RED_DOWN (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 3)
+#define GFX_SCROLLBAR_BLUE (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 0)
+#define GFX_SCROLLBAR_RED (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 1)
+#define GFX_PEARL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 0)
+#define GFX_CRYSTAL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 1)
+#define GFX_WALL_PEARL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 2)
+#define GFX_WALL_CRYSTAL (GFX_START_ROCKSMORE + 3 * MORE_PER_LINE + 3)
+#define GFX_PEARL_BREAKING (GFX_START_ROCKSMORE + 4 * MORE_PER_LINE + 0)
+#define GFX_SPRING (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 0)
+#define GFX_TUBE_RIGHT_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 1)
+#define GFX_TUBE_HORIZ_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 2)
+#define GFX_TUBE_LEFT_DOWN (GFX_START_ROCKSMORE + 5 * MORE_PER_LINE + 3)
+#define GFX_TUBE_HORIZONTAL (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 0)
+#define GFX_TUBE_VERT_RIGHT (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 1)
+#define GFX_TUBE_CROSS (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 2)
+#define GFX_TUBE_VERT_LEFT (GFX_START_ROCKSMORE + 6 * MORE_PER_LINE + 3)
+#define GFX_TUBE_VERTICAL (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 0)
+#define GFX_TUBE_RIGHT_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 1)
+#define GFX_TUBE_HORIZ_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 2)
+#define GFX_TUBE_LEFT_UP (GFX_START_ROCKSMORE + 7 * MORE_PER_LINE + 3)
+
+#define GFX_TRAP_INACTIVE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 4)
+#define GFX_TRAP_ACTIVE (GFX_START_ROCKSMORE + 0 * MORE_PER_LINE + 7)
+#define GFX_BD_WALL (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 4)
+#define GFX_BD_ROCK (GFX_START_ROCKSMORE + 2 * MORE_PER_LINE + 4)
+#define GFX_DX_SUPABOMB (GFX_START_ROCKSMORE + 1 * MORE_PER_LINE + 7)
/* graphics from "RocksFont" */
#define GFX_CHAR_START (GFX_START_ROCKSFONT)
#define GFX_CHAR_COPY (GFX_CHAR_ASCII0 + 94)
#define GFX_CHAR_END (GFX_CHAR_START + 79)
+/* new elements which still have no graphic */
+#define GFX_DOOR_WHITE GFX_CHAR_FRAGE
+#define GFX_DOOR_WHITE_GRAY GFX_CHAR_FRAGE
+#define GFX_KEY_WHITE GFX_CHAR_FRAGE
+#define GFX_SIGN_RADIOACTIVITY GFX_CHAR_FRAGE
+#define GFX_SIGN_WHEELCHAIR GFX_CHAR_FRAGE
+#define GFX_SIGN_PARKING GFX_CHAR_FRAGE
+#define GFX_SIGN_ONEWAY GFX_CHAR_FRAGE
+#define GFX_SIGN_HEART GFX_CHAR_FRAGE
+#define GFX_SIGN_TRIANGLE GFX_CHAR_FRAGE
+#define GFX_SIGN_ROUND GFX_CHAR_FRAGE
+#define GFX_SIGN_EXIT GFX_CHAR_FRAGE
+#define GFX_SIGN_YINYANG GFX_CHAR_FRAGE
+#define GFX_SIGN_OTHER GFX_CHAR_FRAGE
+#define GFX_DX_UNKNOWN_15 GFX_CHAR_FRAGE
+#define GFX_DX_UNKNOWN_42 GFX_CHAR_FRAGE
+
+
/* the names of the sounds */
#define SND_ALCHEMY 0
#define SND_AMOEBE 1
#define SND_SP_BOOOM 58
#define SND_SP_EXIT 59
#define SND_EMPTY 60
+#define SND_GATE 61
-#define NUM_SOUNDS 61
+#define NUM_SOUNDS 62
/* default input keys */
#define KEY_UNDEFINDED XK_VoidSymbol
/* font types */
#define FS_SMALL 0
#define FS_BIG 1
+#define FS_MEDIUM 2
/* font colors */
#define FC_RED 0
#define FC_BLUE 1
#define FC_YELLOW 3
#define FC_SPECIAL1 4
#define FC_SPECIAL2 5
+#define FC_SPECIAL3 6
/* values for game_status */
#define EXITGAME 0
#define SETUPINPUT 9
#define CALIBRATION 10
-#ifndef GAME_DIR
-#define GAME_DIR "."
+#ifndef RO_GAME_DIR
+#define RO_GAME_DIR "."
+#endif
+
+#ifndef RW_GAME_DIR
+#define RW_GAME_DIR "."
#endif
-#define BASE_PATH GAME_DIR
+#define RO_BASE_PATH RO_GAME_DIR
+#define RW_BASE_PATH RW_GAME_DIR
#define GRAPHICS_DIRECTORY "graphics"
#define SOUNDS_DIRECTORY "sounds"
#define TAPES_DIRECTORY "tapes"
#define SCORES_DIRECTORY "scores"
-#define PROGRAM_VERSION_STRING "1.3.0"
+#define PROGRAM_VERSION_STRING "1.4.0"
#define PROGRAM_TITLE_STRING "Rocks'n'Diamonds"
#define PROGRAM_AUTHOR_STRING "Holger Schemel"
#define WINDOW_TITLE_STRING PROGRAM_TITLE_STRING " " PROGRAM_VERSION_STRING
*counter_var = actual_counter;
}
+/* int2str() returns a number converted to a string;
+ the used memory is static, but will be overwritten by later calls,
+ so if you want to save the result, copy it to a private string buffer;
+ there can be 10 local calls of int2str() without buffering the result --
+ the 11th call will then destroy the result from the first call and so on.
+*/
+
char *int2str(int number, int size)
{
- static char s[40];
+ static char shift_array[10][40];
+ static int shift_counter = 0;
+ char *s = shift_array[shift_counter];
+
+ shift_counter = (shift_counter + 1) % 10;
if (size > 20)
size = 20;
char *getStringCopy(char *s)
{
- char *s_copy = checked_malloc(strlen(s) + 1);
+ char *s_copy;
+
+ if (s == NULL)
+ return NULL;
+
+ s_copy = checked_malloc(strlen(s) + 1);
strcpy(s_copy, s);
return s_copy;
while (*s)
*s_ptr++ = tolower(*s++);
+ *s_ptr = '\0';
return s_copy;
}
options.display_name = NULL;
options.server_host = NULL;
options.server_port = 0;
- options.base_directory = BASE_PATH;
- options.level_directory = BASE_PATH "/" LEVELS_DIRECTORY;
+ options.ro_base_directory = RO_BASE_PATH;
+ options.rw_base_directory = RW_BASE_PATH;
+ options.level_directory = RO_BASE_PATH "/" LEVELS_DIRECTORY;
options.serveronly = FALSE;
options.network = FALSE;
options.verbose = FALSE;
"Options:\n"
" -d, --display machine:0 X server display\n"
" -b, --basepath directory alternative base directory\n"
- " -l, --levels directory alternative level directory\n"
+ " -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",
if (option_arg == NULL)
Error(ERR_EXIT_HELP, "option '%s' requires an argument", option_str);
- options.base_directory = option_arg;
+ /* this should be extended to separate options for ro and rw data */
+ options.ro_base_directory = option_arg;
+ options.rw_base_directory = option_arg;
if (option_arg == next_option)
options_left++;
/* adjust path for level directory accordingly */
options.level_directory =
- getPath2(options.base_directory, LEVELS_DIRECTORY);
+ getPath2(options.ro_base_directory, LEVELS_DIRECTORY);
}
else if (strncmp(option, "-levels", option_len) == 0)
{
return ptr;
}
+short getFile16BitInteger(FILE *file, int byte_order)
+{
+ if (byte_order == BYTE_ORDER_BIG_ENDIAN)
+ return ((fgetc(file) << 8) |
+ (fgetc(file) << 0));
+ else /* BYTE_ORDER_LITTLE_ENDIAN */
+ return ((fgetc(file) << 0) |
+ (fgetc(file) << 8));
+}
+
+void putFile16BitInteger(FILE *file, short value, int byte_order)
+{
+ if (byte_order == BYTE_ORDER_BIG_ENDIAN)
+ {
+ fputc((value >> 8) & 0xff, file);
+ fputc((value >> 0) & 0xff, file);
+ }
+ else /* BYTE_ORDER_LITTLE_ENDIAN */
+ {
+ fputc((value >> 0) & 0xff, file);
+ fputc((value >> 8) & 0xff, file);
+ }
+}
+
+int getFile32BitInteger(FILE *file, int byte_order)
+{
+ if (byte_order == BYTE_ORDER_BIG_ENDIAN)
+ return ((fgetc(file) << 24) |
+ (fgetc(file) << 16) |
+ (fgetc(file) << 8) |
+ (fgetc(file) << 0));
+ else /* BYTE_ORDER_LITTLE_ENDIAN */
+ return ((fgetc(file) << 0) |
+ (fgetc(file) << 8) |
+ (fgetc(file) << 16) |
+ (fgetc(file) << 24));
+}
+
+void putFile32BitInteger(FILE *file, int value, int byte_order)
+{
+ if (byte_order == BYTE_ORDER_BIG_ENDIAN)
+ {
+ fputc((value >> 24) & 0xff, file);
+ fputc((value >> 16) & 0xff, file);
+ fputc((value >> 8) & 0xff, file);
+ fputc((value >> 0) & 0xff, file);
+ }
+ else /* BYTE_ORDER_LITTLE_ENDIAN */
+ {
+ fputc((value >> 0) & 0xff, file);
+ fputc((value >> 8) & 0xff, file);
+ fputc((value >> 16) & 0xff, file);
+ fputc((value >> 24) & 0xff, file);
+ }
+}
+
+void getFileChunk(FILE *file, char *chunk_buffer, int *chunk_length,
+ int byte_order)
+{
+ const int chunk_identifier_length = 4;
+
+ /* read chunk identifier */
+ fgets(chunk_buffer, chunk_identifier_length + 1, file);
+
+ /* read chunk length */
+ *chunk_length = getFile32BitInteger(file, byte_order);
+}
+
+void putFileChunk(FILE *file, char *chunk_name, int chunk_length,
+ int byte_order)
+{
+ /* write chunk identifier */
+ fputs(chunk_name, file);
+
+ /* write chunk length */
+ putFile32BitInteger(file, chunk_length, byte_order);
+}
+
#define TRANSLATE_KEYSYM_TO_KEYNAME 0
#define TRANSLATE_KEYSYM_TO_X11KEYNAME 1
#define TRANSLATE_X11KEYNAME_TO_KEYSYM 2
return joystick_nr;
}
-/* ----------------------------------------------------------------- */
-/* the following is only for debugging purpose and normally not used */
-/* ----------------------------------------------------------------- */
+/* ------------------------------------------------------------------------- */
+/* some functions to handle lists of level directories */
+/* ------------------------------------------------------------------------- */
+
+struct LevelDirInfo *newLevelDirInfo()
+{
+ return checked_calloc(sizeof(struct LevelDirInfo));
+}
+
+void pushLevelDirInfo(struct LevelDirInfo **node_first,
+ struct LevelDirInfo *node_new)
+{
+ node_new->next = *node_first;
+ *node_first = node_new;
+}
+
+int numLevelDirInfo(struct LevelDirInfo *node)
+{
+ int num = 0;
+
+ while (node)
+ {
+ num++;
+ node = node->next;
+ }
+
+ return num;
+}
+
+boolean validLevelSeries(struct LevelDirInfo *node)
+{
+ return (node != NULL && !node->node_group && !node->parent_link);
+}
+
+struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *node)
+{
+ if (node == NULL) /* start with first level directory entry */
+ return getFirstValidLevelSeries(leveldir_first);
+ else if (node->node_group) /* enter level group (step down into tree) */
+ return getFirstValidLevelSeries(node->node_group);
+ else if (node->parent_link) /* skip start entry of level group */
+ {
+ if (node->next) /* get first real level series entry */
+ return getFirstValidLevelSeries(node->next);
+ else /* leave empty level group and go on */
+ return getFirstValidLevelSeries(node->node_parent->next);
+ }
+ else /* this seems to be a regular level series */
+ return node;
+}
+
+struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *node)
+{
+ if (node == NULL)
+ return NULL;
+
+ if (node->node_parent == NULL) /* top level group */
+ return leveldir_first;
+ else /* sub level group */
+ return node->node_parent->node_group;
+}
+
+int numLevelDirInfoInGroup(struct LevelDirInfo *node)
+{
+ return numLevelDirInfo(getLevelDirInfoFirstGroupEntry(node));
+}
+
+int posLevelDirInfo(struct LevelDirInfo *node)
+{
+ struct LevelDirInfo *node_cmp = getLevelDirInfoFirstGroupEntry(node);
+ int pos = 0;
+
+ while (node_cmp)
+ {
+ if (node_cmp == node)
+ return pos;
+
+ pos++;
+ node_cmp = node_cmp->next;
+ }
+
+ return 0;
+}
+
+struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *node, int pos)
+{
+ struct LevelDirInfo *node_default = node;
+ int pos_cmp = 0;
+
+ while (node)
+ {
+ if (pos_cmp == pos)
+ return node;
+
+ pos_cmp++;
+ node = node->next;
+ }
+
+ return node_default;
+}
+
+struct LevelDirInfo *getLevelDirInfoFromFilenameExt(struct LevelDirInfo *node,
+ char *filename)
+{
+ if (filename == NULL)
+ return NULL;
+
+ while (node)
+ {
+ if (node->node_group)
+ {
+ struct LevelDirInfo *node_group;
+
+ node_group = getLevelDirInfoFromFilenameExt(node->node_group, filename);
+
+ if (node_group)
+ return node_group;
+ }
+ else if (!node->parent_link)
+ {
+ if (strcmp(filename, node->filename) == 0)
+ return node;
+ }
+
+ node = node->next;
+ }
+
+ return NULL;
+}
+
+struct LevelDirInfo *getLevelDirInfoFromFilename(char *filename)
+{
+ return getLevelDirInfoFromFilenameExt(leveldir_first, filename);
+}
+
+void dumpLevelDirInfo(struct LevelDirInfo *node, int depth)
+{
+ int i;
+
+ while (node)
+ {
+ for (i=0; i<depth * 3; i++)
+ printf(" ");
+
+ printf("filename == '%s'\n", node->filename);
+
+ if (node->node_group != NULL)
+ dumpLevelDirInfo(node->node_group, depth + 1);
+
+ node = node->next;
+ }
+}
+
+void sortLevelDirInfo(struct LevelDirInfo **node_first,
+ int (*compare_function)(const void *, const void *))
+{
+ int num_nodes = numLevelDirInfo(*node_first);
+ struct LevelDirInfo **sort_array;
+ struct LevelDirInfo *node = *node_first;
+ int i = 0;
+
+ if (num_nodes == 0)
+ return;
+
+ /* allocate array for sorting structure pointers */
+ sort_array = checked_calloc(num_nodes * sizeof(struct LevelDirInfo *));
+
+ /* writing structure pointers to sorting array */
+ while (i < num_nodes && node) /* double boundary check... */
+ {
+ sort_array[i] = node;
+
+ i++;
+ node = node->next;
+ }
+
+ /* sorting the structure pointers in the sorting array */
+ qsort(sort_array, num_nodes, sizeof(struct LevelDirInfo *),
+ compare_function);
+
+ /* update the linkage of list elements with the sorted node array */
+ for (i=0; i<num_nodes - 1; i++)
+ sort_array[i]->next = sort_array[i + 1];
+ sort_array[num_nodes - 1]->next = NULL;
+
+ /* update the linkage of the main list anchor pointer */
+ *node_first = sort_array[0];
+
+ free(sort_array);
+
+ /* now recursively sort the level group structures */
+ node = *node_first;
+ while (node)
+ {
+ if (node->node_group != NULL)
+ sortLevelDirInfo(&node->node_group, compare_function);
+
+ node = node->next;
+ }
+}
+
+
+/* ------------------------------------------------------------------------- */
+/* the following is only for debugging purpose and normally not used */
+/* ------------------------------------------------------------------------- */
#define DEBUG_NUM_TIMESTAMPS 3
#include "main.h"
-#define INIT_COUNTER 0
-#define READ_COUNTER 1
+/* values for InitCounter() and Counter() */
+#define INIT_COUNTER 0
+#define READ_COUNTER 1
-#define NEW_RANDOMIZE -1
+/* values for InitRND() */
+#define NEW_RANDOMIZE -1
-#define ERR_RETURN 0
-#define ERR_WARN (1 << 0)
-#define ERR_EXIT (1 << 1)
-#define ERR_HELP (1 << 2)
-#define ERR_SOUND_SERVER (1 << 3)
-#define ERR_NETWORK_SERVER (1 << 4)
-#define ERR_NETWORK_CLIENT (1 << 5)
-#define ERR_FROM_SERVER (ERR_SOUND_SERVER | ERR_NETWORK_SERVER)
-#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP)
-#define ERR_EXIT_SOUND_SERVER (ERR_EXIT | ERR_SOUND_SERVER)
-#define ERR_EXIT_NETWORK_SERVER (ERR_EXIT | ERR_NETWORK_SERVER)
-#define ERR_EXIT_NETWORK_CLIENT (ERR_EXIT | ERR_NETWORK_CLIENT)
+/* values for Error() */
+#define ERR_RETURN 0
+#define ERR_WARN (1 << 0)
+#define ERR_EXIT (1 << 1)
+#define ERR_HELP (1 << 2)
+#define ERR_SOUND_SERVER (1 << 3)
+#define ERR_NETWORK_SERVER (1 << 4)
+#define ERR_NETWORK_CLIENT (1 << 5)
+#define ERR_FROM_SERVER (ERR_SOUND_SERVER | ERR_NETWORK_SERVER)
+#define ERR_EXIT_HELP (ERR_EXIT | ERR_HELP)
+#define ERR_EXIT_SOUND_SERVER (ERR_EXIT | ERR_SOUND_SERVER)
+#define ERR_EXIT_NETWORK_SERVER (ERR_EXIT | ERR_NETWORK_SERVER)
+#define ERR_EXIT_NETWORK_CLIENT (ERR_EXIT | ERR_NETWORK_CLIENT)
+
+/* values for getFile...() and putFile...() */
+#define BYTE_ORDER_BIG_ENDIAN 0
+#define BYTE_ORDER_LITTLE_ENDIAN 1
void InitCounter(void);
unsigned long Counter(void);
void Error(int, char *, ...);
void *checked_malloc(unsigned long);
void *checked_calloc(unsigned long);
+short getFile16BitInteger(FILE *, int);
+void putFile16BitInteger(FILE *, short, int);
+int getFile32BitInteger(FILE *, int);
+void putFile32BitInteger(FILE *, int, int);
+void getFileChunk(FILE *, char *, int *, int);
+void putFileChunk(FILE *, char *, int, int);
char *getKeyNameFromKeySym(KeySym);
char *getX11KeyNameFromKeySym(KeySym);
KeySym getKeySymFromX11KeyName(char *);
int getJoySymbolFromJoyName(char *);
int getJoystickNrFromDeviceName(char *);
+struct LevelDirInfo *newLevelDirInfo();
+void pushLevelDirInfo(struct LevelDirInfo **, struct LevelDirInfo *);
+int numLevelDirInfo(struct LevelDirInfo *);
+boolean validLevelSeries(struct LevelDirInfo *);
+struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *);
+struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *);
+int numLevelDirInfoInGroup(struct LevelDirInfo *);
+int posLevelDirInfo(struct LevelDirInfo *);
+struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *, int);
+struct LevelDirInfo *getLevelDirInfoFromFilename(char *);
+void dumpLevelDirInfo(struct LevelDirInfo *, int);
+void sortLevelDirInfo(struct LevelDirInfo **,
+ int (*compare_function)(const void *, const void *));
+
void debug_print_timestamp(int, char *);
-void print_debug(char *);
#endif /* MISC_H */
BITMAP *mouse_bitmap = NULL;
char *filename;
- filename = getPath3(options.base_directory, GRAPHICS_DIRECTORY,
+ filename = getPath3(options.ro_base_directory, GRAPHICS_DIRECTORY,
MOUSE_FILENAME);
mouse_bitmap = Read_PCX_to_AllegroBitmap(filename);
/* allocate new allegro bitmap structure */
if ((bitmap = create_bitmap_ex(depth, image->width, image->height)) == NULL)
+ {
+ errno_pcx = PCX_NoMemory;
return NULL;
+ }
clear(bitmap);
/* read the graphic file in PCX format to internal image structure */
if ((image = Read_PCX_to_Image(filename)) == NULL)
- {
- Error(ERR_RETURN, "Read_PCX_to_Image failed");
return NULL;
- }
/* convert internal image structure to allegro bitmap structure */
if ((bitmap = Image_to_AllegroBitmap(image)) == NULL)
- {
- Error(ERR_RETURN, "Image_to_AllegroBitmap failed");
return NULL;
- }
set_palette(global_colormap);
BITMAP *bitmap;
if ((bitmap = Read_PCX_to_AllegroBitmap(filename)) == NULL)
- return PCX_FileInvalid;
+ return errno_pcx;
*pixmap = (Pixmap)bitmap;
*pixmap_mask = (Pixmap)bitmap;
#include "screens.h"
#include "misc.h"
-#define MAX_PLAYER_NAME_LEN 14
-
struct NetworkClientPlayerInfo
{
byte nr;
- char name[MAX_PLAYER_NAME_LEN + 2];
+ char name[MAX_PLAYER_NAME_LEN + 1];
struct NetworkClientPlayerInfo *next;
};
{
unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+ int dummy = 0; /* !!! HAS NO MEANING ANYMORE !!! */
+ /* the name of the level must be enough */
+
buffer[1] = OP_START_PLAYING;
buffer[2] = (byte)(level_nr >> 8);
buffer[3] = (byte)(level_nr & 0xff);
- buffer[4] = (byte)(leveldir_nr >> 8);
- buffer[5] = (byte)(leveldir_nr & 0xff);
+ buffer[4] = (byte)(dummy >> 8);
+ buffer[5] = (byte)(dummy & 0xff);
buffer[6] = (unsigned char)((new_random_seed >> 24) & 0xff);
buffer[7] = (unsigned char)((new_random_seed >> 16) & 0xff);
buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff);
buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff);
- strcpy((char *)&buffer[10], leveldir[leveldir_nr].name);
+ strcpy((char *)&buffer[10], leveldir_current->name);
- SendBufferToServer(10 + strlen(leveldir[leveldir_nr].name)+1);
+ SendBufferToServer(10 + strlen(leveldir_current->name) + 1);
}
void SendToServer_PausePlaying()
static void Handle_OP_START_PLAYING()
{
- int new_level_nr, new_leveldir_nr;
+ struct LevelDirInfo *new_leveldir;
+ int new_level_nr;
+ int dummy; /* !!! HAS NO MEANING ANYMORE !!! */
unsigned long new_random_seed;
char *new_leveldir_name;
new_level_nr = (buffer[2] << 8) + buffer[3];
- new_leveldir_nr = (buffer[4] << 8) + buffer[5];
+ dummy = (buffer[4] << 8) + buffer[5];
new_random_seed =
(buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
new_leveldir_name = (char *)&buffer[10];
+ new_leveldir = getLevelDirInfoFromFilename(new_leveldir_name);
+ if (new_leveldir == NULL)
+ {
+ Error(ERR_WARN, "no such level directory: '%s'", new_leveldir_name);
+
+ new_leveldir = leveldir_first;
+ Error(ERR_WARN, "using default level directory: '%s'", new_leveldir->name);
+ }
+
printf("OP_START_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT,
- "client %d starts game [level %d from levedir %d (%s)]\n",
- buffer[0], new_level_nr, new_leveldir_nr, new_leveldir_name);
-
- if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
- Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name);
+ "client %d starts game [level %d from leveldir '%s']\n",
+ buffer[0], new_level_nr, new_leveldir->name);
- leveldir_nr = new_leveldir_nr;
+ leveldir_current = new_leveldir;
level_nr = new_level_nr;
TapeErase();
#include "image.h"
#include "misc.h"
+#define PCX_DEBUG FALSE
+
#define PCX_MAGIC 0x0a /* first byte in a PCX image file */
#define PCX_LAST_VERSION 5 /* last acceptable version number */
#define PCX_ENCODING 1 /* PCX encoding method */
unsigned char filler[58]; /* fill to struct size of 128 */
};
+/* global PCX error value */
+int errno_pcx = PCX_Success;
+
static byte *PCX_ReadBitmap(Image *image, byte *buffer_ptr, byte *buffer_last)
{
/* Run Length Encoding: If the two high bits are set,
int width, height, depth;
int i;
+ errno_pcx = PCX_Success;
+
if (!(file = fopen(filename, "r")))
+ {
+ errno_pcx = PCX_OpenFailed;
return NULL;
+ }
if (fseek(file, 0, SEEK_END) == -1)
{
fclose(file);
+ errno_pcx = PCX_ReadFailed;
return NULL;
}
{
/* PCX file is too short to contain a valid PCX header */
fclose(file);
+
+ errno_pcx = PCX_FileInvalid;
return NULL;
}
if (fread(file_buffer, 1, file_length, file) != file_length)
{
fclose(file);
+ errno_pcx = PCX_ReadFailed;
return NULL;
}
width < 0 || height < 0)
{
free(file_buffer);
+
+ errno_pcx = PCX_FileInvalid;
return NULL;
}
+#if PCX_DEBUG
if (options.verbose)
{
printf("%s is a %dx%d PC Paintbrush image with %d bitplanes\n",
- filename, pcx.xmax, pcx.ymax,
+ filename, width, height,
pcx.color_planes);
printf("depth: %d\n", pcx.bits_per_pixel);
printf("color_planes: %d\n", pcx.color_planes);
(pcx.palette_type == 1 ? "color" :
pcx.palette_type == 2 ? "grayscale" : "undefined"));
}
+#endif
/* allocate new image structure */
image = newImage(width, height, depth);
{
free(file_buffer);
freeImage(image);
+
+ errno_pcx = PCX_FileInvalid;
return NULL;
}
{
/* PCX file is too short to contain a valid 256 colors colormap */
fclose(file);
+ errno_pcx = PCX_ColorFailed;
return NULL;
}
{
free(file_buffer);
freeImage(image);
+ errno_pcx = PCX_ColorFailed;
return NULL;
}
if (image->rgb.color_used[i])
image->rgb.used++;
+#if PCX_DEBUG
if (options.verbose)
printf("Read_PCX_to_Image: %d colors found\n", image->rgb.used);
+#endif
return image;
}
#define PCX_NoMemory -4
#define PCX_ColorFailed -5
+/* global PCX error value */
+extern int errno_pcx;
+
Image *Read_PCX_to_Image(char *);
#endif /* PCX_H */
/* for DrawSetupScreen(), HandleSetupScreen() */
#define SETUP_SCREEN_POS_START 2
-#define SETUP_SCREEN_POS_END 16
+#define SETUP_SCREEN_POS_END (SCR_FIELDY - 1)
#define SETUP_SCREEN_POS_EMPTY1 (SETUP_SCREEN_POS_END - 2)
#define SETUP_SCREEN_POS_EMPTY2 (SETUP_SCREEN_POS_END - 2)
/* for HandleSetupInputScreen() */
#define SETUPINPUT_SCREEN_POS_START 2
-#define SETUPINPUT_SCREEN_POS_END 15
+#define SETUPINPUT_SCREEN_POS_END (SCR_FIELDY - 2)
#define SETUPINPUT_SCREEN_POS_EMPTY1 (SETUPINPUT_SCREEN_POS_START + 3)
#define SETUPINPUT_SCREEN_POS_EMPTY2 (SETUPINPUT_SCREEN_POS_END - 1)
/* for HandleChooseLevel() */
-#define MAX_LEVEL_SERIES_ON_SCREEN 15
+#define MAX_LEVEL_SERIES_ON_SCREEN (SCR_FIELDY - 2)
+
+/* buttons and scrollbars identifiers */
+#define SCREEN_CTRL_ID_SCROLL_UP 0
+#define SCREEN_CTRL_ID_SCROLL_DOWN 1
+#define SCREEN_CTRL_ID_SCROLL_VERTICAL 2
+
+#define NUM_SCREEN_SCROLLBUTTONS 2
+#define NUM_SCREEN_SCROLLBARS 1
+#define NUM_SCREEN_GADGETS 3
+
+/* forward declaration for internal use */
+static void HandleScreenGadgets(struct GadgetInfo *);
+
+static struct GadgetInfo *screen_gadget[NUM_SCREEN_GADGETS];
#ifdef MSDOS
extern unsigned char get_ascii(KeySym);
void DrawMainMenu()
{
+ static struct LevelDirInfo *leveldir_last_valid = NULL;
int i;
char *name_text = (!options.network && setup.team_mode ? "Team:" : "Name:");
return;
}
+ /* needed if last screen was the editor screen */
+ UndrawSpecialEditorDoor();
+
/* map gadgets for main menu screen */
MapTapeButtons();
+ /* leveldir_current may be invalid (level group, parent link) */
+ if (!validLevelSeries(leveldir_current))
+ leveldir_current = getFirstValidLevelSeries(leveldir_last_valid);
+
+ /* store valid level series information */
+ leveldir_last_valid = leveldir_current;
+
+ /* level_nr may have been set to value over handicap with level editor */
+ if (setup.handicap && level_nr > leveldir_current->handicap_level)
+ level_nr = leveldir_current->handicap_level;
+
GetPlayerConfig();
LoadLevel(level_nr);
DrawText(SX + 6*32, SY + 2*32, setup.player_name, FS_BIG, FC_RED);
DrawText(SX + 32, SY + 3*32, "Level:", FS_BIG, FC_GREEN);
DrawText(SX + 11*32, SY + 3*32, int2str(level_nr,3), FS_BIG,
- (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW));
+ (leveldir_current->readonly ? FC_RED : FC_YELLOW));
DrawText(SX + 32, SY + 4*32, "Hall Of Fame", FS_BIG, FC_GREEN);
DrawText(SX + 32, SY + 5*32, "Level Creator", FS_BIG, FC_GREEN);
DrawText(SY + 32, SY + 6*32, "Info Screen", FS_BIG, FC_GREEN);
DrawMicroLevel(MICROLEV_XPOS, MICROLEV_YPOS, TRUE);
DrawTextF(7*32 + 6, 3*32 + 9, FC_RED, "%d-%d",
- leveldir[leveldir_nr].first_level,
- leveldir[leveldir_nr].last_level);
+ leveldir_current->first_level,
+ leveldir_current->last_level);
- if (leveldir[leveldir_nr].readonly)
+ if (leveldir_current->readonly)
{
DrawTextF(15*32 + 6, 3*32 + 9 - 7, FC_RED, "READ");
DrawTextF(15*32 + 6, 3*32 + 9 + 7, FC_RED, "ONLY");
for(i=2; i<10; i++)
DrawGraphic(0, i, GFX_KUGEL_BLAU);
- DrawGraphic(10, 3, GFX_PFEIL_L);
- DrawGraphic(14, 3, GFX_PFEIL_R);
+ DrawGraphic(10, 3, GFX_ARROW_BLUE_LEFT);
+ DrawGraphic(14, 3, GFX_ARROW_BLUE_RIGHT);
DrawText(SX + 56, SY + 326, "A Game by Artsoft Entertainment",
FS_SMALL, FC_RED);
- if (leveldir[leveldir_nr].name)
+ if (leveldir_current->name)
{
- int len = strlen(leveldir[leveldir_nr].name);
+ int len = strlen(leveldir_current->name);
int lxpos = SX + (SXSIZE - len * FONT4_XSIZE) / 2;
int lypos = SY + 352;
- DrawText(lxpos, lypos, leveldir[leveldir_nr].name, FS_SMALL, FC_SPECIAL2);
+ DrawText(lxpos, lypos, leveldir_current->name, FS_SMALL, FC_SPECIAL2);
}
FadeToFront();
OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+#if 0
ClearEventQueue();
+#endif
+
+}
+
+static void gotoTopLevelDir()
+{
+ /* move upwards to top level directory */
+ while (leveldir_current->node_parent)
+ {
+ /* write a "path" into level tree for easy navigation to last level */
+ if (leveldir_current->node_parent->node_group->cl_first == -1)
+ {
+ int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+ int leveldir_pos = posLevelDirInfo(leveldir_current);
+ int num_page_entries;
+ int cl_first, cl_cursor;
+
+ if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+ num_page_entries = num_leveldirs;
+ else
+ num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+
+ cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
+ cl_cursor = leveldir_pos - cl_first + 3;
+
+ leveldir_current->node_parent->node_group->cl_first = cl_first;
+ leveldir_current->node_parent->node_group->cl_cursor = cl_cursor;
+ }
+
+ leveldir_current = leveldir_current->node_parent;
+ }
}
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
y = choice;
}
- if (y == 4 && ((x == 11 && level_nr > leveldir[leveldir_nr].first_level) ||
- (x == 15 && level_nr < leveldir[leveldir_nr].last_level)) &&
+ if (y == 4 && ((x == 11 && level_nr > leveldir_current->first_level) ||
+ (x == 15 && level_nr < leveldir_current->last_level)) &&
button)
{
static unsigned long level_delay = 0;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int new_level_nr, old_level_nr = level_nr;
- int font_color = (leveldir[leveldir_nr].readonly ? FC_RED : FC_YELLOW);
+ int font_color = (leveldir_current->readonly ? FC_RED : FC_YELLOW);
new_level_nr = level_nr + (x == 11 ? -step : +step);
- if (new_level_nr < leveldir[leveldir_nr].first_level)
- new_level_nr = leveldir[leveldir_nr].first_level;
- if (new_level_nr > leveldir[leveldir_nr].last_level)
- new_level_nr = leveldir[leveldir_nr].last_level;
+ if (new_level_nr < leveldir_current->first_level)
+ new_level_nr = leveldir_current->first_level;
+ if (new_level_nr > leveldir_current->last_level)
+ new_level_nr = leveldir_current->last_level;
+
+ if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
+ new_level_nr = leveldir_current->handicap_level;
if (old_level_nr == new_level_nr ||
!DelayReached(&level_delay, GADGET_FRAME_DELAY))
{
if (y != choice)
{
- DrawGraphic(0, y-1, GFX_KUGEL_ROT);
+ DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
choice = y;
}
}
else if (y == 4)
{
- if (num_leveldirs)
+ if (leveldir_first)
{
game_status = CHOOSELEVEL;
- SaveLevelSetup();
+ SaveLevelSetup_LastSeries();
+ SaveLevelSetup_SeriesInfo();
+
+ gotoTopLevelDir();
+
DrawChooseLevel();
}
}
}
else if (y == 6)
{
- if (leveldir[leveldir_nr].readonly &&
+ if (leveldir_current->readonly &&
strcmp(setup.player_name, "Artsoft") != 0)
Request("This level is read only !", REQ_CONFIRM);
game_status = LEVELED;
#endif
{
game_status = PLAYING;
+ StopAnimation();
InitGame();
}
}
}
else if (y == 10)
{
- SaveLevelSetup();
+ SaveLevelSetup_LastSeries();
+ SaveLevelSetup_SeriesInfo();
if (Request("Do you really want to quit ?", REQ_ASK | REQ_STAY_CLOSED))
game_status = EXITGAME;
}
GFX_MAMPFER2+1,1,1, GFX_MAMPFER2+0,1,1, HA_NEXT,
GFX_ROBOT+0,4,1, GFX_ROBOT+3,1,1, GFX_ROBOT+2,1,1,
GFX_ROBOT+1,1,1, GFX_ROBOT+0,1,1, HA_NEXT,
- GFX_MAULWURF_DOWN,4,2,
- GFX_MAULWURF_UP,4,2,
- GFX_MAULWURF_LEFT,4,2,
- GFX_MAULWURF_RIGHT,4,2, HA_NEXT,
+ GFX_MOLE_DOWN,4,2,
+ GFX_MOLE_UP,4,2,
+ GFX_MOLE_LEFT,4,2,
+ GFX_MOLE_RIGHT,4,2, HA_NEXT,
GFX_PINGUIN_DOWN,4,2,
GFX_PINGUIN_UP,4,2,
GFX_PINGUIN_LEFT,4,2,
GFX_DIAMANT,1,10, HA_NEXT,
GFX_LIFE,1,100, HA_NEXT,
GFX_LIFE_ASYNC,1,100, HA_NEXT,
- GFX_SIEB_INAKTIV,4,2, HA_NEXT,
- GFX_SIEB2_INAKTIV,4,2, HA_NEXT,
+ GFX_MAGIC_WALL_OFF,4,2, HA_NEXT,
+ GFX_MAGIC_WALL_BD_OFF,4,2, HA_NEXT,
GFX_AUSGANG_ZU,1,100, GFX_AUSGANG_ACT,4,2,
GFX_AUSGANG_AUF+0,4,2, GFX_AUSGANG_AUF+3,1,2,
GFX_AUSGANG_AUF+2,1,2, GFX_AUSGANG_AUF+1,1,2, HA_NEXT,
{"Cruncher: Eats diamonds and you,", "if you're not careful"},
{"Cruncher (BD style):", "Eats almost everything"},
{"Robot: Tries to kill the player", ""},
- {"The mole: You must guide him savely","to the exit; he will follow you"},
+ {"The mole: Eats the amoeba and turns","empty space into normal sand"},
{"The penguin: Guide him to the exit,","but keep him away from monsters!"},
{"The Pig: Harmless, but eats all", "gems it can get"},
{"The Dragon: Breathes fire,", "especially to some monsters"},
}
if (((key >= XK_A && key <= XK_Z) || (key >= XK_a && key <= XK_z)) &&
- xpos < MAX_NAMELEN - 1)
+ xpos < MAX_PLAYER_NAME_LEN)
{
char ascii;
BackToFront();
}
+static void drawCursorExt(int ypos, int color, int graphic)
+{
+ static int cursor_array[SCR_FIELDY];
+
+ if (graphic)
+ cursor_array[ypos] = graphic;
+
+ graphic = cursor_array[ypos];
+
+ if (color == FC_RED)
+ graphic = (graphic == GFX_ARROW_BLUE_LEFT ? GFX_ARROW_RED_LEFT :
+ graphic == GFX_ARROW_BLUE_RIGHT ? GFX_ARROW_RED_RIGHT :
+ GFX_KUGEL_ROT);
+
+ DrawGraphic(0, ypos, graphic);
+}
+
+static void initCursor(int ypos, int graphic)
+{
+ drawCursorExt(ypos, FC_BLUE, graphic);
+}
+
+static void drawCursor(int ypos, int color)
+{
+ drawCursorExt(ypos, color, 0);
+}
+
void DrawChooseLevel()
{
UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
+ ClearWindow();
+ HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
+ MapChooseLevelGadgets();
+
FadeToFront();
InitAnimation();
- HandleChooseLevel(0,0, 0,0, MB_MENU_INITIALIZE);
+}
+
+static void AdjustChooseLevelScrollbar(int id, int first_entry)
+{
+ struct GadgetInfo *gi = screen_gadget[id];
+ int items_max, items_visible, item_position;
+
+ items_max = numLevelDirInfoInGroup(leveldir_current);
+ items_visible = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+ item_position = first_entry;
+
+ if (item_position > items_max - items_visible)
+ item_position = items_max - items_visible;
+
+ ModifyGadget(gi, GDI_SCROLLBAR_ITEMS_MAX, items_max,
+ GDI_SCROLLBAR_ITEM_POSITION, item_position, GDI_END);
}
static void drawChooseLevelList(int first_entry, int num_page_entries)
{
int i;
- char buffer[SCR_FIELDX];
+ char buffer[SCR_FIELDX * 2];
+ int max_buffer_len = (SCR_FIELDX - 2) * 2;
+ int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+
+ XFillRectangle(display, backbuffer, gc, SX, SY, SXSIZE - 32, SYSIZE);
+ redraw_mask |= REDRAW_FIELD;
- ClearWindow();
DrawText(SX, SY, "Level Directories", FS_BIG, FC_GREEN);
for(i=0; i<num_page_entries; i++)
{
- strncpy(buffer, leveldir[first_entry + i].name , SCR_FIELDX - 1);
- buffer[SCR_FIELDX - 1] = '\0';
- DrawText(SX + 32, SY + (i + 2) * 32, buffer,
- FS_BIG, leveldir[first_entry + i].color);
- DrawGraphic(0, i + 2, GFX_KUGEL_BLAU);
+ struct LevelDirInfo *node, *node_first;
+ int leveldir_pos = first_entry + i;
+ int ypos = i + 2;
+
+ node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+ node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
+ strncpy(buffer, node->name , max_buffer_len);
+ buffer[max_buffer_len] = '\0';
+
+ DrawText(SX + 32, SY + ypos * 32, buffer, FS_MEDIUM, node->color);
+
+ if (node->parent_link)
+ initCursor(ypos, GFX_ARROW_BLUE_LEFT);
+ else if (node->level_group)
+ initCursor(ypos, GFX_ARROW_BLUE_RIGHT);
+ else
+ initCursor(ypos, GFX_KUGEL_BLAU);
}
if (first_entry > 0)
- DrawGraphic(0, 1, GFX_PFEIL_O);
+ DrawGraphic(0, 1, GFX_ARROW_BLUE_UP);
if (first_entry + num_page_entries < num_leveldirs)
- DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_PFEIL_U);
+ DrawGraphic(0, MAX_LEVEL_SERIES_ON_SCREEN + 1, GFX_ARROW_BLUE_DOWN);
}
-static void drawChooseLevelInfo(int leveldir_nr)
+static void drawChooseLevelInfo(int leveldir_pos)
{
+ struct LevelDirInfo *node, *node_first;
int x, last_redraw_mask = redraw_mask;
- XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 32, 32);
- DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
- leveldir[leveldir_nr].levels,
- leveldir[leveldir_nr].readonly ? "readonly" : "writable");
+ node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+ node = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
+ XFillRectangle(display, drawto, gc, SX + 32, SY + 32, SXSIZE - 64, 32);
+
+ if (node->parent_link)
+ DrawTextFCentered(40, FC_RED, "leave group \"%s\"", node->class_desc);
+ else if (node->level_group)
+ DrawTextFCentered(40, FC_RED, "enter group \"%s\"", node->class_desc);
+ else
+ DrawTextFCentered(40, FC_RED, "%3d levels (%s)",
+ node->levels, node->class_desc);
/* let BackToFront() redraw only what is needed */
redraw_mask = last_redraw_mask | REDRAW_TILES;
void HandleChooseLevel(int mx, int my, int dx, int dy, int button)
{
- static int choice = 3;
- static int first_entry = 0;
static unsigned long choose_delay = 0;
static int redraw = TRUE;
int x = (mx + 32 - SX) / 32, y = (my + 32 - SY) / 32;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
int num_page_entries;
if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
if (button == MB_MENU_INITIALIZE)
{
- redraw = TRUE;
- choice = leveldir_nr + 3 - first_entry;
+ int leveldir_pos = posLevelDirInfo(leveldir_current);
- if (choice > num_page_entries + 2)
+ if (leveldir_current->cl_first == -1)
{
- choice = num_page_entries + 2;
- first_entry = num_leveldirs - num_page_entries;
+ leveldir_current->cl_first = MAX(0, leveldir_pos - num_page_entries + 1);
+ leveldir_current->cl_cursor =
+ leveldir_pos - leveldir_current->cl_first + 3;
}
- drawChooseLevelList(first_entry, num_page_entries);
- drawChooseLevelInfo(leveldir_nr);
+ if (dx == 999) /* first entry is set by scrollbar position */
+ leveldir_current->cl_first = dy;
+ else
+ AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+ leveldir_current->cl_first);
+
+ drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+ drawChooseLevelInfo(leveldir_pos);
+ redraw = TRUE;
}
if (redraw)
{
- DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+ drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
redraw = FALSE;
}
if (dy)
{
x = 1;
- y = choice + dy;
+ y = leveldir_current->cl_cursor + dy;
}
else
- x = y = 0;
+ x = y = 0; /* no action */
+
+ if (ABS(dy) == SCR_FIELDY) /* handle XK_Page_Up, XK_Page_Down */
+ {
+ dy = SIGN(dy);
+ step = num_page_entries - 1;
+ x = 1;
+ y = (dy < 0 ? 2 : num_page_entries + 3);
+ }
}
if (x == 1 && y == 2)
{
- if (first_entry > 0 &&
+ if (leveldir_current->cl_first > 0 &&
(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
{
-#if 0
- first_entry--;
-#else
- first_entry -= step;
- if (first_entry < 0)
- first_entry = 0;
-#endif
- drawChooseLevelList(first_entry, num_page_entries);
- drawChooseLevelInfo(first_entry);
- DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+ leveldir_current->cl_first -= step;
+ if (leveldir_current->cl_first < 0)
+ leveldir_current->cl_first = 0;
+
+ drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+ drawChooseLevelInfo(leveldir_current->cl_first +
+ leveldir_current->cl_cursor - 3);
+ drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+ AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+ leveldir_current->cl_first);
return;
}
}
else if (x == 1 && y > num_page_entries + 2)
{
- if (first_entry + num_page_entries < num_leveldirs &&
+ if (leveldir_current->cl_first + num_page_entries < num_leveldirs &&
(dy || DelayReached(&choose_delay, GADGET_FRAME_DELAY)))
{
-#if 0
- first_entry++;
-#else
- first_entry += step;
- if (first_entry + num_page_entries > num_leveldirs)
- first_entry = num_leveldirs - num_page_entries;
-#endif
- drawChooseLevelList(first_entry, num_page_entries);
- drawChooseLevelInfo(first_entry + num_page_entries - 1);
- DrawGraphic(0, choice - 1, GFX_KUGEL_ROT);
+ leveldir_current->cl_first += step;
+ if (leveldir_current->cl_first + num_page_entries > num_leveldirs)
+ leveldir_current->cl_first = MAX(0, num_leveldirs - num_page_entries);
+
+ drawChooseLevelList(leveldir_current->cl_first, num_page_entries);
+ drawChooseLevelInfo(leveldir_current->cl_first +
+ leveldir_current->cl_cursor - 3);
+ drawCursor(leveldir_current->cl_cursor - 1, FC_RED);
+ AdjustChooseLevelScrollbar(SCREEN_CTRL_ID_SCROLL_VERTICAL,
+ leveldir_current->cl_first);
return;
}
}
if (!mx && !my && !dx && !dy)
{
x = 1;
- y = choice;
+ y = leveldir_current->cl_cursor;
+ }
+
+ if (dx == 1)
+ {
+ struct LevelDirInfo *node_first, *node_cursor;
+ int leveldir_pos =
+ leveldir_current->cl_first + leveldir_current->cl_cursor - 3;
+
+ node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+ node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
+
+ if (node_cursor->node_group)
+ {
+ 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 (dx == -1 && leveldir_current->node_parent)
+ {
+ leveldir_current = leveldir_current->node_parent;
+ DrawChooseLevel();
}
if (x == 1 && y >= 3 && y <= num_page_entries + 2)
{
if (button)
{
- if (y != choice)
+ if (y != leveldir_current->cl_cursor)
{
- DrawGraphic(0, y - 1, GFX_KUGEL_ROT);
- DrawGraphic(0, choice - 1, GFX_KUGEL_BLAU);
- drawChooseLevelInfo(first_entry + y - 3);
- choice = y;
+ drawCursor(y - 1, FC_RED);
+ drawCursor(leveldir_current->cl_cursor - 1, FC_BLUE);
+ drawChooseLevelInfo(leveldir_current->cl_first + y - 3);
+ leveldir_current->cl_cursor = y;
}
}
else
{
- leveldir_nr = first_entry + y - 3;
- level_nr =
- getLastPlayedLevelOfLevelSeries(leveldir[leveldir_nr].filename);
+ struct LevelDirInfo *node_first, *node_cursor;
+ int leveldir_pos = leveldir_current->cl_first + y - 3;
- SaveLevelSetup();
- TapeErase();
+ node_first = getLevelDirInfoFirstGroupEntry(leveldir_current);
+ node_cursor = getLevelDirInfoFromPos(node_first, leveldir_pos);
- game_status = MAINMENU;
- DrawMainMenu();
- redraw = TRUE;
+ if (node_cursor->node_group)
+ {
+ 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
+ {
+ leveldir_current = node_cursor;
+
+ LoadLevelSetup_SeriesInfo();
+
+ SaveLevelSetup_LastSeries();
+ SaveLevelSetup_SeriesInfo();
+ TapeErase();
+
+ game_status = MAINMENU;
+ DrawMainMenu();
+ }
}
}
void DrawHallOfFame(int highlight_position)
{
- int i;
-
UnmapAllGadgets();
CloseDoor(DOOR_CLOSE_2);
if (highlight_position < 0)
LoadScore(level_nr);
- ClearWindow();
+ FadeToFront();
+ InitAnimation();
+ HandleHallOfFame(highlight_position,0, 0,0, MB_MENU_INITIALIZE);
+ PlaySound(SND_HALLOFFAME);
+}
+
+static void drawHallOfFameList(int first_entry, int highlight_position)
+{
+ int i;
+ ClearWindow();
DrawText(SX + 80, SY + 8, "Hall Of Fame", FS_BIG, FC_YELLOW);
DrawTextFCentered(46, FC_RED, "HighScores of Level %d", level_nr);
for(i=0; i<MAX_LEVEL_SERIES_ON_SCREEN; i++)
{
- DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG,
- (i == highlight_position ? FC_RED : FC_GREEN));
- DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG,
- (i == highlight_position ? FC_RED : FC_GREEN));
+ int entry = first_entry + i;
+ int color = (entry == highlight_position ? FC_RED : FC_GREEN);
+
+#if 0
+ DrawText(SX, SY + 64 + i * 32, ".................", FS_BIG, color);
+ DrawText(SX, SY + 64 + i * 32, highscore[i].Name, FS_BIG, color);
DrawText(SX + 12 * 32, SY + 64 + i * 32,
- int2str(highscore[i].Score, 5), FS_BIG,
- (i == highlight_position ? FC_RED : FC_GREEN));
+ int2str(highscore[i].Score, 5), FS_BIG, color);
+#else
+ DrawText(SX, SY + 64 + i * 32, "..................................",
+ FS_MEDIUM, FC_YELLOW);
+ DrawText(SX, SY + 64 + i * 32, int2str(entry + 1, 3),
+ FS_MEDIUM, FC_YELLOW);
+ DrawText(SX + 64, SY + 64 + i * 32, highscore[entry].Name, FS_BIG, color);
+ DrawText(SX + 14 * 32 + 16, SY + 64 + i * 32,
+ int2str(highscore[entry].Score, 5), FS_MEDIUM, color);
+#endif
}
-
- FadeToFront();
- InitAnimation();
- PlaySound(SND_HALLOFFAME);
}
-void HandleHallOfFame(int button)
+void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
{
+ static int first_entry = 0;
+ static int highlight_position = 0;
+ int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int button_released = !button;
+ if (button == MB_MENU_INITIALIZE)
+ {
+ first_entry = 0;
+ highlight_position = mx;
+ drawHallOfFameList(first_entry, highlight_position);
+ return;
+ }
+
+ if (ABS(dy) == SCR_FIELDY) /* handle XK_Page_Up, XK_Page_Down */
+ step = MAX_LEVEL_SERIES_ON_SCREEN - 1;
+
+ if (dy < 0)
+ {
+ if (first_entry > 0)
+ {
+ first_entry -= step;
+ if (first_entry < 0)
+ first_entry = 0;
+
+ drawHallOfFameList(first_entry, highlight_position);
+ return;
+ }
+ }
+ else if (dy > 0)
+ {
+ if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN < MAX_SCORE_ENTRIES)
+ {
+ first_entry += step;
+ if (first_entry + MAX_LEVEL_SERIES_ON_SCREEN > MAX_SCORE_ENTRIES)
+ first_entry = MAX(0, MAX_SCORE_ENTRIES - MAX_LEVEL_SERIES_ON_SCREEN);
+
+ drawHallOfFameList(first_entry, highlight_position);
+ return;
+ }
+ }
+
if (button_released)
{
FadeSound(SND_HALLOFFAME);
game_status = MAINMENU;
DrawMainMenu();
- BackToFront();
}
- else
+
+ BackToFront();
+
+ if (game_status == HALLOFFAME)
DoAnimation();
}
{ &setup.sound, "Sound:", },
{ &setup.sound_loops, " Sound Loops:" },
{ &setup.sound_music, " Game Music:" },
+#if 0
{ &setup.toons, "Toons:" },
{ &setup.double_buffering, "Buffered gfx:" },
+#endif
{ &setup.scroll_delay, "Scroll Delay:" },
{ &setup.soft_scrolling, "Soft Scroll.:" },
{ &setup.fading, "Fading:" },
{ &setup.quick_doors, "Quick Doors:" },
{ &setup.autorecord, "Auto-Record:" },
{ &setup.team_mode, "Team-Mode:" },
+ { &setup.handicap, "Handicap:" },
+ { &setup.time_limit, "Timelimit:" },
{ NULL, "Input Devices" },
{ NULL, "" },
{ NULL, "Exit" },
if (!(i >= SETUP_SCREEN_POS_EMPTY1 && i <= SETUP_SCREEN_POS_EMPTY2))
{
- DrawGraphic(0,i,GFX_KUGEL_BLAU);
DrawText(SX+32,SY+i*32, setup_info[base].text, FS_BIG,FC_GREEN);
+
+ if (strcmp(setup_info[base].text, "Input Devices") == 0)
+ initCursor(i, GFX_ARROW_BLUE_RIGHT);
+ else
+ initCursor(i, GFX_KUGEL_BLAU);
}
if (setup_info[base].value)
if (redraw)
{
- DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+ drawCursor(choice - 1, FC_RED);
redraw = FALSE;
}
y = choice;
}
+ if (dx == 1 && choice == 14)
+ {
+ game_status = SETUPINPUT;
+ DrawSetupInputScreen();
+ redraw = TRUE;
+ }
+
if (x==1 && y >= pos_start && y <= pos_end &&
!(y >= pos_empty1 && y <= pos_empty2))
{
{
if (y!=choice)
{
- DrawGraphic(0,y-1,GFX_KUGEL_ROT);
- DrawGraphic(0,choice-1,GFX_KUGEL_BLAU);
+ drawCursor(y - 1, FC_RED);
+ drawCursor(choice - 1, FC_BLUE);
}
choice = y;
}
}
setup.sound_music = !setup.sound_music;
}
+
+#if 0
else if (y==6)
{
if (setup.toons)
setup.direct_draw = !setup.double_buffering;
#endif
}
- else if (y==8)
+#endif
+
+ else if (y==6)
{
if (setup.scroll_delay)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.scroll_delay = !setup.scroll_delay;
}
- else if (y==9)
+ else if (y==7)
{
if (setup.soft_scrolling)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.soft_scrolling = !setup.soft_scrolling;
}
- else if (y==10)
+ else if (y==8)
{
if (setup.fading)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.fading = !setup.fading;
}
- else if (y==11)
+ else if (y==9)
{
if (setup.quick_doors)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.quick_doors = !setup.quick_doors;
}
- else if (y==12)
+ else if (y==10)
{
if (setup.autorecord)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.autorecord = !setup.autorecord;
}
- else if (y==13)
+ else if (y==11)
{
if (setup.team_mode)
DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
setup.team_mode = !setup.team_mode;
}
+ else if (y==12)
+ {
+ if (setup.handicap)
+ DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+ else
+ DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+ setup.handicap = !setup.handicap;
+ }
+ else if (y==13)
+ {
+ if (setup.time_limit)
+ DrawText(SX+14*32, SY+yy*32,"off",FS_BIG,FC_BLUE);
+ else
+ DrawText(SX+14*32, SY+yy*32,"on ",FS_BIG,FC_YELLOW);
+ setup.time_limit = !setup.time_limit;
+ }
else if (y==14)
{
game_status = SETUPINPUT;
ClearWindow();
DrawText(SX+16, SY+16, "SETUP INPUT", FS_BIG, FC_YELLOW);
- DrawGraphic(0, 2, GFX_KUGEL_BLAU);
- DrawGraphic(0, 3, GFX_KUGEL_BLAU);
- DrawGraphic(0, 4, GFX_KUGEL_BLAU);
- DrawGraphic(0, 15, GFX_KUGEL_BLAU);
- DrawGraphic(10, 2, GFX_PFEIL_L);
- DrawGraphic(12, 2, GFX_PFEIL_R);
+ initCursor(2, GFX_KUGEL_BLAU);
+ initCursor(3, GFX_KUGEL_BLAU);
+ initCursor(4, GFX_ARROW_BLUE_RIGHT);
+ initCursor(15, GFX_KUGEL_BLAU);
+
+ DrawGraphic(10, 2, GFX_ARROW_BLUE_LEFT);
+ DrawGraphic(12, 2, GFX_ARROW_BLUE_RIGHT);
DrawText(SX+32, SY+2*32, "Player:", FS_BIG, FC_GREEN);
DrawText(SX+32, SY+3*32, "Device:", FS_BIG, FC_GREEN);
}
DrawText(SX+32, SY+5*32, "Actual Settings:", FS_BIG, FC_GREEN);
- DrawGraphic(1, 6, GFX_PFEIL_L);
- DrawGraphic(1, 7, GFX_PFEIL_R);
- DrawGraphic(1, 8, GFX_PFEIL_O);
- DrawGraphic(1, 9, GFX_PFEIL_U);
+ DrawGraphic(1, 6, GFX_ARROW_BLUE_LEFT);
+ DrawGraphic(1, 7, GFX_ARROW_BLUE_RIGHT);
+ DrawGraphic(1, 8, GFX_ARROW_BLUE_UP);
+ DrawGraphic(1, 9, GFX_ARROW_BLUE_DOWN);
DrawText(SX+2*32, SY+6*32, ":", FS_BIG, FC_BLUE);
DrawText(SX+2*32, SY+7*32, ":", FS_BIG, FC_BLUE);
DrawText(SX+2*32, SY+8*32, ":", FS_BIG, FC_BLUE);
if (redraw)
{
- DrawGraphic(0,choice-1,GFX_KUGEL_ROT);
+ drawCursor(choice - 1, FC_RED);
redraw = FALSE;
}
{
if (y != choice)
{
- DrawGraphic(0, y-1, GFX_KUGEL_ROT);
- DrawGraphic(0, choice-1, GFX_KUGEL_BLAU);
+ drawCursor(y - 1, FC_RED);
+ drawCursor(choice - 1, FC_BLUE);
}
choice = y;
}
DrawSetupInputScreen();
}
-
-
-#if 0
-
-void CalibrateJoystick_OLD()
-{
-#ifdef __FreeBSD__
- struct joystick joy_ctrl;
-#else
- struct joystick_control
- {
- int buttons;
- int x;
- int y;
- } joy_ctrl;
-#endif
-
-#ifdef MSDOS
- char joy_nr[4];
-#endif
-
- int joystick_nr = setup.input[0].joystick_nr;
- int new_joystick_xleft, new_joystick_xright, new_joystick_xmiddle;
- int new_joystick_yupper, new_joystick_ylower, new_joystick_ymiddle;
-
- if (joystick_status == JOYSTICK_OFF)
- goto error_out;
-
-#ifndef MSDOS
- ClearWindow();
- DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
- BackToFront();
-
-#ifdef __FreeBSD__
- joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
- joy_ctrl.buttons = 0;
-#endif
- while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
- while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
- while(!joy_ctrl.buttons)
-#endif
- {
- if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
- {
- joystick_status=JOYSTICK_OFF;
- goto error_out;
- }
- Delay(10);
- }
-
- new_joystick_xleft = joy_ctrl.x;
- new_joystick_yupper = joy_ctrl.y;
-
- ClearWindow();
- DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
- DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+9*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
- BackToFront();
-
-#ifdef __FreeBSD__
- joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
- joy_ctrl.buttons = 0;
-#endif
- while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
- while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
- while(!joy_ctrl.buttons)
-#endif
- {
- if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
- {
- joystick_status=JOYSTICK_OFF;
- goto error_out;
- }
- Delay(10);
- }
-
- new_joystick_xright = joy_ctrl.x;
- new_joystick_ylower = joy_ctrl.y;
-
- ClearWindow();
- DrawText(SX+32, SY+16+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+16+8*32, "AND PRESS BUTTON",FS_BIG,FC_YELLOW);
- BackToFront();
-
-#ifdef __FreeBSD__
- joy_ctrl.b1 = joy_ctrl.b2 = 0;
-#else
- joy_ctrl.buttons = 0;
-#endif
- while(Joystick() & JOY_BUTTON);
-#ifdef __FreeBSD__
- while(!(joy_ctrl.b1 || joy_ctrl.b2))
-#else
- while(!joy_ctrl.buttons)
-#endif
- {
- if (read(joystick_device, &joy_ctrl, sizeof(joy_ctrl)) != sizeof(joy_ctrl))
- {
- joystick_status=JOYSTICK_OFF;
- goto error_out;
- }
- Delay(10);
- }
-
- new_joystick_xmiddle = joy_ctrl.x;
- new_joystick_ymiddle = joy_ctrl.y;
-
- setup.input[player_nr].joy.xleft = new_joystick_xleft;
- setup.input[player_nr].joy.yupper = new_joystick_yupper;
- setup.input[player_nr].joy.xright = new_joystick_xright;
- setup.input[player_nr].joy.ylower = new_joystick_ylower;
- setup.input[player_nr].joy.xmiddle = new_joystick_xmiddle;
- setup.input[player_nr].joy.ymiddle = new_joystick_ymiddle;
-
- CheckJoystickData();
-
- DrawSetupScreen();
- while(Joystick() & JOY_BUTTON);
- return;
-
-#endif
- error_out:
-
-#ifdef MSDOS
- joy_nr[0] = '#';
- joy_nr[1] = SETUP_2ND_JOYSTICK_ON(local_player->setup)+49;
- joy_nr[2] = '\0';
-
- remove_joystick();
- ClearWindow();
- DrawText(SX+32, SY+7*32, "CENTER JOYSTICK",FS_BIG,FC_YELLOW);
- DrawText(SX+16+7*32, SY+8*32, joy_nr, FS_BIG,FC_YELLOW);
- DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
- BackToFront();
-
- for(clear_keybuf();!keypressed(););
- install_joystick(JOY_TYPE_2PADS);
-
- ClearWindow();
- DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+8*32, " THE UPPER LEFT ",FS_BIG,FC_YELLOW);
- DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
- BackToFront();
-
- for(clear_keybuf();!keypressed(););
- calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
- ClearWindow();
- DrawText(SX+16, SY+7*32, "MOVE JOYSTICK TO",FS_BIG,FC_YELLOW);
- DrawText(SX+32, SY+8*32, "THE LOWER RIGHT",FS_BIG,FC_YELLOW);
- DrawText(SX+32, SY+9*32, "AND PRESS A KEY",FS_BIG,FC_YELLOW);
- BackToFront();
-
- for(clear_keybuf();!keypressed(););
- calibrate_joystick(SETUP_2ND_JOYSTICK_ON(local_player->setup));
-
- DrawSetupScreen();
- return;
-#endif
-
- ClearWindow();
- DrawText(SX+16, SY+16, "NO JOYSTICK",FS_BIG,FC_YELLOW);
- DrawText(SX+16, SY+48, " AVAILABLE ",FS_BIG,FC_YELLOW);
- BackToFront();
- Delay(3000);
- DrawSetupScreen();
-}
-
-#endif
-
-
-
void HandleGameActions()
{
if (game_status != PLAYING)
BackToFront();
}
-void HandleVideoButtons(int mx, int my, int button)
-{
- return;
+/* ---------- new screen button stuff -------------------------------------- */
+/* graphic position and size values for buttons and scrollbars */
+#define SC_SCROLLBUTTON_XPOS 64
+#define SC_SCROLLBUTTON_YPOS 0
+#define SC_SCROLLBAR_XPOS 0
+#define SC_SCROLLBAR_YPOS 64
+#define SC_SCROLLBUTTON_XSIZE 32
+#define SC_SCROLLBUTTON_YSIZE 32
+#define SC_SCROLL_UP_XPOS (SXSIZE - SC_SCROLLBUTTON_XSIZE)
+#define SC_SCROLL_UP_YPOS SC_SCROLLBUTTON_YSIZE
+#define SC_SCROLL_DOWN_XPOS SC_SCROLL_UP_XPOS
+#define SC_SCROLL_DOWN_YPOS (SYSIZE - SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XPOS SC_SCROLL_UP_XPOS
+#define SC_SCROLL_VERTICAL_YPOS (SC_SCROLL_UP_YPOS + SC_SCROLLBUTTON_YSIZE)
+#define SC_SCROLL_VERTICAL_XSIZE SC_SCROLLBUTTON_XSIZE
+#define SC_SCROLL_VERTICAL_YSIZE (SYSIZE - 3 * SC_SCROLLBUTTON_YSIZE)
- if (game_status != MAINMENU && game_status != PLAYING)
- return;
+#define SC_BORDER_SIZE 14
- switch(CheckVideoButtons(mx,my,button))
+static struct
+{
+ int xpos, ypos;
+ int x, y;
+ int gadget_id;
+ char *infotext;
+} scrollbutton_info[NUM_SCREEN_SCROLLBUTTONS] =
+{
{
- case BUTTON_VIDEO_EJECT:
- TapeStop();
- if (TAPE_IS_EMPTY(tape))
- {
- LoadTape(level_nr);
- if (TAPE_IS_EMPTY(tape))
- Request("No tape for this level !",REQ_CONFIRM);
- }
- else
- {
- if (tape.changed)
- SaveTape(tape.level_nr);
- TapeErase();
- }
- DrawCompleteVideoDisplay();
- break;
-
- case BUTTON_VIDEO_STOP:
- TapeStop();
- break;
-
- case BUTTON_VIDEO_PAUSE:
- TapeTogglePause();
- break;
-
- case BUTTON_VIDEO_REC:
- if (TAPE_IS_STOPPED(tape))
- {
- TapeStartRecording();
-
-#ifndef MSDOS
- if (options.network)
- SendToServer_StartPlaying();
- else
-#endif
- {
- game_status = PLAYING;
- InitGame();
- }
- }
- else if (tape.pausing)
- {
- if (tape.playing) /* PLAYING -> PAUSING -> RECORDING */
- {
- tape.pos[tape.counter].delay = tape.delay_played;
- tape.playing = FALSE;
- tape.recording = TRUE;
- tape.changed = TRUE;
-
- DrawVideoDisplay(VIDEO_STATE_PLAY_OFF | VIDEO_STATE_REC_ON,0);
- }
- else
- TapeTogglePause();
- }
- break;
-
- case BUTTON_VIDEO_PLAY:
- if (TAPE_IS_EMPTY(tape))
- break;
+ SC_SCROLLBUTTON_XPOS + 0 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS,
+ SC_SCROLL_UP_XPOS, SC_SCROLL_UP_YPOS,
+ SCREEN_CTRL_ID_SCROLL_UP,
+ "scroll level series up"
+ },
+ {
+ SC_SCROLLBUTTON_XPOS + 1 * SC_SCROLLBUTTON_XSIZE, SC_SCROLLBUTTON_YPOS,
+ SC_SCROLL_DOWN_XPOS, SC_SCROLL_DOWN_YPOS,
+ SCREEN_CTRL_ID_SCROLL_DOWN,
+ "scroll level series down"
+ }
+};
- if (TAPE_IS_STOPPED(tape))
- {
- TapeStartPlaying();
+static struct
+{
+ int xpos, ypos;
+ int x, y;
+ int width, height;
+ int type;
+ int gadget_id;
+ char *infotext;
+} scrollbar_info[NUM_SCREEN_SCROLLBARS] =
+{
+ {
+ SC_SCROLLBAR_XPOS, SC_SCROLLBAR_YPOS,
+ SX + SC_SCROLL_VERTICAL_XPOS, SY + SC_SCROLL_VERTICAL_YPOS,
+ SC_SCROLL_VERTICAL_XSIZE, SC_SCROLL_VERTICAL_YSIZE,
+ GD_TYPE_SCROLLBAR_VERTICAL,
+ SCREEN_CTRL_ID_SCROLL_VERTICAL,
+ "scroll level series vertically"
+ }
+};
- game_status = PLAYING;
- InitGame();
- }
- else if (tape.playing)
- {
- if (tape.pausing) /* PAUSE -> PLAY */
- TapeTogglePause();
- else if (!tape.fast_forward) /* PLAY -> FAST FORWARD PLAY */
- {
- tape.fast_forward = TRUE;
- DrawVideoDisplay(VIDEO_STATE_FFWD_ON, 0);
- }
- else if (!tape.pause_before_death) /* FFWD PLAY -> + AUTO PAUSE */
- {
- tape.pause_before_death = TRUE;
- DrawVideoDisplay(VIDEO_STATE_PBEND_ON, VIDEO_DISPLAY_LABEL_ONLY);
- }
- else /* -> NORMAL PLAY */
- {
- tape.fast_forward = FALSE;
- tape.pause_before_death = FALSE;
- DrawVideoDisplay(VIDEO_STATE_FFWD_OFF | VIDEO_STATE_PBEND_OFF, 0);
- }
- }
- break;
+static void CreateScreenScrollbuttons()
+{
+ Pixmap gd_pixmap = pix[PIX_MORE];
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
+ int i;
- default:
- break;
+ for (i=0; i<NUM_SCREEN_SCROLLBUTTONS; i++)
+ {
+ int id = scrollbutton_info[i].gadget_id;
+ int x, y, width, height;
+ int gd_x1, gd_x2, gd_y1, gd_y2;
+
+ x = scrollbutton_info[i].x;
+ y = scrollbutton_info[i].y;
+
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
+
+ x += SX;
+ y += SY;
+ width = SC_SCROLLBUTTON_XSIZE;
+ height = SC_SCROLLBUTTON_YSIZE;
+ gd_x1 = scrollbutton_info[i].xpos;
+ gd_y1 = scrollbutton_info[i].ypos;
+ gd_x2 = gd_x1;
+ gd_y2 = gd_y1 + SC_SCROLLBUTTON_YSIZE;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_INFO_TEXT, scrollbutton_info[i].infotext,
+ GDI_X, x,
+ GDI_Y, y,
+ GDI_WIDTH, width,
+ GDI_HEIGHT, height,
+ GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
+ GDI_STATE, GD_BUTTON_UNPRESSED,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleScreenGadgets,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ screen_gadget[id] = gi;
}
-
- BackToFront();
}
-void HandleSoundButtons(int mx, int my, int button)
+static void CreateScreenScrollbars()
{
+ int i;
-
-
- return;
-
-
-
- if (game_status != PLAYING)
- return;
-
- switch(CheckSoundButtons(mx,my,button))
+ for (i=0; i<NUM_SCREEN_SCROLLBARS; i++)
{
- case BUTTON_SOUND_MUSIC:
- if (setup.sound_music)
- {
- setup.sound_music = FALSE;
- FadeSound(background_loop[level_nr % num_bg_loops]);
- DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
- }
- else if (sound_loops_allowed)
- {
- setup.sound = setup.sound_music = TRUE;
- PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
- DrawSoundDisplay(BUTTON_SOUND_MUSIC_ON);
- }
- else
- DrawSoundDisplay(BUTTON_SOUND_MUSIC_OFF);
- break;
+ int id = scrollbar_info[i].gadget_id;
+ Pixmap gd_pixmap = pix[PIX_MORE];
+ int gd_x1, gd_x2, gd_y1, gd_y2;
+ struct GadgetInfo *gi;
+ int items_max, items_visible, item_position;
+ unsigned long event_mask;
+ int num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
- case BUTTON_SOUND_LOOPS:
- if (setup.sound_loops)
- {
- setup.sound_loops = FALSE;
- DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
- }
- else if (sound_loops_allowed)
- {
- setup.sound = setup.sound_loops = TRUE;
- DrawSoundDisplay(BUTTON_SOUND_LOOPS_ON);
- }
- else
- DrawSoundDisplay(BUTTON_SOUND_LOOPS_OFF);
- break;
+#if 0
+ if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+ num_page_entries = num_leveldirs;
+ else
+ num_page_entries = MAX_LEVEL_SERIES_ON_SCREEN - 1;
- case BUTTON_SOUND_SIMPLE:
- if (setup.sound_simple)
- {
- setup.sound_simple = FALSE;
- DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
- }
- else if (sound_status==SOUND_AVAILABLE)
- {
- setup.sound = setup.sound_simple = TRUE;
- DrawSoundDisplay(BUTTON_SOUND_SIMPLE_ON);
- }
- else
- DrawSoundDisplay(BUTTON_SOUND_SIMPLE_OFF);
- break;
+ items_max = MAX(num_leveldirs, num_page_entries);
+ items_visible = num_page_entries;
+ item_position = 0;
+#else
+ items_max = num_page_entries;
+ items_visible = num_page_entries;
+ item_position = 0;
+#endif
- default:
- break;
+ event_mask = GD_EVENT_MOVING | GD_EVENT_OFF_BORDERS;
+
+ gd_x1 = scrollbar_info[i].xpos;
+ gd_x2 = gd_x1 + scrollbar_info[i].width;
+ gd_y1 = scrollbar_info[i].ypos;
+ gd_y2 = scrollbar_info[i].ypos;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_CUSTOM_TYPE_ID, i,
+ GDI_INFO_TEXT, scrollbar_info[i].infotext,
+ GDI_X, scrollbar_info[i].x,
+ GDI_Y, scrollbar_info[i].y,
+ GDI_WIDTH, scrollbar_info[i].width,
+ GDI_HEIGHT, scrollbar_info[i].height,
+ GDI_TYPE, scrollbar_info[i].type,
+ GDI_SCROLLBAR_ITEMS_MAX, items_max,
+ GDI_SCROLLBAR_ITEMS_VISIBLE, items_visible,
+ GDI_SCROLLBAR_ITEM_POSITION, item_position,
+ GDI_STATE, GD_BUTTON_UNPRESSED,
+ GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y1,
+ GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y2,
+ GDI_BORDER_SIZE, SC_BORDER_SIZE,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK_ACTION, HandleScreenGadgets,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ screen_gadget[id] = gi;
}
+}
- BackToFront();
+void CreateScreenGadgets()
+{
+ CreateScreenScrollbuttons();
+ CreateScreenScrollbars();
}
-void HandleGameButtons(int mx, int my, int button)
+void MapChooseLevelGadgets()
{
+ int num_leveldirs = numLevelDirInfoInGroup(leveldir_current);
+ int i;
+ if (num_leveldirs <= MAX_LEVEL_SERIES_ON_SCREEN)
+ return;
+ for (i=0; i<NUM_SCREEN_GADGETS; i++)
+ MapGadget(screen_gadget[i]);
+}
- return;
+void UnmapChooseLevelGadgets()
+{
+ int i;
+ for (i=0; i<NUM_SCREEN_GADGETS; i++)
+ UnmapGadget(screen_gadget[i]);
+}
+static void HandleScreenGadgets(struct GadgetInfo *gi)
+{
+ int id = gi->custom_id;
- if (game_status != PLAYING)
+ if (game_status != CHOOSELEVEL)
return;
- switch(CheckGameButtons(mx,my,button))
+ switch (id)
{
- case BUTTON_GAME_STOP:
- if (AllPlayersGone)
- {
- CloseDoor(DOOR_CLOSE_1);
- game_status = MAINMENU;
- DrawMainMenu();
- break;
- }
-
- if (Request("Do you really want to quit the game ?",
- REQ_ASK | REQ_STAY_CLOSED))
- {
-#ifndef MSDOS
- if (options.network)
- SendToServer_StopPlaying();
- else
-#endif
- {
- game_status = MAINMENU;
- DrawMainMenu();
- }
- }
- else
- OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
+ case SCREEN_CTRL_ID_SCROLL_UP:
+ HandleChooseLevel(SX,SY + 32, 0,0, MB_MENU_MARK);
break;
- case BUTTON_GAME_PAUSE:
- if (options.network)
- {
-#ifndef MSDOS
- if (tape.pausing)
- SendToServer_ContinuePlaying();
- else
- SendToServer_PausePlaying();
-#endif
- }
- else
- TapeTogglePause();
+ case SCREEN_CTRL_ID_SCROLL_DOWN:
+ HandleChooseLevel(SX,SY + SYSIZE - 32, 0,0, MB_MENU_MARK);
break;
- case BUTTON_GAME_PLAY:
- if (tape.pausing)
- {
-#ifndef MSDOS
- if (options.network)
- SendToServer_ContinuePlaying();
- else
-#endif
- {
- tape.pausing = FALSE;
- DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
- }
- }
+ case SCREEN_CTRL_ID_SCROLL_VERTICAL:
+ HandleChooseLevel(0,0, 999,gi->event.item_position, MB_MENU_INITIALIZE);
break;
default:
break;
}
-
- BackToFront();
}
void DrawChooseLevel(void);
void HandleChooseLevel(int, int, int, int, int);
void DrawHallOfFame(int);
-void HandleHallOfFame(int);
+void HandleHallOfFame(int, int, int, int, int);
void DrawSetupScreen(void);
void HandleSetupScreen(int, int, int, int, int);
void DrawSetupInputScreen(void);
void CalibrateJoystick(int);
void HandleGameActions(void);
+void CreateScreenGadgets();
+void MapChooseLevelGadgets();
+void UnmapChooseLevelGadgets();
+
#endif /* SCREENS_H */
/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/
-#ifndef MSDOS
-static unsigned long be2long(unsigned long *be) /* big-endian -> longword */
-{
- unsigned char *ptr = (unsigned char *)be;
-
- return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
-}
-
-static unsigned long le2long(unsigned long *be) /* little-endian -> longword */
-{
- unsigned char *ptr = (unsigned char *)be;
-
- return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]);
-}
-#endif /* !MSDOS */
+#define CHUNK_ID_LEN 4 /* IFF style chunk id length */
+#define WAV_HEADER_SIZE 20 /* size of WAV file header */
boolean LoadSound(struct SoundInfo *snd_info)
{
char filename[256];
char *sound_ext = "wav";
#ifndef MSDOS
- struct SoundHeader_WAV *sound_header;
+ byte sound_header_buffer[WAV_HEADER_SIZE];
+ char chunk[CHUNK_ID_LEN + 1];
+ int chunk_length, dummy;
FILE *file;
int i;
#endif
sprintf(filename, "%s/%s/%s.%s",
- options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
+ options.ro_base_directory, SOUNDS_DIRECTORY,
+ snd_info->name, sound_ext);
#ifndef MSDOS
if ((file = fopen(filename, "r")) == NULL)
{
Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
- return(FALSE);
+ return FALSE;
}
- if (fseek(file, 0, SEEK_END) < 0)
+ /* read chunk "RIFF" */
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "RIFF") != 0)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
- snd_info->file_len = ftell(file);
- rewind(file);
-
- snd_info->file_ptr = checked_malloc(snd_info->file_len);
-
- if (fread(snd_info->file_ptr, 1, snd_info->file_len, file) !=
- snd_info->file_len)
+ /* read chunk "WAVE" */
+ getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "WAVE") != 0)
{
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
- fclose(file);
-
- sound_header = (struct SoundHeader_WAV *)snd_info->file_ptr;
+ /* read header information */
+ for (i=0; i<WAV_HEADER_SIZE; i++)
+ sound_header_buffer[i] = fgetc(file);
- if (strncmp(sound_header->magic_RIFF, "RIFF", 4) ||
- snd_info->file_len != le2long(&sound_header->header_size) + 8 ||
- strncmp(sound_header->magic_WAVE, "WAVE", 4) ||
- strncmp(sound_header->magic_DATA, "data", 4) ||
- snd_info->file_len != le2long(&sound_header->data_size) + 44)
+ /* read chunk "data" */
+ getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+ if (strcmp(chunk, "data") != 0)
{
- Error(ERR_WARN, "'%s' is not a RIFF/WAVE file or broken - no sounds",
- filename);
- return(FALSE);
- }
-
- snd_info->data_ptr = snd_info->file_ptr + 44;
- snd_info->data_len = le2long(&sound_header->data_size);
-
- for (i=0; i<snd_info->data_len; i++)
- snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80;
-
-#else /* MSDOS */
-
- snd_info->sample_ptr = load_sample(filename);
- if (!snd_info->sample_ptr)
- {
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
- return(FALSE);
- }
-
-#endif /* MSDOS */
-
- return(TRUE);
-}
-
-boolean LoadSound_8SVX(struct SoundInfo *snd_info)
-{
- char filename[256];
-#ifndef MSDOS
- struct SoundHeader_8SVX *sound_header;
- FILE *file;
- char *ptr;
- char *sound_ext = "8svx";
-#else
- char *sound_ext = "wav";
-#endif
-
- sprintf(filename, "%s/%s/%s.%s",
- options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
-
-#ifndef MSDOS
- if (!(file=fopen(filename,"r")))
- {
- Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
- return(FALSE);
- }
-
- if (fseek(file,0,SEEK_END)<0)
- {
- Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
fclose(file);
- return(FALSE);
+ return FALSE;
}
- snd_info->file_len = ftell(file);
- rewind(file);
+ snd_info->data_len = chunk_length;
+ snd_info->data_ptr = checked_malloc(snd_info->data_len);
- if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
- {
- Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
- fclose(file);
- return(FALSE);
- }
-
- if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_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);
fclose(file);
- return(FALSE);
+ return FALSE;
}
fclose(file);
- sound_header = (struct SoundHeader_8SVX *)snd_info->file_ptr;
-
- if (strncmp(sound_header->magic_FORM,"FORM",4) ||
- snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
- strncmp(sound_header->magic_8SVX,"8SVX",4))
- {
- Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
- filename);
- return(FALSE);
- }
-
- ptr = (char *)snd_info->file_ptr + 12;
-
- while(ptr < (char *)(snd_info->file_ptr + snd_info->file_len))
- {
- if (!strncmp(ptr,"VHDR",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"ANNO",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"CHAN",4))
- {
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- else if (!strncmp(ptr,"BODY",4))
- {
- snd_info->data_ptr = (byte *)ptr + 8;
- snd_info->data_len = be2long((unsigned long *)(ptr + 4));
- return(TRUE);
- }
- else
- {
- /* other chunk not recognized here */
- ptr += be2long((unsigned long *)(ptr + 4)) + 8;
- continue;
- }
- }
+ for (i=0; i<snd_info->data_len; i++)
+ snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
- return(FALSE);
#else /* MSDOS */
+
snd_info->sample_ptr = load_sample(filename);
- if(!snd_info->sample_ptr)
+ if (!snd_info->sample_ptr)
{
Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
return(FALSE);
}
- return(TRUE);
+
#endif /* MSDOS */
+
+ return(TRUE);
}
void PlaySound(int nr)
#endif
}
-void FreeSounds(int max)
+void FreeSounds(int num_sounds)
{
int i;
- if (sound_status==SOUND_OFF)
+ if (sound_status == SOUND_OFF)
return;
- for(i=0;i<max;i++)
+ for(i=0; i<num_sounds; i++)
#ifndef MSDOS
- free(Sound[i].file_ptr);
+ free(Sound[i].data_ptr);
#else
destroy_sample(Sound[i].sample_ptr);
#endif
char magic_8SVX[4];
};
-struct SoundHeader_WAV
-{
- char magic_RIFF[4];
- unsigned long header_size;
- char magic_WAVE[4];
- char some_stuff[24];
- char magic_DATA[4];
- unsigned long data_size;
-};
-
struct SoundInfo
{
char *name;
- byte *file_ptr;
byte *data_ptr;
- long file_len, data_len;
+ long data_len;
#ifdef MSDOS
SAMPLE *sample_ptr;
#endif
/* forward declaration for internal use */
static int getGraphicAnimationPhase(int, int, int);
+static void DrawGraphicAnimationShiftedThruMask(int, int, int, int, int,
+ int, int, int);
static void UnmapToolButtons();
static void HandleToolButtons(struct GadgetInfo *);
if (redraw_mask & REDRAW_FIELD)
redraw_mask &= ~REDRAW_TILES;
- /*
- if (redraw_mask & REDRAW_FIELD ||
- (ScreenGfxPos && setup.soft_scrolling && game_status == PLAYING))
- redraw_mask &= ~REDRAW_TILES;
- */
-
if (!redraw_mask)
return;
XSync(display, FALSE);
- /*
-#ifdef MSDOS
- wait_for_vsync = TRUE;
-#endif
- */
-
if (redraw_mask & REDRAW_ALL)
{
XCopyArea(display, backbuffer, window, gc,
redraw_mask |= REDRAW_FIELD;
}
+int getFontWidth(int font_size, int font_type)
+{
+ return (font_size == FS_BIG ? FONT1_XSIZE :
+ font_size == FS_MEDIUM ? FONT6_XSIZE :
+ font_type == FC_SPECIAL1 ? FONT3_XSIZE :
+ font_type == FC_SPECIAL2 ? FONT4_XSIZE :
+ font_type == FC_SPECIAL3 ? FONT5_XSIZE :
+ FONT2_XSIZE);
+}
+
+int getFontHeight(int font_size, int font_type)
+{
+ return (font_size == FS_BIG ? FONT1_YSIZE :
+ font_size == FS_MEDIUM ? FONT6_YSIZE :
+ font_type == FC_SPECIAL1 ? FONT3_YSIZE :
+ font_type == FC_SPECIAL2 ? FONT4_YSIZE :
+ font_type == FC_SPECIAL3 ? FONT5_YSIZE :
+ FONT2_YSIZE);
+}
+
+void DrawInitText(char *text, int ypos, int color)
+{
+ if (display && window && pix[PIX_SMALLFONT])
+ {
+ XFillRectangle(display, window, gc, 0, ypos, WIN_XSIZE, FONT2_YSIZE);
+ DrawTextExt(window, gc, (WIN_XSIZE - strlen(text) * FONT2_XSIZE)/2,
+ ypos,text,FS_SMALL,color);
+ XFlush(display);
+ }
+}
+
void DrawTextFCentered(int y, int font_type, char *format, ...)
{
- char buffer[FULL_SXSIZE / FONT3_XSIZE + 10];
- int font_xsize;
+ char buffer[FULL_SXSIZE / FONT5_XSIZE + 10];
+ int font_width = getFontWidth(FS_SMALL, font_type);
va_list ap;
- font_xsize = (font_type < FC_SPECIAL1 ? FONT2_XSIZE :
- font_type < FC_SPECIAL2 ? FONT3_XSIZE : FONT4_XSIZE);
-
va_start(ap, format);
vsprintf(buffer, format, ap);
va_end(ap);
- DrawText(SX + (SXSIZE - strlen(buffer) * font_xsize) / 2, SY + y,
+ DrawText(SX + (SXSIZE - strlen(buffer) * font_width) / 2, SY + y,
buffer, FS_SMALL, font_type);
}
void DrawTextF(int x, int y, int font_type, char *format, ...)
{
- char buffer[FULL_SXSIZE / FONT3_XSIZE + 10];
+ char buffer[FULL_SXSIZE / FONT5_XSIZE + 10];
va_list ap;
va_start(ap, format);
int font_pixmap;
boolean print_inverse = FALSE;
- if (font_size != FS_SMALL && font_size != FS_BIG)
+ if (font_size != FS_SMALL && font_size != FS_BIG && font_size != FS_MEDIUM)
font_size = FS_SMALL;
- if (font_type < FC_RED || font_type > FC_SPECIAL2)
+ if (font_type < FC_RED || font_type > FC_SPECIAL3)
font_type = FC_RED;
- font_width = (font_size == FS_BIG ? FONT1_XSIZE :
- font_type < FC_SPECIAL1 ? FONT2_XSIZE :
- font_type < FC_SPECIAL2 ? FONT3_XSIZE : FONT4_XSIZE);
- font_height = (font_size == FS_BIG ? FONT1_XSIZE :
- font_type < FC_SPECIAL2 ? FONT2_XSIZE : FONT4_XSIZE);
- font_pixmap = (font_size == FS_BIG ? PIX_BIGFONT : PIX_SMALLFONT);
- font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE : FONT2_YSIZE) *
+ font_width = getFontWidth(font_size, font_type);
+ font_height = getFontHeight(font_size, font_type);
+
+ font_pixmap = (font_size == FS_BIG ? PIX_BIGFONT :
+ font_size == FS_MEDIUM ? PIX_MEDIUMFONT :
+ PIX_SMALLFONT);
+ font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
+ font_size == FS_MEDIUM ? FONT6_YSIZE :
+ FONT2_YSIZE) *
FONT_LINES_PER_FONT);
+ if (font_type == FC_SPECIAL3)
+ font_start += (FONT4_YSIZE - FONT2_YSIZE) * FONT_LINES_PER_FONT;
+
while (*text)
{
char c = *text++;
- if (c == '~' && font_size == FS_SMALL && font_type <= FC_YELLOW)
+ if (c == '~' && font_size == FS_SMALL)
{
print_inverse = TRUE;
continue;
void DrawPlayerField(int x, int y)
{
- if (!IS_PLAYER(x,y))
+ if (!IS_PLAYER(x, y))
return;
- DrawPlayer(PLAYERINFO(x,y));
+ DrawPlayer(PLAYERINFO(x, y));
}
void DrawPlayer(struct PlayerInfo *player)
int next_jx = jx + (jx - last_jx), next_jy = jy + (jy - last_jy);
int sx = SCREENX(jx), sy = SCREENY(jy);
int sxx = 0, syy = 0;
- int element = Feld[jx][jy];
+ int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy];
int graphic, phase;
+ boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE);
- if (!player->active || player->gone ||
- !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
+ if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
return;
#if DEBUG
/* draw things in the field the player is leaving, if needed */
- if (last_jx != jx || last_jy != jy)
+ if (player_is_moving)
{
- if (Store[last_jx][last_jy] && IS_DRAWABLE(Feld[last_jx][last_jy]))
+ 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);
}
- else if (Feld[last_jx][last_jy] == EL_DYNAMIT)
+ else if (last_element == EL_DYNAMITE_ACTIVE)
DrawDynamite(last_jx, last_jy);
else
DrawLevelField(last_jx, last_jy);
if (Store[jx][jy])
DrawLevelElement(jx, jy, Store[jx][jy]);
- else if (element != EL_DYNAMIT && element != EL_DYNABOMB)
+ else if (!IS_ACTIVE_BOMB(element))
DrawLevelField(jx, jy);
/* draw player himself */
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
{
static int last_dir = MV_LEFT;
+ int action = (player->programmed_action ? player->programmed_action :
+ player->action);
boolean action_moving =
- ((player->action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) &&
- !(player->action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)));
+ (player_is_moving ||
+ ((action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) &&
+ !(action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN))));
graphic = GFX_SP_MURPHY;
else if (action_moving)
{
if (player->MovDir == MV_LEFT)
- graphic = GFX_MURPHY_ANY_LEFT;
+ graphic = GFX_MURPHY_GO_LEFT;
else if (player->MovDir == MV_RIGHT)
- graphic = GFX_MURPHY_ANY_RIGHT;
+ graphic = GFX_MURPHY_GO_RIGHT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
- graphic = GFX_MURPHY_ANY_LEFT;
+ graphic = GFX_MURPHY_GO_LEFT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
- graphic = GFX_MURPHY_ANY_RIGHT;
+ graphic = GFX_MURPHY_GO_RIGHT;
+ else
+ graphic = GFX_MURPHY_GO_LEFT;
- graphic -= getGraphicAnimationPhase(2, 4, ANIM_NORMAL);
+ graphic += getGraphicAnimationPhase(3, 2, ANIM_OSCILLATE);
}
if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING);
+ if (SHIELD_ON(player))
+ {
+ int graphic = (player->shield_active_time_left ? GFX2_SHIELD_ACTIVE :
+ GFX2_SHIELD_PASSIVE);
+
+ DrawGraphicAnimationShiftedThruMask(sx, sy, sxx, syy, graphic,
+ 3, 8, ANIM_OSCILLATE);
+ }
+
if (player->Pushing && player->GfxPos)
{
int px = SCREENX(next_jx), py = SCREENY(next_jy);
- if (Feld[jx][jy] == EL_SOKOBAN_FELD_LEER ||
+ if (element == EL_SOKOBAN_FELD_LEER ||
Feld[next_jx][next_jy] == EL_SOKOBAN_FELD_VOLL)
DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT,
NO_CUTTING);
int element = Feld[next_jx][next_jy];
int graphic = el2gfx(element);
- if (element == EL_FELSBROCKEN && sxx)
+ if ((element == EL_FELSBROCKEN ||
+ element == EL_SP_ZONK ||
+ element == EL_BD_ROCK) && sxx)
{
- int phase = (player->GfxPos / (TILEX/4));
+ int phase = (player->GfxPos / (TILEX / 4));
if (player->MovDir == MV_LEFT)
graphic += phase;
else
- graphic += (phase+4)%4;
+ graphic += (phase + 4) % 4;
}
DrawGraphicShifted(px, py, sxx, syy, graphic, NO_CUTTING, NO_MASKING);
}
}
- /* draw things in front of player (EL_DYNAMIT || EL_DYNABOMB) */
+ /* draw things in front of player (active dynamite or dynabombs) */
- if (element == EL_DYNAMIT || element == EL_DYNABOMB)
+ if (IS_ACTIVE_BOMB(element))
{
graphic = el2gfx(element);
- if (element == EL_DYNAMIT)
+ if (element == EL_DYNAMITE_ACTIVE)
{
if ((phase = (96 - MovDelay[jx][jy]) / 12) > 6)
phase = 6;
phase = 7 - phase;
}
- if (game_emulation == EMU_SUPAPLEX)
+ if (game.emulation == EMU_SUPAPLEX)
DrawGraphic(sx, sy, GFX_SP_DISK_RED);
else
DrawGraphicThruMask(sx, sy, graphic + phase);
}
- if ((last_jx != jx || last_jy != jy) &&
- Feld[last_jx][last_jy] == EL_EXPLODING)
+ if (player_is_moving && last_element == EL_EXPLODING)
{
int phase = Frame[last_jx][last_jy];
int delay = 2;
GFX_EXPLOSION + ((phase - 1) / delay - 1));
}
+ /* draw elements that stay over the player */
+ /* handle the field the player is leaving ... */
+ if (player_is_moving && IS_OVER_PLAYER(last_element))
+ DrawLevelField(last_jx, last_jy);
+ /* ... and the field the player is entering */
+ if (IS_OVER_PLAYER(element))
+ DrawLevelField(jx, jy);
+
if (setup.direct_draw)
{
int dest_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX;
DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, USE_MASKING);
}
+static void DrawGraphicAnimationShiftedThruMask(int sx, int sy,
+ int sxx, int syy,
+ int graphic,
+ int frames, int delay,
+ int mode)
+{
+ int phase = getGraphicAnimationPhase(frames, delay, mode);
+
+ DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic + phase, NO_CUTTING);
+}
+
void getGraphicSource(int graphic, int *pixmap_nr, int *x, int *y)
{
if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
*x = SX + (graphic % GFX_PER_LINE) * TILEX;
*y = SY + (graphic / GFX_PER_LINE) * TILEY;
}
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- *pixmap_nr = PIX_MORE;
- *x = (graphic % MORE_PER_LINE) * TILEX;
- *y = (graphic / MORE_PER_LINE) * TILEY;
- }
else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
{
graphic -= GFX_START_ROCKSHEROES;
*x = (graphic % HEROES_PER_LINE) * TILEX;
*y = (graphic / HEROES_PER_LINE) * TILEY;
}
+ else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
+ {
+ graphic -= GFX_START_ROCKSSP;
+ *pixmap_nr = PIX_SP;
+ *x = (graphic % SP_PER_LINE) * TILEX;
+ *y = (graphic / SP_PER_LINE) * TILEY;
+ }
+ else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
+ {
+ graphic -= GFX_START_ROCKSDC;
+ *pixmap_nr = PIX_DC;
+ *x = (graphic % DC_PER_LINE) * TILEX;
+ *y = (graphic / DC_PER_LINE) * TILEY;
+ }
+ else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
+ {
+ graphic -= GFX_START_ROCKSMORE;
+ *pixmap_nr = PIX_MORE;
+ *x = (graphic % MORE_PER_LINE) * TILEX;
+ *y = (graphic / MORE_PER_LINE) * TILEY;
+ }
else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
{
graphic -= GFX_START_ROCKSFONT;
}
else
{
- *pixmap_nr = PIX_MORE;
+ *pixmap_nr = PIX_SP;
*x = 0;
*y = 0;
}
void DrawGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
{
-
-#if 1
-
int pixmap_nr;
int src_x, src_y;
getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
XCopyArea(display, pix[pixmap_nr], d, gc,
src_x, src_y, TILEX, TILEY, x, y);
-
-#else
-
- if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
- {
- graphic -= GFX_START_ROCKSSCREEN;
- XCopyArea(display, pix[PIX_BACK], d, gc,
- SX + (graphic % GFX_PER_LINE) * TILEX,
- SY + (graphic / GFX_PER_LINE) * TILEY,
- TILEX, TILEY, x, y);
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- XCopyArea(display, pix[PIX_MORE], d, gc,
- (graphic % MORE_PER_LINE) * TILEX,
- (graphic / MORE_PER_LINE) * TILEY,
- TILEX, TILEY, x, y);
- }
- else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
- {
- graphic -= GFX_START_ROCKSHEROES;
- XCopyArea(display, pix[PIX_HEROES], d, gc,
- (graphic % HEROES_PER_LINE) * TILEX,
- (graphic / HEROES_PER_LINE) * TILEY,
- TILEX, TILEY, x, y);
- }
- else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
- {
- graphic -= GFX_START_ROCKSFONT;
- XCopyArea(display, pix[PIX_BIGFONT], d, gc,
- (graphic % FONT_CHARS_PER_LINE) * TILEX,
- (graphic / FONT_CHARS_PER_LINE) * TILEY +
- FC_SPECIAL1 * FONT_LINES_PER_FONT * TILEY,
- TILEX, TILEY, x, y);
- }
- else
- XFillRectangle(display, d, gc, x, y, TILEX, TILEY);
-
-#endif
-
}
void DrawGraphicThruMask(int x, int y, int graphic)
void DrawGraphicThruMaskExt(Drawable d, int dest_x, int dest_y, int graphic)
{
-
-#if 1
-
int tile = graphic;
int pixmap_nr;
int src_x, src_y;
src_pixmap = pix[pixmap_nr];
drawing_gc = clip_gc[pixmap_nr];
-#else
-
- int src_x, src_y;
- int tile = graphic;
- Pixmap src_pixmap;
- GC drawing_gc;
-
- if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
- {
- src_pixmap = pix[PIX_BACK];
- drawing_gc = clip_gc[PIX_BACK];
- graphic -= GFX_START_ROCKSSCREEN;
- src_x = SX + (graphic % GFX_PER_LINE) * TILEX;
- src_y = SY + (graphic / GFX_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- src_pixmap = pix[PIX_MORE];
- drawing_gc = clip_gc[PIX_MORE];
- graphic -= GFX_START_ROCKSMORE;
- src_x = (graphic % MORE_PER_LINE) * TILEX;
- src_y = (graphic / MORE_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
- {
- src_pixmap = pix[PIX_HEROES];
- drawing_gc = clip_gc[PIX_HEROES];
- graphic -= GFX_START_ROCKSHEROES;
- src_x = (graphic % HEROES_PER_LINE) * TILEX;
- src_y = (graphic / HEROES_PER_LINE) * TILEY;
- }
- else
- {
- DrawGraphicExt(d, gc, dest_x,dest_y, graphic);
- return;
- }
-
-#endif
-
-
if (tile_clipmask[tile] != None)
{
XSetClipMask(display, tile_clip_gc, tile_clipmask[tile]);
*x = MINI_GFX_STARTX + (graphic % MINI_GFX_PER_LINE) * MINI_TILEX;
*y = MINI_GFX_STARTY + (graphic / MINI_GFX_PER_LINE) * MINI_TILEY;
}
+ else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
+ {
+ graphic -= GFX_START_ROCKSSP;
+ graphic -= ((graphic / SP_PER_LINE) * SP_PER_LINE) / 2;
+ *pixmap = pix[PIX_SP];
+ *x = MINI_SP_STARTX + (graphic % MINI_SP_PER_LINE) * MINI_TILEX;
+ *y = MINI_SP_STARTY + (graphic / MINI_SP_PER_LINE) * MINI_TILEY;
+ }
+ else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
+ {
+ graphic -= GFX_START_ROCKSDC;
+ *pixmap = pix[PIX_DC];
+ *x = MINI_DC_STARTX + (graphic % MINI_DC_PER_LINE) * MINI_TILEX;
+ *y = MINI_DC_STARTY + (graphic / MINI_DC_PER_LINE) * MINI_TILEY;
+ }
else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
{
graphic -= GFX_START_ROCKSMORE;
}
else
{
- *pixmap = pix[PIX_MORE];
- *x = MINI_MORE_STARTX;
- *y = MINI_MORE_STARTY;
+ *pixmap = pix[PIX_SP];
+ *x = MINI_SP_STARTX;
+ *y = MINI_SP_STARTY;
}
}
void DrawMiniGraphicExt(Drawable d, GC gc, int x, int y, int graphic)
{
-
-#if 1
-
Pixmap pixmap;
int src_x, src_y;
getMiniGraphicSource(graphic, &pixmap, &src_x, &src_y);
XCopyArea(display, pixmap, d, gc,
src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
-
-#else
-
- if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
- {
- graphic -= GFX_START_ROCKSSCREEN;
- XCopyArea(display, pix[PIX_BACK], d, gc,
- MINI_GFX_STARTX + (graphic % MINI_GFX_PER_LINE) * MINI_TILEX,
- MINI_GFX_STARTY + (graphic / MINI_GFX_PER_LINE) * MINI_TILEY,
- MINI_TILEX, MINI_TILEY, x, y);
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- XCopyArea(display, pix[PIX_MORE], d, gc,
- MINI_MORE_STARTX + (graphic % MINI_MORE_PER_LINE) * MINI_TILEX,
- MINI_MORE_STARTY + (graphic / MINI_MORE_PER_LINE) * MINI_TILEY,
- MINI_TILEX, MINI_TILEY, x, y);
- }
- else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
- {
- graphic -= GFX_START_ROCKSFONT;
- XCopyArea(display, pix[PIX_SMALLFONT], d, gc,
- (graphic % FONT_CHARS_PER_LINE) * FONT4_XSIZE,
- (graphic / FONT_CHARS_PER_LINE) * FONT4_YSIZE +
- FC_SPECIAL2 * FONT2_YSIZE * FONT_LINES_PER_FONT,
- MINI_TILEX, MINI_TILEY, x, y);
- }
- else
- XFillRectangle(display, d, gc, x, y, MINI_TILEX, MINI_TILEY);
-
-#endif
-
}
void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
int cx = 0, cy = 0;
int src_x, src_y, dest_x, dest_y;
int tile = graphic;
+ int pixmap_nr;
Pixmap src_pixmap;
GC drawing_gc;
MarkTileDirty(x, y + SIGN(dy));
}
- if (graphic >= GFX_START_ROCKSSCREEN && graphic <= GFX_END_ROCKSSCREEN)
- {
- src_pixmap = pix[PIX_BACK];
- drawing_gc = clip_gc[PIX_BACK];
- graphic -= GFX_START_ROCKSSCREEN;
- src_x = SX + (graphic % GFX_PER_LINE) * TILEX + cx;
- src_y = SY + (graphic / GFX_PER_LINE) * TILEY + cy;
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- src_pixmap = pix[PIX_MORE];
- drawing_gc = clip_gc[PIX_MORE];
- graphic -= GFX_START_ROCKSMORE;
- src_x = (graphic % MORE_PER_LINE) * TILEX + cx;
- src_y = (graphic / MORE_PER_LINE) * TILEY + cy;
- }
- else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
- {
- src_pixmap = pix[PIX_HEROES];
- drawing_gc = clip_gc[PIX_HEROES];
- graphic -= GFX_START_ROCKSHEROES;
- src_x = (graphic % HEROES_PER_LINE) * TILEX + cx;
- src_y = (graphic / HEROES_PER_LINE) * TILEY + cy;
- }
- else /* big font graphics currently not allowed (and not needed) */
- return;
+ getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
+ src_pixmap = pix[pixmap_nr];
+ drawing_gc = clip_gc[pixmap_nr];
+
+ src_x += cx;
+ src_y += cy;
dest_x = FX + x * TILEX + dx;
dest_y = FY + y * TILEY + dy;
{
graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_NORMAL);
}
- else if (element == EL_MAULWURF || element == EL_PINGUIN ||
+ else if (element == EL_MOLE || element == EL_PINGUIN ||
element == EL_SCHWEIN || element == EL_DRACHE)
{
if (dir == MV_LEFT)
- graphic = (element == EL_MAULWURF ? GFX_MAULWURF_LEFT :
+ graphic = (element == EL_MOLE ? GFX_MOLE_LEFT :
element == EL_PINGUIN ? GFX_PINGUIN_LEFT :
element == EL_SCHWEIN ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
else if (dir == MV_RIGHT)
- graphic = (element == EL_MAULWURF ? GFX_MAULWURF_RIGHT :
+ graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT :
element == EL_PINGUIN ? GFX_PINGUIN_RIGHT :
element == EL_SCHWEIN ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
else if (dir == MV_UP)
- graphic = (element == EL_MAULWURF ? GFX_MAULWURF_UP :
+ graphic = (element == EL_MOLE ? GFX_MOLE_UP :
element == EL_PINGUIN ? GFX_PINGUIN_UP :
element == EL_SCHWEIN ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
else
- graphic = (element == EL_MAULWURF ? GFX_MAULWURF_DOWN :
+ graphic = (element == EL_MOLE ? GFX_MOLE_DOWN :
element == EL_PINGUIN ? GFX_PINGUIN_DOWN :
element == EL_SCHWEIN ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
{
graphic += !phase2;
}
- else if ((element == EL_FELSBROCKEN || IS_GEM(element)) && !cut_mode)
+ else if (element == EL_BALLOON)
+ {
+ graphic += phase4;
+ }
+ else if ((element == EL_FELSBROCKEN ||
+ element == EL_SP_ZONK ||
+ element == EL_BD_ROCK ||
+ IS_GEM(element)) && !cut_mode)
{
- if (element != EL_SP_INFOTRON)
- graphic += phase2 * (element == EL_FELSBROCKEN ? 2 : 1);
+ if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
+ {
+ if (element == EL_FELSBROCKEN ||
+ element == EL_SP_ZONK ||
+ element == EL_BD_ROCK)
+ {
+ if (dir == MV_LEFT)
+ graphic += (4 - phase4) % 4;
+ else if (dir == MV_RIGHT)
+ graphic += phase4;
+ else
+ graphic += phase2 * 2;
+ }
+ else if (element != EL_SP_INFOTRON)
+ graphic += phase2;
+ }
}
- else if (element == EL_SIEB_LEER || element == EL_SIEB2_LEER ||
- element == EL_SIEB_VOLL || element == EL_SIEB2_VOLL)
+ else if (element == EL_MAGIC_WALL_EMPTY ||
+ element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_FULL ||
+ element == EL_MAGIC_WALL_BD_FULL)
{
graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
}
else if (rechts_massiv)
graphic = GFX_MAUER_L;
}
+ else if ((element == EL_INVISIBLE_STEEL ||
+ element == EL_UNSICHTBAR ||
+ element == EL_SAND_INVISIBLE) && game.light_time_left)
+ {
+ graphic = (element == EL_INVISIBLE_STEEL ? GFX_INVISIBLE_STEEL_ON :
+ element == EL_UNSICHTBAR ? GFX_UNSICHTBAR_ON :
+ GFX_SAND_INVISIBLE_ON);
+ }
if (dx || dy)
DrawGraphicShifted(x, y, dx, dy, graphic, cut_mode, mask_mode);
element = Feld[ux][uy];
- if (element == EL_ERDREICH)
+ if (element == EL_ERDREICH ||
+ element == EL_LANDMINE ||
+ element == EL_TRAP_INACTIVE ||
+ element == EL_TRAP_ACTIVE)
{
if (!IN_SCR_FIELD(x, y))
return;
else
element = Feld[uxx][uyy];
- if (element == EL_ERDREICH)
+ if (element == EL_ERDREICH ||
+ element == EL_LANDMINE ||
+ element == EL_TRAP_INACTIVE ||
+ element == EL_TRAP_ACTIVE)
continue;
if (i == 1 || i == 2)
uxx = ux + xy[i][0];
uyy = uy + xy[i][1];
- if (!IN_LEV_FIELD(uxx, uyy) || Feld[uxx][uyy] != EL_ERDREICH ||
+ if (!IN_LEV_FIELD(uxx, uyy) ||
+ (Feld[uxx][uyy] != EL_ERDREICH &&
+ Feld[uxx][uyy] != EL_LANDMINE &&
+ Feld[uxx][uyy] != EL_TRAP_INACTIVE &&
+ Feld[uxx][uyy] != EL_TRAP_ACTIVE) ||
!IN_SCR_FIELD(xx, yy))
continue;
boolean cut_mode = NO_CUTTING;
if (Store[ux][uy] == EL_MORAST_LEER ||
- Store[ux][uy] == EL_SIEB_LEER ||
- Store[ux][uy] == EL_SIEB2_LEER ||
+ Store[ux][uy] == EL_MAGIC_WALL_EMPTY ||
+ Store[ux][uy] == EL_MAGIC_WALL_BD_EMPTY ||
Store[ux][uy] == EL_AMOEBE_NASS)
cut_mode = CUT_ABOVE;
else if (Store[ux][uy] == EL_MORAST_VOLL ||
- Store[ux][uy] == EL_SIEB_VOLL ||
- Store[ux][uy] == EL_SIEB2_VOLL)
+ Store[ux][uy] == EL_MAGIC_WALL_FULL ||
+ Store[ux][uy] == EL_MAGIC_WALL_BD_FULL)
cut_mode = CUT_BELOW;
if (cut_mode == CUT_ABOVE)
MovDir[oldx][oldy] == MV_RIGHT);
if (Store[oldx][oldy] == EL_MORAST_LEER ||
- Store[oldx][oldy] == EL_SIEB_LEER ||
- Store[oldx][oldy] == EL_SIEB2_LEER ||
+ Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY ||
+ Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY ||
Store[oldx][oldy] == EL_AMOEBE_NASS)
cut_mode = CUT_ABOVE;
if (steel_position != -1)
DrawMiniGraphic(sx, sy, border[steel_position][steel_type]);
-
-
-#if 0
- if (x == -1 && y == -1)
- DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_LEFT);
- else if (x == lev_fieldx && y == -1)
- DrawMiniGraphic(sx, sy, GFX_STEEL_UPPER_RIGHT);
- else if (x == -1 && y == lev_fieldy)
- DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_LEFT);
- else if (x == lev_fieldx && y == lev_fieldy)
- DrawMiniGraphic(sx, sy, GFX_STEEL_LOWER_RIGHT);
- else if (x == -1 || x == lev_fieldx)
- DrawMiniGraphic(sx, sy, GFX_STEEL_VERTICAL);
- else if (y == -1 || y == lev_fieldy)
- DrawMiniGraphic(sx, sy, GFX_STEEL_HORIZONTAL);
-#endif
-
-
}
}
graphic = el2gfx(element);
- if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
+ if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
+ {
+ graphic -= GFX_START_ROCKSSP;
+ graphic -= ((graphic / SP_PER_LINE) * SP_PER_LINE) / 2;
+ XCopyArea(display, pix[PIX_SP], drawto, gc,
+ MICRO_SP_STARTX + (graphic % MICRO_SP_PER_LINE) * MICRO_TILEX,
+ MICRO_SP_STARTY + (graphic / MICRO_SP_PER_LINE) * MICRO_TILEY,
+ MICRO_TILEX, MICRO_TILEY, xpos, ypos);
+ }
+ else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
+ {
+ graphic -= GFX_START_ROCKSDC;
+ XCopyArea(display, pix[PIX_DC], drawto, gc,
+ MICRO_DC_STARTX + (graphic % MICRO_DC_PER_LINE) * MICRO_TILEX,
+ MICRO_DC_STARTY + (graphic / MICRO_DC_PER_LINE) * MICRO_TILEY,
+ MICRO_TILEX, MICRO_TILEY, xpos, ypos);
+ }
+ else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
{
graphic -= GFX_START_ROCKSMORE;
XCopyArea(display, pix[PIX_MORE], drawto, gc,
for(y=BY1; y<=BY2; y++)
DrawScreenField(x, y);
- if (setup.soft_scrolling)
- XCopyArea(display, fieldbuffer, backbuffer, gc,
- FX, FY, SXSIZE, SYSIZE, SX, SY);
-
- redraw_mask |= (REDRAW_FIELD | REDRAW_FROM_BACKBUFFER);
+ redraw_mask |= REDRAW_FIELD;
}
void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
{
int x, y;
- /* determine border element for this level */
- SetBorderElement();
-
XFillRectangle(display, drawto, gc,
xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
redraw_mask |= REDRAW_MICROLEVEL;
}
+#define MICROLABEL_EMPTY 0
+#define MICROLABEL_LEVEL_NAME 1
+#define MICROLABEL_CREATED_BY 2
+#define MICROLABEL_LEVEL_AUTHOR 3
+#define MICROLABEL_IMPORTED_FROM 4
+#define MICROLABEL_LEVEL_IMPORT_INFO 5
+
+#define MAX_MICROLABEL_SIZE (SXSIZE / FONT4_XSIZE)
+
static void DrawMicroLevelLabelExt(int mode)
{
- char label_text[100];
+ char label_text[MAX_MICROLABEL_SIZE + 1];
XFillRectangle(display, drawto,gc,
SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
- strcpy(label_text, (mode == 1 ? level.name :
- mode == 2 ? "created by" :
- mode == 3 ? level.author : ""));
+ strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name :
+ mode == MICROLABEL_CREATED_BY ? "created by" :
+ mode == MICROLABEL_LEVEL_AUTHOR ? level.author :
+ mode == MICROLABEL_IMPORTED_FROM ? "imported from" :
+ mode == MICROLABEL_LEVEL_IMPORT_INFO ?
+ leveldir_current->imported_from : ""),
+ MAX_MICROLABEL_SIZE);
+ label_text[MAX_MICROLABEL_SIZE] = '\0';
if (strlen(label_text) > 0)
{
- int size, lxpos, lypos;
-
- label_text[SXSIZE / FONT4_XSIZE] = '\0';
-
- size = strlen(label_text);
- lxpos = SX + (SXSIZE - size * FONT4_XSIZE) / 2;
- lypos = MICROLABEL_YPOS;
+ int lxpos = SX + (SXSIZE - strlen(label_text) * FONT4_XSIZE) / 2;
+ int lypos = MICROLABEL_YPOS;
DrawText(lxpos, lypos, label_text, FS_SMALL, FC_SPECIAL2);
}
/* redraw micro level label, if needed */
if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 &&
strcmp(level.author, ANONYMOUS_NAME) != 0 &&
- strcmp(level.author, leveldir[leveldir_nr].name) != 0 &&
+ strcmp(level.author, leveldir_current->name) != 0 &&
DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY))
{
- label_counter = (label_counter + 1) % 23;
- label_state = (label_counter >= 0 && label_counter <= 7 ? 1 :
- label_counter >= 9 && label_counter <= 12 ? 2 :
- label_counter >= 14 && label_counter <= 21 ? 3 : 0);
+ int max_label_counter = 23;
+
+ if (leveldir_current->imported_from != NULL)
+ max_label_counter += 14;
+
+ label_counter = (label_counter + 1) % max_label_counter;
+ label_state = (label_counter >= 0 && label_counter <= 7 ?
+ MICROLABEL_LEVEL_NAME :
+ label_counter >= 9 && label_counter <= 12 ?
+ MICROLABEL_CREATED_BY :
+ label_counter >= 14 && label_counter <= 21 ?
+ MICROLABEL_LEVEL_AUTHOR :
+ label_counter >= 23 && label_counter <= 26 ?
+ MICROLABEL_IMPORTED_FROM :
+ label_counter >= 28 && label_counter <= 35 ?
+ MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY);
DrawMicroLevelLabelExt(label_state);
}
}
DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
/* clear door drawing field */
-#if 0
- XFillRectangle(display, pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE);
-#else
XFillRectangle(display, drawto, gc, DX, DY, DXSIZE, DYSIZE);
-#endif
/* write text for request */
for(ty=0; ty<13; ty++)
}
sprintf(txt, text);
txt[tl] = 0;
-#if 0
- DrawTextExt(pix[PIX_DB_DOOR], gc,
- DOOR_GFX_PAGEX1 + 51 - (tl * 14)/2, SY + ty * 16,
- txt, FS_SMALL, FC_YELLOW);
-#else
DrawTextExt(drawto, gc,
DX + 51 - (tl * 14)/2, DY + 8 + ty * 16,
txt, FS_SMALL, FC_YELLOW);
-#endif
text += tl + (tc == 32 ? 1 : 0);
}
-#if 0
- if (req_state & REQ_ASK)
- {
- DrawYesNoButton(BUTTON_OK, DB_INIT);
- DrawYesNoButton(BUTTON_NO, DB_INIT);
- }
- else if (req_state & REQ_CONFIRM)
- {
- DrawConfirmButton(BUTTON_CONFIRM, DB_INIT);
- }
- else if (req_state & REQ_PLAYER)
- {
- DrawPlayerButton(BUTTON_PLAYER_1, DB_INIT);
- DrawPlayerButton(BUTTON_PLAYER_2, DB_INIT);
- DrawPlayerButton(BUTTON_PLAYER_3, DB_INIT);
- DrawPlayerButton(BUTTON_PLAYER_4, DB_INIT);
- }
-#else
-
if (req_state & REQ_ASK)
{
MapGadget(tool_gadget[TOOL_CTRL_ID_YES]);
DX, DY, DXSIZE, DYSIZE,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
-#endif
-
OpenDoor(DOOR_OPEN_1);
+
+#if 0
ClearEventQueue();
+#endif
if (!(req_state & REQUEST_WAIT_FOR))
return(FALSE);
case ButtonRelease:
case MotionNotify:
{
-
-#if 0
- int choice;
-#endif
-
if (event.type == MotionNotify)
{
Window root, child;
button_status = MB_RELEASED;
}
-
-
-#if 0
- if (req_state & REQ_ASK)
- choice = CheckYesNoButtons(mx,my,button_status);
- else if (req_state & REQ_CONFIRM)
- choice = CheckConfirmButton(mx,my,button_status);
- else
- choice = CheckPlayerButtons(mx,my,button_status);
-
- switch(choice)
- {
- case BUTTON_OK:
- result = TRUE;
- break;
- case BUTTON_NO:
- result = FALSE;
- break;
- case BUTTON_CONFIRM:
- result = TRUE | FALSE;
- break;
-
- case BUTTON_PLAYER_1:
- result = 1;
- break;
- case BUTTON_PLAYER_2:
- result = 2;
- break;
- case BUTTON_PLAYER_3:
- result = 3;
- break;
- case BUTTON_PLAYER_4:
- result = 4;
- break;
-
- default:
- break;
- }
-#else
-
/* this sets 'request_gadget_id' */
HandleGadgets(mx, my, button_status);
default:
break;
}
-#endif
break;
}
redraw_mask |= REDRAW_DOOR_2;
}
-
-
-#if 1
BackToFront();
-#else
- XCopyArea(display, drawto, window, gc, DX, DY, DXSIZE, DYSIZE, DX, DY);
-#endif
-
-
if (game_status == MAINMENU)
DoAnimation();
if (door_state & DOOR_ACTION_2)
door2 = door_state & DOOR_ACTION_2;
- return(door1 | door2);
+ return (door1 | door2);
+}
+
+void DrawSpecialEditorDoor()
+{
+ /* draw bigger toolbox window */
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX7, 0, 108, 56, EX - 4, EY - 12);
+
+ redraw_mask |= REDRAW_ALL;
+}
+
+void UndrawSpecialEditorDoor()
+{
+ /* draw normal tape recorder window */
+ XCopyArea(display, pix[PIX_BACK], drawto, gc,
+ 562, 344, 108, 56, EX - 4, EY - 12);
+
+ redraw_mask |= REDRAW_ALL;
}
int ReadPixel(Drawable d, int x, int y)
}
};
+static void DoNotDisplayInfoText(void *ptr)
+{
+ return;
+}
+
void CreateToolButtons()
{
int i;
GDI_DECORATION_SHIFTING, 1, 1,
GDI_EVENT_MASK, event_mask,
GDI_CALLBACK_ACTION, HandleToolButtons,
+ GDI_CALLBACK_INFO, DoNotDisplayInfoText,
GDI_END);
if (gi == NULL)
static void HandleToolButtons(struct GadgetInfo *gi)
{
request_gadget_id = gi->custom_id;
-
-
-#if 0
- int id = gi->custom_id;
-
- if (game_status != PLAYING)
- return;
-
- switch (id)
- {
- case GAME_CTRL_ID_STOP:
- if (AllPlayersGone)
- {
- CloseDoor(DOOR_CLOSE_1);
- game_status = MAINMENU;
- DrawMainMenu();
- break;
- }
-
- if (Request("Do you really want to quit the game ?",
- REQ_ASK | REQ_STAY_CLOSED))
- {
-#ifndef MSDOS
- if (options.network)
- SendToServer_StopPlaying();
- else
-#endif
- {
- game_status = MAINMENU;
- DrawMainMenu();
- }
- }
- else
- OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK);
- break;
-
- case GAME_CTRL_ID_PAUSE:
- if (options.network)
- {
-#ifndef MSDOS
- if (tape.pausing)
- SendToServer_ContinuePlaying();
- else
- SendToServer_PausePlaying();
-#endif
- }
- else
- TapeTogglePause();
- break;
-
- case GAME_CTRL_ID_PLAY:
- if (tape.pausing)
- {
-#ifndef MSDOS
- if (options.network)
- SendToServer_ContinuePlaying();
- else
-#endif
- {
- tape.pausing = FALSE;
- DrawVideoDisplay(VIDEO_STATE_PAUSE_OFF,0);
- }
- }
- break;
-
- case SOUND_CTRL_ID_MUSIC:
- if (setup.sound_music)
- {
- setup.sound_music = FALSE;
- FadeSound(background_loop[level_nr % num_bg_loops]);
- }
- else if (sound_loops_allowed)
- {
- setup.sound = setup.sound_music = TRUE;
- PlaySoundLoop(background_loop[level_nr % num_bg_loops]);
- }
- break;
-
- case SOUND_CTRL_ID_LOOPS:
- if (setup.sound_loops)
- setup.sound_loops = FALSE;
- else if (sound_loops_allowed)
- setup.sound = setup.sound_loops = TRUE;
- break;
-
- case SOUND_CTRL_ID_SIMPLE:
- if (setup.sound_simple)
- setup.sound_simple = FALSE;
- else if (sound_status==SOUND_AVAILABLE)
- setup.sound = setup.sound_simple = TRUE;
- break;
-
- default:
- break;
- }
-#endif
-
-
-
}
int el2gfx(int element)
case EL_SPIELER3: return GFX_SPIELER3;
case EL_SPIELER4: return GFX_SPIELER4;
case EL_KAEFER: return GFX_KAEFER;
- case EL_KAEFER_R: return GFX_KAEFER_R;
- case EL_KAEFER_O: return GFX_KAEFER_O;
- case EL_KAEFER_L: return GFX_KAEFER_L;
- case EL_KAEFER_U: return GFX_KAEFER_U;
+ case EL_KAEFER_RIGHT: return GFX_KAEFER_RIGHT;
+ case EL_KAEFER_UP: return GFX_KAEFER_UP;
+ case EL_KAEFER_LEFT: return GFX_KAEFER_LEFT;
+ case EL_KAEFER_DOWN: return GFX_KAEFER_DOWN;
case EL_FLIEGER: return GFX_FLIEGER;
- case EL_FLIEGER_R: return GFX_FLIEGER_R;
- case EL_FLIEGER_O: return GFX_FLIEGER_O;
- case EL_FLIEGER_L: return GFX_FLIEGER_L;
- case EL_FLIEGER_U: return GFX_FLIEGER_U;
+ case EL_FLIEGER_RIGHT: return GFX_FLIEGER_RIGHT;
+ case EL_FLIEGER_UP: return GFX_FLIEGER_UP;
+ case EL_FLIEGER_LEFT: return GFX_FLIEGER_LEFT;
+ case EL_FLIEGER_DOWN: return GFX_FLIEGER_DOWN;
case EL_BUTTERFLY: return GFX_BUTTERFLY;
- case EL_BUTTERFLY_R: return GFX_BUTTERFLY_R;
- case EL_BUTTERFLY_O: return GFX_BUTTERFLY_O;
- case EL_BUTTERFLY_L: return GFX_BUTTERFLY_L;
- case EL_BUTTERFLY_U: return GFX_BUTTERFLY_U;
+ case EL_BUTTERFLY_RIGHT: return GFX_BUTTERFLY_RIGHT;
+ case EL_BUTTERFLY_UP: return GFX_BUTTERFLY_UP;
+ case EL_BUTTERFLY_LEFT: return GFX_BUTTERFLY_LEFT;
+ case EL_BUTTERFLY_DOWN: return GFX_BUTTERFLY_DOWN;
case EL_FIREFLY: return GFX_FIREFLY;
- case EL_FIREFLY_R: return GFX_FIREFLY_R;
- case EL_FIREFLY_O: return GFX_FIREFLY_O;
- case EL_FIREFLY_L: return GFX_FIREFLY_L;
- case EL_FIREFLY_U: return GFX_FIREFLY_U;
+ case EL_FIREFLY_RIGHT: return GFX_FIREFLY_RIGHT;
+ case EL_FIREFLY_UP: return GFX_FIREFLY_UP;
+ case EL_FIREFLY_LEFT: return GFX_FIREFLY_LEFT;
+ case EL_FIREFLY_DOWN: return GFX_FIREFLY_DOWN;
case EL_MAMPFER: return GFX_MAMPFER;
case EL_ROBOT: return GFX_ROBOT;
case EL_BETON: return GFX_BETON;
case EL_MORAST_VOLL: return GFX_MORAST_VOLL;
case EL_TROPFEN: return GFX_TROPFEN;
case EL_BOMBE: return GFX_BOMBE;
- case EL_SIEB_INAKTIV: return GFX_SIEB_INAKTIV;
- case EL_SIEB_LEER: return GFX_SIEB_LEER;
- case EL_SIEB_VOLL: return GFX_SIEB_VOLL;
- case EL_SIEB_TOT: return GFX_SIEB_TOT;
+ case EL_MAGIC_WALL_OFF: return GFX_MAGIC_WALL_OFF;
+ case EL_MAGIC_WALL_EMPTY: 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_TOT: return GFX_AMOEBE_TOT;
case EL_AMOEBE_NASS: 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_DYNAMIT: return GFX_DYNAMIT;
+ case EL_DYNAMITE_ACTIVE: return GFX_DYNAMIT;
case EL_BADEWANNE: return GFX_BADEWANNE;
case EL_BADEWANNE1: return GFX_BADEWANNE1;
case EL_BADEWANNE2: return GFX_BADEWANNE2;
case EL_PFORTE2X: return GFX_PFORTE2X;
case EL_PFORTE3X: return GFX_PFORTE3X;
case EL_PFORTE4X: return GFX_PFORTE4X;
- case EL_DYNAMIT_AUS: return GFX_DYNAMIT_AUS;
+ case EL_DYNAMITE_INACTIVE: return GFX_DYNAMIT_AUS;
case EL_PACMAN: return GFX_PACMAN;
- case EL_PACMAN_R: return GFX_PACMAN_R;
- case EL_PACMAN_O: return GFX_PACMAN_O;
- case EL_PACMAN_L: return GFX_PACMAN_L;
- case EL_PACMAN_U: return GFX_PACMAN_U;
+ case EL_PACMAN_RIGHT: return GFX_PACMAN_RIGHT;
+ case EL_PACMAN_UP: return GFX_PACMAN_UP;
+ case EL_PACMAN_LEFT: return GFX_PACMAN_LEFT;
+ case EL_PACMAN_DOWN: return GFX_PACMAN_DOWN;
case EL_UNSICHTBAR: return GFX_UNSICHTBAR;
case EL_ERZ_EDEL: return GFX_ERZ_EDEL;
case EL_ERZ_DIAM: return GFX_ERZ_DIAM;
case EL_ERZ_EDEL_ROT: return GFX_ERZ_EDEL_ROT;
case EL_ERZ_EDEL_LILA: return GFX_ERZ_EDEL_LILA;
case EL_MAMPFER2: return GFX_MAMPFER2;
- case EL_SIEB2_INAKTIV: return GFX_SIEB2_INAKTIV;
- case EL_SIEB2_LEER: return GFX_SIEB2_LEER;
- case EL_SIEB2_VOLL: return GFX_SIEB2_VOLL;
- case EL_SIEB2_TOT: return GFX_SIEB2_TOT;
- case EL_DYNABOMB: return GFX_DYNABOMB;
+ 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_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;
+ case EL_DYNABOMB_ACTIVE_2: return GFX_DYNABOMB;
+ case EL_DYNABOMB_ACTIVE_3: return GFX_DYNABOMB;
+ case EL_DYNABOMB_ACTIVE_4: return GFX_DYNABOMB;
case EL_DYNABOMB_NR: return GFX_DYNABOMB_NR;
case EL_DYNABOMB_SZ: return GFX_DYNABOMB_SZ;
case EL_DYNABOMB_XL: return GFX_DYNABOMB_XL;
case EL_SOKOBAN_OBJEKT: return GFX_SOKOBAN_OBJEKT;
case EL_SOKOBAN_FELD_LEER: return GFX_SOKOBAN_FELD_LEER;
case EL_SOKOBAN_FELD_VOLL: return GFX_SOKOBAN_FELD_VOLL;
- case EL_MAULWURF: return GFX_MAULWURF;
+ case EL_MOLE: return GFX_MOLE;
case EL_PINGUIN: return GFX_PINGUIN;
case EL_SCHWEIN: return GFX_SCHWEIN;
case EL_DRACHE: return GFX_DRACHE;
case EL_SONDE: return GFX_SONDE;
- case EL_PFEIL_L: return GFX_PFEIL_L;
- case EL_PFEIL_R: return GFX_PFEIL_R;
- case EL_PFEIL_O: return GFX_PFEIL_O;
- case EL_PFEIL_U: return GFX_PFEIL_U;
+ case EL_PFEIL_LEFT: return GFX_PFEIL_LEFT;
+ case EL_PFEIL_RIGHT: return GFX_PFEIL_RIGHT;
+ case EL_PFEIL_UP: return GFX_PFEIL_UP;
+ case EL_PFEIL_DOWN: return GFX_PFEIL_DOWN;
case EL_SPEED_PILL: return GFX_SPEED_PILL;
case EL_SP_TERMINAL_ACTIVE: return GFX_SP_TERMINAL;
case EL_SP_BUG_ACTIVE: return GFX_SP_BUG_ACTIVE;
+ case EL_SP_ZONK: return GFX_SP_ZONK;
+ /* ^^^^^^^^^^ non-standard position in supaplex graphic set! */
case EL_INVISIBLE_STEEL: return GFX_INVISIBLE_STEEL;
case EL_BLACK_ORB: return GFX_BLACK_ORB;
+ case EL_EM_GATE_1: return GFX_EM_GATE_1;
+ case EL_EM_GATE_2: return GFX_EM_GATE_2;
+ case EL_EM_GATE_3: return GFX_EM_GATE_3;
+ case EL_EM_GATE_4: return GFX_EM_GATE_4;
+ case EL_EM_GATE_1X: return GFX_EM_GATE_1X;
+ case EL_EM_GATE_2X: return GFX_EM_GATE_2X;
+ case EL_EM_GATE_3X: return GFX_EM_GATE_3X;
+ case EL_EM_GATE_4X: return GFX_EM_GATE_4X;
+ case EL_EM_KEY_1_FILE: return GFX_EM_KEY_1;
+ case EL_EM_KEY_2_FILE: return GFX_EM_KEY_2;
+ case EL_EM_KEY_3_FILE: return GFX_EM_KEY_3;
+ case EL_EM_KEY_4_FILE: return GFX_EM_KEY_4;
+ case EL_EM_KEY_1: return GFX_EM_KEY_1;
+ case EL_EM_KEY_2: return GFX_EM_KEY_2;
+ case EL_EM_KEY_3: return GFX_EM_KEY_3;
+ case EL_EM_KEY_4: return GFX_EM_KEY_4;
+ case EL_PEARL: return GFX_PEARL;
+ case EL_CRYSTAL: return GFX_CRYSTAL;
+ case EL_WALL_PEARL: return GFX_WALL_PEARL;
+ case EL_WALL_CRYSTAL: return GFX_WALL_CRYSTAL;
+ case EL_DOOR_WHITE: return GFX_DOOR_WHITE;
+ case EL_DOOR_WHITE_GRAY: return GFX_DOOR_WHITE_GRAY;
+ case EL_KEY_WHITE: return GFX_KEY_WHITE;
+ case EL_SHIELD_PASSIVE: return GFX_SHIELD_PASSIVE;
+ case EL_SHIELD_ACTIVE: return GFX_SHIELD_ACTIVE;
+ case EL_EXTRA_TIME: return GFX_EXTRA_TIME;
+ case EL_SWITCHGATE_OPEN: return GFX_SWITCHGATE_OPEN;
+ case EL_SWITCHGATE_CLOSED: return GFX_SWITCHGATE_CLOSED;
+ case EL_SWITCHGATE_SWITCH_1:return GFX_SWITCHGATE_SWITCH_1;
+ case EL_SWITCHGATE_SWITCH_2:return GFX_SWITCHGATE_SWITCH_2;
+ case EL_BELT1_LEFT: return GFX_BELT1_LEFT;
+ case EL_BELT1_MIDDLE: return GFX_BELT1_MIDDLE;
+ case EL_BELT1_RIGHT: return GFX_BELT1_RIGHT;
+ case EL_BELT1_SWITCH_LEFT: return GFX_BELT1_SWITCH_LEFT;
+ case EL_BELT1_SWITCH_MIDDLE:return GFX_BELT1_SWITCH_MIDDLE;
+ case EL_BELT1_SWITCH_RIGHT: return GFX_BELT1_SWITCH_RIGHT;
+ case EL_BELT2_LEFT: return GFX_BELT2_LEFT;
+ case EL_BELT2_MIDDLE: return GFX_BELT2_MIDDLE;
+ case EL_BELT2_RIGHT: return GFX_BELT2_RIGHT;
+ case EL_BELT2_SWITCH_LEFT: return GFX_BELT2_SWITCH_LEFT;
+ case EL_BELT2_SWITCH_MIDDLE:return GFX_BELT2_SWITCH_MIDDLE;
+ case EL_BELT2_SWITCH_RIGHT: return GFX_BELT2_SWITCH_RIGHT;
+ case EL_BELT3_LEFT: return GFX_BELT3_LEFT;
+ case EL_BELT3_MIDDLE: return GFX_BELT3_MIDDLE;
+ case EL_BELT3_RIGHT: return GFX_BELT3_RIGHT;
+ case EL_BELT3_SWITCH_LEFT: return GFX_BELT3_SWITCH_LEFT;
+ case EL_BELT3_SWITCH_MIDDLE:return GFX_BELT3_SWITCH_MIDDLE;
+ case EL_BELT3_SWITCH_RIGHT: return GFX_BELT3_SWITCH_RIGHT;
+ case EL_BELT4_LEFT: return GFX_BELT4_LEFT;
+ case EL_BELT4_MIDDLE: return GFX_BELT4_MIDDLE;
+ case EL_BELT4_RIGHT: return GFX_BELT4_RIGHT;
+ case EL_BELT4_SWITCH_LEFT: return GFX_BELT4_SWITCH_LEFT;
+ case EL_BELT4_SWITCH_MIDDLE:return GFX_BELT4_SWITCH_MIDDLE;
+ case EL_BELT4_SWITCH_RIGHT: return GFX_BELT4_SWITCH_RIGHT;
+ case EL_LANDMINE: return GFX_LANDMINE;
+ case EL_ENVELOPE: return GFX_ENVELOPE;
+ case EL_LIGHT_SWITCH_OFF: return GFX_LIGHT_SWITCH_OFF;
+ case EL_LIGHT_SWITCH_ON: return GFX_LIGHT_SWITCH_ON;
+ case EL_SIGN_EXCLAMATION: return GFX_SIGN_EXCLAMATION;
+ case EL_SIGN_RADIOACTIVITY: return GFX_SIGN_RADIOACTIVITY;
+ case EL_SIGN_STOP: return GFX_SIGN_STOP;
+ case EL_SIGN_WHEELCHAIR: return GFX_SIGN_WHEELCHAIR;
+ case EL_SIGN_PARKING: return GFX_SIGN_PARKING;
+ case EL_SIGN_ONEWAY: return GFX_SIGN_ONEWAY;
+ case EL_SIGN_HEART: return GFX_SIGN_HEART;
+ case EL_SIGN_TRIANGLE: return GFX_SIGN_TRIANGLE;
+ case EL_SIGN_ROUND: return GFX_SIGN_ROUND;
+ case EL_SIGN_EXIT: return GFX_SIGN_EXIT;
+ case EL_SIGN_YINYANG: return GFX_SIGN_YINYANG;
+ case EL_SIGN_OTHER: return GFX_SIGN_OTHER;
+ case EL_MOLE_LEFT: return GFX_MOLE_LEFT;
+ case EL_MOLE_RIGHT: return GFX_MOLE_RIGHT;
+ case EL_MOLE_UP: return GFX_MOLE_UP;
+ case EL_MOLE_DOWN: return GFX_MOLE_DOWN;
+ case EL_STEEL_SLANTED: return GFX_STEEL_SLANTED;
+ case EL_SAND_INVISIBLE: return GFX_SAND_INVISIBLE;
+ case EL_DX_UNKNOWN_15: return GFX_DX_UNKNOWN_15;
+ case EL_DX_UNKNOWN_42: return GFX_DX_UNKNOWN_42;
+ case EL_TIMEGATE_OPEN: return GFX_TIMEGATE_OPEN;
+ case EL_TIMEGATE_CLOSED: return GFX_TIMEGATE_CLOSED;
+ case EL_TIMEGATE_SWITCH_ON: return GFX_TIMEGATE_SWITCH;
+ case EL_TIMEGATE_SWITCH_OFF:return GFX_TIMEGATE_SWITCH;
+ case EL_BALLOON: return GFX_BALLOON;
+ case EL_BALLOON_SEND_LEFT: return GFX_BALLOON_SEND_LEFT;
+ case EL_BALLOON_SEND_RIGHT: return GFX_BALLOON_SEND_RIGHT;
+ case EL_BALLOON_SEND_UP: return GFX_BALLOON_SEND_UP;
+ case EL_BALLOON_SEND_DOWN: return GFX_BALLOON_SEND_DOWN;
+ case EL_BALLOON_SEND_ANY: return GFX_BALLOON_SEND_ANY;
+ case EL_EMC_STEEL_WALL_1: return GFX_EMC_STEEL_WALL_1;
+ case EL_EMC_STEEL_WALL_2: return GFX_EMC_STEEL_WALL_2;
+ case EL_EMC_STEEL_WALL_3: return GFX_EMC_STEEL_WALL_3;
+ case EL_EMC_STEEL_WALL_4: return GFX_EMC_STEEL_WALL_4;
+ case EL_EMC_WALL_1: return GFX_EMC_WALL_1;
+ case EL_EMC_WALL_2: return GFX_EMC_WALL_2;
+ case EL_EMC_WALL_3: return GFX_EMC_WALL_3;
+ case EL_EMC_WALL_4: return GFX_EMC_WALL_4;
+ case EL_EMC_WALL_5: return GFX_EMC_WALL_5;
+ case EL_EMC_WALL_6: return GFX_EMC_WALL_6;
+ case EL_EMC_WALL_7: return GFX_EMC_WALL_7;
+ case EL_EMC_WALL_8: return GFX_EMC_WALL_8;
+ case EL_TUBE_CROSS: return GFX_TUBE_CROSS;
+ case EL_TUBE_VERTICAL: return GFX_TUBE_VERTICAL;
+ case EL_TUBE_HORIZONTAL: return GFX_TUBE_HORIZONTAL;
+ case EL_TUBE_VERT_LEFT: return GFX_TUBE_VERT_LEFT;
+ case EL_TUBE_VERT_RIGHT: return GFX_TUBE_VERT_RIGHT;
+ case EL_TUBE_HORIZ_UP: return GFX_TUBE_HORIZ_UP;
+ case EL_TUBE_HORIZ_DOWN: return GFX_TUBE_HORIZ_DOWN;
+ case EL_TUBE_LEFT_UP: return GFX_TUBE_LEFT_UP;
+ case EL_TUBE_LEFT_DOWN: return GFX_TUBE_LEFT_DOWN;
+ case EL_TUBE_RIGHT_UP: return GFX_TUBE_RIGHT_UP;
+ case EL_TUBE_RIGHT_DOWN: return GFX_TUBE_RIGHT_DOWN;
+ case EL_SPRING: return GFX_SPRING;
+ case EL_SPRING_MOVING: return GFX_SPRING;
+ case EL_TRAP_INACTIVE: return GFX_TRAP_INACTIVE;
+ case EL_TRAP_ACTIVE: return GFX_TRAP_ACTIVE;
+ case EL_BD_WALL: return GFX_BD_WALL;
+ case EL_BD_ROCK: return GFX_BD_ROCK;
+ case EL_DX_SUPABOMB: return GFX_DX_SUPABOMB;
+ case EL_SP_MURPHY_CLONE: return GFX_SP_MURPHY_CLONE;
default:
{
int nr_element = element - EL_SP_START;
int gfx_per_line = 8;
int nr_graphic =
- (nr_element / gfx_per_line) * MORE_PER_LINE +
+ (nr_element / gfx_per_line) * SP_PER_LINE +
(nr_element % gfx_per_line);
- return GFX_START_ROCKSMORE + nr_graphic;
+ return GFX_START_ROCKSSP + nr_graphic;
}
else
return -1;
void BackToFront();
void FadeToFront();
void ClearWindow();
+int getFontWidth(int, int);
+int getFontHeight(int, int);
+void DrawInitText(char *, int, int);
void DrawTextF(int, int, int, char *, ...);
void DrawTextFCentered(int, int, char *, ...);
void DrawText(int, int, char *, int, int);
unsigned int CloseDoor(unsigned int);
unsigned int GetDoorState(void);
unsigned int MoveDoor(unsigned int);
+void DrawSpecialEditorDoor();
+void UndrawSpecialEditorDoor();
int ReadPixel(Drawable, int, int);
void CreateToolButtons();
projects / rocksndiamonds.git / commitdiff