aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/global_objects.c6
-rwxr-xr-xlib/init-multi.c17
-rwxr-xr-xlib/init-multi.h2
3 files changed, 17 insertions, 8 deletions
diff --git a/lib/global_objects.c b/lib/global_objects.c
index fe56c0b..2e3f2fd 100644
--- a/lib/global_objects.c
+++ b/lib/global_objects.c
@@ -63,4 +63,10 @@ float RandomFloat(float min, float max){
return ((max - min) * ((float)rand() / (double)RAND_MAX)) + min;
}
+float constrain(float val, float min, float max){
+ if(val > max) val=max;
+ else if(val < min) val=min;
+ return val;
+}
+
#endif
diff --git a/lib/init-multi.c b/lib/init-multi.c
index 054ef9e..734835c 100755
--- a/lib/init-multi.c
+++ b/lib/init-multi.c
@@ -11,8 +11,8 @@ int main(int argc, char *argv[])
if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
SDL_Log("SDL fails to initialize! %s\n", SDL_GetError());
- int startw=400;
- int starth=400;
+ int startw=600;
+ int starth=600;
SDL_Window *window = SDL_CreateWindow(PROJECT_NAME, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, startw, starth, SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL);
if (!window) {
@@ -23,11 +23,8 @@ int main(int argc, char *argv[])
printf("Failed to create renderer: %s\n", SDL_GetError());
}
-
srand(time(NULL));
- OBJECT obj_storage[obj_n];
-
- init_stuffs(startw,starth,obj_storage);
+ OBJECT_INER obj_storage[obj_n];
STUFFS stuff = {
startw,
@@ -35,10 +32,16 @@ int main(int argc, char *argv[])
false,
0,
0,
+ (OBJECT){},
};
+ init_stuffs(startw,starth,obj_storage,&stuff);
+
+
for (int i = 0; i < obj_n; i++)
- stuff.obj[i] = &obj_storage[i];
+ stuff.obj.objs[i] = &obj_storage[i];
+
+ SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND);
bool quit = false;
SDL_Event e;
diff --git a/lib/init-multi.h b/lib/init-multi.h
index 34376e1..72bb366 100755
--- a/lib/init-multi.h
+++ b/lib/init-multi.h
@@ -10,6 +10,6 @@ typedef struct{
bool mousedown;
int mx;
int my;
- OBJECT *obj[obj_n];
+ OBJECT obj;
} STUFFS;
#endif