X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e0446de5604e47c9569087d904856e86b508b3d8;hb=7cd6d9ecca4ccd4927eddc994b616569ef23b231;hp=f5daeb4a3d545c97a6b24eba470ccdb2daeac5ca;hpb=1d7b4b0ee6ba41cb6f977d35aca97e4965560cd4;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index f5daeb4a..e0446de5 100644 --- a/src/files.c +++ b/src/files.c @@ -90,7 +90,7 @@ static void setLevelInfoToDefaults() level.yam_content[i][x][y] = (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY); - Feld[0][0] = Ur[0][0] = EL_PLAYER; + Feld[0][0] = Ur[0][0] = EL_PLAYER1; Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED; @@ -129,11 +129,15 @@ static void setLevelInfoToDefaults() static int checkLevelElement(int element) { - if (element >= EL_FIRST_RUNTIME) + if (element >= NUM_FILE_ELEMENTS) { Error(ERR_WARN, "invalid level element %d", element); element = EL_CHAR_QUESTION; } + else if (element == EL_PLAYER_OBSOLETE) + element = EL_PLAYER1; + else if (element == EL_KEY_OBSOLETE) + element = EL_KEY1; return element; }