diff options
| author | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-08-05 17:59:21 +0000 |
| commit | 1fe3ad3288fd2198f5480f75a17b707cd2a3c2af (patch) | |
| tree | 89d8ada3dbf29005d4cf5ab88204c3b24dd97795 /src/heightmap.cpp | |
| parent | 2fe966fd8c56a7cab7a4a9dd9485e0034e6cf7f0 (diff) | |
| download | openttd-1fe3ad3288fd2198f5480f75a17b707cd2a3c2af.tar.xz | |
(svn r17075) -Codechange: rename ~750 strings to be more uniform with their relatives
Diffstat (limited to 'src/heightmap.cpp')
| -rw-r--r-- | src/heightmap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/heightmap.cpp b/src/heightmap.cpp index 04207cd2e..202905e8a 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -101,20 +101,20 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map) fp = FioFOpenFile(filename, "rb"); if (fp == NULL) { - ShowErrorMessage(STR_PNGMAP_ERR_FILE_NOT_FOUND, STR_PNGMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_PNGMAP_FILE_NOT_FOUND, STR_ERROR_PNGMAP, 0, 0); return false; } png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png_ptr == NULL) { - ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_PNGMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_PNGMAP_MISC, STR_ERROR_PNGMAP, 0, 0); fclose(fp); return false; } info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL || setjmp(png_jmpbuf(png_ptr))) { - ShowErrorMessage(STR_PNGMAP_ERR_MISC, STR_PNGMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_PNGMAP_MISC, STR_ERROR_PNGMAP, 0, 0); fclose(fp); png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return false; @@ -130,7 +130,7 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map) /* Maps of wrong colour-depth are not used. * (this should have been taken care of by stripping alpha and 16-bit samples on load) */ if ((info_ptr->channels != 1) && (info_ptr->channels != 3) && (info_ptr->bit_depth != 8)) { - ShowErrorMessage(STR_PNGMAP_ERR_IMAGE_TYPE, STR_PNGMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_PNGMAP_IMAGE_TYPE, STR_ERROR_PNGMAP, 0, 0); fclose(fp); png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return false; @@ -224,14 +224,14 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map) f = FioFOpenFile(filename, "rb"); if (f == NULL) { - ShowErrorMessage(STR_PNGMAP_ERR_FILE_NOT_FOUND, STR_BMPMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_PNGMAP_FILE_NOT_FOUND, STR_ERROR_BMPMAP, 0, 0); return false; } BmpInitializeBuffer(&buffer, f); if (!BmpReadHeader(&buffer, &info, &data)) { - ShowErrorMessage(STR_BMPMAP_ERR_IMAGE_TYPE, STR_BMPMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_BMPMAP_IMAGE_TYPE, STR_ERROR_BMPMAP, 0, 0); fclose(f); BmpDestroyData(&data); return false; @@ -239,7 +239,7 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map) if (map != NULL) { if (!BmpReadBitmap(&buffer, &info, &data)) { - ShowErrorMessage(STR_BMPMAP_ERR_IMAGE_TYPE, STR_BMPMAP_ERROR, 0, 0); + ShowErrorMessage(STR_ERROR_BMPMAP_IMAGE_TYPE, STR_ERROR_BMPMAP, 0, 0); fclose(f); BmpDestroyData(&data); return false; |