X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=0262c37ea1e887ca48655f17e33f03f0b66f4797;hp=8032ffb3d82bd798bd690dea25364937cdc4c3a8;hb=3367ba5eaec57086e3c1013708967e8a995ef2e3;hpb=c3d03cdffce070695ba0520d00667b42b8460087 diff --git a/src/init.c b/src/init.c index 8032ffb3..0262c37e 100644 --- a/src/init.c +++ b/src/init.c @@ -16,11 +16,41 @@ #include "misc.h" #include "sound.h" #include "screens.h" +#include "tools.h" #include "files.h" +#include "joystick.h" +#include "gfxload.h" +#include "gifload.h" + #include +#ifdef DEBUG +#define DEBUG_TIMING +#endif + +struct PictureFileInfo +{ + char *picture_filename; + BOOL picture_with_mask; +}; + +struct IconFileInfo +{ + char *picture_filename; + char *picturemask_filename; +}; + static int sound_process_id = 0; +static void InitLevelAndPlayerInfo(void); +static void InitDisplay(int, char **); +static void InitSound(void); +static void InitSoundProcess(void); +static void InitWindow(int, char **); +static void InitGfx(void); +static void LoadGfx(int, struct PictureFileInfo *); +static void InitElementProperties(void); + void OpenAll(int argc, char *argv[]) { InitLevelAndPlayerInfo(); @@ -36,13 +66,14 @@ void OpenAll(int argc, char *argv[]) InitDisplay(argc, argv); InitWindow(argc, argv); + + XMapWindow(display, window); + XFlush(display); + InitGfx(); InitElementProperties(); DrawMainMenu(); - - XMapWindow(display, window); - XFlush(display); } void InitLevelAndPlayerInfo() @@ -61,6 +92,7 @@ void InitSound() if (sound_status==SOUND_OFF) return; +#ifndef MSDOS if (access(sound_device_name,W_OK)<0) { fprintf(stderr,"%s: cannot access sound device - no sounds\n",progname); @@ -82,9 +114,16 @@ void InitSound() sound_loops_allowed = TRUE; sound_loops_on = TRUE; #endif +#else + sound_loops_allowed = TRUE; + sound_loops_on = TRUE; +#endif for(i=0;ivisual; + XFree((void *)vinfo); + } + + /* got appropriate visual? */ + if (depth < 8) + { + printf("Sorry, displays with less than 8 bits per pixel not supported.\n"); + exit(-1); + } + else if ((depth ==8 && visual->class != PseudoColor) || + (depth > 8 && visual->class != TrueColor && + visual->class != DirectColor)) + { + printf("Sorry, cannot get appropriate visual.\n"); + exit(-1); + } } void InitWindow(int argc, char *argv[]) @@ -191,21 +268,40 @@ void InitWindow(int argc, char *argv[]) XTextProperty windowName, iconName; XGCValues gc_values; unsigned long gc_valuemask; - char *window_name = "Rocks'n'Diamonds"; - char *icon_name = "Rocks'n'Diamonds"; + char *window_name = WINDOWTITLE_STRING; + char *icon_name = WINDOWTITLE_STRING; long window_event_mask; - static struct PictureFile icon_pic = + Atom proto_atom = None, delete_atom = None; + int screen_width, screen_height; + int win_xpos = WIN_XPOS, win_ypos = WIN_YPOS; + +#ifndef MSDOS + static struct IconFileInfo icon_pic = { "rocks_icon.xbm", "rocks_iconmask.xbm" }; +#endif + + screen_width = XDisplayWidth(display, screen); + screen_height = XDisplayHeight(display, screen); width = WIN_XSIZE; height = WIN_YSIZE; + win_xpos = (screen_width - width) / 2; + win_ypos = (screen_height - height) / 2; + window = XCreateSimpleWindow(display, RootWindow(display, screen), - WIN_XPOS, WIN_YPOS, width, height, border_width, - pen_fg, pen_bg); + win_xpos, win_ypos, width, height, border_width, + pen_fg, pen_bg); + +#ifndef MSDOS + proto_atom = XInternAtom(display, "WM_PROTOCOLS", FALSE); + delete_atom = XInternAtom(display, "WM_DELETE_WINDOW", FALSE); + if ((proto_atom != None) && (delete_atom != None)) + XChangeProperty(display, window, proto_atom, XA_ATOM, 32, + PropModePrepend, (unsigned char *) &delete_atom, 1); sprintf(icon_filename,"%s/%s",GFX_PATH,icon_pic.picture_filename); XReadBitmapFile(display,window,icon_filename, @@ -229,9 +325,16 @@ void InitWindow(int argc, char *argv[]) exit(-1); } - size_hints.flags = PSize | PMinSize | PMaxSize; size_hints.width = size_hints.min_width = size_hints.max_width = width; size_hints.height = size_hints.min_height = size_hints.max_height = height; + size_hints.flags = PSize | PMinSize | PMaxSize; + + if (win_xpos || win_ypos) + { + size_hints.x = win_xpos; + size_hints.y = win_ypos; + size_hints.flags |= PPosition; + } if (!XStringListToTextProperty(&window_name, 1, &windowName)) { @@ -269,6 +372,7 @@ void InitWindow(int argc, char *argv[]) KeyPressMask | KeyReleaseMask; XSelectInput(display, window, window_event_mask); +#endif /* create GC for drawing with window depth */ gc_values.graphics_exposures = False; gc_values.foreground = pen_bg; @@ -277,105 +381,67 @@ void InitWindow(int argc, char *argv[]) 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,x,y; - int xpm_err, xbm_err; - unsigned int width,height; - int hot_x,hot_y; - XGCValues gc_values; - unsigned long gc_valuemask; + int i,j; XGCValues clip_gc_values; unsigned long clip_gc_valuemask; - char filename[256]; - Pixmap shapemask; - - static struct PictureFile pic[NUM_PICTURES] = +#ifdef MSDOS + static struct PictureFileInfo pic[NUM_PICTURES] = { - "RocksScreen.xpm", "RocksScreenMaske.xbm", - "RocksDoor.xpm", "RocksDoorMaske.xbm", - "RocksToons.xpm", "RocksToonsMaske.xbm", - "RocksFont.xpm", NULL, - "RocksFont2.xpm", NULL + { "Screen", TRUE }, + { "Door", TRUE }, + { "Heroes", TRUE }, + { "Toons", TRUE }, + { "Font", FALSE }, + { "Font2", FALSE } }; - - for(i=0;ipicture_filename) + { + sprintf(basefilename,"%s%s",pic->picture_filename,picture_ext); + DrawInitText(basefilename,150,FC_YELLOW); + sprintf(filename,"%s/%s",GFX_PATH,basefilename); + +#ifdef MSDOS + rest(100); +#endif MSDOS + +#ifdef DEBUG_TIMING + count1 = Counter(); +#endif + +#ifdef XPM_INCLUDE_FILE + + xpm_att[pos].valuemask = XpmCloseness; + xpm_att[pos].closeness = 20000; + xpm_err = XpmReadFileToPixmap(display,window,filename, + &pix[pos],&shapemask,&xpm_att[pos]); + + switch(xpm_err) + { + case XpmOpenFailed: + fprintf(stderr,"Cannot open Xpm file '%s' !\n",filename); + CloseAll(); + exit(-1); + case XpmFileInvalid: + fprintf(stderr,"Invalid Xpm file '%s'!\n",filename); + CloseAll(); + exit(-1); + case XpmNoMemory: + fprintf(stderr,"Not enough memory for Xpm file '%s'!\n",filename); + CloseAll(); + exit(1); + case XpmColorFailed: + fprintf(stderr,"Can't get colors for Xpm file '%s'!\n",filename); + CloseAll(); + exit(-1); + default: + break; + } + +#ifdef DEBUG_TIMING + count2 = Counter(); + printf("XPM LOADING %s IN %.2f SECONDS\n", + filename,(float)(count2-count1)/100.0); +#endif + +#else + + gif_err = Read_GIF_to_Pixmaps(display, window, filename, + &pix[pos], &clipmask[pos]); + + switch(gif_err) + { + case GIF_Success: + break; + case GIF_OpenFailed: + fprintf(stderr,"Cannot open GIF file '%s' !\n",filename); + CloseAll(); + exit(-1); + case GIF_ReadFailed: + fprintf(stderr,"Cannot read GIF file '%s' !\n",filename); + CloseAll(); + exit(-1); + case GIF_FileInvalid: + fprintf(stderr,"Invalid GIF file '%s'!\n",filename); + CloseAll(); + exit(-1); + case GIF_NoMemory: + fprintf(stderr,"Not enough memory for GIF file '%s'!\n",filename); + CloseAll(); + exit(1); + case GIF_ColorFailed: + fprintf(stderr,"Can't get colors for GIF file '%s'!\n",filename); + CloseAll(); + exit(-1); + default: + break; + } + +#ifdef DEBUG_TIMING + count2 = Counter(); + printf("GIF LOADING %s IN %.2f SECONDS\n", + filename,(float)(count2-count1)/100.0); +#endif - for(i=0;ipicture_filename); + CloseAll(); + exit(-1); + } + } + + /* zugehörige Maske laden (wenn vorhanden) */ + if (pic->picture_with_mask) + { + +#ifdef XPM_INCLUDE_FILE + + sprintf(basefilename,"%s%s",pic->picture_filename,picturemask_ext); + DrawInitText(basefilename,150,FC_YELLOW); + sprintf(filename,"%s/%s",GFX_PATH,basefilename); + +#ifdef DEBUG_TIMING + count1 = Counter(); +#endif + + xbm_err = XReadBitmapFile(display,window,filename, + &width,&height,&clipmask[pos],&hot_x,&hot_y); + + switch(xbm_err) + { + case BitmapSuccess: + break; + case BitmapOpenFailed: + fprintf(stderr,"Bitmap file open failed on '%s' !\n",filename); + CloseAll(); + exit(-1); + break; + case BitmapFileInvalid: + fprintf(stderr,"Bitmap file invalid: '%s' !\n",filename); + CloseAll(); + exit(-1); + break; + case BitmapNoMemory: + fprintf(stderr,"No memory for file '%s' !\n",filename); + CloseAll(); + exit(-1); + break; + default: + break; + } + +#ifdef DEBUG_TIMING + count2 = Counter(); + printf("XBM LOADING %s IN %.2f SECONDS\n", + filename,(float)(count2-count1)/100.0); +#endif + +#endif + + if (!clipmask[pos]) + { + fprintf(stderr, "%s: cannot get clipmask for '%s'.\n", + progname, pic->picture_filename); + CloseAll(); + exit(-1); + } + } } void InitElementProperties() @@ -441,7 +679,8 @@ void InitElementProperties() { EL_AMOEBE_NASS, EL_AMOEBE_NORM, - EL_AMOEBE_VOLL + EL_AMOEBE_VOLL, + EL_AMOEBE_BD }; static int ep_amoebalive_num = sizeof(ep_amoebalive)/sizeof(int); @@ -450,20 +689,11 @@ void InitElementProperties() EL_AMOEBE_TOT, EL_AMOEBE_NASS, EL_AMOEBE_NORM, - EL_AMOEBE_VOLL + EL_AMOEBE_VOLL, + EL_AMOEBE_BD }; static int ep_amoeboid_num = sizeof(ep_amoeboid)/sizeof(int); - static int ep_badewannoid[] = - { - EL_BADEWANNE1, - EL_BADEWANNE2, - EL_BADEWANNE3, - EL_BADEWANNE4, - EL_BADEWANNE5 - }; - static int ep_badewannoid_num = sizeof(ep_badewannoid)/sizeof(int); - static int ep_schluessel[] = { EL_SCHLUESSEL1, @@ -490,6 +720,7 @@ void InitElementProperties() { EL_BETON, EL_MAUERWERK, + EL_MAUER_LEBT, EL_FELSBODEN, EL_AUSGANG_ZU, EL_AUSGANG_ACT, @@ -498,10 +729,15 @@ void InitElementProperties() EL_AMOEBE_NASS, EL_AMOEBE_NORM, EL_AMOEBE_VOLL, + EL_AMOEBE_BD, EL_MORAST_VOLL, EL_MORAST_LEER, EL_SIEB_VOLL, EL_SIEB_LEER, + EL_SIEB_TOT, + EL_SIEB2_VOLL, + EL_SIEB2_LEER, + EL_SIEB2_TOT, EL_LIFE, EL_LIFE_ASYNC, EL_BADEWANNE1, @@ -537,6 +773,10 @@ void InitElementProperties() EL_FELSBODEN, EL_FELSBROCKEN, EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, EL_DIAMANT, EL_BOMBE, EL_KOKOSNUSS, @@ -547,7 +787,8 @@ void InitElementProperties() EL_BIRNE_EIN, EL_BIRNE_AUS, EL_BADEWANNE1, - EL_BADEWANNE2 + EL_BADEWANNE2, + EL_SONDE }; static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int); @@ -555,22 +796,51 @@ void InitElementProperties() { EL_KAEFER, EL_FLIEGER, + EL_BUTTERFLY, + EL_FIREFLY, EL_MAMPFER, - EL_ZOMBIE, + EL_MAMPFER2, + EL_ROBOT, EL_PACMAN }; static int ep_enemy_num = sizeof(ep_enemy)/sizeof(int); + static int ep_mauer[] = + { + EL_BETON, + EL_PFORTE1, + EL_PFORTE2, + EL_PFORTE3, + EL_PFORTE4, + EL_PFORTE1X, + EL_PFORTE2X, + EL_PFORTE3X, + EL_PFORTE4X, + EL_AUSGANG_ZU, + EL_AUSGANG_ACT, + EL_AUSGANG_AUF, + EL_MAUERWERK, + EL_FELSBODEN, + EL_MAUER_LEBT, + EL_MAUERND + }; + static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int); + static int ep_can_fall[] = { EL_FELSBROCKEN, EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, EL_DIAMANT, EL_BOMBE, EL_KOKOSNUSS, EL_TROPFEN, EL_MORAST_VOLL, EL_SIEB_VOLL, + EL_SIEB2_VOLL, EL_ZEIT_VOLL, EL_ZEIT_LEER }; @@ -580,6 +850,10 @@ void InitElementProperties() { EL_FELSBROCKEN, EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, EL_DIAMANT, EL_SCHLUESSEL1, EL_SCHLUESSEL2, @@ -597,6 +871,10 @@ void InitElementProperties() { EL_FELSBROCKEN, EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, EL_DIAMANT }; static int ep_can_change_num = sizeof(ep_can_change)/sizeof(int); @@ -605,9 +883,17 @@ void InitElementProperties() { EL_KAEFER, EL_FLIEGER, + EL_BUTTERFLY, + EL_FIREFLY, EL_MAMPFER, - EL_ZOMBIE, - EL_PACMAN + EL_MAMPFER2, + EL_ROBOT, + EL_PACMAN, + EL_MAULWURF, + EL_PINGUIN, + EL_SCHWEIN, + EL_DRACHE, + EL_SONDE }; static int ep_can_move_num = sizeof(ep_can_move)/sizeof(int); @@ -621,6 +907,14 @@ void InitElementProperties() 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, @@ -631,7 +925,9 @@ void InitElementProperties() static int ep_dont_touch[] = { EL_KAEFER, - EL_FLIEGER + EL_FLIEGER, + EL_BUTTERFLY, + EL_FIREFLY }; static int ep_dont_touch_num = sizeof(ep_dont_touch)/sizeof(int); @@ -639,70 +935,264 @@ void InitElementProperties() { EL_KAEFER, EL_FLIEGER, + EL_BUTTERFLY, + EL_FIREFLY, EL_MAMPFER, - EL_ZOMBIE, + EL_MAMPFER2, + EL_ROBOT, EL_PACMAN, EL_TROPFEN, EL_SALZSAEURE }; static int ep_dont_go_to_num = sizeof(ep_dont_go_to)/sizeof(int); + static int ep_mampf2[] = + { + EL_ERDREICH, + EL_KAEFER, + EL_FLIEGER, + EL_BUTTERFLY, + EL_FIREFLY, + EL_MAMPFER, + EL_ROBOT, + EL_PACMAN, + EL_TROPFEN, + EL_AMOEBE_TOT, + EL_AMOEBE_NASS, + EL_AMOEBE_NORM, + EL_AMOEBE_VOLL, + EL_AMOEBE_BD, + EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, + EL_DIAMANT + }; + static int ep_mampf2_num = sizeof(ep_mampf2)/sizeof(int); + + static int ep_bd_element[] = + { + EL_LEERRAUM, + EL_ERDREICH, + EL_FELSBODEN, + EL_FELSBROCKEN, + EL_EDELSTEIN_BD, + EL_SIEB2_LEER, + EL_AUSGANG_ZU, + EL_AUSGANG_AUF, + EL_BETON, + EL_SPIELFIGUR, + EL_FIREFLY, + EL_FIREFLY_1, + EL_FIREFLY_2, + EL_FIREFLY_3, + EL_FIREFLY_4, + EL_BUTTERFLY, + EL_BUTTERFLY_1, + EL_BUTTERFLY_2, + EL_BUTTERFLY_3, + EL_BUTTERFLY_4, + EL_AMOEBE_BD, + EL_CHAR_FRAGE + }; + static int ep_bd_element_num = sizeof(ep_bd_element)/sizeof(int); + + static int ep_sb_element[] = + { + EL_LEERRAUM, + EL_BETON, + EL_SOKOBAN_OBJEKT, + EL_SOKOBAN_FELD_LEER, + EL_SOKOBAN_FELD_VOLL, + EL_SPIELFIGUR + }; + static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int); + + static int ep_gem[] = + { + EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, + EL_DIAMANT + }; + static int ep_gem_num = sizeof(ep_gem)/sizeof(int); + + static int ep_inactive[] = + { + EL_LEERRAUM, + EL_ERDREICH, + EL_MAUERWERK, + EL_FELSBODEN, + EL_SCHLUESSEL, + EL_BETON, + EL_AMOEBE_TOT, + EL_MORAST_LEER, + EL_BADEWANNE, + EL_ABLENK_AUS, + EL_SCHLUESSEL1, + EL_SCHLUESSEL2, + EL_SCHLUESSEL3, + EL_SCHLUESSEL4, + EL_PFORTE1, + EL_PFORTE2, + EL_PFORTE3, + EL_PFORTE4, + EL_PFORTE1X, + EL_PFORTE2X, + EL_PFORTE3X, + EL_PFORTE4X, + EL_DYNAMIT_AUS, + EL_UNSICHTBAR, + EL_BIRNE_AUS, + EL_BIRNE_EIN, + EL_ERZ_EDEL, + EL_ERZ_DIAM, + EL_ERZ_EDEL_BD, + EL_ERZ_EDEL_GELB, + EL_DYNABOMB_NR, + EL_DYNABOMB_SZ, + EL_DYNABOMB_XL, + EL_SOKOBAN_OBJEKT, + EL_SOKOBAN_FELD_LEER, + EL_SOKOBAN_FELD_VOLL, + EL_ERZ_EDEL_ROT, + EL_ERZ_EDEL_LILA, + EL_BADEWANNE1, + EL_BADEWANNE2, + EL_BADEWANNE3, + EL_BADEWANNE4, + EL_BADEWANNE5, + EL_SIEB_TOT, + EL_SIEB2_TOT, + EL_AMOEBA2DIAM, + EL_BLOCKED + }; + static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int); + + static int ep_explosive[] = + { + EL_BOMBE, + EL_DYNAMIT, + EL_DYNAMIT_AUS, + EL_DYNABOMB, + EL_DYNABOMB_NR, + EL_DYNABOMB_SZ, + EL_DYNABOMB_XL, + EL_KAEFER, + EL_MAULWURF, + EL_PINGUIN, + EL_SCHWEIN, + EL_DRACHE, + EL_SONDE + }; + static int ep_explosive_num = sizeof(ep_explosive)/sizeof(int); + + static int ep_mampf3[] = + { + EL_EDELSTEIN, + EL_EDELSTEIN_BD, + EL_EDELSTEIN_GELB, + EL_EDELSTEIN_ROT, + EL_EDELSTEIN_LILA, + EL_DIAMANT + }; + static int ep_mampf3_num = sizeof(ep_mampf3)/sizeof(int); + + static int ep_pushable[] = + { + EL_FELSBROCKEN, + EL_BOMBE, + EL_KOKOSNUSS, + EL_ZEIT_LEER, + EL_SOKOBAN_FELD_VOLL, + EL_SOKOBAN_OBJEKT, + EL_SONDE + }; + static int ep_pushable_num = sizeof(ep_pushable)/sizeof(int); + static long ep_bit[] = { EP_BIT_AMOEBALIVE, EP_BIT_AMOEBOID, - EP_BIT_BADEWANNOID, EP_BIT_SCHLUESSEL, EP_BIT_PFORTE, EP_BIT_SOLID, EP_BIT_MASSIV, EP_BIT_SLIPPERY, EP_BIT_ENEMY, + EP_BIT_MAUER, EP_BIT_CAN_FALL, EP_BIT_CAN_SMASH, EP_BIT_CAN_CHANGE, EP_BIT_CAN_MOVE, EP_BIT_COULD_MOVE, EP_BIT_DONT_TOUCH, - EP_BIT_DONT_GO_TO + EP_BIT_DONT_GO_TO, + EP_BIT_MAMPF2, + EP_BIT_BD_ELEMENT, + EP_BIT_SB_ELEMENT, + EP_BIT_GEM, + EP_BIT_INACTIVE, + EP_BIT_EXPLOSIVE, + EP_BIT_MAMPF3, + EP_BIT_PUSHABLE }; static int *ep_array[] = { ep_amoebalive, ep_amoeboid, - ep_badewannoid, ep_schluessel, ep_pforte, ep_solid, ep_massiv, ep_slippery, ep_enemy, + ep_mauer, ep_can_fall, ep_can_smash, ep_can_change, ep_can_move, ep_could_move, ep_dont_touch, - ep_dont_go_to + ep_dont_go_to, + ep_mampf2, + ep_bd_element, + ep_sb_element, + ep_gem, + ep_inactive, + ep_explosive, + ep_mampf3, + ep_pushable }; static int *ep_num[] = { &ep_amoebalive_num, &ep_amoeboid_num, - &ep_badewannoid_num, &ep_schluessel_num, &ep_pforte_num, &ep_solid_num, &ep_massiv_num, &ep_slippery_num, &ep_enemy_num, + &ep_mauer_num, &ep_can_fall_num, &ep_can_smash_num, &ep_can_change_num, &ep_can_move_num, &ep_could_move_num, &ep_dont_touch_num, - &ep_dont_go_to_num + &ep_dont_go_to_num, + &ep_mampf2_num, + &ep_bd_element_num, + &ep_sb_element_num, + &ep_gem_num, + &ep_inactive_num, + &ep_explosive_num, + &ep_mampf3_num, + &ep_pushable_num }; static int num_properties = sizeof(ep_num)/sizeof(int *); @@ -713,7 +1203,7 @@ void InitElementProperties() for(j=0;j<*(ep_num[i]);j++) Elementeigenschaften[(ep_array[i])[j]] |= ep_bit[i]; for(i=EL_CHAR_START;i