From a6c277b24ef2df950a282fbe8df0d8f2f1ce3e9a Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Sun, 13 Mar 2016 13:29:56 -0400
Subject: Update simple2d usage to latest interface

Commit [890aa1c](https://github.com/simple2d/simple2d/commit/890aa1cdeacccac97d6512019f02e43d9fb1943d)
in simple2d makes some backwards-incompatible interface changes. This
should bring ruby2d back up to date with them.
---
 ext/ruby2d/ruby2d.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/ruby2d/ruby2d.c b/ext/ruby2d/ruby2d.c
index 790f83c..24baeb8 100644
--- a/ext/ruby2d/ruby2d.c
+++ b/ext/ruby2d/ruby2d.c
@@ -11,7 +11,7 @@
 VALUE self;
 
 // Simple 2D window
-Window *window;
+S2D_Window *window;
 
 // Ruby data types
 static VALUE ruby2d_module;
@@ -20,13 +20,13 @@ static VALUE c_data_klass;
 
 // Structures for Ruby 2D classes
 struct image_data {
-  Image img;
+  S2D_Image* img;
 };
 struct text_data {
-  Text txt;
+  S2D_Text* txt;
 };
 struct sound_data {
-  Sound snd;
+  S2D_Sound* snd;
 };
 
 
@@ -215,8 +215,8 @@ void render() {
         struct image_data *data;
         Data_Get_Struct(rb_iv_get(el, "@data"), struct image_data, data);
         
-        data->img.x = NUM2DBL(rb_iv_get(el, "@x"));
-        data->img.y = NUM2DBL(rb_iv_get(el, "@y"));
+        data->img->x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->img->y = NUM2DBL(rb_iv_get(el, "@y"));
         S2D_DrawImage(data->img);
       }
       break;
@@ -234,8 +234,8 @@ void render() {
         struct text_data *data;
         Data_Get_Struct(rb_iv_get(el, "@data"), struct text_data, data);
         
-        data->txt.x = NUM2DBL(rb_iv_get(el, "@x"));
-        data->txt.y = NUM2DBL(rb_iv_get(el, "@y"));
+        data->txt->x = NUM2DBL(rb_iv_get(el, "@x"));
+        data->txt->y = NUM2DBL(rb_iv_get(el, "@y"));
         S2D_DrawText(data->txt);
       }
       break;
-- 
cgit v1.2.3