diff options
| author | Ixtli <cg@325i.org> | 2010-03-07 18:52:28 +0900 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:42 -0400 |
| commit | d2b2b4e8793e9e32d2dcbf65d480c0a611fd59d8 (patch) | |
| tree | 7e5fdd022d5e4b2cf69a7d3789a1481dc9611195 /crawl-ref/source/tiletex.cc | |
| parent | 34993de71cddf2f9ee3a1baeb1c239f4408a191a (diff) | |
| download | crawl-ref-d2b2b4e8793e9e32d2dcbf65d480c0a611fd59d8.tar.gz crawl-ref-d2b2b4e8793e9e32d2dcbf65d480c0a611fd59d8.zip | |
Changed camelcased function names to underscores_as_spaces
Diffstat (limited to 'crawl-ref/source/tiletex.cc')
| -rw-r--r-- | crawl-ref/source/tiletex.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index 746c72632e..47ee010ce6 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -59,13 +59,13 @@ bool GenericTexture::load_texture(const char *filename, return (false); } - if ( img->loadImage(tex_path.c_str()) ) + if ( img->load_image(tex_path.c_str()) ) { fprintf(stderr, "Couldn't load texture '%s'.\n", tex_path.c_str()); return (false); } - unsigned int bpp = img->bytesPerPixel(); + unsigned int bpp = img->bytes_per_pixel(); GLStateManager::pixelStoreUnpackAlignment(bpp); // Determine texture format @@ -92,7 +92,7 @@ bool GenericTexture::load_texture(const char *filename, if (bpp == 4) { // Even if the size is the same, still go through - // SDL_GetRGBA to put the image in the right format. + // SDL_get_rgba to put the image in the right format. img->lock(); pixels = new unsigned char[4 * new_width * new_height]; memset(pixels, 0, 4 * new_width * new_height); @@ -105,7 +105,7 @@ bool GenericTexture::load_texture(const char *filename, unsigned char *p = ((unsigned char*)img->pixels() + y * img->pitch() + x * bpp); unsigned int pixel = *(unsigned int*)p; - img->getRGBA(pixel, &pixels[dest], &pixels[dest+1], + img->get_rgba(pixel, &pixels[dest], &pixels[dest+1], &pixels[dest+2], &pixels[dest+3]); dest += 4; } @@ -134,7 +134,7 @@ bool GenericTexture::load_texture(const char *filename, pixel = p[0] << 16 | p[1] << 8 | p[2]; else pixel = p[0] | p[1] << 8 | p[2]; - img->getRGBA(pixel, &pixels[dest], &pixels[dest+1], + img->get_rgba(pixel, &pixels[dest], &pixels[dest+1], &pixels[dest+2], &pixels[dest+3]); dest += 4; } @@ -166,7 +166,7 @@ bool GenericTexture::load_texture(const char *filename, pixels[dest*4 ] = pal->colors[index].r; pixels[dest*4 + 1] = pal->colors[index].g; pixels[dest*4 + 2] = pal->colors[index].b; - pixels[dest*4 + 3] = (index != img->colorKey() ? 255 : 0); + pixels[dest*4 + 3] = (index != img->color_key() ? 255 : 0); dest++; } while (x++ < new_width) |