remade the collision system
This commit is contained in:
+8
-8
@@ -9,8 +9,7 @@
|
||||
#define EMPTY 0
|
||||
#define DEFAULT 1
|
||||
#define PLATFORM1 2
|
||||
#define CHECKERED 3
|
||||
#define BASE 4
|
||||
#define BASE 3
|
||||
|
||||
#include <SFML/Graphics/Color.hpp>
|
||||
#include <SFML/System/Vector2.hpp>
|
||||
@@ -42,7 +41,8 @@ struct PlayerData : EntityData
|
||||
|
||||
struct LevelData
|
||||
{
|
||||
std::array<std::array<char, MAX_COLS>, MAX_ROWS> data {};
|
||||
// std::array<std::array<char, MAX_COLS>, MAX_ROWS> data {};
|
||||
const char data[MAX_ROWS][MAX_COLS + 1];
|
||||
};
|
||||
|
||||
struct TimerData
|
||||
@@ -51,10 +51,10 @@ struct TimerData
|
||||
float max_time { 1.f };
|
||||
};
|
||||
|
||||
extern std::vector<ObjectData> object_data;
|
||||
extern std::vector<EntityData> entity_data;
|
||||
extern std::vector<LevelData> level_data;
|
||||
extern std::vector<TimerData> timer_data;
|
||||
extern PlayerData player_data;
|
||||
extern const std::vector<ObjectData> object_data;
|
||||
extern const std::vector<EntityData> entity_data;
|
||||
extern const std::vector<LevelData> level_data;
|
||||
extern const std::vector<TimerData> timer_data;
|
||||
extern const PlayerData player_data;
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user