commented things

TrustFall/TrustFall.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrustFall", "TrustFall\TrustFall.vcxproj", "{C6900ECF-254F-4751-A968-DDA699CCD5A6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Debug|x64.ActiveCfg = Debug|x64
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Debug|x64.Build.0 = Debug|x64
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Debug|x86.ActiveCfg = Debug|Win32
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Debug|x86.Build.0 = Debug|Win32
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Release|x64.ActiveCfg = Release|x64
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Release|x64.Build.0 = Release|x64
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Release|x86.ActiveCfg = Release|Win32
+		{C6900ECF-254F-4751-A968-DDA699CCD5A6}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {33B495B4-3A19-4588-AA7F-6E664C8E0C19}
+	EndGlobalSection
+EndGlobal

TrustFall/TrustFall/TrustFall.vcxproj

@@ -106,6 +106,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -148,6 +149,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="chaos_screen.cpp" />
     <ClCompile Include="cursor.cpp" />
     <ClCompile Include="game.cpp" />
     <ClCompile Include="game_screen.cpp" />
@@ -157,6 +159,7 @@
     <ClCompile Include="start_screen.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="chaos_screen.h" />
     <ClInclude Include="cursor.h" />
     <ClInclude Include="enums.h" />
     <ClInclude Include="game.h" />
@@ -170,6 +173,8 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\AllegroDeps.1.7.0.0\build\native\AllegroDeps.targets" Condition="Exists('..\packages\AllegroDeps.1.7.0.0\build\native\AllegroDeps.targets')" />
     <Import Project="..\packages\Allegro.5.2.4.0\build\native\Allegro.targets" Condition="Exists('..\packages\Allegro.5.2.4.0\build\native\Allegro.targets')" />
+    <Import Project="..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets" Condition="Exists('..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets')" />
+    <Import Project="..\packages\pthreads.2.9.1.4\build\native\pthreads.targets" Condition="Exists('..\packages\pthreads.2.9.1.4\build\native\pthreads.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -177,5 +182,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\AllegroDeps.1.7.0.0\build\native\AllegroDeps.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\AllegroDeps.1.7.0.0\build\native\AllegroDeps.targets'))" />
     <Error Condition="!Exists('..\packages\Allegro.5.2.4.0\build\native\Allegro.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Allegro.5.2.4.0\build\native\Allegro.targets'))" />
+    <Error Condition="!Exists('..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\pthreads.redist.2.9.1.4\build\native\pthreads.redist.targets'))" />
+    <Error Condition="!Exists('..\packages\pthreads.2.9.1.4\build\native\pthreads.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\pthreads.2.9.1.4\build\native\pthreads.targets'))" />
   </Target>
 </Project>

TrustFall/TrustFall/TrustFall.vcxproj.filters

@@ -57,6 +57,9 @@
     <ClCompile Include="result_screen.cpp">
       <Filter>Source Files\ScreensImplement</Filter>
     </ClCompile>
+    <ClCompile Include="chaos_screen.cpp">
+      <Filter>Source Files\ScreensImplement</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="cursor.h">
@@ -83,5 +86,8 @@
     <ClInclude Include="result_screen.h">
       <Filter>Header Files\Screens</Filter>
     </ClInclude>
+    <ClInclude Include="chaos_screen.h">
+      <Filter>Header Files\Screens</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

TrustFall/TrustFall/chaos_screen.cpp

@@ -0,0 +1,319 @@
+#define HAVE_STRUCT_TIMESPEC
+#include <pthread.h> //#%#@ VC++ with their bulls*** linker stuff I'm never using Visual Studio for this language again
+#include <allegro5/allegro.h>
+#include <allegro5/allegro_image.h>
+#include <allegro5/allegro_audio.h>
+#include <allegro5/allegro_acodec.h>
+#include <vector>
+#include <string>
+#include <sstream>
+#include <Windows.h>
+#include <map>
+#include <ctime>
+
+#include "chaos_screen.h"
+
+#define FPS 60
+
+using std::vector;
+using std::string;
+using std::ostringstream;
+using std::map;
+using std::pair;
+
+//Separate mutex for the important variables
+pthread_mutex_t go_line_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t game_over_mutex = PTHREAD_MUTEX_INITIALIZER;
+int go_line[3] = { false, false, false }; //Tracking which lines are set to move
+bool game_over = false; //flag for whether thread should exit
+int ticks = 0;
+
+//Thread function
+void* run_line(void *line_arg) {
+	int* line = (int*)line_arg;
+	bool exit_thread = false;
+	while (!exit_thread) {
+		//Figure out how many seconds to wait this time
+		int tenth_secs_wait = rand() % 15 + 1;
+		Sleep(tenth_secs_wait * 100);
+		//Check for gameover
+		while (!pthread_mutex_trylock(&game_over_mutex)) { //Wait for game_over mutex
+		}
+		pthread_mutex_lock(&game_over_mutex);//Lock game over mutex while checking
+		if (game_over) { //If the game is over, kill the thread
+			exit_thread = true;
+		}
+		else {
+			while (!pthread_mutex_trylock(&go_line_mutex)) { //Wait for go_line mutex
+			}
+			pthread_mutex_lock(&go_line_mutex); //lock go_line while working with it
+			go_line[*line] = true; //set line as ready to go
+			pthread_mutex_unlock(&go_line_mutex); //Free go_line
+		}
+		pthread_mutex_unlock(&game_over_mutex); //Free game_over
+	}
+
+	return 0; //valid thread exit code
+}
+
+
+ChaosScreen::ChaosScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples) {
+	sprites = _sprites;
+	samples = _samples;
+	srand(time(NULL)); //Seed random number generator with current time so sequence is unique each run
+}
+
+//Resets game to default values, and uses new given values
+void ChaosScreen::reset(int _lines, int _max_catchers, int _difficulty) {
+	lines.clear();
+	for (int i = 0; i < _lines; i++) {
+		Line new_line(SCREEN_W / 2, SCREEN_H / _lines * i, sprites);
+		lines.push_back(new_line);
+	}
+
+	selected = 0;
+	max_catchers = _max_catchers;
+	catchers = 0;
+	score = 0;
+	difficulty = _difficulty;
+	music = true;
+}
+
+//If a sample needs to be played while it is still being played, it will be stopped first.
+//Admittedly this was a hack solution to the fact that my sound effect samples are too long. 
+//In future projects I will use a better program for sound effect creation that does not have a large minimum length for audio export.
+void play(ALLEGRO_SAMPLE_INSTANCE* x) {
+	if (al_get_sample_instance_playing(x)) {
+		al_stop_sample_instance(x);
+	}
+	al_play_sample_instance(x);
+}
+
+void ChaosScreen::run(ALLEGRO_FONT* font) {
+	//Map that represents difficulty scale
+	map<int, double> difficulty_map;
+	difficulty_map.insert(pair<int, int>(1, 15));
+	difficulty_map.insert(pair<int, int>(2, 12));
+	difficulty_map.insert(pair<int, int>(3, 10));
+	difficulty_map.insert(pair<int, int>(4, 8));
+	difficulty_map.insert(pair<int, int>(5, 5));
+	difficulty_map.insert(pair<int, int>(6, 3));
+	difficulty_map.insert(pair<int, int>(7, 2));
+
+	ALLEGRO_EVENT_QUEUE* event_queue = NULL;
+	event_queue = al_create_event_queue();
+	al_register_event_source(event_queue, al_get_keyboard_event_source());
+
+	ALLEGRO_TIMER* timer = NULL;
+	timer = al_create_timer(0.1); //Universally a "tick" in the context of the game is 1/10 of a second.
+	al_register_event_source(event_queue, al_get_timer_event_source(timer));
+
+	redraw(font);
+	al_flip_display();
+
+	//Create map of sample instances. This is more memory efficient than play samples over and over again individually, 
+	//and allows the anti-overlap functionality implemented above.
+	map<string, ALLEGRO_SAMPLE_INSTANCE*> instances;
+	map<string, ALLEGRO_SAMPLE*>::iterator it;
+	for (it = samples.begin(); it != samples.end(); it++) {
+		instances.insert(pair<string, ALLEGRO_SAMPLE_INSTANCE*>(it->first, al_create_sample_instance(it->second)));
+		al_attach_sample_instance_to_mixer(instances[it->first], al_get_default_mixer());
+	}
+
+	al_set_sample_instance_playmode(instances["Theme"], ALLEGRO_PLAYMODE_LOOP);
+	play(instances["Theme"]);
+
+	pthread_t line_ts[3]; //Create 3 threads to run the 3 lines
+	for (int i = 0; i < 3; i++) {
+		pthread_create(&line_ts[i], NULL, run_line, (void*)i);
+	}
+
+	bool exit_screen = false;
+	bool ctrl = false; //whether ctrl key is currently held
+	bool help = false; //whether help screen is currently displayed
+
+	al_start_timer(timer);
+	while (!exit_screen) {
+		ALLEGRO_EVENT ev;
+		al_wait_for_event(event_queue, &ev);
+		if (ev.type == ALLEGRO_EVENT_TIMER) {
+			for (unsigned int i = 0; i < 3; i++) {
+				if (go_line[i]) { //If this line is set to move
+					int add_to = rand() % 2; //randomly 0 or 1
+					if (add_to) { //If we will add to the line this time, add to it
+						lines.at(i).add_employee();
+					}
+					lines.at(i).move(); //Move this line
+					if (lines.at(i).fall) { //If an employee has fallen, the game is over
+						map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator in_it;
+						for (in_it = instances.begin(); in_it != instances.end(); in_it++) {
+							al_stop_sample_instance(in_it->second);
+						}
+						al_play_sample_instance(instances["Fall"]);
+						exit_screen = true;
+						game_over = true;
+						al_clear_to_color(al_map_rgb(0, 0, 0));
+						redraw(font);
+						al_flip_display();
+						al_rest(2.0);
+					}
+					else if (lines.at(i).caught) { //If an employee is caught, add to the score and then check if difficulty should be adjusted
+						play(instances["Catch"]);
+						catchers--;
+						score++;
+						if ((score == 10 || score == 20 || score == 30 || score == 40 || score == 50 || score == 75 || score == 100) && difficulty < 7) {
+							play(instances["LevelUp"]);
+							difficulty++;
+						}
+					}
+
+					go_line[i] = false;
+				}
+			}
+				
+		}
+		if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
+			switch (ev.keyboard.keycode) {
+			case ALLEGRO_KEY_DOWN:
+				play(instances["Move"]);
+				if (selected < lines.size() - 1) selected++;
+				break;
+			case ALLEGRO_KEY_UP:
+				play(instances["Move"]);
+				if (selected > 0) selected--;
+				break;
+			case ALLEGRO_KEY_SPACE:
+				if (catchers < max_catchers) {
+					if (!lines.at(selected).catchers[2]) {
+						play(instances["Place"]);
+						lines.at(selected).add_catcher();
+						catchers++;
+					}
+				}
+				break;
+			case ALLEGRO_KEY_M:
+				//Toggle music
+				if (ctrl) {
+					if (music) {
+						al_stop_sample_instance(instances["Theme"]);
+					}
+					else {
+						al_play_sample_instance(instances["Theme"]);
+					}
+					music = !music;
+				}
+				break;
+			case ALLEGRO_KEY_H:
+				if (ctrl) {
+					help = true; //help screen is up
+
+					//Draw the help screen
+					al_clear_to_color(al_map_rgb(0, 0, 0));
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Place catchers at the ends of the conveyors");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 30, ALLEGRO_ALIGN_CENTER, "You can place 3 catchers per conveyor");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 40, ALLEGRO_ALIGN_CENTER, "Make sure to keep track of how many catchers you have left");
+
+					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
+					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Up and down - Move cursor");
+
+					al_draw_bitmap(sprites["Spacebar"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 100, NULL);
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Spacebar - ");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 15, ALLEGRO_ALIGN_LEFT, "Place Employee");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 25, ALLEGRO_ALIGN_LEFT, "Select Menu Item");
+
+					al_draw_bitmap(sprites["KeyEsc"], SCREEN_W / 2 + 58, SCREEN_H / 2 + 60, NULL);
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Close menu");
+
+					al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 100, NULL);
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
+					al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
+
+					al_flip_display();
+
+					while (help) { //While the help screen is still down
+						ALLEGRO_EVENT unhelp;
+						al_wait_for_event(event_queue, &unhelp);
+
+						if (unhelp.type == ALLEGRO_EVENT_KEY_DOWN) {
+							if (unhelp.keyboard.keycode == ALLEGRO_KEY_ESCAPE) {
+								help = false; //Take the help screen down
+							}
+						}
+					}
+				}
+				break;
+			case ALLEGRO_KEY_ESCAPE:
+				//Force quit game
+				back();
+				exit_screen = true;
+				game_over = true; //Set flag to ensure the threads exit
+				break;
+			case ALLEGRO_KEY_LCTRL:
+			case ALLEGRO_KEY_RCTRL:
+				ctrl = true; //ctrl is held
+				break;
+			}
+			if (ev.type == ALLEGRO_EVENT_KEY_UP) {
+				if (ev.keyboard.keycode == ALLEGRO_KEY_LCTRL || ev.keyboard.keycode == ALLEGRO_KEY_RCTRL) {
+					ctrl = false; //ctrl is released
+				}
+			}
+			//Global refresh
+			al_clear_to_color(al_map_rgb(0, 0, 0));
+			redraw(font);
+			al_flip_display();
+		}
+	}
+	if (next_state != Exit) { //If the game loop was exited naturally rather than forced by Esc
+		cont();
+	}
+ 
+	//Wait while each thread finishes exiting now that the game is over of natural causes
+	for (int i = 0; i < 3; i++) {
+		pthread_join(line_ts[i], NULL);
+	}
+
+	//Garbage collection
+	al_destroy_event_queue(event_queue);
+	al_destroy_timer(timer);
+	map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator it2;
+	for (it2 = instances.begin(); it2 != instances.end(); it2++) {
+		al_destroy_sample_instance(it2->second);
+	}
+}
+
+//Redraw all elements of the screen
+void ChaosScreen::redraw(ALLEGRO_FONT* font) {
+	al_draw_bitmap(sprites["Mr. Manager"], 80, 0 + (SCREEN_H / lines.size() * selected), NULL); //Draw the manager based on which line is selected
+
+	for (unsigned int i = 0; i < lines.size(); i++) { //Draw each line
+		lines.at(i).draw();
+	}
+
+	//Display score, number of catchers, current difficulty level, and whether the music is on or off
+	ostringstream score_msg;
+	score_msg << "Score:  " << score;
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 0, ALLEGRO_ALIGN_LEFT, score_msg.str().c_str());
+
+	al_draw_bitmap(sprites["Mr. Man"], SCREEN_W - 90, 20, NULL);
+	ostringstream catcher_msg;
+	catcher_msg << " x " << max_catchers - catchers;
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 50, 30, ALLEGRO_ALIGN_LEFT, catcher_msg.str().c_str());
+
+	ostringstream difficulty_msg;
+	difficulty_msg << "Level:  " << difficulty;
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 75, ALLEGRO_ALIGN_LEFT, difficulty_msg.str().c_str());
+
+	string music_img = (music) ? "MusicOn" : "MusicOff";
+	al_draw_bitmap(sprites[music_img], SCREEN_W - 60, 90, NULL);
+}
+
+void ChaosScreen::back() {
+	next_state = Exit;
+}
+
+void ChaosScreen::cont() {
+	next_state = End;
+}

TrustFall/TrustFall/chaos_screen.h

@@ -0,0 +1,27 @@
+#pragma once
+#include <allegro5/allegro.h>
+#include <allegro5/allegro_audio.h>
+#include "line.h"
+#include "screen.h"
+
+//Thread screen for gameplay
+class ChaosScreen : public Screen {
+public:
+	std::map<std::string, ALLEGRO_BITMAP*> sprites;
+	std::map<std::string, ALLEGRO_SAMPLE*> samples;
+	std::vector<Line> lines;
+	unsigned int selected;
+	int max_catchers;
+	int catchers;
+	int score;
+	int difficulty;
+	bool music;
+
+	ChaosScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples);
+
+	void reset(int _lines, int _max_catchers, int _difficulty);
+	void run(ALLEGRO_FONT* font);
+	void redraw(ALLEGRO_FONT* font);
+	void back();
+	void cont();
+};

TrustFall/TrustFall/cursor.cpp

@@ -9,102 +9,102 @@
 using std::string;
 using std::vector;
 
-template<class T>
+template<class T>
-Cursor<T>::Cursor()
+Cursor<T>::Cursor()
-{
+{
-	active = false;
+	active = false;
-}
+}
-
+
-//Give items to the cursor, and set the selected item to be the first
+//Give items to the cursor, and set the selected item to be the first
-template<class T>
+template<class T>
-void Cursor<T>::activate(std::vector<T> _items)
+void Cursor<T>::activate(std::vector<T> _items)
-{
+{
-	items = _items;
+	items = _items;
-	selected = 0;
+	selected = 0;
-	active = true;
+	active = true;
-}
+}
-
+
-//Functionality that was not used for this game, may be used in future projects.
+//Functionality that was not used for this game, may be used in future projects.
-template<class T>
+template<class T>
-void Cursor<T>::deactivate()
+void Cursor<T>::deactivate()
-{
+{
-	active = false;
+	active = false;
-}
+}
-
+
-//Draw the menu options on the screen based on the x and y coordinates for the menu to start at
+//Draw the menu options on the screen based on the x and y coordinates for the menu to start at
-template<class T>
+template<class T>
-void Cursor<T>::draw(float _x_start, float _y_start, float _y_offset, ALLEGRO_FONT* _font) {
+void Cursor<T>::draw(float _x_start, float _y_start, float _y_offset, ALLEGRO_FONT* _font) {
-	vector<string> items_text = get_item_strings();
+	vector<string> items_text = get_item_strings();
-
+
-	x_start = _x_start;
+	x_start = _x_start;
-	y_start = _y_start;
+	y_start = _y_start;
-	y_offset = _y_offset;
+	y_offset = _y_offset;
-	font = _font;
+	font = _font;
-
+
-	for (unsigned int i = 0; i < items_text.size(); i++) {
+	for (unsigned int i = 0; i < items_text.size(); i++) {
-		al_draw_text(font, al_map_rgb(255, 255, 255), x_start, y_start + (y_offset*i), ALLEGRO_ALIGN_LEFT, items_text.at(i).c_str());
+		al_draw_text(font, al_map_rgb(255, 255, 255), x_start, y_start + (y_offset*i), ALLEGRO_ALIGN_LEFT, items_text.at(i).c_str());
-	}
+	}
-
+
-	update_selector();
+	update_selector();
-}
+}
-
+
-//Change the selection of the cursor
+//Change the selection of the cursor
-template<class T>
+template<class T>
-void Cursor<T>::down()
+void Cursor<T>::down()
-{
+{
-	if (selected < items.size() - 1) {
+	if (selected < items.size() - 1) {
-		selected++;
+		selected++;
-		redraw();
+		redraw();
-	}
+	}
-}
+}
-
+
-template<class T>
+template<class T>
-void Cursor<T>::up()
+void Cursor<T>::up()
-{
+{
-	if (selected > 0) {
+	if (selected > 0) {
-		selected--;
+		selected--;
-		redraw();
+		redraw();
-	}
+	}
-}
+}
-
+
-template<class T>
+template<class T>
-T Cursor<T>::get_selected() {
+T Cursor<T>::get_selected() {
-	return items.at(selected);
+	return items.at(selected);
-}
+}
-
+
-//Clear screen before drawing menu
+//Clear screen before drawing menu
-template<class T>
+template<class T>
-void Cursor<T>::redraw()
+void Cursor<T>::redraw()
-{
+{
-	al_clear_to_color(al_map_rgb(0, 0, 0));
+	al_clear_to_color(al_map_rgb(0, 0, 0));
-	draw(x_start, y_start, y_offset, font);
+	draw(x_start, y_start, y_offset, font);
-}
+}
-
+
-//Draw selector to highlight proper selected item
+//Draw selector to highlight proper selected item
-template<class T>
+template<class T>
-void Cursor<T>::update_selector() {
+void Cursor<T>::update_selector() {
-	ALLEGRO_COLOR white = al_map_rgb(255, 255, 255);
+	ALLEGRO_COLOR white = al_map_rgb(255, 255, 255);
-	float offset = y_offset * selected;
+	float offset = y_offset * selected;
-	float x1 = x_start - 5;
+	float x1 = x_start - 5;
-	float y1 = y_start + offset;
+	float y1 = y_start + offset;
-	float x2 = x_start - 5;
+	float x2 = x_start - 5;
-	float y2 = y_start + 5 + offset;
+	float y2 = y_start + 5 + offset;
-	float x3 = x_start - 1;
+	float x3 = x_start - 1;
-	float y3 = y_start + 2.5 + offset;
+	float y3 = y_start + 2.5 + offset;
-
+
-	al_draw_filled_triangle(x1, y1, x2, y2, x3, y3, white);
+	al_draw_filled_triangle(x1, y1, x2, y2, x3, y3, white);
-}
+}
-
+
-//Define how the template will function when given various types. Only string was needed for this project.
+//Define how the template will function when given various types. Only string was needed for this project.
-template Cursor<string>::Cursor();
+template Cursor<string>::Cursor();
-template void Cursor<string>::activate(std::vector<string> _options);
+template void Cursor<string>::activate(std::vector<string> _options);
-template void Cursor<string>::deactivate();
+template void Cursor<string>::deactivate();
-template void Cursor<string>::draw(float x_start, float y_start, float _y_offset, ALLEGRO_FONT* font);
+template void Cursor<string>::draw(float x_start, float y_start, float _y_offset, ALLEGRO_FONT* font);
-template void Cursor<string>::redraw();
+template void Cursor<string>::redraw();
-template void Cursor<string>::up();
+template void Cursor<string>::up();
-template void Cursor<string>::down();
+template void Cursor<string>::down();
-template string Cursor<string>::get_selected();
+template string Cursor<string>::get_selected();
-template void Cursor<string>::update_selector();
+template void Cursor<string>::update_selector();
-vector<string> Cursor<string>::get_item_strings() {
+vector<string> Cursor<string>::get_item_strings() {
-	return items;
+	return items;
-}
+}

TrustFall/TrustFall/enums.h

@@ -10,6 +10,7 @@ enum State {
 	Medium,
 	Hard,
 	EXTREME,
+	Chaos,
 	Help,
 	End,
 	Exit

TrustFall/TrustFall/game.cpp

@@ -2,6 +2,7 @@
 #include "start_screen.h"
 #include "game_screen.h"
 #include "result_screen.h"
+#include "chaos_screen.h"
 
 using std::string;
 using std::map;
@@ -11,41 +12,41 @@ Game::Game() {
 }
 
 //Load all global data for the game: sprites, audio, and font.
-void Game::init() {
+void Game::init() {
 	score = 0;
-	state = Start;
+	state = Start;
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Title", al_load_bitmap("logo.bmp")));
+	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. Man", al_load_bitmap("MrMan.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. Manager", al_load_bitmap("BigMrManager.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. Manager", al_load_bitmap("BigMrManager.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. ManagerSad", al_load_bitmap("mrmanagersad.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. ManagerSad", al_load_bitmap("mrmanagersad.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. ManagerHappy", al_load_bitmap("mrmanagerhappy.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Mr. ManagerHappy", al_load_bitmap("mrmanagerhappy.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyUp", al_load_bitmap("small_key_up.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*>("Spacebar", al_load_bitmap("spacebar.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Employee", al_load_bitmap("employee.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*>("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*>("EmployeeSad", al_load_bitmap("employee_sad.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Conveyor", al_load_bitmap("conveyor.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("Conveyor", al_load_bitmap("conveyor.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyCtrl", al_load_bitmap("small_key_ctrl.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyCtrl", al_load_bitmap("small_key_ctrl.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyH", al_load_bitmap("small_key_h.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyH", al_load_bitmap("small_key_h.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyM", al_load_bitmap("small_key_m.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyM", al_load_bitmap("small_key_m.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyEsc", al_load_bitmap("small_key_esc.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("KeyEsc", al_load_bitmap("small_key_esc.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("MusicOn", al_load_bitmap("music_on.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("MusicOn", al_load_bitmap("music_on.bmp")));
-	sprites.insert(pair<string, ALLEGRO_BITMAP*>("MusicOff", al_load_bitmap("music_off.bmp")));
+	sprites.insert(pair<string, ALLEGRO_BITMAP*>("MusicOff", al_load_bitmap("music_off.bmp")));
-	
+	
-	al_reserve_samples(4);
+	al_reserve_samples(4);
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Theme", al_load_sample("rasputin.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Theme", al_load_sample("rasputin.wav")));
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Move", al_load_sample("move.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Move", al_load_sample("move.wav")));
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Catch", al_load_sample("catch.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Catch", al_load_sample("catch.wav")));
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Fall", al_load_sample("fall.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Fall", al_load_sample("fall.wav")));
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Place", al_load_sample("place.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("Place", al_load_sample("place.wav")));
-	samples.insert(pair<string, ALLEGRO_SAMPLE*>("LevelUp", al_load_sample("level.wav")));
+	samples.insert(pair<string, ALLEGRO_SAMPLE*>("LevelUp", al_load_sample("level.wav")));
-
+
-	font = al_create_builtin_font();
+	font = al_create_builtin_font();
-}
+}
-
+
-//Was not used in this project
+//Was not used in this project
-void Game::reset() {
+void Game::reset() {
-}
+}
 
 //Run the game state machine
 void Game::run() {
@@ -53,6 +54,7 @@ void Game::run() {
 	GameScreen game_screen(sprites, samples);
 	StartScreen start_screen(sprites);
 	ResultScreen result_screen(sprites, 0, 0, Easy);
+	ChaosScreen chaos_screen(sprites, samples);
 	int difficulty = 1; //Difficulty to run
 	bool EXTREME_ON = false; //Flag for EXTREME easter egg
 	while (state != Exit) {
@@ -93,6 +95,10 @@ void Game::run() {
 			game_screen.run(font);
 			state = game_screen.next_state;
 			break;
+		case Chaos:
+			chaos_screen.reset(3, 5, difficulty);
+			chaos_screen.run(font);
+			state = chaos_screen.next_state;
 		case End:
 			//Send proper finishing values for this game to the result screen
 			result_screen.score = game_screen.score;
@@ -112,4 +118,4 @@ void Game::run() {
 	for (it2 = samples.begin(); it2 != samples.end(); it2++) {
 		al_destroy_sample(it2->second);
 	}
-}
+}

TrustFall/TrustFall/game.h

@@ -1,9 +1,9 @@
-#pragma once
+#pragma once
-#include <allegro5/allegro.h>
+#include <allegro5/allegro.h>
-#include <allegro5/allegro_font.h>
+#include <allegro5/allegro_font.h>
-#include <allegro5/allegro_image.h>
+#include <allegro5/allegro_image.h>
-#include <allegro5/allegro_primitives.h>
+#include <allegro5/allegro_primitives.h>
-#include <allegro5/allegro_audio.h>
+#include <allegro5/allegro_audio.h>
 #include <allegro5/allegro_acodec.h>
 
 #include <vector>
@@ -33,4 +33,4 @@ public:
 
 private:
 	void reset();
-};
+};

TrustFall/TrustFall/game_screen.cpp

@@ -1,275 +1,276 @@
-#include <allegro5/allegro.h>
+#include <allegro5/allegro.h>
-#include <allegro5/allegro_image.h>
+#include <allegro5/allegro_image.h>
-#include <allegro5/allegro_audio.h>
+#include <allegro5/allegro_audio.h>
-#include <allegro5/allegro_acodec.h>
+#include <allegro5/allegro_acodec.h>
-#include <vector>
+#include <vector>
-#include <string>
+#include <string>
-#include <sstream>
+#include <sstream>
-#include <map>
+#include <map>
-#include <ctime>
+#include <ctime>
-
+
-#include "game_screen.h"
+#include "game_screen.h"
-
+
-#define FPS 60
+#define FPS 60
-
+
-using std::vector;
+using std::vector;
-using std::string;
+using std::string;
-using std::ostringstream;
+using std::ostringstream;
-using std::map;
+using std::map;
-using std::pair;
+using std::pair;
-
+
-GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples) {
+GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples) {
-	sprites = _sprites;
+	sprites = _sprites;
-	samples = _samples;
+	samples = _samples;
-	srand(time(NULL)); //Seed random number generator with current time so sequence is unique each run
+	srand(time(NULL)); //Seed random number generator with current time so sequence is unique each run
-}
+}
-
+
-//Resets game to default values, and uses new given values
+//Resets game to default values, and uses new given values
-void GameScreen::reset(int _lines, int _max_catchers, int _difficulty) {
+void GameScreen::reset(int _lines, int _max_catchers, int _difficulty) {
-	lines.clear();
+	lines.clear();
-	for (int i = 0; i < _lines; i++) {
+	for (int i = 0; i < _lines; i++) {
-		Line new_line(SCREEN_W / 2, SCREEN_H / _lines * i, sprites);
+		Line new_line(SCREEN_W / 2, SCREEN_H / _lines * i, sprites);
-		lines.push_back(new_line);
+		lines.push_back(new_line);
-	}
+	}
-
+
-	selected = 0;
+	selected = 0;
-	max_catchers = _max_catchers;
+	max_catchers = _max_catchers;
-	catchers = 0;
+	catchers = 0;
-	score = 0;
+	score = 0;
-	difficulty = _difficulty;
+	difficulty = _difficulty;
-	music = true;
+	music = true;
-}
+	int x = 0;
-
+}
-//If a sample needs to be played while it is still being played, it will be stopped first.
+
-//Admittedly this was a hack solution to the fact that my sound effect samples are too long. 
+//If a sample needs to be played while it is still being played, it will be stopped first.
-//In future projects I will use a better program for sound effect creation that does not have a large minimum length for audio export.
+//Admittedly this was a hack solution to the fact that my sound effect samples are too long. 
-void play(ALLEGRO_SAMPLE_INSTANCE* x) {
+//In future projects I will use a better program for sound effect creation that does not have a large minimum length for audio export.
-	if (al_get_sample_instance_playing(x)) {
+void play(ALLEGRO_SAMPLE_INSTANCE* x) {
-		al_stop_sample_instance(x);
+	if (al_get_sample_instance_playing(x)) {
-	}
+		al_stop_sample_instance(x);
-	al_play_sample_instance(x);
+	}
-}
+	al_play_sample_instance(x);
-
+}
-void GameScreen::run(ALLEGRO_FONT* font) {
+
-	//Map that represents difficulty scale
+void GameScreen::run(ALLEGRO_FONT* font) {
-	map<int, double> difficulty_map;
+	//Map that represents difficulty scale
-	difficulty_map.insert(pair<int, int>(1, 15));
+	map<int, double> difficulty_map;
-	difficulty_map.insert(pair<int, int>(2, 12));
+	difficulty_map.insert(pair<int, int>(1, 15));
-	difficulty_map.insert(pair<int, int>(3, 10));
+	difficulty_map.insert(pair<int, int>(2, 12));
-	difficulty_map.insert(pair<int, int>(4, 8));
+	difficulty_map.insert(pair<int, int>(3, 10));
-	difficulty_map.insert(pair<int, int>(5, 5));
+	difficulty_map.insert(pair<int, int>(4, 8));
-	difficulty_map.insert(pair<int, int>(6, 3));
+	difficulty_map.insert(pair<int, int>(5, 5));
-	difficulty_map.insert(pair<int, int>(7, 2));
+	difficulty_map.insert(pair<int, int>(6, 3));
-
+	difficulty_map.insert(pair<int, int>(7, 2));
-	ALLEGRO_EVENT_QUEUE* event_queue = NULL;
+
-	event_queue = al_create_event_queue();
+	ALLEGRO_EVENT_QUEUE* event_queue = NULL;
-	al_register_event_source(event_queue, al_get_keyboard_event_source());
+	event_queue = al_create_event_queue();
-	
+	al_register_event_source(event_queue, al_get_keyboard_event_source());
-	ALLEGRO_TIMER* timer = NULL;
+	
-	timer = al_create_timer(0.1); //Universally a "tick" in the context of the game is 1/10 of a second.
+	ALLEGRO_TIMER* timer = NULL;
-	al_register_event_source(event_queue, al_get_timer_event_source(timer));
+	timer = al_create_timer(0.1); //Universally a "tick" in the context of the game is 1/10 of a second.
-	
+	al_register_event_source(event_queue, al_get_timer_event_source(timer));
-	redraw(font);
+	
-	al_flip_display();
+	redraw(font);
-
+	al_flip_display();
-	//Create map of sample instances. This is more memory efficient than play samples over and over again individually, 
+
-	//and allows the anti-overlap functionality implemented above.
+	//Create map of sample instances. This is more memory efficient than play samples over and over again individually, 
-	map<string, ALLEGRO_SAMPLE_INSTANCE*> instances;
+	//and allows the anti-overlap functionality implemented above.
-	map<string, ALLEGRO_SAMPLE*>::iterator it;
+	map<string, ALLEGRO_SAMPLE_INSTANCE*> instances;
-	for (it = samples.begin(); it != samples.end(); it++) {
+	map<string, ALLEGRO_SAMPLE*>::iterator it;
-		instances.insert(pair<string, ALLEGRO_SAMPLE_INSTANCE*>(it->first, al_create_sample_instance(it->second)));
+	for (it = samples.begin(); it != samples.end(); it++) {
-		al_attach_sample_instance_to_mixer(instances[it->first], al_get_default_mixer());
+		instances.insert(pair<string, ALLEGRO_SAMPLE_INSTANCE*>(it->first, al_create_sample_instance(it->second)));
-	}
+		al_attach_sample_instance_to_mixer(instances[it->first], al_get_default_mixer());
-
+	}
-	al_set_sample_instance_playmode(instances["Theme"], ALLEGRO_PLAYMODE_LOOP);
+
-	play(instances["Theme"]);
+	al_set_sample_instance_playmode(instances["Theme"], ALLEGRO_PLAYMODE_LOOP);
-
+	play(instances["Theme"]);
-	int ticks = 0; //Counts the number of ticks, this is used to determine when to move the lines
+
-	bool exit_screen = false;
+	int ticks = 0; //Counts the number of ticks, this is used to determine when to move the lines
-	bool ctrl = false; //whether ctrl key is currently held
+	bool exit_screen = false;
-	bool help = false; //whether help screen is currently displayed
+	bool ctrl = false; //whether ctrl key is currently held
-
+	bool help = false; //whether help screen is currently displayed
-	al_start_timer(timer);
+
-	while (!exit_screen) {
+	al_start_timer(timer);
-		ALLEGRO_EVENT ev;
+	while (!exit_screen) {
-		al_wait_for_event(event_queue, &ev);
+		ALLEGRO_EVENT ev;
-		if (ev.type == ALLEGRO_EVENT_TIMER) {
+		al_wait_for_event(event_queue, &ev);
-			if (ticks == difficulty_map[difficulty]) { //If at the current difficulty level, the lines are due to move
+		if (ev.type == ALLEGRO_EVENT_TIMER) {
-				int add_to = rand() % (lines.size() + 1); //Randomly decide which line to add to, with a 1/lines.size() chance of not adding
+			if (ticks == difficulty_map[difficulty]) { //If at the current difficulty level, the lines are due to move
-				for (unsigned int i = 0; i < lines.size(); i++) {
+				int add_to = rand() % (lines.size() + 1); //Randomly decide which line to add to, with a 1/lines.size() chance of not adding
-					if (i == add_to) {
+				for (unsigned int i = 0; i < lines.size(); i++) {
-						lines.at(i).add_employee();
+					if (i == add_to) {
-					}
+						lines.at(i).add_employee();
-					lines.at(i).move(); //Every line will move regardless of any factors
+					}
-					if (lines.at(i).fall) { //If an employee has fallen, the game is over
+					lines.at(i).move(); //Every line will move regardless of any factors
-						map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator in_it;
+					if (lines.at(i).fall) { //If an employee has fallen, the game is over
-						for (in_it = instances.begin(); in_it != instances.end(); in_it++) {
+						map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator in_it;
-							al_stop_sample_instance(in_it->second);
+						for (in_it = instances.begin(); in_it != instances.end(); in_it++) {
-						}
+							al_stop_sample_instance(in_it->second);
-						al_play_sample_instance(instances["Fall"]);
+						}
-						exit_screen = true;
+						al_play_sample_instance(instances["Fall"]);
-						al_clear_to_color(al_map_rgb(0, 0, 0));
+						exit_screen = true;
-						redraw(font);
+						al_clear_to_color(al_map_rgb(0, 0, 0));
-						al_flip_display();
+						redraw(font);
-						al_rest(2.0);
+						al_flip_display();
-					}
+						al_rest(2.0);
-					else if (lines.at(i).caught) { //If an employee is caught, add to the score and then check if difficulty should be adjusted
+					}
-						play(instances["Catch"]);
+					else if (lines.at(i).caught) { //If an employee is caught, add to the score and then check if difficulty should be adjusted
-						catchers--;
+						play(instances["Catch"]);
-						score++;
+						catchers--;
-						if ((score == 10 || score == 20 || score == 30 || score == 40 || score == 50 || score == 75 || score == 100) && difficulty < 7) {
+						score++;
-							play(instances["LevelUp"]);
+						if ((score == 10 || score == 20 || score == 30 || score == 40 || score == 50 || score == 75 || score == 100) && difficulty < 7) {
-							difficulty++;
+							play(instances["LevelUp"]);
-						}
+							difficulty++;
-					}
+						}
-				}
+					}
-				//Refresh screen
+				}
-				al_clear_to_color(al_map_rgb(0, 0, 0));
+				//Refresh screen
-				redraw(font);
+				al_clear_to_color(al_map_rgb(0, 0, 0));
-				al_flip_display();
+				redraw(font);
-				ticks = 0; //reset ticks
+				al_flip_display();
-			}
+				ticks = 0; //reset ticks
-			else {
+			}
-				//if not time to move, add to ticks
+			else {
-				ticks++;
+				//if not time to move, add to ticks
-			}
+				ticks++;
-		}
+			}
-	    if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
+		}
-			switch (ev.keyboard.keycode) {
+	    if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
-			case ALLEGRO_KEY_DOWN:
+			switch (ev.keyboard.keycode) {
-				play(instances["Move"]);
+			case ALLEGRO_KEY_DOWN:
-				if (selected < lines.size() - 1) selected++;
+				play(instances["Move"]);
-				break;
+				if (selected < lines.size() - 1) selected++;
-			case ALLEGRO_KEY_UP:
+				break;
-				play(instances["Move"]);
+			case ALLEGRO_KEY_UP:
-				if (selected > 0) selected--;
+				play(instances["Move"]);
-				break;
+				if (selected > 0) selected--;
-			case ALLEGRO_KEY_SPACE:
+				break;
-				if (catchers < max_catchers) {
+			case ALLEGRO_KEY_SPACE:
-					if (!lines.at(selected).catchers[2]) {
+				if (catchers < max_catchers) {
-						play(instances["Place"]);
+					if (!lines.at(selected).catchers[2]) {
-						lines.at(selected).add_catcher();
+						play(instances["Place"]);
-						catchers++;
+						lines.at(selected).add_catcher();
-					}
+						catchers++;
-				}
+					}
-				break;
+				}
-			case ALLEGRO_KEY_M:
+				break;
-				//Toggle music
+			case ALLEGRO_KEY_M:
-				if (ctrl) {
+				//Toggle music
-					if (music) {
+				if (ctrl) {
-						al_stop_sample_instance(instances["Theme"]);
+					if (music) {
-					}
+						al_stop_sample_instance(instances["Theme"]);
-					else {
+					}
-						al_play_sample_instance(instances["Theme"]);
+					else {
-					}
+						al_play_sample_instance(instances["Theme"]);
-					music = !music;
+					}
-				}
+					music = !music;
-				break;
+				}
-			case ALLEGRO_KEY_H:
+				break;
-				if (ctrl) {
+			case ALLEGRO_KEY_H:
-					help = true; //help screen is up
+				if (ctrl) {
-
+					help = true; //help screen is up
-					//Draw the help screen
+
-					al_clear_to_color(al_map_rgb(0, 0, 0));
+					//Draw the help screen
+					al_clear_to_color(al_map_rgb(0, 0, 0));
 					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Place catchers at the ends of the conveyors");
 					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 30, ALLEGRO_ALIGN_CENTER, "You can place 3 catchers per conveyor");
 					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 40, ALLEGRO_ALIGN_CENTER, "Make sure to keep track of how many catchers you have left");
 					
-					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
+					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
-					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
+					al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Up and down - Move cursor");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Up and down - Move cursor");
-
+
-					al_draw_bitmap(sprites["Spacebar"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 100, NULL);
+					al_draw_bitmap(sprites["Spacebar"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 100, NULL);
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Spacebar - ");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Spacebar - ");
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 15, ALLEGRO_ALIGN_LEFT, "Place Employee");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 15, ALLEGRO_ALIGN_LEFT, "Place Employee");
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 25, ALLEGRO_ALIGN_LEFT, "Select Menu Item");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 25, ALLEGRO_ALIGN_LEFT, "Select Menu Item");
-										
+										
-					al_draw_bitmap(sprites["KeyEsc"], SCREEN_W / 2 + 58, SCREEN_H / 2 + 60, NULL);
+					al_draw_bitmap(sprites["KeyEsc"], SCREEN_W / 2 + 58, SCREEN_H / 2 + 60, NULL);
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Close menu");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Close menu");
-
+
-					al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 100, NULL);
+					al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 100, NULL);
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
-					al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
+					al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
-					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
+					al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
-
+
-					al_flip_display();
+					al_flip_display();
-
+
-					while (help) { //While the help screen is still down
+					while (help) { //While the help screen is still down
-						ALLEGRO_EVENT unhelp;
+						ALLEGRO_EVENT unhelp;
-						al_wait_for_event(event_queue, &unhelp);
+						al_wait_for_event(event_queue, &unhelp);
-
+
-						if (unhelp.type == ALLEGRO_EVENT_KEY_DOWN) {
+						if (unhelp.type == ALLEGRO_EVENT_KEY_DOWN) {
-							if (unhelp.keyboard.keycode == ALLEGRO_KEY_ESCAPE) {
+							if (unhelp.keyboard.keycode == ALLEGRO_KEY_ESCAPE) {
-								help = false; //Take the help screen down
+								help = false; //Take the help screen down
-							}
+							}
-						}
+						}
-					}
+					}
-				}
+				}
-				break;
+				break;
-			case ALLEGRO_KEY_ESCAPE:
+			case ALLEGRO_KEY_ESCAPE:
-				//Force quit game
+				//Force quit game
-				back(); 
+				back(); 
-				exit_screen = true;
+				exit_screen = true;
-				break;
+				break;
-			case ALLEGRO_KEY_LCTRL:
+			case ALLEGRO_KEY_LCTRL:
-			case ALLEGRO_KEY_RCTRL:
+			case ALLEGRO_KEY_RCTRL:
-				ctrl = true; //ctrl is held
+				ctrl = true; //ctrl is held
-				break;
+				break;
-			}
+			}
-			if (ev.type == ALLEGRO_EVENT_KEY_UP) {
+			if (ev.type == ALLEGRO_EVENT_KEY_UP) {
-				if (ev.keyboard.keycode == ALLEGRO_KEY_LCTRL || ev.keyboard.keycode == ALLEGRO_KEY_RCTRL) {
+				if (ev.keyboard.keycode == ALLEGRO_KEY_LCTRL || ev.keyboard.keycode == ALLEGRO_KEY_RCTRL) {
-					ctrl = false; //ctrl is released
+					ctrl = false; //ctrl is released
-				}
+				}
-			}
+			}
-			//Global refresh
+			//Global refresh
-			al_clear_to_color(al_map_rgb(0, 0, 0));
+			al_clear_to_color(al_map_rgb(0, 0, 0));
-			redraw(font);
+			redraw(font);
-			al_flip_display();
+			al_flip_display();
-		}
+		}
-	}
+	}
-	if (next_state != Exit) { //If the game loop was exited naturally rather than forced by Esc
+	if (next_state != Exit) { //If the game loop was exited naturally rather than forced by Esc
-		cont();
+		cont();
-	}
+	}
-	
+	
-	//Garbage collection
+	//Garbage collection
-	al_destroy_event_queue(event_queue);
+	al_destroy_event_queue(event_queue);
-	al_destroy_timer(timer);
+	al_destroy_timer(timer);
-	map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator it2;
+	map<string, ALLEGRO_SAMPLE_INSTANCE*>::iterator it2;
-	for (it2 = instances.begin(); it2 != instances.end(); it2++) {
+	for (it2 = instances.begin(); it2 != instances.end(); it2++) {
-		al_destroy_sample_instance(it2->second);
+		al_destroy_sample_instance(it2->second);
-	}
+	}
-}
+}
-
+
-//Redraw all elements of the screen
+//Redraw all elements of the screen
-void GameScreen::redraw(ALLEGRO_FONT* font) {
+void GameScreen::redraw(ALLEGRO_FONT* font) {
-	al_draw_bitmap(sprites["Mr. Manager"], 80, 0 + (SCREEN_H / lines.size() * selected), NULL); //Draw the manager based on which line is selected
+	al_draw_bitmap(sprites["Mr. Manager"], 80, 0 + (SCREEN_H / lines.size() * selected), NULL); //Draw the manager based on which line is selected
-
+
-	for (unsigned int i = 0; i < lines.size(); i++) { //Draw each line
+	for (unsigned int i = 0; i < lines.size(); i++) { //Draw each line
-		lines.at(i).draw();
+		lines.at(i).draw();
-	}
+	}
-
+
-	//Display score, number of catchers, current difficulty level, and whether the music is on or off
+	//Display score, number of catchers, current difficulty level, and whether the music is on or off
-	ostringstream score_msg;
+	ostringstream score_msg;
-	score_msg << "Score:  " << score;
+	score_msg << "Score:  " << score;
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 0, ALLEGRO_ALIGN_LEFT, score_msg.str().c_str());
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 0, ALLEGRO_ALIGN_LEFT, score_msg.str().c_str());
-
+
-	al_draw_bitmap(sprites["Mr. Man"], SCREEN_W - 90, 20, NULL);
+	al_draw_bitmap(sprites["Mr. Man"], SCREEN_W - 90, 20, NULL);
-	ostringstream catcher_msg;
+	ostringstream catcher_msg;
-	catcher_msg << " x " << max_catchers - catchers;
+	catcher_msg << " x " << max_catchers - catchers;
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 50, 30, ALLEGRO_ALIGN_LEFT, catcher_msg.str().c_str());
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 50, 30, ALLEGRO_ALIGN_LEFT, catcher_msg.str().c_str());
-
+
-	ostringstream difficulty_msg;
+	ostringstream difficulty_msg;
-	difficulty_msg << "Level:  " << difficulty;
+	difficulty_msg << "Level:  " << difficulty;
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 75, ALLEGRO_ALIGN_LEFT, difficulty_msg.str().c_str());
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W - 90, 75, ALLEGRO_ALIGN_LEFT, difficulty_msg.str().c_str());
-
+
-	string music_img = (music) ? "MusicOn" : "MusicOff";
+	string music_img = (music) ? "MusicOn" : "MusicOff";
-	al_draw_bitmap(sprites[music_img], SCREEN_W - 60, 90, NULL);
+	al_draw_bitmap(sprites[music_img], SCREEN_W - 60, 90, NULL);
-}
+}
-
+
-void GameScreen::back() {
+void GameScreen::back() {
-	next_state = Exit;
+	next_state = Exit;
-}
+}
-
+
-void GameScreen::cont() {
+void GameScreen::cont() {
-	next_state = End;
+	next_state = End;
-}
+}

TrustFall/TrustFall/packages.config

@@ -2,4 +2,6 @@
 <packages>
   <package id="Allegro" version="5.2.4.0" targetFramework="native" />
   <package id="AllegroDeps" version="1.7.0.0" targetFramework="native" />
+  <package id="pthreads" version="2.9.1.4" targetFramework="native" />
+  <package id="pthreads.redist" version="2.9.1.4" targetFramework="native" />
 </packages>

TrustFall/TrustFall/start_screen.cpp

@@ -1,136 +1,147 @@
-#include "start_screen.h"
+#include "start_screen.h"
-
+
-#include <vector>
+#include <vector>
-#include <string>
+#include <string>
-
+
-using std::vector;
+using std::vector;
-using std::string;
+using std::string;
-
+
-StartScreen::StartScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites) {
+StartScreen::StartScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites) {
-	vector<string> menu_options;
+	vector<string> menu_options;
-	menu_options.push_back("Easy"); //Select Difficulty
+	menu_options.push_back("Easy"); //Select Difficulty
-	menu_options.push_back("Medium");
+	menu_options.push_back("Medium");
-	menu_options.push_back("Hard");
+	menu_options.push_back("Hard");
-	menu_options.push_back("Quit"); //Quit game
+	menu_options.push_back("Quit"); //Quit game
-	menu.activate(menu_options);
+	menu.activate(menu_options);
-
+
-	sprites = _sprites;
+	sprites = _sprites;
-}
+}
-
+
-//Run screen
+//Run screen
-void StartScreen::run(ALLEGRO_FONT * font) {
+void StartScreen::run(ALLEGRO_FONT * font) {
-	ALLEGRO_EVENT_QUEUE* event_queue = NULL;
+	ALLEGRO_EVENT_QUEUE* event_queue = NULL;
-	event_queue = al_create_event_queue();
+	event_queue = al_create_event_queue();
-	al_register_event_source(event_queue, al_get_keyboard_event_source());
+	al_register_event_source(event_queue, al_get_keyboard_event_source());
-
+
-	redraw(font);
+	redraw(font);
-	menu.draw(300.0, 400.0, 20.0, font);
+	menu.draw(300.0, 400.0, 20.0, font);
-	al_flip_display();
+	al_flip_display();
-	
+	
-	bool ctrl = false;
+	bool ctrl = false;
-	bool exit_screen = false;
+	bool shift = false;
-	while (!exit_screen) {
+	bool exit_screen = false;
-		ALLEGRO_EVENT ev;
+	while (!exit_screen) {
-		al_wait_for_event(event_queue, &ev);
+		ALLEGRO_EVENT ev;
-
+		al_wait_for_event(event_queue, &ev);
-		if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
+
-			switch (ev.keyboard.keycode) {
+		if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
-			case ALLEGRO_KEY_UP:
+			switch (ev.keyboard.keycode) {
-				//Move cursor up
+			case ALLEGRO_KEY_UP:
-				menu.up();
+				//Move cursor up
-				break;
+				menu.up();
-			case ALLEGRO_KEY_DOWN:
+				break;
-				//Move cursor down
+			case ALLEGRO_KEY_DOWN:
-				menu.down();
+				//Move cursor down
-				break;
+				menu.down();
-			case ALLEGRO_KEY_SPACE:
+				break;
-				if (ctrl) { //If the ctrl key is held regardless of option, they will enter EXTREME easter egg mode
+			case ALLEGRO_KEY_SPACE:
-					next_state = EXTREME;
+				if (ctrl) { //If the ctrl key is held regardless of option, they will enter EXTREME easter egg mode
-				}
+					next_state = EXTREME;
-				else {
+				}
-					cont(); //Otherwise select the menu item
+				else if (shift) {
-				}
+					next_state = Chaos;
-				
+				}
-				exit_screen = true;
+				else {
-				break;
+					cont(); //Otherwise select the menu item
-			case ALLEGRO_KEY_ESCAPE:
+				}
-				//Force quit game
+				
-				back();
+				exit_screen = true;
-				exit_screen = true;
+				break;
-				break;
+			case ALLEGRO_KEY_ESCAPE:
-			case ALLEGRO_KEY_LCTRL:
+				//Force quit game
-			case ALLEGRO_KEY_RCTRL:
+				back();
-				ctrl = true; //ctrl is held down
+				exit_screen = true;
-				break;
+				break;
-			}
+			case ALLEGRO_KEY_LCTRL:
-			redraw(font);
+			case ALLEGRO_KEY_RCTRL:
-			al_flip_display();
+				ctrl = true; //ctrl is held down
-		}
+				break;
-		if (ev.type == ALLEGRO_EVENT_KEY_UP) {
+			case ALLEGRO_KEY_LSHIFT:
-			if (ev.keyboard.keycode == ALLEGRO_KEY_LCTRL || ev.keyboard.keycode == ALLEGRO_KEY_RCTRL) {
+			case ALLEGRO_KEY_RSHIFT:
-				ctrl = false; //ctrl is released
+				shift = true;
-			}
+				break;
-		}
+			}
-	}
+			redraw(font);
-
+			al_flip_display();
-	//Garbage collection
+		}
-	al_destroy_event_queue(event_queue);
+		if (ev.type == ALLEGRO_EVENT_KEY_UP) {
-}
+			if (ev.keyboard.keycode == ALLEGRO_KEY_LCTRL || ev.keyboard.keycode == ALLEGRO_KEY_RCTRL) {
-
+				ctrl = false; //ctrl is released
-void StartScreen::redraw(ALLEGRO_FONT* font) {
+			}
-	al_draw_bitmap(sprites["Title"], SCREEN_W/2 - 240, 20, NULL); //logo
+			if (ev.keyboard.keycode == ALLEGRO_KEY_LSHIFT || ev.keyboard.keycode == ALLEGRO_KEY_RSHIFT) {
-	al_draw_bitmap(sprites["Mr. Manager"], SCREEN_W / 2 - 40, 120, NULL); //manager
+				shift = false;
-	for (int i = 1; i < 7; i++) {
+			}
-		al_draw_bitmap(sprites["Mr. Man"], SCREEN_W / 8 * i + 14, SCREEN_H / 2 - 30, NULL); //army of catchers
+		}
-	}
+	}
-
+
-	//Instructions
+	//Garbage collection
+	al_destroy_event_queue(event_queue);
+}
+
+void StartScreen::redraw(ALLEGRO_FONT* font) {
+	al_draw_bitmap(sprites["Title"], SCREEN_W/2 - 240, 20, NULL); //logo
+	al_draw_bitmap(sprites["Mr. Manager"], SCREEN_W / 2 - 40, 120, NULL); //manager
+	for (int i = 1; i < 7; i++) {
+		al_draw_bitmap(sprites["Mr. Man"], SCREEN_W / 8 * i + 14, SCREEN_H / 2 - 30, NULL); //army of catchers
+	}
+
+	//Instructions
 	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 10, ALLEGRO_ALIGN_CENTER, "Mr. Manager wants to run a teambuilding exercise for his employees.");
 	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Help Mr.Manager place his 5 catchers at the end of his");
 	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 30, ALLEGRO_ALIGN_CENTER, "conveyor belts to make sure no other employees fall off.");
 	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 40, ALLEGRO_ALIGN_CENTER, "Try to catch enough to help the team bond!");
 	
 	//Keys and their associated functions
-	al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
+	al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
-	al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
+	al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Up and down - Move cursor");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Up and down - Move cursor");
-
+
-	al_draw_bitmap(sprites["Spacebar"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 100, NULL);
+	al_draw_bitmap(sprites["Spacebar"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 100, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Spacebar - ");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Spacebar - ");
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 15, ALLEGRO_ALIGN_LEFT, "Place Employee");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 15, ALLEGRO_ALIGN_LEFT, "Place Employee");
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 25, ALLEGRO_ALIGN_LEFT, "Select Menu Item");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 150, SCREEN_H / 1.3 - 25, ALLEGRO_ALIGN_LEFT, "Select Menu Item");
-
+
-	al_draw_bitmap(sprites["KeyEsc"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 140, NULL);
+	al_draw_bitmap(sprites["KeyEsc"], SCREEN_W / 8 + 20, SCREEN_H / 2 + 140, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 2 + 150, ALLEGRO_ALIGN_LEFT, "Exit Game");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 8 + 68, SCREEN_H / 2 + 150, ALLEGRO_ALIGN_LEFT, "Exit Game");
-
+
-	al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 60, NULL);
+	al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 60, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "+");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "+");
-	al_draw_bitmap(sprites["KeyH"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 60, NULL);
+	al_draw_bitmap(sprites["KeyH"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 60, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Help menu");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.5 - 10, ALLEGRO_ALIGN_LEFT, "Help menu");
-
+
-	al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 100, NULL);
+	al_draw_bitmap(sprites["KeyCtrl"], SCREEN_W / 2 + 40, SCREEN_H / 2 + 100, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
-	al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
+	al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
-	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
+	al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
-
+
-	al_draw_text(font, al_map_rgb(255, 255, 255), 0, SCREEN_H - 10, ALLEGRO_ALIGN_LEFT, "Copyright 2019 Braydon Kains");
+	al_draw_text(font, al_map_rgb(255, 255, 255), 0, SCREEN_H - 10, ALLEGRO_ALIGN_LEFT, "Copyright 2019 Braydon Kains");
-}
+}
-
+
-void StartScreen::back() {
+void StartScreen::back() {
-	next_state = Exit;
+	next_state = Exit;
-}
+}
-
+
-void StartScreen::cont() {
+void StartScreen::cont() {
-	if (menu.get_selected() == "Easy") {
+	if (menu.get_selected() == "Easy") {
-		next_state = Easy;
+		next_state = Easy;
-	}
+	}
-	else if (menu.get_selected() == "Medium") {
+	else if (menu.get_selected() == "Medium") {
-		next_state = Medium;
+		next_state = Medium;
-	}
+	}
-	else if (menu.get_selected() == "Hard") {
+	else if (menu.get_selected() == "Hard") {
-		next_state = Hard;
+		next_state = Hard;
-	}
+	}
-	else {
+	else {
-		next_state = Exit;
+		next_state = Exit;
-	}
+	}
-}
+}