From 4ae3a615c23fecaeec4675efdba9e82c2a1b0369 Mon Sep 17 00:00:00 2001
From: Braydon Kains <kainsbraydon@gmail.com>
Date: Thu, 3 Jan 2019 04:31:55 -0500
Subject: [PATCH] Finished Line object and all drawing mechanics for it

---
 TrustFall/TrustFall/BigMrManager.bmp          | Bin 0 -> 19322 bytes
 TrustFall/TrustFall/TrustFall.vcxproj         |   2 +
 TrustFall/TrustFall/TrustFall.vcxproj.filters |   6 ++
 TrustFall/TrustFall/catcher.cpp               |   9 ++
 TrustFall/TrustFall/catcher.h                 |   9 ++
 TrustFall/TrustFall/conveyor.bmp              | Bin 0 -> 52922 bytes
 TrustFall/TrustFall/cursor.cpp                |   3 +-
 TrustFall/TrustFall/employee.bmp              | Bin 0 -> 4922 bytes
 TrustFall/TrustFall/employee.cpp              |  11 +++
 TrustFall/TrustFall/employee.h                |   9 ++
 TrustFall/TrustFall/employee_happy.bmp        | Bin 0 -> 4922 bytes
 TrustFall/TrustFall/employee_sad.bmp          | Bin 0 -> 4922 bytes
 TrustFall/TrustFall/game.cpp                  |  16 +++-
 TrustFall/TrustFall/game_screen.cpp           |   8 +-
 TrustFall/TrustFall/game_screen.h             |   5 +-
 TrustFall/TrustFall/line.cpp                  |  89 ++++++++++++++++++
 TrustFall/TrustFall/line.h                    |  30 ++++++
 TrustFall/TrustFall/start_screen.cpp          |   4 +-
 18 files changed, 193 insertions(+), 8 deletions(-)
 create mode 100644 TrustFall/TrustFall/BigMrManager.bmp
 create mode 100644 TrustFall/TrustFall/catcher.cpp
 create mode 100644 TrustFall/TrustFall/catcher.h
 create mode 100644 TrustFall/TrustFall/conveyor.bmp
 create mode 100644 TrustFall/TrustFall/employee.bmp
 create mode 100644 TrustFall/TrustFall/employee.cpp
 create mode 100644 TrustFall/TrustFall/employee.h
 create mode 100644 TrustFall/TrustFall/employee_happy.bmp
 create mode 100644 TrustFall/TrustFall/employee_sad.bmp
 create mode 100644 TrustFall/TrustFall/line.cpp
 create mode 100644 TrustFall/TrustFall/line.h

diff --git a/TrustFall/TrustFall/BigMrManager.bmp b/TrustFall/TrustFall/BigMrManager.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..f1bbfa8a0da5cdca9593226c0403b36f9e19501d
GIT binary patch
literal 19322
zcmeH_!EPKe3`3{=ir#zgN958&QK0B|^wwK`K3PO9@D>CO*&ff1cN`!ahNdV{+LxcN
zKemsb*W2fx+wZS`zn``*AN+QE|N1R{gV?s0@4x^4$JxK1vqGbLJK2vJb2s{Aao=_e
zW{e`Qc}&sVSgOE?`X@2QcXWT3dGm5|#dmAMKU9LggVZPvY4CSt1O8zborH{QUaO%#
z@bP)sx138~Ilp^Vo=n++%6^>h<#tkba8;bV>_BBd&dkFuoGpV{TgJ7Ml-=BGZI?_&
zYFuCCYbQ~M5sXgd(y4O9Jfl4|#mXBy*UgN+#Rz{*vF^L>JK~$>Jo$Z_9lMO=XV1v_
znM-jfm7kX>Cn~?rnA#<B{EQiOW=*GzR?W*W9r3)0GLuKrl{d4i88z#^ZCB&oM&q^#
zql&Zb<wMUAc&|Czd?Ha>Evw3#Q6-r?W|w>wmDkC;S5n<x<_c}yGtQicxUC}{6my=k
zfB99NgQ36EDBspgeH@eb&nu(X%IkK%FW<K3{ux%^{vBo<)}Aw4>eoDK&;66PIjp?>
zd*cojJAYL=#yMnodS>)aL!UAp=ir>lb2jp|IDA+|XJTrIsUcPknOf|e+k99>XJTrI
zsUcPknOf|e+k99>XJTrIsUcPknOf|e+k99>XJTrIsUcPknOf|e+k99>XJTrIsUcPk
znOf|e+k99>XJTrIsUcPknOf|e+kDDZ(aUMduThoJIDb0q<&){<G?^JP8s|SEZ_HEv
zbn}#}`05-o{0JX<Dt1$;(lO2<!_zaPpIvj!ym7V2KKljT{F+V~S34u`(m8&{j4^XL
zQTcVo)R{z~d5+J_jh-WE=CYY>sOHH1X!qlp>*OteXY^H>xQ_D5IOUP|byK<7oL+fl
zoaZrl-8}5B8Zr)Na<P^j$Kgyz)sS)coOv^wWFn>@AD9f4nJ(wixD@2CkXJ9l4Lsj{
yuaj4kIz}(<l;`1lX6~td)COYap3g^3-qyD#>5TVn+tR998(14y8(15N4ZH(9kdk%)

literal 0
HcmV?d00001

diff --git a/TrustFall/TrustFall/TrustFall.vcxproj b/TrustFall/TrustFall/TrustFall.vcxproj
index fc3ad9b..8209fe7 100644
--- a/TrustFall/TrustFall/TrustFall.vcxproj
+++ b/TrustFall/TrustFall/TrustFall.vcxproj
@@ -131,6 +131,7 @@
   <ItemGroup>
     <ClCompile Include="cursor.cpp" />
     <ClCompile Include="game.cpp" />
+    <ClCompile Include="game_screen.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="start_screen.cpp" />
   </ItemGroup>
@@ -138,6 +139,7 @@
     <ClInclude Include="cursor.h" />
     <ClInclude Include="enums.h" />
     <ClInclude Include="game.h" />
+    <ClInclude Include="game_screen.h" />
     <ClInclude Include="screen.h" />
     <ClInclude Include="start_screen.h" />
   </ItemGroup>
diff --git a/TrustFall/TrustFall/TrustFall.vcxproj.filters b/TrustFall/TrustFall/TrustFall.vcxproj.filters
index b9d8f93..ad87e00 100644
--- a/TrustFall/TrustFall/TrustFall.vcxproj.filters
+++ b/TrustFall/TrustFall/TrustFall.vcxproj.filters
@@ -45,6 +45,9 @@
     <ClCompile Include="start_screen.cpp">
       <Filter>Source Files\ScreensImplement</Filter>
     </ClCompile>
+    <ClCompile Include="game_screen.cpp">
+      <Filter>Source Files\ScreensImplement</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cursor.h">
@@ -62,5 +65,8 @@
     <ClInclude Include="start_screen.h">
       <Filter>Header Files\Screens</Filter>
     </ClInclude>
+    <ClInclude Include="game_screen.h">
+      <Filter>Header Files\Screens</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TrustFall/TrustFall/catcher.cpp b/TrustFall/TrustFall/catcher.cpp
new file mode 100644
index 0000000..3831755
--- /dev/null
+++ b/TrustFall/TrustFall/catcher.cpp
@@ -0,0 +1,9 @@
+#include "catcher.h"
+
+Catcher::Catcher(int _position) {
+	position = _position;
+}
+
+void Catcher::move_up()
+{
+}
diff --git a/TrustFall/TrustFall/catcher.h b/TrustFall/TrustFall/catcher.h
new file mode 100644
index 0000000..0ad20af
--- /dev/null
+++ b/TrustFall/TrustFall/catcher.h
@@ -0,0 +1,9 @@
+#pragma once
+class Catcher {
+public:
+	int position;
+
+	Catcher(int _position);
+
+	void move_up();
+};
\ No newline at end of file
diff --git a/TrustFall/TrustFall/conveyor.bmp b/TrustFall/TrustFall/conveyor.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..43cabfc37f92a3598023122b0e21496b02c14839
GIT binary patch
literal 52922
zcmeH{L5^fa3`84F!Ja*5K(k?mgg6H~b{uUE!3ns_V6{~tS2)u@t<IY2QbtKVZ95}e
z_G@dt{QmXdxA)IK_U~Wz^Pm0vVLv~-{bc{Xz5QzMKmX!C?*;qk%Wr@FeT!Fr|F|lg
z>%QH8=ECvIz5Cl(G_T4I0&_^?7Z^Pli{{l2+PyI~8K(0QrZ3cIs+&B>4gwQG(=v=6
zOm&lo=h}TJnqinu#;?lMr;?7|WCwu}o~j0;2bFa6_FTJ9L^BN2(d-vB>T{t^&$5F+
zVslY|(Sr+hdVa3m$DtX9X&U^xKz*(a_X^oT;2z9%2BQbphI_?x?LG_5Fih{KUdpJ?
zk|&5{2Z2CkDTL93B~K7N*Y1PR48t^xyc$xURohJ`I|$s6tp0}4gH_v2_guSAK{E`~
z+q{k6)TiNmm&y(TN1^j&v3n78v6!B^bvwuo0!N|qWwCn^bg`J8x^+9q4gyD^^JTGn
z5p=Pbp1O5A$PNNWq4Q<2dl7W8n4Y?IJID?KN1^j&v3n78v6!B^bvwuo0!N|qWwCn^
zbg`J8x^+9q4gyD^^JTGn5p=Pbp1O5A$PNNWq4Q<2dl7W8n4Y?IJID?KN1^j&v3n78
zv6!B^bvwuo0!N|qWwCn^bg`J8x^+9q4gyD^^JTGn5p=Pbp1O5A$PNNWq4Q<2dl7W8
zn4Y?IJID?KN1^j&v3n6jEQL%@BJkY^;3mJ@H|mQ-pe7LiM~!iG;ci!gX!Ll+1&!>H
z0I;kC(fDb}=OJ^&mW}gUoYx-~v&>uNy6l-rt_&#+i`i?Hp>kM!uH8mj{P>(E9u7QP
znZ&Xa5Kjv%&=;EG=@sp^&dO&IowWjl9MrF-uLbq1>=`&JuZ7O0UHM%8#V^;lZ-J%=
zX0lnGTFqp$y6hk@Lo}<y=)p`js~2{&EPi5>Y@yefT5S4Qkv$S1GBG_9U4&D|kyTdG
zYfR4s3j)Rpv7;b*^cqvw#|n9K^C*5%d){$YiOXgUy~gxK$zX;2cc=BC%$w#4d2{pF
z?M!<{G^<2bSwpWeJrgVl<f|ikP-alMLf+gwc6(8K-f>om%VrI|#`HzWV1@j5r}d%C
zo8}66bMx5kOnXK&t3*~=L$5JC6D$bit0Q_)W>C38-rPKPdr^DdaahUQ(e6lz(q$b2
z4`e4Gmd==vawePAKds#cUitX^rldtEtp)X~wW<a6tL*f*i0NygvuPJUzN3lbvN0~6
zAS*P*lk7&I;8Q%kB05{=^5Z~E<_jXgzAlJq5z9_+hCoQ;=}<W=zO>yoy8Hl$DPtUs
zLkP2CG<rN!4(qZ<0z*WzVl;kQ@_EQy!Gifo6%lv}0o<eoPZ>a8Dgs0x-lSp?cr*bz
zzhV058Ps0{B7xx%QZecki@>7^(D@D1N6(=CA`l4-kC2K{uUG^gO@PjCm_B+2^*@t<
z9oum6;So}CXjD-IK1jgNEH|O^8>ZQ%iU@q10FI4Xp<V=JQ7Qsk2*i_%4P$*4N4;VZ
z*hPTu4Q;7DOd(bv0vieBWAo;@o+}&2P%9AtfqZFJvDaapifE!h1U3?&Gi#+A$51N~
z0D;yKk{C@Ch`>eybY`t|;}~is0wB;jLK35i0uk6qfX=LyZX83cL;wU@M@V8cQ6K^v
z3DB9f(v4%Nl?Z@9>j+7VCJIDgBLO<IR=RNvwGsgkXdNMm(L{j=Y$QNu)=D>yp;jUQ
z0<9w?F`6h4fsF*{%v$NjG1N)~K%jMmBt{bjBCwGFomng0IEGq@00^{>ki=-BKm;}t
zpfhWw8^=&95deYK5t0~96o|k^0(54rbmJImB?2JOIzkeoi2@PWNPy1FQfr=z!^*}n
z)Jg<EfR4@URGg(~qCf;T5{UPPwy{{m&?^vujRbIVu_uak5G{&DU>5<uI_g%RB3{X*
mR0OsVumj6|aCLQ%jjD*ig9y~8h}Q>wyV{CCCV;D}gZ}}TI`yIe

literal 0
HcmV?d00001

diff --git a/TrustFall/TrustFall/cursor.cpp b/TrustFall/TrustFall/cursor.cpp
index 160d131..e591e93 100644
--- a/TrustFall/TrustFall/cursor.cpp
+++ b/TrustFall/TrustFall/cursor.cpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include "cursor.h"
+#include "line.h"
 
 using std::string;
 using std::vector;
@@ -99,4 +100,4 @@ template string Cursor<string>::get_selected();
 template void Cursor<string>::update_selector();
 vector<string> Cursor<string>::get_item_strings() {
 	return items;
-}
+}
\ No newline at end of file
diff --git a/TrustFall/TrustFall/employee.bmp b/TrustFall/TrustFall/employee.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..f35a8a0d1a6bcb11b57e31a95253273f38d69b5b
GIT binary patch
literal 4922
zcmeH@F%H5o3`GM+fQ6lfi32cpVPfGNY;2s4n}OAWWtkVNlG6nxQd;*p->=GWIc>|h
z9`d}&K7977>_-0Fl(Iigdj#?r&e!|5p8H<M2VaY=z$?z6n{3sF*LYHA<ETJrQ~4Sd
z2=gvG0Tl>sDqo`lVcumYpaP*y<!e+R%)9IaR3Nk|t>vU!+KLNF{T@I#^VrhaV1Cfj
zpT{!@HPWO&1;Qpe9fAsk8fj9X0$~%K4nYM%jWj7xflzhQwM)4amP>70uEs7x7fgPl
z0%20*;;2CAg2_)*AWVu}92E#%F!@<i)Ob=i#pB`9U1&A=`97rIK)->01N{d24gALq
Fya8&QeT4u3

literal 0
HcmV?d00001

diff --git a/TrustFall/TrustFall/employee.cpp b/TrustFall/TrustFall/employee.cpp
new file mode 100644
index 0000000..69382ae
--- /dev/null
+++ b/TrustFall/TrustFall/employee.cpp
@@ -0,0 +1,11 @@
+#include "employee.h"
+
+Employee::Employee(int _line) {
+	position = 6;
+}
+
+void Employee::move() {
+	position -= 1;
+}
+
+
diff --git a/TrustFall/TrustFall/employee.h b/TrustFall/TrustFall/employee.h
new file mode 100644
index 0000000..90337cc
--- /dev/null
+++ b/TrustFall/TrustFall/employee.h
@@ -0,0 +1,9 @@
+#pragma once
+class Employee {
+public:
+	int position;
+	
+	Employee(int _line);
+
+	void move();
+};
\ No newline at end of file
diff --git a/TrustFall/TrustFall/employee_happy.bmp b/TrustFall/TrustFall/employee_happy.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..61daded8f018fcffd9bdd32e8a922a3c8210ba8a
GIT binary patch
literal 4922
zcmeH@F%H5o3`GM+fQ6lfi32cpVPfGNY;2s4n}OAW6(uiLDysv+ky6~}|NV=H%W0d&
z^N{CF?%{J+X*crcCZ+vxx+9RsaK7HZb?@)m7QPlcMy_NUU1zH`yv3byxg8@A<}QDY
z5eWTR`2>tWn7jNnMj-TO<r6RhVeZmel*Q4OU5Kj|AncSa?KS2bE&X`ZAXLj#7#gFc
zLr{ZIEt)H`)+xmGs~9_BE%T7bmF?jYJX@{37=f_%dI&}!#FRo=yrN}-s6>cE3T5$%
zmY>cw{*m3n%^<Yr%<W<X!nu=eeJi5H?P;A|d$@ELI-Q>vve-auAT|&ihz<P12Hx|j
Bm2Ch3

literal 0
HcmV?d00001

diff --git a/TrustFall/TrustFall/employee_sad.bmp b/TrustFall/TrustFall/employee_sad.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..9250ceaefc9e3b2a748d2a6b540b9901fc9b6095
GIT binary patch
literal 4922
zcmeH@F%H5o3`GM+fQ6lfi32cpVPfGNY;2s4n}JopvXU2<)^tIM)Z#w>?;qTq4(rsP
zo4hab?B35JZF+uRrL^6@o*u}nJD#tf`rF^7FMP~)oLtFty1`a$c#Q|+tQ{i|T35Wr
z2!!!0I{_mQT35Wr2!!!0I{_mQT9?$0#%bvg)F4!g7AQlg7A;VQP%X9)Wp-@Wsl`=x
z5tgzD!3czrl+ue42up8-U<ATQO6kQ2gw{KgU~sJ5!O=J^y*z3VsznQwAykVNC_|_g
zTV%@Y(<-wXl?XGVe4-5D553NOr==G_4MMfl{%Kq=m}?`Z)fj<r+WeZU7E$B1Iit8g
ZT)H!zQI~Auwt=>Rwt=>Rwt@fNz!O=AiFp73

literal 0
HcmV?d00001

diff --git a/TrustFall/TrustFall/game.cpp b/TrustFall/TrustFall/game.cpp
index 1c9e89a..368ccc8 100644
--- a/TrustFall/TrustFall/game.cpp
+++ b/TrustFall/TrustFall/game.cpp
@@ -1,5 +1,6 @@
 #include "game.h"
 #include "start_screen.h"
+#include "game_screen.h"
 
 using std::string;
 using std::map;
@@ -13,10 +14,14 @@ void Game::init() {
 	state = Start;
 	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Title", al_load_bitmap("logo.bmp")));
 	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. Man", al_load_bitmap("MrMan.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. Manager", al_load_bitmap("MrManager.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. Manager", al_load_bitmap("BigMrManager.bmp")));
 	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyUp", al_load_bitmap("small_key_up.bmp")));
 	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Spacebar", al_load_bitmap("spacebar.bmp")));
-	
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Employee", al_load_bitmap("employee.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("EmployeeHappy", al_load_bitmap("employee_happy.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("EmployeeSad", al_load_bitmap("employee_sad.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Conveyor", al_load_bitmap("conveyor.bmp")));
+		
 	font = al_create_builtin_font();
 }
 
@@ -26,13 +31,18 @@ void Game::reset() {
 }
 
 void Game::run() {
+	StartScreen start_screen(sprites);
+	GameScreen game_screen(sprites);
 	while (state != Exit) {
 		switch (state) {
 		case Start:
-			StartScreen start_screen(sprites);
 			start_screen.run(font);
 			state = start_screen.next_state;
 			break;
+		case Gameplay:
+			game_screen.run(font);
+			state = game_screen.next_state;
+			break;
 		}
 	}
 }
\ No newline at end of file
diff --git a/TrustFall/TrustFall/game_screen.cpp b/TrustFall/TrustFall/game_screen.cpp
index 59c318e..7ea626b 100644
--- a/TrustFall/TrustFall/game_screen.cpp
+++ b/TrustFall/TrustFall/game_screen.cpp
@@ -6,8 +6,14 @@
 using std::vector;
 using std::string;
 
-GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites) {
+GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, int _lines) {
 	sprites = _sprites;
+
+	for (int i = 0; i < _lines; i++) {
+		Line new_line(SCREEN_W-220, SCREEN_H/_lines * i, sprites);
+	}
+
+	selected = 0;
 }
 
 void GameScreen::run(ALLEGRO_FONT * font) {
diff --git a/TrustFall/TrustFall/game_screen.h b/TrustFall/TrustFall/game_screen.h
index ece3708..984fd21 100644
--- a/TrustFall/TrustFall/game_screen.h
+++ b/TrustFall/TrustFall/game_screen.h
@@ -1,12 +1,15 @@
 #pragma once
+#include "line.h"
 #include "screen.h"
 #include "cursor.h"
 
 class GameScreen : public Screen {
 public:
 	std::map<std::string, ALLEGRO_BITMAP*> sprites;
+	std::vector<Line> lines;
+	int selected;
 
-	GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites);
+	GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, int _lines);
 
 	void run(ALLEGRO_FONT* font);
 	void redraw(ALLEGRO_FONT* font);
diff --git a/TrustFall/TrustFall/line.cpp b/TrustFall/TrustFall/line.cpp
new file mode 100644
index 0000000..ac88528
--- /dev/null
+++ b/TrustFall/TrustFall/line.cpp
@@ -0,0 +1,89 @@
+#include "line.h"
+
+using std::map;
+using std::string;
+
+Line::Line(int _start_x, int _start_y, map<string, ALLEGRO_BITMAP*> _sprites) {
+	start_x = _start_x;
+	start_y = _start_y;
+	
+	sprites = _sprites;
+
+	queued = false;
+	fall = false;
+
+	for (int i = 0; i < 3; i++) {
+		catchers[i] = 0;
+	}
+	for (int i = 0; i < 5; i++) {
+		employees[i] = 0;
+	}
+}
+
+void Line::move() {
+	if (caught) {
+		caught = false;
+		catchers[0] = catchers[1];
+		catchers[1] = catchers[0];
+		catchers[2] = 0;
+	}
+
+	if (employees[0]) {
+		if (catchers[0]) {
+			caught = true;
+		}
+		else {
+			fall = true;
+		}
+	}
+	for (int i = 0; i < 4; i++) {
+		employees[i] = employees[i + 1];
+	}
+	employees[4] = (queued) ? 1 : 0;
+	queued = false;
+}
+
+void Line::add_employee() {
+	queued = true;
+}
+
+void Line::add_catcher() {
+	for (int i = 2; i > -1; i--) {
+		if (!catchers[i]) {
+			catchers[i] = 1;
+			break;
+		}
+	}
+}
+
+void Line::draw() {
+	al_draw_bitmap(sprites["Conveyor"], start_x, start_y, NULL);
+	
+	for (int i = 0; i < 5; i++) {
+		if (employees[i]) {
+			al_draw_bitmap(sprites["Employee"], start_x + (40 * i), start_y, NULL);
+		}
+	}
+
+	for (int i = 2; i > -1; i++) {
+		if (i = 0) {
+			if (caught) {
+				al_draw_bitmap(sprites["EmployeeHappy"], start_x - 40, start_y, NULL);
+				al_draw_bitmap(sprites["MrMan"], start_x - 40, start_y - 40, NULL);
+			}
+			else if (fall) {
+					al_draw_bitmap(sprites["EmployeeSad"], start_x - 40, start_y - 55, ALLEGRO_FLIP_VERTICAL);
+			}
+			else {
+				if (catchers[i]) {
+					al_draw_bitmap(sprites["MrMan"], start_x - 40, start_y - 40, NULL);
+				}
+			}
+		}
+		else {
+			if (catchers[i]) {
+				al_draw_bitmap(sprites["MrMan"], start_x - 40 - (50*(i+1)), start_y - 40, NULL);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/TrustFall/TrustFall/line.h b/TrustFall/TrustFall/line.h
new file mode 100644
index 0000000..ab9c6f0
--- /dev/null
+++ b/TrustFall/TrustFall/line.h
@@ -0,0 +1,30 @@
+#pragma once
+#include <allegro5/allegro.h>
+#include <allegro5/allegro_image.h>
+#include <map>
+#include <string>
+
+#include "catcher.h"
+#include "employee.h"
+
+class Line {
+public:
+	float start_x;
+	float start_y;
+
+	std::map<std::string, ALLEGRO_BITMAP*> sprites;
+
+	int catchers[3];
+	int employees[5];
+
+	bool queued;
+	bool fall;
+	bool caught;
+
+	Line(int _start_x, int _start_y, std::map<std::string, ALLEGRO_BITMAP*> _sprites);
+
+	void move();
+	void draw();
+	void add_employee();
+	void add_catcher();
+};
\ No newline at end of file
diff --git a/TrustFall/TrustFall/start_screen.cpp b/TrustFall/TrustFall/start_screen.cpp
index 9d5f3b7..25709d3 100644
--- a/TrustFall/TrustFall/start_screen.cpp
+++ b/TrustFall/TrustFall/start_screen.cpp
@@ -54,9 +54,9 @@ void StartScreen::run(ALLEGRO_FONT * font) {
 
 void StartScreen::redraw(ALLEGRO_FONT* font) {
 	al_draw_bitmap(sprites["Title"], 0, 20, NULL);
-	al_draw_bitmap(sprites["Mr. Manager"], SCREEN_W / 2 - 24, 150, NULL);
+	al_draw_bitmap(sprites["Mr. Manager"], SCREEN_W / 2 - 40, 120, NULL);
 	for (int i = 1; i < 7; i++) {
-		al_draw_bitmap(sprites["Mr. Man"], SCREEN_W / 8 * i + 14, SCREEN_H / 2 - 40, NULL);
+		al_draw_bitmap(sprites["Mr. Man"], SCREEN_W / 8 * i + 14, SCREEN_H / 2 - 30, NULL);
 	}
 
 	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Mr. Manager wants to run a teambuilding exercise for his employees.");