From 1f769cf0e589001adc4a65d621f7968550209799 Mon Sep 17 00:00:00 2001 From: Andy Belle-Isle Date: Thu, 10 Sep 2015 11:50:13 -0400 Subject: a --- include/World.h | 2 -- include/common.h | 13 +++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/World.h b/include/World.h index 212fe38..6da0972 100644 --- a/include/World.h +++ b/include/World.h @@ -3,8 +3,6 @@ #include -#define HLINE (2.0f/ 200 ) - class World { private: struct line_t { diff --git a/include/common.h b/include/common.h index 816de5a..e4de2c5 100644 --- a/include/common.h +++ b/include/common.h @@ -1,6 +1,8 @@ #ifndef COMMON_H #define COMMON_H +typedef struct{float x; float y;}vec2; + ///THIS FILE IS USED FOR VARIABLES THAT WILL BE ACCESED BY MULTIPLE CLASSES/FILES #include @@ -9,18 +11,21 @@ #include #include #include +#include #include -#define SCREEN_WIDTH 640 -#define SCREEN_HEIGHT 480 +#define SCREEN_WIDTH 1280 +#define SCREEN_HEIGHT 720 //#define FULLSCREEN +#define HLINE (2.0f / (SCREEN_WIDTH / 4)) + //SDL VARIABLES extern SDL_Window *window; extern SDL_Surface *renderSurface; extern SDL_GLContext mainGLContext; -//WINODWS VARIABLES +//WINDOW VARIABLES extern bool gameRunning; -#endif // COMMON_H +#endif // COMMON_H \ No newline at end of file -- cgit v1.2.3 From dfb65f04b8579c9c4e24086452474adcae9b87b7 Mon Sep 17 00:00:00 2001 From: Andy Belle-Isle Date: Thu, 10 Sep 2015 11:51:00 -0400 Subject: Stuff --- doc/QuestList.htm | 40 ++++++++++++++++++++++++++++++++++++++++ include/entities.h | 29 +++++++++++++++++++++++++++++ src/entities.cpp | 21 +++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 doc/QuestList.htm create mode 100644 include/entities.h create mode 100644 src/entities.cpp (limited to 'include') diff --git a/doc/QuestList.htm b/doc/QuestList.htm new file mode 100644 index 0000000..a4bf677 --- /dev/null +++ b/doc/QuestList.htm @@ -0,0 +1,40 @@ + + + + Quest + + + +

Quests

Hello there!

In this quest you must find the starting village of ASS

A starting weapon for the class of your choice

+ + diff --git a/include/entities.h b/include/entities.h new file mode 100644 index 0000000..cb10bcf --- /dev/null +++ b/include/entities.h @@ -0,0 +1,29 @@ +#ifndef ENTITIES_H +#define ENTITIES_H + +#include + + +class Entities{ +public: + float width; + float height; + float speed; + int type; + vec2 loc; + vec2 loci; + vec2 vel; + vec2 velg; + + void spawn(float, float); + + +}; + +class Player : public Entities{ +public: + Player(); + ~Player(); +}; + +#endif //ENTITIES_H \ No newline at end of file diff --git a/src/entities.cpp b/src/entities.cpp new file mode 100644 index 0000000..1cf2a32 --- /dev/null +++ b/src/entities.cpp @@ -0,0 +1,21 @@ +#include + +void Entities::spawn(float x, float y){ + loc.x = x; + loc.y = y; + loci.x = loc.x; + loci.y = loc.y; + vel.x = 0; + vel.y = 0; + velg.x = 0; + velg.y = 0; +} + +Player::Player(){ + width = HLINE * 6; + height = HLINE * 16; + speed = 1; + type = 0; +} + +Player::~Player(){} \ No newline at end of file -- cgit v1.2.3