Move camera initialization in camera.c

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/camera.c b/camera.c
index 6d91d43fd8e20ea85f5eff4c7d1c4a13fc439b76..3a848c553780f15029b1d41ec0612ea3b388c7d2 100644 (file)
--- a/camera.c
+++ b/camera.c
@@ -1,5 +1,12 @@
 #include "camera.h"
 
+void init_camera(struct camera *cam)
+{
+       cam->pos.x   = cam->pos.y   = 0;
+       cam->speed.x = cam->speed.y = 0;
+       cam->zoom = 1;
+}
+
 void move_camera(struct camera *cam, const double time)
 {
        struct vector tmp;

diff --git a/camera.h b/camera.h
index 641d214ac415330c51133e9494795ae78fe663c7..3b5451f9cdc3a7d46611688818bcac62bd00304e 100644 (file)
--- a/camera.h
+++ b/camera.h
@@ -13,6 +13,7 @@ struct camera {
 /* Camera speed, when key pressed down, pixels per second */
 #define CAM_SPEED 200
 
+void init_camera(struct camera *cam);
 void move_camera(struct camera *cam, const double time);
 
 #endif

diff --git a/main.c b/main.c
index f7574fac30a397178ac6411fed7707573ba7acbf..de6bfb5559827bea97b2750de30d62cd0f71d222 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,9 +33,7 @@ static void loop(SDL_Surface *screen, int num_of_planets)
        int last_framecount = 0;
        double time = 0, last_fps = 0;
 
-       camera.pos.x = camera.pos.y = 0;
-       camera.speed.x = camera.speed.y = 0;
-       camera.zoom = 1;
+       init_camera(&camera);
 
        planet = malloc(sizeof(*planet));
        init_planet(screen, planet);