X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=718f43948c5d4e2656bb4e0463a0026e9078ccc3;hb=c93f939100438a9047653b2c2c6b86f034e1bb01;hp=798f4b4aab05442ac4d6f0c40db79ce65d710d30;hpb=6b702ffdb8025ef5538c2607131ecae2874730c4;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 798f4b4a..718f4394 100644 --- a/src/init.c +++ b/src/init.c @@ -4415,7 +4415,7 @@ static void InitArtworkConfig() for (i = 0; i < NUM_MUSIC_PREFIXES; i++) music_id_prefix[i] = music_prefix_info[i].prefix; - music_id_prefix[MAX_LEVELS] = NULL; + music_id_prefix[NUM_MUSIC_PREFIXES] = NULL; for (i = 0; i < NUM_ACTIONS; i++) action_id_suffix[i] = element_action_info[i].suffix; @@ -4710,7 +4710,12 @@ static char *getNewArtworkIdentifier(int type) artwork_current_identifier) != 0) artwork_new_identifier = artwork_current_identifier; +#if 1 + *(ARTWORK_CURRENT_IDENTIFIER_PTR(artwork, type))= artwork_current_identifier; +#else + /* newer versions of gcc do not like this anymore :-/ */ *(&(ARTWORK_CURRENT_IDENTIFIER(artwork, type))) = artwork_current_identifier; +#endif #if 0 if (type == ARTWORK_TYPE_GRAPHICS)