Network Agents are no longer created on the cosntructor

MartGon · Jul 16, 2018 · 7d26f9c · 7d26f9c
1 parent 0f9163c
commit 7d26f9c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/SDL-Pong/Game.cpp b/SDL-Pong/Game.cpp
@@ -9,16 +9,11 @@ Game::Game()
 {
 }
 
-Game::Game(SDL_Renderer * renderer, GameMode mode)
+Game::Game(SDL_Renderer *renderer, GameMode mode)
 {
 	this->renderer = renderer;
 	this->gameMode = mode;
 	gameState = GAME_RUNNING;
-
-	if (gameMode == ONLINE_SERVER)
-		networkAgent = new NetworkServer();
-	else if(gameMode == ONLINE_CLIENT)
-		networkAgent = new NetworkClient();
 }
 
 Game::~Game()
@@ -69,6 +64,12 @@ void Game::loadMedia()
 	// Set scoreboard
 	player->scoreBoard = scoreBoardOne;
 	playerTwo->scoreBoard = scoreBoardTwo;
+
+	// Creating networkAgents
+	if (gameMode == ONLINE_SERVER)
+		networkAgent = new NetworkServer();
+	else if (gameMode == ONLINE_CLIENT)
+		networkAgent = new NetworkClient();
 }
 
 void Game::startNewGame()
@@ -176,33 +177,25 @@ void Game::handlePlayersMovement()
 	if (gameMode != ONLINE_CLIENT)
 	{
 		if (currentKeyStates[SDL_SCANCODE_W])
-		{
 			player->move(player->MOVE_UP);
-		}
-		if (currentKeyStates[SDL_SCANCODE_S])
-		{
+		else if (currentKeyStates[SDL_SCANCODE_S])
 			player->move(player->MOVE_DOWN);
-		}
 	}
 	// If Online client
 	else
 	{
 		if (currentKeyStates[SDL_SCANCODE_W])
-		{
 			playerTwo->move(player->MOVE_UP);
-		}
-		if (currentKeyStates[SDL_SCANCODE_S])
-		{
+		else if (currentKeyStates[SDL_SCANCODE_S])
 			playerTwo->move(player->MOVE_DOWN);
-		}
 	}
 
 	switch (gameMode)
 	{
 	case TWO_PLAYERS:
 		if (currentKeyStates[SDL_SCANCODE_UP])
 			playerTwo->move(player->MOVE_UP);
-		if (currentKeyStates[SDL_SCANCODE_DOWN])
+		else if (currentKeyStates[SDL_SCANCODE_DOWN])
 			playerTwo->move(player->MOVE_DOWN);
 		break;
 	case ONLINE_CLIENT:
@@ -312,6 +305,13 @@ void Game::sendClientData()
 
 void Game::handlePacket(PongPacket* packet)
 {
+	if (!packet)
+	{
+		std::cout << "Se perdió la conexión con el otro jugador\n";
+		loadMainMenu();
+		return;
+	}
+
 	switch (packet->packetType)
 	{
 	case PongPacket::PACKET_BALL_POSITION:
@@ -331,5 +331,8 @@ void Game::handlePacket(PongPacket* packet)
 
 void Game::destroy()
 {
+	if (isOnline())
+		networkAgent->destroy();
+
 	Scene::destroy();
 }
diff --git a/SDL-Pong/NetworkAgent.cpp b/SDL-Pong/NetworkAgent.cpp
@@ -1,7 +1,7 @@
 #include "NetworkAgent.h"
 
 // Attributes
-//bool NetworkAgent::networkEnabled = false;
+
 
 // Constructors
 
@@ -25,7 +25,6 @@ void NetworkAgent::initNetworking()
 		return;
 	}
 
-	//networkEnabled = true;
 }
 
 bool NetworkAgent::readConfigFile()
@@ -101,7 +100,6 @@ void NetworkAgent::destroy()
 
 	// Reset flag
 	printf("Destroying network agent\n");
-	//networkEnabled = false;
 
 	// Calling SDL
 	SDLNet_Quit();
@@ -112,5 +110,5 @@ void NetworkAgent::destroy()
 
 void NetworkAgent::beforeDestroy()
 {
-	printf("Parent method");
+	printf("Parent method\n");
 }
diff --git a/SDL-Pong/NetworkAgent.h b/SDL-Pong/NetworkAgent.h
@@ -13,7 +13,6 @@ class NetworkAgent
 
 	// Methods
 		// Initializing
-	//static bool networkEnabled;
 	static void initNetworking();
 
 		// Configuration