Working in dialogs and some texture fixing

src/Environment.cpp

@@ -22,6 +22,7 @@ int Environment::width = CONST_DEFAULT_WIDTH;
 int Environment::height = CONST_DEFAULT_HEIGHT;
 float Environment::zoom = DEFAULT_ZOOM;
 
+
 bool Environment::enableLogging = false;
 
 SDL_Window* Environment::window = nullptr;

src/Game.cpp

@@ -506,7 +506,7 @@ namespace ZL
 		LocationSetup uniInteriorParams;
 		uniInteriorParams.gameObjectsJsonPath = "resources/config/gameobjects_uni_interior_x.json";
 		uniInteriorParams.npcsJsonPath = "resources/config/npcs_uni_interior.json";
-		uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_009.json";
+		uniInteriorParams.dialoguesJsonPath = "resources/dialogue/uni_interior_dialogues_010.json";
 
 		uniInteriorParams.navigationJsonPaths = {
 			"resources/navigation/uni_interior4_unlocked_n2.txt", //0
@@ -643,7 +643,7 @@ namespace ZL
 		uniExteriorParams.scriptPath = "resources/start_uni_exterior.lua";
 		uniExteriorParams.playerPosition = Eigen::Vector3f(5, 0, -18.4);
 		uniExteriorParams.npcsJsonPath = "resources/config/npcs_uni_exterior.json";
-		uniExteriorParams.dialoguesJsonPath = "resources/dialogue/uni_exterior_dialogues002.json";
+		uniExteriorParams.dialoguesJsonPath = "resources/dialogue/uni_exterior_dialogues003.json";
 
 
 		gameState.locations["uni_exterior"] = std::make_shared<Location>(renderer, gameState.inventory);
@@ -685,7 +685,6 @@ namespace ZL
 
 		//Exterior set up taxi end
 
-
 	}
 
 
@@ -697,7 +696,7 @@ namespace ZL
 		params_dorm.gameObjectsJsonPath = "resources/config/gameobjects_dorm_new_x.json";
 
 		params_dorm.npcsJsonPath = "resources/config/npcs_dorm.json";
-		params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues003.json";
+		params_dorm.dialoguesJsonPath = "resources/dialogue/dorm_dialogues004.json";
 
 		/*
 		params_dorm.navigationJsonPaths = {

src/items/GameObjectLoader.cpp

@@ -9,6 +9,7 @@
 #include "../Character.h"
 #include <SDL.h>
 
+
 namespace ZL {
 
 	using json = nlohmann::json;