Merge

src/Game.cpp

@@ -773,7 +773,6 @@ namespace ZL
 
 			lastTickCount = newTickCount;
 
-			//if (player) player->update(delta);
 			if (player) {
 				player->update(delta);
 				dialogueSystem.update(static_cast<int>(delta), player->position);
@@ -808,18 +807,7 @@ namespace ZL
 
 					targetInteractiveObject = nullptr;
 				}
-
-				//for (auto& npc : npcs) npc->update(delta);
-				//if (player) {
-				//	dialogueSystem.update(static_cast<int>(delta), player->position);
-				//}
 			}
-
-			// Some AI stuff
-			
-
-
-
 		}
 	}
 
@@ -1054,11 +1042,11 @@ namespace ZL
 			if (event.type == SDL_KEYDOWN && event.key.repeat == 0) {
 				switch (event.key.keysym.sym) {
 				case SDLK_f:
-					dialogueSystem.startDialogue("test_line_dialogue");
+					dialogueSystem.startDialogue("test_cutscene_pan_dialogue_silent");
 					break;
 
 				case SDLK_e:
-					dialogueSystem.startDialogue("test_cutscene_dialogue");
+					dialogueSystem.startDialogue("test_cutscene_pan_dialogue");
 					break;
 
 				case SDLK_p: