get rid of subsys

6 files changed, 0 insertions, 33 deletions

diff --git a/libwinnie/src/sdl/gfx.cc b/libwinnie/src/sdl/gfx.cc
index bb5eb68..531eb58 100644
--- a/libwinnie/src/sdl/gfx.cc
+++ b/libwinnie/src/sdl/gfx.cc
@@ -51,8 +51,6 @@ init_gfx()
     return false;
   }
 
-  get_subsys()->graphics_offset = (intptr_t) (gfx);
-
   Rect scr_rect(0, 0, 1280, 853);
   gfx->screen_rect = scr_rect;
   gfx->color_depth = 32;
diff --git a/libwinnie/src/sdl/mouse.cc b/libwinnie/src/sdl/mouse.cc
index 9ec6605..e604e73 100644
--- a/libwinnie/src/sdl/mouse.cc
+++ b/libwinnie/src/sdl/mouse.cc
@@ -46,7 +46,6 @@ init_mouse()
   if (!(mouse = (Mouse *) malloc(sizeof *mouse))) {
     return false;
   }
-  get_subsys()->mouse_offset = (intptr_t) (mouse);
 
   memset(mouse, 0, sizeof *mouse);
   return true;
diff --git a/libwinnie/src/text.cc b/libwinnie/src/text.cc
index cd1a6f7..4b2c226 100644
--- a/libwinnie/src/text.cc
+++ b/libwinnie/src/text.cc
@@ -50,8 +50,6 @@ init_text()
     return false;
   }
 
-  get_subsys()->text_offset = (intptr_t) (text);
-
   if (FT_Init_FreeType(&text->ft_lib)) {
     fprintf(stderr, "Failed to initialize the FreeType library!\n");
     return false;
diff --git a/libwinnie/src/winnie.cc b/libwinnie/src/winnie.cc
index 175b9a1..5023978 100644
--- a/libwinnie/src/winnie.cc
+++ b/libwinnie/src/winnie.cc
@@ -32,15 +32,9 @@ Author: Eleni Maria Stea <elene.mst@gmail.com>
 #include "sdl/mouse.h"
 #include "winnie.h"
 
-static Subsys *subsys;
-
 bool
 winnie_init()
 {
-  if (!(subsys = (Subsys *) malloc(sizeof *subsys))) {
-    return false;
-  }
-
   if (!init_gfx()) {
     return false;
   }
@@ -73,15 +67,11 @@ winnie_shutdown()
   destroy_mouse();
   destroy_text();
   destroy_window_manager();
-
-  free(subsys);
 }
 
 bool
 winnie_open()
 {
-  subsys = (Subsys *) malloc(sizeof(Subsys));
-
   return true;
 }
 
@@ -106,9 +96,3 @@ winnie_get_time()
   return (tv.tv_usec - init_tv.tv_usec) / 1000
          + (tv.tv_sec - init_tv.tv_sec) * 1000;
 }
-
-Subsys *
-get_subsys()
-{
-  return subsys;
-}
diff --git a/libwinnie/src/winnie.h b/libwinnie/src/winnie.h
index 300316f..263c657 100644
--- a/libwinnie/src/winnie.h
+++ b/libwinnie/src/winnie.h
@@ -31,14 +31,6 @@ Author: Eleni Maria Stea <elene.mst@gmail.com>
 #include "window.h"
 #include "wm.h"
 
-struct Subsys {
-  int graphics_offset;
-  int keyboard_offset;
-  int mouse_offset;
-  int text_offset;
-  int wm_offset;
-};
-
 bool winnie_init();
 void winnie_shutdown();
 
@@ -47,6 +39,4 @@ void winnie_close();
 
 long winnie_get_time();
 
-Subsys *get_subsys();
-
 #endif
diff --git a/libwinnie/src/wm.cc b/libwinnie/src/wm.cc
index 86562ba..7c78098 100644
--- a/libwinnie/src/wm.cc
+++ b/libwinnie/src/wm.cc
@@ -51,8 +51,6 @@ init_window_manager()
 
   wm = new (wm_mem) WindowManager;
 
-  get_subsys()->wm_offset = (intptr_t) (wm);
-
   return true;
 }