RubyGems - gosu - Versions diffs - 0.7.37 → 0.7.38 - Mend

gosu 0.7.37 → 0.7.38

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

data/Gosu/Bitmap.hpp +2 -2
data/Gosu/Color.hpp +1 -1
data/Gosu/Graphics.hpp +3 -0
data/Gosu/GraphicsBase.hpp +2 -1
data/Gosu/Utility.hpp +2 -1
data/Gosu/Version.hpp +2 -2
data/GosuImpl/Graphics/BitmapApple.mm +25 -4
data/GosuImpl/Graphics/DrawOp.hpp +1 -0
data/GosuImpl/Graphics/Macro.hpp +9 -5
data/GosuImpl/Graphics/RenderState.hpp +1 -1
data/GosuImpl/RubyGosu.swg +19 -5
data/GosuImpl/RubyGosu_wrap.cxx +289 -392
data/examples/ChipmunkIntegration.rb +1 -1
data/examples/OpenGLIntegration.rb +1 -1
data/examples/Tutorial.rb +1 -1
data/lib/gosu.rb +3 -4
data/lib/gosu/preview.rb +6 -1
data/linux/extconf.rb +1 -2
metadata +4 -4

data/Gosu/Bitmap.hpp CHANGED

@@ -52,10 +52,10 @@ namespace Gosu
         void insert(const Bitmap& source, int x, int y, unsigned srcX,
             unsigned srcY, unsigned srcWidth, unsigned srcHeight);
-		//! Direct access to the array of color values. May be useful for optimized
+        //! Direct access to the array of color values. May be useful for optimized
         //! OpenGL operations.
         const Color* data() const { return &pixels[0]; }
-        Color* data()             { return &pixels[0]; }
+        Color* data() { return &pixels[0]; }
         // Work with data() instead if you need fast operations.
         GOSU_DEPRECATED void fill(Color c);

data/Gosu/Color.hpp CHANGED

@@ -126,7 +126,7 @@ namespace Gosu
             return alpha() << 24 | red() << 16 | green() << 8 | blue();
         }
-        //! Returns the color in 0x00bbggrr representation.
+        //! Returns the color in 0x00bbggrr representation. Useful for Win32 programming.
         std::tr1::uint32_t bgr() const
         {
             return blue() << 16 | green() << 8 | red();

data/Gosu/Graphics.hpp CHANGED

@@ -90,6 +90,9 @@ namespace Gosu
         void popTransform();
         //! Draws a line from one point to another (last pixel exclusive).
+        //! Note: OpenGL lines are not reliable at all and may have a missing pixel at the start
+        //! or end point. Please only use this for debugging purposes. Otherwise, use a quad or
+        //! image to simulate lines, or contribute a better drawLine to Gosu.
         void drawLine(double x1, double y1, Color c1,
             double x2, double y2, Color c2,
             ZPos z, AlphaMode mode = amDefault);

data/Gosu/GraphicsBase.hpp CHANGED

@@ -24,7 +24,8 @@ namespace Gosu
         //! The colors' channels will be added. The alpha channel specifies
         //! the percentage of the new color's channels that will be added
         //! to the old color's channels.
-        amAdditive,
+        amAdd,
+        amAdditive = amAdd,
         //! The color's channels will be multiplied with each other.
         amMultiply
     };

data/Gosu/Utility.hpp CHANGED

@@ -20,7 +20,8 @@ namespace Gosu
     std::string narrow(const std::wstring& ws);
     //! Returns the user's preferred language, at the moment of calling the function. Expect return
-    //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'.
+    //! values such as 'en_US', 'de_DE.UTF-8', 'ja', 'zh-Hans'. You can rely only on the first two letters
+    //! being a common language abbreviation.
     std::string language();
 }

data/Gosu/Version.hpp CHANGED

@@ -3,8 +3,8 @@
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 37
-#define GOSU_VERSION "0.7.37"
+#define GOSU_POINT_VERSION 38
+#define GOSU_VERSION "0.7.38"
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/GosuImpl/Graphics/BitmapApple.mm CHANGED

@@ -27,6 +27,20 @@ namespace
         CGContextDrawImage(context.obj(), CGRectMake(0.0, 0.0, bitmap.width(), bitmap.height()), imageRef);
     }
+    void unmultiplyAlpha(Gosu::Bitmap& bitmap)
+    {
+        int pixels = bitmap.width() * bitmap.height();
+        for (unsigned char* ptr = reinterpret_cast<unsigned char*>(bitmap.data()); pixels--; ptr += 4)
+        {
+            // Avoid division-by-zero weirdness
+            if (!ptr[3])
+                continue;
+            ptr[0] = ptr[0] * 255 / ptr[3];
+            ptr[1] = ptr[1] * 255 / ptr[3];
+            ptr[2] = ptr[2] * 255 / ptr[3];
+        }
+    }
     #ifdef GOSU_IS_IPHONE
     #define APPLE_IMAGE UIImage
     void appleImageToBitmap(UIImage* image, Gosu::Bitmap& bitmap)
@@ -39,10 +53,13 @@ namespace
     {
         // If we have CGImageForProposedRect (10.6+), use it. This is important because the code below
         // started to break in 10.6:
-           http://stackoverflow.com/questions/2239785/nsimage-color-shift-on-snow-leopard
+        http://stackoverflow.com/questions/2239785/nsimage-color-shift-on-snow-leopard
         if ([image respondsToSelector:@selector(CGImageForProposedRect:context:hints:)])
-            return CGImageToBitmap((CGImageRef)[image CGImageForProposedRect:NULL context:nil hints:nil], bitmap);
+        {
+            CGImageToBitmap((CGImageRef)[image CGImageForProposedRect:NULL context:nil hints:nil], bitmap);
+            unmultiplyAlpha(bitmap);
+        }
         // Otherwise, take the slow route using -drawInRect:fromRect:operation:fraction:
         // TODO: Support vector graphics (we rely on NSBitmapImageRep right now for pixelsWide/pixelsHigh)
@@ -56,16 +73,20 @@ namespace
         // Use a temporary context to draw the NSImage to the buffer. For that, construct a color
         // space that does not alter the colors while drawing from the NSImage to the CGBitmapContext.
         static Gosu::CFRef<CGColorSpaceRef> colorSpace(CGColorSpaceCreateDeviceRGB());
+        // We do NOT want premultiplied alpha (yet?) in Gosu. However, with kCGImageAlphaLast, this
+        // call mysteriously fails.
         Gosu::CFRef<CGContextRef> context(CGBitmapContextCreate(bitmap.data(), bitmap.width(), bitmap.height(),
                                     8, bitmap.width() * 4,
-                                    colorSpace.obj(), kCGImageAlphaPremultipliedLast)); // kCGBitmapByteOrder32Host?
+                                    colorSpace.obj(), kCGImageAlphaPremultipliedLast));
         [NSGraphicsContext saveGraphicsState];
         [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:context.obj() flipped:NO]];
         [image drawInRect:NSMakeRect(0, 0, bitmap.width(), bitmap.height()) fromRect:NSZeroRect
             operation:NSCompositeCopy fraction:1.0];
         [NSGraphicsContext restoreGraphicsState];
+        unmultiplyAlpha(bitmap);
     }
     #endif
 }

data/GosuImpl/Graphics/DrawOp.hpp CHANGED

@@ -62,6 +62,7 @@ namespace Gosu
                 glEnableClientState(GL_VERTEX_ARRAY);
                 glTexCoordPointer(2, GL_FLOAT, 0, spriteTexcoords);
                 glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+                // TODO: See if I can somehow change the format of the color pointer, or maybe change the internal color representation on iOS.
                 glColorPointer(4, GL_UNSIGNED_BYTE, 0, spriteColors);
                 glEnableClientState(GL_COLOR_ARRAY);

data/GosuImpl/Graphics/Macro.hpp CHANGED

@@ -18,16 +18,16 @@ class Gosu::Macro : public Gosu::ImageData
     Graphics& graphics;
 public:
     Macro(Graphics& graphics, DrawOpQueue& queue)
-    : graphics(graphics)
+    :   graphics(graphics)
     {
         queue.compileTo(vertexArray);
         double left = 0, right = 0, top = 0, bottom = 0;
         for (VertexArray::const_iterator it = vertexArray.begin(),
              end = vertexArray.end(); it != end; ++it)
         {
-            left   = std::min<double>(left,   it->vertices[0]);
-            right  = std::max<double>(right,  it->vertices[0]);
-            top    = std::min<double>(top,    it->vertices[1]);
+            left = std::min<double>(left, it->vertices[0]);
+            right = std::max<double>(right, it->vertices[0]);
+            top = std::min<double>(top, it->vertices[1]);
             bottom = std::max<double>(bottom, it->vertices[1]);
         }
         w = std::ceil(right - left);
@@ -58,6 +58,10 @@ public:
               double x2, double y2,
               double x3, double y3) const
     {
+        // Empty record- avoid division by zero.
+        if (vertexArray.empty())
+            return;
         // TODO: Commented out for now on the iPhone.
         // To work, it would need to reset the VertexPointer etc. after doing its work.
     #ifndef GOSU_IS_IPHONE
@@ -75,7 +79,7 @@ public:
         glScaled((x2 - x1) / width(), (y3 - y1) / height(), 1);
         glInterleavedArrays(GL_T2F_C4UB_V3F, 0, &vertexArray[0]);
         glDrawArrays(GL_QUADS, 0, vertexArray.size());
         glFlush();

data/GosuImpl/Graphics/RenderState.hpp CHANGED

@@ -96,7 +96,7 @@ public:
         if (newMode == mode)
             return;
         mode = newMode;
-        if (mode == amAdditive)
+        if (mode == amAdd)
             glBlendFunc(GL_SRC_ALPHA, GL_ONE);
         else if (mode == amMultiply)
             glBlendFunc(GL_DST_COLOR, GL_ZERO);

data/GosuImpl/RubyGosu.swg CHANGED

@@ -97,6 +97,8 @@
         SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
     else if (!strcmp(cstr, "default"))
         $1 = Gosu::amDefault;
+    else if (!strcmp(cstr, "add"))
+        $1 = Gosu::amAdditive;
     else if (!strcmp(cstr, "additive"))
         $1 = Gosu::amAdditive;
     else if (!strcmp(cstr, "multiply"))
@@ -124,7 +126,7 @@
 // Allow integral constants to be passed in place of Color values.
 %typemap(in) Gosu::Color {
     if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)
-        $1 = Gosu::Color(NUM2UINT($input));
+        $1 = Gosu::Color(NUM2ULONG($input));
     else
     {
         void* ptr;
@@ -138,6 +140,15 @@
     }
 }
+// Make color channels less strict.
+%typemap(in) Gosu::Color::Channel {
+    $1 = Gosu::clamp<int>(NUM2ULONG($input), 0, 255);
+}
+// To allow for overloading with Channel values.
+%typemap(typecheck) Gosu::Color::Channel {
+    $1 = !!rb_respond_to($input, rb_intern("to_i"));
+}
 // Header inclusion (order irrelevant)
 %module(directors="1") gosu
 %{
@@ -284,8 +295,8 @@ namespace Gosu
         VALUE conversion = rb_str_new2("to_blob { self.format = 'RGBA'; self.depth = 8 }");
         VALUE blob = rb_obj_instance_eval(1, &conversion, val);
         rb_check_safe_obj(blob);
-        unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
-        unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
+        unsigned width = NUM2ULONG(rb_funcall(val, rb_intern("columns"), 0));
+        unsigned height = NUM2ULONG(rb_funcall(val, rb_intern("rows"), 0));
         bitmap.resize(width, height, Gosu::Color::NONE);
         if (width * height * 4 == RSTRING_LEN(blob))
@@ -318,7 +329,7 @@ namespace Gosu
 %exception {
     try {
         $action
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
     }
 }
@@ -384,6 +395,9 @@ namespace Gosu {
 %rename("value=") setValue;
 %include "std_string.i"
+%ignore Gosu::Color::argb();
+%ignore Gosu::Color::bgr();
+%ignore Gosu::Color::abgr();
 %ignore Gosu::Color::NONE;
 %ignore Gosu::Color::BLACK;
 %ignore Gosu::Color::GRAY;
@@ -443,7 +457,7 @@ namespace Gosu {
     bool operator==(VALUE other) {
         if (TYPE(other) == T_FIXNUM || TYPE(other) == T_BIGNUM)
-            return *$self == Gosu::Color(NUM2UINT(other));
+            return *$self == Gosu::Color(NUM2ULONG(other));
         void* ptr;
         int res = SWIG_ConvertPtr(other, &ptr, SWIGTYPE_p_Gosu__Color, 0);
         return SWIG_IsOK(res) && ptr && *$self == *reinterpret_cast<Gosu::Color*>(ptr);

data/GosuImpl/RubyGosu_wrap.cxx CHANGED

@@ -2345,8 +2345,8 @@ namespace Gosu
         VALUE conversion = rb_str_new2("to_blob { self.format = 'RGBA'; self.depth = 8 }");
         VALUE blob = rb_obj_instance_eval(1, &conversion, val);
         rb_check_safe_obj(blob);
-        unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
-        unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
+        unsigned width = NUM2ULONG(rb_funcall(val, rb_intern("columns"), 0));
+        unsigned height = NUM2ULONG(rb_funcall(val, rb_intern("rows"), 0));
         bitmap.resize(width, height, Gosu::Color::NONE);
         if (width * height * 4 == RSTRING_LEN(blob))
@@ -2533,22 +2533,6 @@ SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
 }
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_char (VALUE obj, unsigned char *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UCHAR_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned char >(v);
-    }
-  }
-  return res;
-}
 SWIGINTERNINLINE VALUE
 SWIG_From_unsigned_SS_char  (unsigned char value)
 {
@@ -2591,7 +2575,7 @@ SWIG_From_std_string  (const std::string& s)
 SWIGINTERN bool Gosu_Color_operator_Se__Se_(Gosu::Color *self,VALUE other){
         if (TYPE(other) == T_FIXNUM || TYPE(other) == T_BIGNUM)
-            return *self == Gosu::Color(NUM2UINT(other));
+            return *self == Gosu::Color(NUM2ULONG(other));
         void* ptr;
         int res = SWIG_ConvertPtr(other, &ptr, SWIGTYPE_p_Gosu__Color, 0);
         return SWIG_IsOK(res) && ptr && *self == *reinterpret_cast<Gosu::Color*>(ptr);
@@ -3031,7 +3015,7 @@ _wrap_milliseconds(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned long)Gosu::milliseconds();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3069,7 +3053,7 @@ _wrap_random(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::random(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3099,7 +3083,7 @@ _wrap_degrees_to_radians(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::degreesToRadians(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3129,7 +3113,7 @@ _wrap_radians_to_degrees(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::radiansToDegrees(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3167,7 +3151,7 @@ _wrap_offset_x(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::offsetX(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3205,7 +3189,7 @@ _wrap_offset_y(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::offsetY(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3269,7 +3253,7 @@ _wrap_angle(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::angle(arg1,arg2,arg3,arg4,arg5);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3307,7 +3291,7 @@ _wrap_angle_diff(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::angleDiff(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3337,7 +3321,7 @@ _wrap_normalize_angle(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::normalizeAngle(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3391,7 +3375,7 @@ _wrap_distance(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu::distance(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3413,7 +3397,7 @@ _wrap_default_font_name(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::defaultFontName();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3438,7 +3422,7 @@ _wrap_screen_width(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu::screenWidth();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3460,7 +3444,7 @@ _wrap_screen_height(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu::screenHeight();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3498,7 +3482,7 @@ _wrap_translate(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::translate(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3548,7 +3532,7 @@ _wrap_rotate(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::rotate(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3578,7 +3562,7 @@ _wrap_scale__SWIG_0(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::scale(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3636,7 +3620,7 @@ _wrap_scale__SWIG_1(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::scale(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3722,7 +3706,7 @@ _wrap_language(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::language();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3744,7 +3728,7 @@ _wrap_enable_undocumented_retrofication(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu::enableUndocumentedRetrofication();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3778,7 +3762,7 @@ _wrap_register_entity(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu::register_entity((std::wstring const &)*arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3803,7 +3787,7 @@ _wrap_new_Color__SWIG_0(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Color *)new Gosu::Color();
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3834,7 +3818,7 @@ _wrap_new_Color__SWIG_1(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Color *)new Gosu::Color(arg1);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3849,39 +3833,27 @@ _wrap_new_Color__SWIG_2(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg1 ;
   Gosu::Color::Channel arg2 ;
   Gosu::Color::Channel arg3 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  unsigned char val3 ;
-  int ecode3 = 0 ;
   const char *classname SWIGUNUSED = "Gosu::Color";
   Gosu::Color *result = 0 ;
   if ((argc < 3) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 2, argv[1] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_char(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 3, argv[2] ));
-  }
-  arg3 = static_cast< Gosu::Color::Channel >(val3);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+  }
+  {
+    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  }
   {
     try {
       result = (Gosu::Color *)new Gosu::Color(arg1,arg2,arg3);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3914,46 +3886,30 @@ _wrap_new_Color__SWIG_3(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   Gosu::Color::Channel arg3 ;
   Gosu::Color::Channel arg4 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  unsigned char val3 ;
-  int ecode3 = 0 ;
-  unsigned char val4 ;
-  int ecode4 = 0 ;
   const char *classname SWIGUNUSED = "Gosu::Color";
   Gosu::Color *result = 0 ;
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 2, argv[1] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_char(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 3, argv[2] ));
-  }
-  arg3 = static_cast< Gosu::Color::Channel >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_char(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color", 4, argv[3] ));
-  }
-  arg4 = static_cast< Gosu::Color::Channel >(val4);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+  }
+  {
+    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  }
+  {
+    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+  }
   {
     try {
       result = (Gosu::Color *)new Gosu::Color(arg1,arg2,arg3,arg4);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -3989,18 +3945,15 @@ SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
   if (argc == 3) {
     int _v;
     {
-      int res = SWIG_AsVal_unsigned_SS_char(argv[0], NULL);
-      _v = SWIG_CheckState(res);
+      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
     }
     if (_v) {
       {
-        int res = SWIG_AsVal_unsigned_SS_char(argv[1], NULL);
-        _v = SWIG_CheckState(res);
+        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
       }
       if (_v) {
         {
-          int res = SWIG_AsVal_unsigned_SS_char(argv[2], NULL);
-          _v = SWIG_CheckState(res);
+          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
         }
         if (_v) {
           return _wrap_new_Color__SWIG_2(nargs, args, self);
@@ -4011,23 +3964,19 @@ SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
   if (argc == 4) {
     int _v;
     {
-      int res = SWIG_AsVal_unsigned_SS_char(argv[0], NULL);
-      _v = SWIG_CheckState(res);
+      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
     }
     if (_v) {
       {
-        int res = SWIG_AsVal_unsigned_SS_char(argv[1], NULL);
-        _v = SWIG_CheckState(res);
+        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
       }
       if (_v) {
         {
-          int res = SWIG_AsVal_unsigned_SS_char(argv[2], NULL);
-          _v = SWIG_CheckState(res);
+          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
         }
         if (_v) {
           {
-            int res = SWIG_AsVal_unsigned_SS_char(argv[3], NULL);
-            _v = SWIG_CheckState(res);
+            _v = !!rb_respond_to(argv[3], rb_intern("to_i"));
           }
           if (_v) {
             return _wrap_new_Color__SWIG_3(nargs, args, self);
@@ -4083,7 +4032,7 @@ _wrap_Color_from_hsv(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::Color::fromHSV(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4100,8 +4049,6 @@ _wrap_Color_from_ahsv(int argc, VALUE *argv, VALUE self) {
   double arg2 ;
   double arg3 ;
   double arg4 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
   double val3 ;
@@ -4114,11 +4061,9 @@ _wrap_Color_from_ahsv(int argc, VALUE *argv, VALUE self) {
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu::Color::fromAHSV", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
   ecode2 = SWIG_AsVal_double(argv[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::Color::fromAHSV", 2, argv[1] ));
@@ -4137,7 +4082,7 @@ _wrap_Color_from_ahsv(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::Color::fromAHSV(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4167,7 +4112,7 @@ _wrap_Color_red(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->red();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4197,7 +4142,7 @@ _wrap_Color_green(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->green();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4227,7 +4172,7 @@ _wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->blue();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4257,7 +4202,7 @@ _wrap_Color_alpha(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->alpha();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4274,8 +4219,6 @@ _wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -4285,15 +4228,13 @@ _wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setRed", 1, self ));
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setRed", 2, argv[0] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
   {
     try {
       (arg1)->setRed(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4309,8 +4250,6 @@ _wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -4320,15 +4259,13 @@ _wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setGreen", 1, self ));
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setGreen", 2, argv[0] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
   {
     try {
       (arg1)->setGreen(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4344,8 +4281,6 @@ _wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -4355,15 +4290,13 @@ _wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setBlue", 1, self ));
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setBlue", 2, argv[0] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
   {
     try {
       (arg1)->setBlue(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4379,8 +4312,6 @@ _wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -4390,15 +4321,13 @@ _wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setAlpha", 1, self ));
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setAlpha", 2, argv[0] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
   {
     try {
       (arg1)->setAlpha(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4427,7 +4356,7 @@ _wrap_Color_hue(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Color const *)arg1)->hue();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4463,7 +4392,7 @@ _wrap_Color_huee___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setHue(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4492,7 +4421,7 @@ _wrap_Color_saturation(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Color const *)arg1)->saturation();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4528,7 +4457,7 @@ _wrap_Color_saturatione___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setSaturation(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4557,7 +4486,7 @@ _wrap_Color_value(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Color const *)arg1)->value();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4593,7 +4522,7 @@ _wrap_Color_valuee___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setValue(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4622,7 +4551,7 @@ _wrap_Color_argb__SWIG_0(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->argb();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4652,7 +4581,7 @@ _wrap_Color_bgr(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->bgr();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4682,7 +4611,7 @@ _wrap_Color_abgr(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->abgr();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4712,7 +4641,7 @@ _wrap_Color_gl(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Color const *)arg1)->gl();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4728,37 +4657,25 @@ _wrap_Color_rgb(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg1 ;
   Gosu::Color::Channel arg2 ;
   Gosu::Color::Channel arg3 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  unsigned char val3 ;
-  int ecode3 = 0 ;
   Gosu::Color result;
   VALUE vresult = Qnil;
   if ((argc < 3) || (argc > 3)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgb", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgb", 2, argv[1] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_char(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgb", 3, argv[2] ));
-  }
-  arg3 = static_cast< Gosu::Color::Channel >(val3);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+  }
+  {
+    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  }
   {
     try {
       result = Gosu_Color_rgb(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4775,44 +4692,28 @@ _wrap_Color_rgba__SWIG_0(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   Gosu::Color::Channel arg3 ;
   Gosu::Color::Channel arg4 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  unsigned char val3 ;
-  int ecode3 = 0 ;
-  unsigned char val4 ;
-  int ecode4 = 0 ;
   Gosu::Color result;
   VALUE vresult = Qnil;
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgba__SWIG_0", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgba__SWIG_0", 2, argv[1] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_char(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgba__SWIG_0", 3, argv[2] ));
-  }
-  arg3 = static_cast< Gosu::Color::Channel >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_char(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_rgba__SWIG_0", 4, argv[3] ));
-  }
-  arg4 = static_cast< Gosu::Color::Channel >(val4);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+  }
+  {
+    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  }
+  {
+    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+  }
   {
     try {
       result = Gosu_Color_rgba__SWIG_0(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4842,7 +4743,7 @@ _wrap_Color_rgba__SWIG_1(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Color_rgba__SWIG_1(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4876,23 +4777,19 @@ SWIGINTERN VALUE _wrap_Color_rgba(int nargs, VALUE *args, VALUE self) {
   if (argc == 4) {
     int _v;
     {
-      int res = SWIG_AsVal_unsigned_SS_char(argv[0], NULL);
-      _v = SWIG_CheckState(res);
+      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
     }
     if (_v) {
       {
-        int res = SWIG_AsVal_unsigned_SS_char(argv[1], NULL);
-        _v = SWIG_CheckState(res);
+        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
       }
       if (_v) {
         {
-          int res = SWIG_AsVal_unsigned_SS_char(argv[2], NULL);
-          _v = SWIG_CheckState(res);
+          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
         }
         if (_v) {
           {
-            int res = SWIG_AsVal_unsigned_SS_char(argv[3], NULL);
-            _v = SWIG_CheckState(res);
+            _v = !!rb_respond_to(argv[3], rb_intern("to_i"));
           }
           if (_v) {
             return _wrap_Color_rgba__SWIG_0(nargs, args, self);
@@ -4917,44 +4814,28 @@ _wrap_Color_argb__SWIG_1(int argc, VALUE *argv, VALUE self) {
   Gosu::Color::Channel arg2 ;
   Gosu::Color::Channel arg3 ;
   Gosu::Color::Channel arg4 ;
-  unsigned char val1 ;
-  int ecode1 = 0 ;
-  unsigned char val2 ;
-  int ecode2 = 0 ;
-  unsigned char val3 ;
-  int ecode3 = 0 ;
-  unsigned char val4 ;
-  int ecode4 = 0 ;
   Gosu::Color result;
   VALUE vresult = Qnil;
   if ((argc < 4) || (argc > 4)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
   }
-  ecode1 = SWIG_AsVal_unsigned_SS_char(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_argb__SWIG_1", 1, argv[0] ));
-  }
-  arg1 = static_cast< Gosu::Color::Channel >(val1);
-  ecode2 = SWIG_AsVal_unsigned_SS_char(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_argb__SWIG_1", 2, argv[1] ));
-  }
-  arg2 = static_cast< Gosu::Color::Channel >(val2);
-  ecode3 = SWIG_AsVal_unsigned_SS_char(argv[2], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_argb__SWIG_1", 3, argv[2] ));
-  }
-  arg3 = static_cast< Gosu::Color::Channel >(val3);
-  ecode4 = SWIG_AsVal_unsigned_SS_char(argv[3], &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "Gosu::Color::Channel","Gosu_Color_argb__SWIG_1", 4, argv[3] ));
-  }
-  arg4 = static_cast< Gosu::Color::Channel >(val4);
+  {
+    arg1 = Gosu::clamp<int>(NUM2ULONG(argv[0]), 0, 255);
+  }
+  {
+    arg2 = Gosu::clamp<int>(NUM2ULONG(argv[1]), 0, 255);
+  }
+  {
+    arg3 = Gosu::clamp<int>(NUM2ULONG(argv[2]), 0, 255);
+  }
+  {
+    arg4 = Gosu::clamp<int>(NUM2ULONG(argv[3]), 0, 255);
+  }
   {
     try {
       result = Gosu_Color_argb__SWIG_1(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -4984,7 +4865,7 @@ _wrap_Color_argb__SWIG_2(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Color_argb__SWIG_2(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5027,23 +4908,19 @@ SWIGINTERN VALUE _wrap_Color_argb(int nargs, VALUE *args, VALUE self) {
   if (argc == 4) {
     int _v;
     {
-      int res = SWIG_AsVal_unsigned_SS_char(argv[0], NULL);
-      _v = SWIG_CheckState(res);
+      _v = !!rb_respond_to(argv[0], rb_intern("to_i"));
     }
     if (_v) {
       {
-        int res = SWIG_AsVal_unsigned_SS_char(argv[1], NULL);
-        _v = SWIG_CheckState(res);
+        _v = !!rb_respond_to(argv[1], rb_intern("to_i"));
       }
       if (_v) {
         {
-          int res = SWIG_AsVal_unsigned_SS_char(argv[2], NULL);
-          _v = SWIG_CheckState(res);
+          _v = !!rb_respond_to(argv[2], rb_intern("to_i"));
         }
         if (_v) {
           {
-            int res = SWIG_AsVal_unsigned_SS_char(argv[3], NULL);
-            _v = SWIG_CheckState(res);
+            _v = !!rb_respond_to(argv[3], rb_intern("to_i"));
           }
           if (_v) {
             return _wrap_Color_argb__SWIG_1(nargs, args, self);
@@ -5091,7 +4968,7 @@ _wrap_Color_dup(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Color_dup((Gosu::Color const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5121,7 +4998,7 @@ _wrap_Color_to_s(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Color_toS((Gosu::Color const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5162,7 +5039,7 @@ _wrap_Color___eq__(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)Gosu_Color_operator_Se__Se_(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5194,7 +5071,7 @@ _wrap_interpolate(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM)
-    arg1 = Gosu::Color(NUM2UINT(argv[0]));
+    arg1 = Gosu::Color(NUM2ULONG(argv[0]));
     else
     {
       void* ptr;
@@ -5209,7 +5086,7 @@ _wrap_interpolate(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM)
-    arg2 = Gosu::Color(NUM2UINT(argv[1]));
+    arg2 = Gosu::Color(NUM2ULONG(argv[1]));
     else
     {
       void* ptr;
@@ -5232,7 +5109,7 @@ _wrap_interpolate(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::interpolate(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5255,7 +5132,7 @@ _wrap_multiply(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM)
-    arg1 = Gosu::Color(NUM2UINT(argv[0]));
+    arg1 = Gosu::Color(NUM2ULONG(argv[0]));
     else
     {
       void* ptr;
@@ -5270,7 +5147,7 @@ _wrap_multiply(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM)
-    arg2 = Gosu::Color(NUM2UINT(argv[1]));
+    arg2 = Gosu::Color(NUM2ULONG(argv[1]));
     else
     {
       void* ptr;
@@ -5286,7 +5163,7 @@ _wrap_multiply(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu::multiply(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5417,7 +5294,7 @@ _wrap_Font_name(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Font const *)arg1)->name();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5450,7 +5327,7 @@ _wrap_Font_height(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)((Gosu::Font const *)arg1)->height();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5480,7 +5357,7 @@ _wrap_Font_flags(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)((Gosu::Font const *)arg1)->flags();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5527,7 +5404,7 @@ _wrap_Font_text_width(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Font const *)arg1)->textWidth((std::wstring const &)*arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5608,7 +5485,7 @@ _wrap_Font_draw(int argc, VALUE *argv, VALUE self) {
   if (argc > 6) {
     {
       if (TYPE(argv[6]) == T_FIXNUM || TYPE(argv[6]) == T_BIGNUM)
-      arg8 = Gosu::Color(NUM2UINT(argv[6]));
+      arg8 = Gosu::Color(NUM2ULONG(argv[6]));
       else
       {
         void* ptr;
@@ -5630,6 +5507,8 @@ _wrap_Font_draw(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg9 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg9 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg9 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -5641,7 +5520,7 @@ _wrap_Font_draw(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Font const *)arg1)->draw((std::wstring const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5737,7 +5616,7 @@ _wrap_Font_draw_rel(int argc, VALUE *argv, VALUE self) {
   if (argc > 8) {
     {
       if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-      arg10 = Gosu::Color(NUM2UINT(argv[8]));
+      arg10 = Gosu::Color(NUM2ULONG(argv[8]));
       else
       {
         void* ptr;
@@ -5759,6 +5638,8 @@ _wrap_Font_draw_rel(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -5770,7 +5651,7 @@ _wrap_Font_draw_rel(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Font const *)arg1)->drawRel((std::wstring const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5858,7 +5739,7 @@ _wrap_Font_draw_rot(int argc, VALUE *argv, VALUE self) {
   if (argc > 7) {
     {
       if (TYPE(argv[7]) == T_FIXNUM || TYPE(argv[7]) == T_BIGNUM)
-      arg9 = Gosu::Color(NUM2UINT(argv[7]));
+      arg9 = Gosu::Color(NUM2ULONG(argv[7]));
       else
       {
         void* ptr;
@@ -5880,6 +5761,8 @@ _wrap_Font_draw_rot(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg10 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg10 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg10 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -5891,7 +5774,7 @@ _wrap_Font_draw_rot(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Font const *)arg1)->drawRot((std::wstring const &)*arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5957,7 +5840,7 @@ _wrap_new_Font(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Font *)new_Gosu_Font(*arg1,(std::wstring const &)*arg2,arg3);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -5998,7 +5881,7 @@ _wrap_Font_set_image(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Font_set_image(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6311,7 +6194,7 @@ _wrap_new_GLTexInfo(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::GLTexInfo *)new Gosu::GLTexInfo();
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6348,7 +6231,7 @@ _wrap_Image_width(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)((Gosu::Image const *)arg1)->width();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6378,7 +6261,7 @@ _wrap_Image_height(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)((Gosu::Image const *)arg1)->height();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6452,7 +6335,7 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
   if (argc > 5) {
     {
       if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-      arg7 = Gosu::Color(NUM2UINT(argv[5]));
+      arg7 = Gosu::Color(NUM2ULONG(argv[5]));
       else
       {
         void* ptr;
@@ -6474,6 +6357,8 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg8 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg8 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg8 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -6485,7 +6370,7 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Image const *)arg1)->draw(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6556,7 +6441,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   arg6 = static_cast< double >(val6);
   {
     if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-    arg7 = Gosu::Color(NUM2UINT(argv[5]));
+    arg7 = Gosu::Color(NUM2ULONG(argv[5]));
     else
     {
       void* ptr;
@@ -6571,7 +6456,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[6]) == T_FIXNUM || TYPE(argv[6]) == T_BIGNUM)
-    arg8 = Gosu::Color(NUM2UINT(argv[6]));
+    arg8 = Gosu::Color(NUM2ULONG(argv[6]));
     else
     {
       void* ptr;
@@ -6586,7 +6471,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[7]) == T_FIXNUM || TYPE(argv[7]) == T_BIGNUM)
-    arg9 = Gosu::Color(NUM2UINT(argv[7]));
+    arg9 = Gosu::Color(NUM2ULONG(argv[7]));
     else
     {
       void* ptr;
@@ -6601,7 +6486,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   }
   {
     if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-    arg10 = Gosu::Color(NUM2UINT(argv[8]));
+    arg10 = Gosu::Color(NUM2ULONG(argv[8]));
     else
     {
       void* ptr;
@@ -6622,6 +6507,8 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -6633,7 +6520,7 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Image const *)arg1)->drawMod(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6734,7 +6621,7 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
   if (argc > 8) {
     {
       if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-      arg10 = Gosu::Color(NUM2UINT(argv[8]));
+      arg10 = Gosu::Color(NUM2ULONG(argv[8]));
       else
       {
         void* ptr;
@@ -6756,6 +6643,8 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -6767,7 +6656,7 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
   {
     try {
       ((Gosu::Image const *)arg1)->drawRot(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6796,7 +6685,7 @@ _wrap_Image_get_data(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::ImageData *) &((Gosu::Image const *)arg1)->getData();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6843,7 +6732,7 @@ _wrap_new_Image__SWIG_0(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Image *)new_Gosu_Image__SWIG_0(*arg1,arg2,arg3);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -6936,7 +6825,7 @@ _wrap_new_Image__SWIG_1(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Image *)new_Gosu_Image__SWIG_1(*arg1,arg2,arg3,arg4,arg5,arg6,arg7);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7087,7 +6976,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   arg3 = static_cast< double >(val3);
   {
     if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
-    arg4 = Gosu::Color(NUM2UINT(argv[2]));
+    arg4 = Gosu::Color(NUM2ULONG(argv[2]));
     else
     {
       void* ptr;
@@ -7112,7 +7001,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   arg6 = static_cast< double >(val6);
   {
     if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-    arg7 = Gosu::Color(NUM2UINT(argv[5]));
+    arg7 = Gosu::Color(NUM2ULONG(argv[5]));
     else
     {
       void* ptr;
@@ -7137,7 +7026,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   arg9 = static_cast< double >(val9);
   {
     if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-    arg10 = Gosu::Color(NUM2UINT(argv[8]));
+    arg10 = Gosu::Color(NUM2ULONG(argv[8]));
     else
     {
       void* ptr;
@@ -7162,7 +7051,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   arg12 = static_cast< double >(val12);
   {
     if (TYPE(argv[11]) == T_FIXNUM || TYPE(argv[11]) == T_BIGNUM)
-    arg13 = Gosu::Color(NUM2UINT(argv[11]));
+    arg13 = Gosu::Color(NUM2ULONG(argv[11]));
     else
     {
       void* ptr;
@@ -7188,6 +7077,8 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg15 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg15 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg15 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -7199,7 +7090,7 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Image_drawAsQuad(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7228,7 +7119,7 @@ _wrap_Image_gl_tex_info(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::GLTexInfo *)Gosu_Image_glTexInfo((Gosu::Image const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7283,7 +7174,7 @@ _wrap_Image_from_text4(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::Image *)Gosu_Image_fromText4(*arg1,(std::wstring const &)*arg2,(std::wstring const &)*arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7371,7 +7262,7 @@ _wrap_Image_from_text7(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::Image *)Gosu_Image_fromText7(*arg1,(std::wstring const &)*arg2,(std::wstring const &)*arg3,arg4,arg5,arg6,arg7);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7430,7 +7321,7 @@ _wrap_Image_load_tiles(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Image_loadTiles(*arg1,arg2,arg3,arg4,arg5);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7466,7 +7357,7 @@ _wrap_Image_to_blob(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Image_toBlob((Gosu::Image const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7496,7 +7387,7 @@ _wrap_Image_columns(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu_Image_columns((Gosu::Image const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7526,7 +7417,7 @@ _wrap_Image_rows(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu_Image_rows((Gosu::Image const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7561,7 +7452,7 @@ _wrap_Image_save(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Image_save((Gosu::Image const *)arg1,(std::wstring const &)*arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7615,7 +7506,7 @@ _wrap_Image_insert(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Image_insert(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7642,7 +7533,7 @@ _wrap_fps(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (int)Gosu::fps();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7701,7 +7592,7 @@ _wrap_new_SampleInstance(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::SampleInstance *)new Gosu::SampleInstance(arg1,arg2);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7730,7 +7621,7 @@ _wrap_SampleInstance_playingq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)((Gosu::SampleInstance const *)arg1)->playing();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7760,7 +7651,7 @@ _wrap_SampleInstance_pausedq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)((Gosu::SampleInstance const *)arg1)->paused();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7788,7 +7679,7 @@ _wrap_SampleInstance_pause(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->pause();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7815,7 +7706,7 @@ _wrap_SampleInstance_resume(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->resume();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7842,7 +7733,7 @@ _wrap_SampleInstance_stop(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->stop();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7877,7 +7768,7 @@ _wrap_SampleInstance_volumee___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->changeVolume(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7912,7 +7803,7 @@ _wrap_SampleInstance_pane___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->changePan(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -7947,7 +7838,7 @@ _wrap_SampleInstance_speede___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->changeSpeed(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8002,7 +7893,7 @@ _wrap_new_Sample(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Sample *)new Gosu::Sample((std::wstring const &)*arg1);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8061,7 +7952,7 @@ _wrap_Sample_play(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Sample const *)arg1)->play(arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8129,7 +8020,7 @@ _wrap_Sample_play_pan(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Sample const *)arg1)->playPan(arg2,arg3,arg4,arg5);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8185,7 +8076,7 @@ _wrap_new_Song(int argc, VALUE *argv, VALUE self) {
       result = (Gosu::Song *)new Gosu::Song((std::wstring const &)*arg1);
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8212,7 +8103,7 @@ _wrap_Song_current_song(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::Song *)Gosu::Song::currentSong();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8250,7 +8141,7 @@ _wrap_Song_play(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->play(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8277,7 +8168,7 @@ _wrap_Song_pause(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->pause();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8306,7 +8197,7 @@ _wrap_Song_pausedq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)((Gosu::Song const *)arg1)->paused();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8334,7 +8225,7 @@ _wrap_Song_stop(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->stop();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8363,7 +8254,7 @@ _wrap_Song_playingq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)((Gosu::Song const *)arg1)->playing();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8393,7 +8284,7 @@ _wrap_Song_volume(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Song const *)arg1)->volume();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8429,7 +8320,7 @@ _wrap_Song_volumee___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->changeVolume(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8447,7 +8338,7 @@ _wrap_Song_update(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu::Song::update();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8497,7 +8388,7 @@ _wrap_new_TextInput(int argc, VALUE *argv, VALUE self) {
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8532,7 +8423,7 @@ _wrap_TextInput_text(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::TextInput const *)arg1)->text();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8570,7 +8461,7 @@ _wrap_TextInput_texte___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setText((std::wstring const &)*arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8605,7 +8496,7 @@ _wrap_TextInput_caret_pose___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setCaretPos(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8640,7 +8531,7 @@ _wrap_TextInput_selection_starte___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setSelectionStart(arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8685,7 +8576,7 @@ _wrap_TextInput_filter(int argc, VALUE *argv, VALUE self) {
         } else {
           result = ((Gosu::TextInput const *)arg1)->filter((std::wstring const &)*arg2);
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -8722,7 +8613,7 @@ _wrap_TextInput_caret_pos(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu_TextInput_caret_pos((Gosu::TextInput const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8752,7 +8643,7 @@ _wrap_TextInput_selection_start(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (unsigned int)Gosu_TextInput_selection_start((Gosu::TextInput const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8862,7 +8753,7 @@ _wrap_new_Window(int argc, VALUE *argv, VALUE self) {
       DATA_PTR(self) = result;
       SWIG_RubyAddTracking(result, self);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8897,7 +8788,7 @@ _wrap_Window_caption(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = ((Gosu::Window const *)arg1)->caption();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8935,7 +8826,7 @@ _wrap_Window_captione___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->setCaption((std::wstring const &)*arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8964,7 +8855,7 @@ _wrap_Window_update_interval(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)((Gosu::Window const *)arg1)->updateInterval();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -8992,7 +8883,7 @@ _wrap_Window_show(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->show();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9019,7 +8910,7 @@ _wrap_Window_close(int argc, VALUE *argv, VALUE self) {
   {
     try {
       (arg1)->close();
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9055,7 +8946,7 @@ _wrap_Window_update(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->update();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9095,7 +8986,7 @@ _wrap_Window_draw(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->draw();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9137,7 +9028,7 @@ _wrap_Window_needs_redrawq___(int argc, VALUE *argv, VALUE self) {
         } else {
           result = (bool)((Gosu::Window const *)arg1)->needsRedraw();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9180,7 +9071,7 @@ _wrap_Window_needs_cursorq___(int argc, VALUE *argv, VALUE self) {
         } else {
           result = (bool)((Gosu::Window const *)arg1)->needsCursor();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9221,7 +9112,7 @@ _wrap_Window_lose_focus(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->loseFocus();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9261,7 +9152,7 @@ _wrap_Window_release_memory(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->releaseMemory();
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9308,7 +9199,7 @@ _wrap_Window_button_down(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->buttonDown(arg2);
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9355,7 +9246,7 @@ _wrap_Window_button_up(int argc, VALUE *argv, VALUE self) {
         } else {
           (arg1)->buttonUp(arg2);
         }
-      } catch(const std::runtime_error& e) {
+      } catch (const std::exception& e) {
         SWIG_exception(SWIG_RuntimeError, e.what());
       }
     }
@@ -9413,7 +9304,7 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
   arg3 = static_cast< double >(val3);
   {
     if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
-    arg4 = Gosu::Color(NUM2UINT(argv[2]));
+    arg4 = Gosu::Color(NUM2ULONG(argv[2]));
     else
     {
       void* ptr;
@@ -9438,7 +9329,7 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
   arg6 = static_cast< double >(val6);
   {
     if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-    arg7 = Gosu::Color(NUM2UINT(argv[5]));
+    arg7 = Gosu::Color(NUM2ULONG(argv[5]));
     else
     {
       void* ptr;
@@ -9466,6 +9357,8 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg9 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg9 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg9 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -9477,7 +9370,7 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_drawLine(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9538,7 +9431,7 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   arg3 = static_cast< double >(val3);
   {
     if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
-    arg4 = Gosu::Color(NUM2UINT(argv[2]));
+    arg4 = Gosu::Color(NUM2ULONG(argv[2]));
     else
     {
       void* ptr;
@@ -9563,7 +9456,7 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   arg6 = static_cast< double >(val6);
   {
     if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-    arg7 = Gosu::Color(NUM2UINT(argv[5]));
+    arg7 = Gosu::Color(NUM2ULONG(argv[5]));
     else
     {
       void* ptr;
@@ -9588,7 +9481,7 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   arg9 = static_cast< double >(val9);
   {
     if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-    arg10 = Gosu::Color(NUM2UINT(argv[8]));
+    arg10 = Gosu::Color(NUM2ULONG(argv[8]));
     else
     {
       void* ptr;
@@ -9616,6 +9509,8 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg12 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg12 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg12 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -9627,7 +9522,7 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_drawTriangle(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9695,7 +9590,7 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   arg3 = static_cast< double >(val3);
   {
     if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
-    arg4 = Gosu::Color(NUM2UINT(argv[2]));
+    arg4 = Gosu::Color(NUM2ULONG(argv[2]));
     else
     {
       void* ptr;
@@ -9720,7 +9615,7 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   arg6 = static_cast< double >(val6);
   {
     if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
-    arg7 = Gosu::Color(NUM2UINT(argv[5]));
+    arg7 = Gosu::Color(NUM2ULONG(argv[5]));
     else
     {
       void* ptr;
@@ -9745,7 +9640,7 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   arg9 = static_cast< double >(val9);
   {
     if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
-    arg10 = Gosu::Color(NUM2UINT(argv[8]));
+    arg10 = Gosu::Color(NUM2ULONG(argv[8]));
     else
     {
       void* ptr;
@@ -9770,7 +9665,7 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   arg12 = static_cast< double >(val12);
   {
     if (TYPE(argv[11]) == T_FIXNUM || TYPE(argv[11]) == T_BIGNUM)
-    arg13 = Gosu::Color(NUM2UINT(argv[11]));
+    arg13 = Gosu::Color(NUM2ULONG(argv[11]));
     else
     {
       void* ptr;
@@ -9798,6 +9693,8 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
       SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
       else if (!strcmp(cstr, "default"))
       arg15 = Gosu::amDefault;
+      else if (!strcmp(cstr, "add"))
+      arg15 = Gosu::amAdditive;
       else if (!strcmp(cstr, "additive"))
       arg15 = Gosu::amAdditive;
       else if (!strcmp(cstr, "multiply"))
@@ -9809,7 +9706,7 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_drawQuad(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9836,7 +9733,7 @@ _wrap_Window_flush(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_flush(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9872,7 +9769,7 @@ _wrap_Window_button_downq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)Gosu_Window_isButtonDown((Gosu::Window const *)arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9906,7 +9803,7 @@ _wrap_Window_char_to_button_id(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Window_charToButtonId(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9940,7 +9837,7 @@ _wrap_Window_button_id_to_char(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = Gosu_Window_buttonIdToChar(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -9979,7 +9876,7 @@ _wrap_Window_text_input(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::TextInput *)Gosu_Window_textInput((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10020,7 +9917,7 @@ _wrap_Window_text_inpute___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_setTextInput(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10049,7 +9946,7 @@ _wrap_Window_mouse_x(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu_Window_mouseX((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10079,7 +9976,7 @@ _wrap_Window_mouse_y(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (double)Gosu_Window_mouseY((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10123,7 +10020,7 @@ _wrap_Window_set_mouse_position(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_setMousePosition(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10158,7 +10055,7 @@ _wrap_Window_mouse_xe___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_setMouseX(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10193,7 +10090,7 @@ _wrap_Window_mouse_ye___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_setMouseY(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10222,7 +10119,7 @@ _wrap_Window_width(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (int)Gosu_Window_width((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10252,7 +10149,7 @@ _wrap_Window_height(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (int)Gosu_Window_height((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10282,7 +10179,7 @@ _wrap_Window_fullscreenq___(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (bool)Gosu_Window_fullscreen((Gosu::Window const *)arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10310,7 +10207,7 @@ _wrap_Window_gl__SWIG_0(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_gl__SWIG_0(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10345,7 +10242,7 @@ _wrap_Window_gl__SWIG_1(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_gl__SWIG_1(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10449,7 +10346,7 @@ _wrap_Window_clip_to(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_clipTo(arg1,arg2,arg3,arg4,arg5);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10478,7 +10375,7 @@ _wrap_Window_record(int argc, VALUE *argv, VALUE self) {
   {
     try {
       result = (Gosu::Image *)Gosu_Window_record(arg1);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10634,7 +10531,7 @@ _wrap_Window_transform(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_transform(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12,arg13,arg14,arg15,arg16,arg17);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10689,7 +10586,7 @@ _wrap_Window_rotate(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_rotate(arg1,arg2,arg3,arg4);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10724,7 +10621,7 @@ _wrap_Window_scale__SWIG_0(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_scale__SWIG_0(arg1,arg2);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10767,7 +10664,7 @@ _wrap_Window_scale__SWIG_1(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_scale__SWIG_1(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10826,7 +10723,7 @@ _wrap_Window_scale__SWIG_2(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_scale__SWIG_2(arg1,arg2,arg3,arg4,arg5);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -10960,7 +10857,7 @@ _wrap_Window_translate(int argc, VALUE *argv, VALUE self) {
   {
     try {
       Gosu_Window_translate(arg1,arg2,arg3);
-    } catch(const std::runtime_error& e) {
+    } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
@@ -11330,8 +11227,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(37)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.37"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(38)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.38"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);