i hate cmake, g++, ld, collect2, cc1, x86_64-w64-mingw32

4 files changed, 46 insertions, 36 deletions

diff --git a/hud/hud.c b/hud/hud.c
index 9c1d892..f2eb361 100644
--- a/hud/hud.c
+++ b/hud/hud.c
@@ -3,10 +3,10 @@
 #include <string.h>
 #include <math.h>
 
-#include <hud.h>
-#include <hud_views.h>
+#include "hud.h"
+#include "hud_views.h"
 
-#include <intersect.h>
+#include "../umath/intersect.h"
 
 // TODO: make sound module mabye?
 #define SOUND_MOUSE_OVER 0
@@ -15,13 +15,18 @@
 #define SOUND_SUCCESS 3
 
 
+void SDL_Rect_init (SDL_Rect *rect, float x, float y, float w, float h) {
+    rect->x = x; rect->y = y; rect->w = w; rect->h = h;
+}
+
+
 // INIT
 void init_overlay_battle (graphic_settings *gs, overlay_battle *ob,
     txtd *t) 
 {
     int w = 400, h = 100;
     int x = gs->resx-w-10, y = 10;
-    ob->rect_back = { x, y, w, h };
+    SDL_Rect_init(&ob->rect_back, x, y, w, h);
 }
 
 void init_sel_chassis (graphic_settings *gs, hud_sel *sc, txtd *t, 
@@ -35,22 +40,25 @@ void init_sel_chassis (graphic_settings *gs, hud_sel *sc, txtd *t,
 void init_form_new_unit (graphic_settings *gs, form_new_unit *fnu, txtd *t) {
     int w = 290+200+300+20*2+10*4 + 30*3 + 200, h = 145+300+20*2+10*1 + 30*2;
     int x = gs->resx/2-w/2, y = gs->resy/2-h/2;
-    fnu->rect_back = { x, y, w, h };
+    SDL_Rect_init(&fnu->rect_back, x, y, w, h);
     
-    fnu->rect_chassis = { x+20, y+20+145+10+30, 300, 300 };
-    fnu->rect_brain = { x+20, y+20+30, 145, 145 };
-    fnu->rect_battery = { x+150+25, y+20+30, 145, 145 };
+    SDL_Rect_init(&fnu->rect_chassis, x+20, y+20+145+10+30, 300, 300);
+    SDL_Rect_init(&fnu->rect_brain, x+20, y+20+30, 145, 145);
+    SDL_Rect_init(&fnu->rect_battery, 0+25, y+20+30, 145, 145);
     for (int i=0; i<8; i++) {
-        fnu->rect_weapons[i] = { x+20+300+10+30, y+20+120*i +30, 200, 110 };
+        SDL_Rect_init(&fnu->rect_weapons[i], 
+            x+20+300+10+30, y+20+120*i +30, 200, 110);
     }
     for (int i=0; i<8; i++) {
-        fnu->rect_armor[i] = { x+20+500+20+30*2, y+20+60*i +30, 150, 50 };
+        SDL_Rect_init(&fnu->rect_armor[i], 
+            x+20+500+20+30*2, y+20+60*i +30, 150, 50);
     }
     for (int i=0; i<8; i++) {
-        fnu->rect_augs[i] = { x+20+500+20+160+30*2, y+20+60*i +30, 150, 50 };
+        SDL_Rect_init(&fnu->rect_augs[i],
+            x+20+500+20+160+30*2, y+20+60*i +30, 150, 50);
     }
     
-    fnu->rect_stats = { x+w-20-200, y+20, 200, h-70 };
+    SDL_Rect_init(&fnu->rect_stats, x+w-20-200, y+20, 200, h-70 );
     
     int width = get_text_width("save", t);
     button bdone = { "save", 4, { x+w-4*2-width-20, y+h-4*2-11-20 } };
@@ -59,7 +67,7 @@ void init_form_new_unit (graphic_settings *gs, form_new_unit *fnu, txtd *t) {
 
 void init_overlay_game (graphic_settings *gs, overlay_game *og, txtd *t) {
     int w = 250, h = gs->resy-20;
-    og->rect_templates = { 10, gs->resy-10-h, w, h };
+    SDL_Rect_init(&og->rect_templates, 10, gs->resy-10-h, w, h);
     
     float wnu = get_text_width("new template", t);
     button b = { "new template", 4, { w-wnu-4*2+5, 10+5 } };
@@ -70,7 +78,8 @@ void init_overlay_game (graphic_settings *gs, overlay_game *og, txtd *t) {
     og->save_templates = b2;
     
     int warmy = 250, harmy = gs->resy-20;
-    og->rect_army = { gs->resx-warmy-10, gs->resy-harmy-10, warmy, harmy };
+    SDL_Rect_init(&og->rect_army, 
+        gs->resx-warmy-10, gs->resy-harmy-10, warmy, harmy);
     button b3 = { "save army", 4, { gs->resx-warmy-5, gs->resy-20-4*2-5 } };
     og->save_army = b3;
     
@@ -89,7 +98,7 @@ void init_overlay_game (graphic_settings *gs, overlay_game *og, txtd *t) {
     }
     
     int wbattle = 400, hbattle = 100;
-    og->rect_battle = { gs->resx/2-wbattle/2, 10, wbattle, hbattle };
+    SDL_Rect_init(&og->rect_battle, gs->resx/2-wbattle/2, 10, wbattle, hbattle);
     
     float wsb = get_text_width("start battle", t);
     button b1 = { "start battle", 4, 
diff --git a/hud/hud.h b/hud/hud.h
index 1901620..e767c4b 100644
--- a/hud/hud.h
+++ b/hud/hud.h
@@ -1,18 +1,19 @@
 #ifndef HUD_H
 #define HUD_H
 
-#include <SDL.h>
-#include <SDL_mixer.h>
 
-#include <render_text.h>
-#include <button.h>
-#include <graphicsettings.h>
-#include <mkb.h>
-#include <info.h>
-#include <units.h>
-#include <map.h>
-#include <gst.h>
-#include <net.h>
+#include <SDL2/SDL.h> 
+#include <SDL2/SDL_mixer.h> 
+
+#include "../render/render_text.h"
+#include "../render/button.h"
+#include "../render/graphicsettings.h"
+#include "../mkb/mkb.h"
+#include "../gst/info.h"
+#include "../gst/units.h"
+#include "../gst/map.h"
+#include "../gst/gst.h"
+#include "../net/net.h"
 
 typedef struct {
     float start;
diff --git a/hud/hud_views.c b/hud/hud_views.c
index 2d3a9fd..b2192b3 100644
--- a/hud/hud_views.c
+++ b/hud/hud_views.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <math.h>
 
-#include <hud_views.h>
+#include "hud_views.h"
 
 #define LABEL(x, y, s, d) {\
     float p[2]={x,y};\
diff --git a/hud/hud_views.h b/hud/hud_views.h
index 747c348..e177e09 100644
--- a/hud/hud_views.h
+++ b/hud/hud_views.h
@@ -1,15 +1,15 @@
 #ifndef HUD_VIEWS_H
 #define HUD_VIEWS_H
 
-#include <SDL.h>
-
-#include <render_text.h>
-#include <button.h>
-#include <graphicsettings.h>
-#include <mkb.h>
-#include <info.h>
-#include <units.h>
-#include <hud.h>
+#include <SDL2/SDL.h> 
+
+#include "../render/render_text.h"
+#include "../render/button.h"
+#include "../render/graphicsettings.h"
+#include "../mkb/mkb.h"
+#include "../gst/info.h"
+#include "../gst/units.h"
+#include "hud.h"
 
 void render_view_stats (SDL_Renderer* rend, txtd *t, int px, int py, 
     infos *info, info_unit *tm);