summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tilebuf.cc
diff options
context:
space:
mode:
authorEnne Walker <ennewalker@users.sourceforge.net>2010-04-23 16:00:41 -0400
committerEnne Walker <ennewalker@users.sourceforge.net>2010-04-24 11:41:02 -0400
commita22caea21579cd15007a2c2167d233789a1e01fa (patch)
tree96a415826979769b7a00a75966df91b785b98b02 /crawl-ref/source/tilebuf.cc
parent0f928518b4f7497c0108c1fcab0096c6c369cffb (diff)
downloadcrawl-ref-a22caea21579cd15007a2c2167d233789a1e01fa.tar.gz
crawl-ref-a22caea21579cd15007a2c2167d233789a1e01fa.zip
General coding standards update.
No spaces on parens. Line up function params. Sort includes more rationally. Put curly braces on their own line. Don't C-style typedef enum and structs. Put if-clauses on their own line.
Diffstat (limited to 'crawl-ref/source/tilebuf.cc')
-rw-r--r--crawl-ref/source/tilebuf.cc56
1 files changed, 32 insertions, 24 deletions
diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc
index 2cfb4225e4..894713476d 100644
--- a/crawl-ref/source/tilebuf.cc
+++ b/crawl-ref/source/tilebuf.cc
@@ -44,16 +44,18 @@ void VertBuffer<PTVert>::draw(GLW_3VF *pt, GLW_3VF *ps) const
glmanager->set(m_state);
m_tex->bind();
- GLPrimitive prim( sizeof(Vert), size(), 2,
- &(*this)[0].pos_x,
- NULL,
- &(*this)[0].tex_x);
+ GLPrimitive prim(sizeof(Vert), size(), 2,
+ &(*this)[0].pos_x,
+ NULL,
+ &(*this)[0].tex_x);
prim.mode = m_prim;
// Set prerender matrix manipulations
- if ( pt ) prim.pretranslate = pt;
- if ( ps ) prim.prescale = ps;
+ if (pt)
+ prim.pretranslate = pt;
+ if (ps)
+ prim.prescale = ps;
// Draw
glmanager->draw_primitive(prim);
@@ -79,16 +81,18 @@ void VertBuffer<PCVert>::draw(GLW_3VF *pt, GLW_3VF *ps) const
glmanager->set(m_state);
// Create the primitive we wish to draw
- GLPrimitive prim( sizeof(Vert), size(), 2,
- &(*this)[0].pos_x,
- &(*this)[0].col,
- NULL);
+ GLPrimitive prim(sizeof(Vert), size(), 2,
+ &(*this)[0].pos_x,
+ &(*this)[0].col,
+ NULL);
prim.mode = m_prim;
// Set prerender matrix manipulations
- if ( pt ) prim.pretranslate = pt;
- if ( ps ) prim.prescale = ps;
+ if (pt)
+ prim.pretranslate = pt;
+ if (ps)
+ prim.prescale = ps;
// Draw
glmanager->draw_primitive(prim);
@@ -118,16 +122,18 @@ void VertBuffer<PTCVert>::draw(GLW_3VF *pt, GLW_3VF *ps) const
m_tex->bind();
// Create the primitive we wish to draw
- GLPrimitive prim( sizeof(Vert), size(), 2,
- &(*this)[0].pos_x,
- &(*this)[0].col,
- &(*this)[0].tex_x);
+ GLPrimitive prim(sizeof(Vert), size(), 2,
+ &(*this)[0].pos_x,
+ &(*this)[0].col,
+ &(*this)[0].tex_x);
prim.mode = m_prim;
// Set prerender matrix manipulations
- if ( pt ) prim.pretranslate = pt;
- if ( ps ) prim.prescale = ps;
+ if (pt)
+ prim.pretranslate = pt;
+ if (ps)
+ prim.prescale = ps;
// Draw
glmanager->draw_primitive(prim);
@@ -160,16 +166,18 @@ void VertBuffer<P3TCVert>::draw(GLW_3VF *pt, GLW_3VF *ps) const
m_tex->bind();
// Create the primitive we wish to draw
- GLPrimitive prim( sizeof(Vert), size(), 3,
- &(*this)[0].pos_x,
- &(*this)[0].col,
- &(*this)[0].tex_x);
+ GLPrimitive prim(sizeof(Vert), size(), 3,
+ &(*this)[0].pos_x,
+ &(*this)[0].col,
+ &(*this)[0].tex_x);
prim.mode = m_prim;
// Set prerender matrix manipulations
- if ( pt ) prim.pretranslate = pt;
- if ( ps ) prim.prescale = ps;
+ if (pt)
+ prim.pretranslate = pt;
+ if (ps)
+ prim.prescale = ps;
// Draw
glmanager->draw_primitive(prim);