Changeset 2610Tweet

Timestamp:

Mar 28, 2013, 12:43:11 PM (10 years ago)

Author:

sam

Message:

base: a few minor style tweaks.

Location:

trunk/src

Files:

• entity.cpp (modified) (1 diff)
• gpu/shader.cpp (modified) (1 diff)
• gpu/vertexbuffer.cpp (modified) (2 diffs)
• lol/gpu/vertexbuffer.h (modified) (2 diffs)
• platform/sdl/sdlinput.cpp (modified) (1 diff)
• tileset.cpp (modified) (5 diffs)

trunk/src/entity.cpp

@@ -53 +53 @@
 void Entity::TickGame(float seconds)
 {
-    (void)seconds;
+    UNUSED(seconds);
 #if !LOL_RELEASE
     if (m_tickstate != STATE_PRETICK_GAME)

trunk/src/gpu/shader.cpp

@@ -164 +164 @@
 {
     /* XXX: do nothing! the shader should remain in cache */
-    (void)shader;
+    UNUSED(shader);
 }
 

trunk/src/gpu/vertexbuffer.cpp

@@ -240 +240 @@
     case MeshPrimitive::Triangles:
         /* FIXME: ignores most of the arguments! */
-        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        UNUSED(vbase, vskip, vcount, skip);
         glDrawElements(GL_TRIANGLES, count, GL_UNSIGNED_SHORT, 0);
         break;
     case MeshPrimitive::TriangleStrips:
         /* FIXME: ignores most of the arguments! */
-        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        UNUSED(vbase, vskip, vcount, skip);
         glDrawElements(GL_TRIANGLE_STRIP, count, GL_UNSIGNED_SHORT, 0);
         break;
     case MeshPrimitive::TriangleFans:
         /* FIXME: ignores most of the arguments! */
-        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        UNUSED(vbase, vskip, vcount, skip);
         glDrawElements(GL_TRIANGLE_FAN, count, GL_UNSIGNED_SHORT, 0);
         break;
     case MeshPrimitive::Points:
         /* FIXME: ignores most of the arguments! */
-        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        UNUSED(vbase, vskip, vcount, skip);
         glDrawElements(GL_POINTS, count, GL_UNSIGNED_SHORT, 0);
         break;
     case MeshPrimitive::Lines:
         /* FIXME: ignores most of the arguments! */
-        (void)vbase; (void)vskip; (void)vcount; (void)skip;
+        UNUSED(vbase, vskip, vcount, skip);
         glDrawElements(GL_LINES, count, GL_UNSIGNED_SHORT, 0);
         break;
@@ -646 +646 @@
 #else
     /* FIXME: is there a way to use "size"? */
-    (void)size;
+    UNUSED(size);
     return m_data->m_memory + offset;
 #endif

trunk/src/lol/gpu/vertexbuffer.h

@@ -159 +159 @@
 
 #define LOL_TYPE(T) \
-    static uint8_t GetType(T *x) { (void)x; return Type##T; }
+    static uint8_t GetType(T *x) { UNUSED(x); return Type##T; }
 
     LOL_TYPE(void)
@@ -192 +192 @@
 inline void VertexStreamBase::AddStream<void>(int n, VertexUsage usage)
 {
-    (void)usage;
+    UNUSED(usage);
     m_streams[n].size = 0;
 }

trunk/src/platform/sdl/sdlinput.cpp

@@ -202 +202 @@
             Input::KeyPressed(i, seconds);
 #else
-    (void)seconds;
+    UNUSED(seconds);
 #endif
 #endif

trunk/src/tileset.cpp

@@ -68 +68 @@
 {
     Init(path);
-
-    m_drawgroup = DRAWGROUP_BEFORE;
 }
 
@@ -86 +84 @@
         if (size.x <= 0 || size.y <= 0)
             size = ivec2(32, 32);
-        count = ivec2(max(1, m_data->m_image_size.x / size.x),
-                      max(1, m_data->m_image_size.y / size.y));
+        count = max(ivec2(1, 1), m_data->m_image_size / size);
     }
 
@@ -96 +93 @@
                       size * ivec2(i + 1, j + 1)));
     }
-
-    m_drawgroup = DRAWGROUP_BEFORE;
 }
 
@@ -109 +104 @@
     m_data->m_texture_size = ivec2(PotUp(m_data->m_image_size.x),
                                    PotUp(m_data->m_image_size.y));
+
+    m_drawgroup = DRAWGROUP_BEFORE;
 }
 
@@ -195 +192 @@
 ivec2 TileSet::GetTileSize(int tileid) const
 {
-    (void)tileid;
-
     ibox2 const &box = m_data->m_tiles[tileid].m1;
     return box.B - box.A;