diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-28 19:46:18 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-28 19:46:18 +0000 |
commit | 21361a5df873316c55c3e4e494249377149b2334 (patch) | |
tree | 410c4f3b4475ee721a412302d51cf27529530e30 /crawl-ref/source/tiletex.h | |
parent | b94440dcf7c44d70948fb30166651cc0c13145b9 (diff) | |
download | crawl-ref-21361a5df873316c55c3e4e494249377149b2334.tar.gz crawl-ref-21361a5df873316c55c3e4e494249377149b2334.zip |
Add whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7054 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiletex.h')
-rw-r--r-- | crawl-ref/source/tiletex.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h index 0003395bc8..d5692f9021 100644 --- a/crawl-ref/source/tiletex.h +++ b/crawl-ref/source/tiletex.h @@ -18,7 +18,7 @@ enum TextureID TEX_MAX }; -class GenericTexture +class GenericTexture { public: GenericTexture(); @@ -32,10 +32,10 @@ public: }; // Arbitrary post-load texture processing - typedef bool(*tex_proc_func)(unsigned char *pixels, unsigned int w, + typedef bool(*tex_proc_func)(unsigned char *pixels, unsigned int w, unsigned int h); - bool load_texture(const char *filename, MipMapOptions mip_opt, + bool load_texture(const char *filename, MipMapOptions mip_opt, tex_proc_func proc = NULL); bool load_texture(unsigned char *pixels, unsigned int w, unsigned int h, MipMapOptions mip_opt); @@ -90,7 +90,7 @@ inline void TilesTexture::get_coords(int idx, int ofs_x, int ofs_y, // center tiles on x, but allow taller tiles to extend upwards int size_ox = centre ? TILE_X / 2 - inf.width / 2 : 0; int size_oy = centre ? TILE_Y - inf.height : 0; - + int ey = inf.ey; if (ymax > 0) ey = std::min(inf.sy + ymax - inf.offset_y, ey); |