projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added command line option to drop file into program window
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index c620a531b37bf4e30517c01366137a61e78edf8e..7b2d7b2d7e728c68d090bd1c8e25d51ad752a6e6 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-4644,9
+4644,12
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
SetDefaultLevelColors_BD();
// level name
SetDefaultLevelColors_BD();
// level name
- char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);
+ char *cave_name_latin1 = getLatin1FromUTF8(cave->name);
+ char *cave_name_final = (gd_caveset_has_levels() ?
+ getStringPrint("%s / %d", cave_name_latin1, bd_level_nr + 1) :
+ getStringCopy(cave_name_latin1));
- strncpy(level->name, cave_name, MAX_LEVEL_NAME_LEN);
+ strncpy(level->name, cave_name
_final
, MAX_LEVEL_NAME_LEN);
level->name[MAX_LEVEL_NAME_LEN] = '\0';
// playfield elements
level->name[MAX_LEVEL_NAME_LEN] = '\0';
// playfield elements
@@
-4654,7
+4657,8
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
for (y = 0; y < level->fieldy; y++)
level->field[x][y] = CAVE_TO_LEVEL(cave->map[y][x]);
for (y = 0; y < level->fieldy; y++)
level->field[x][y] = CAVE_TO_LEVEL(cave->map[y][x]);
- checked_free(cave_name);
+ checked_free(cave_name_latin1);
+ checked_free(cave_name_final);
}
static void setTapeInfoToDefaults(void);
}
static void setTapeInfoToDefaults(void);