Merge branch 'develop' into SDL2

Conflicts:
	lib/NetPacks.h
	lib/NetPacksLib.cpp

lib/NetPacks.h

@@ -1542,10 +1542,10 @@ struct CatapultAttack : public CPackForClient //3015
 			h & destinationTile & attackedPart & damageDealt;
 		}
 	};
+
 	DLL_LINKAGE CatapultAttack();
 	DLL_LINKAGE ~CatapultAttack();
 
-
 	DLL_LINKAGE void applyGs(CGameState *gs);
 	void applyCl(CClient *cl);
 	DLL_LINKAGE std::string toString() const override;

lib/NetPacksLib.cpp

@@ -1495,18 +1495,16 @@ DLL_LINKAGE void ObstaclesRemoved::applyGs( CGameState *gs )
 	}
 }
 
+
 DLL_LINKAGE CatapultAttack::CatapultAttack()
 {
 	type = 3015;
 }
 
-
-
 DLL_LINKAGE CatapultAttack::~CatapultAttack()
 {
 }
 
-
 DLL_LINKAGE void CatapultAttack::applyGs( CGameState *gs )
 {
 	if(gs->curB && gs->curB->siege != CGTownInstance::NONE) //if there is a battle and it's a siege