src/entities.cpp


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

<<<<<<< HEAD
#include <entities.h>

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;
}

=======
#include <entities.h>

void Entities::spawn(float x, float y){
	loc.x = x;
	loc.y = y;

}

Player::Player(){
	width = 24;
	height = 42;
	speed = 1;
	type = 0;
}

>>>>>>> origin/master
Player::~Player(){}