Game has been restructured in favor of OOP

1 files changed, 30 insertions, 42 deletions

diff --git a/Camera.h b/Camera.h
index cbefc6b..4e9bae9 100644
--- a/Camera.h
+++ b/Camera.h
@@ -1,56 +1,44 @@
-#ifndef __CAM_HEADER__
-#define __CAM_HEADER__
+#ifndef CAMERA_H__
+#define CAMERA_H__
 
 /* *************************************
- * 	Includes
+ *  Includes
  * *************************************/
 
-#include "Global_Inc.h"
-#include "Gfx.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif //__cplusplus
-
+#include <stdint.h>
 
 /* *************************************
- * 	Defines
+ *  Defines
  * *************************************/
 
 /* *************************************
- * 	Structs and enums
+ *  Structs and enums
  * *************************************/
 
-typedef struct t_Camera
-{
-	int16_t X_Offset;
-	int16_t Y_Offset;
-	int8_t X_Speed;
-	int8_t Y_Speed;
-	uint8_t Speed_Timer;
-    bool locked;
-}TYPE_CAMERA;
-
-typedef struct t_sprite TYPE_SPRITE;
-
 /* *************************************
- * 	Global prototypes
+ *  Class definition
  * *************************************/
 
-void                    CameraInit(TYPE_CAMERA* ptrCamera);
-void                    CameraHandler(TYPE_CAMERA* ptrCamera);
-void                    CameraSetLock(TYPE_CAMERA* ptrCamera, bool value);
-void                    CameraApplyCoordinatesToSprite( TYPE_CAMERA* ptrCamera,
-                                                        TYPE_SPRITE* spr,
-                                                        uint16_t x,
-                                                        uint16_t y		);
-TYPE_COLLISION_BLOCK    CameraApplyCoordinatesToCoordinates(	TYPE_CAMERA* ptrCamera,
-                                                                uint16_t x,
-                                                                uint16_t y				);
-
-#ifdef __cplusplus
-}
-#endif //__cplusplus
-
-#endif //__CAM_HEADER__
+class Camera
+{
+    public:
+        Camera(void);
+        void setLock(const bool bLock)
+        {
+            _bLocked = bLock;
+        }
+        void getCoordinates(int16_t* const x, int16_t* const y);
+
+        /* Event handlers. */
+        void onLeftBtnPressed(void);
+
+    private:
+        bool _bLocked;
+        int16_t _xOffset;
+        int16_t _yOffset;
+        int16_t _xSpeed;
+        int16_t _ySpeed;
+        uint8_t _speedTimer;
+};
+
+#endif /* CAMERA_H__ */