diff --git a/mk/windows/vs2017-64/libzetaglest.vcxproj b/mk/windows/vs2017-64/libzetaglest.vcxproj
index 7d5dc0fc5..55bdff8ea 100644
--- a/mk/windows/vs2017-64/libzetaglest.vcxproj
+++ b/mk/windows/vs2017-64/libzetaglest.vcxproj
@@ -409,10 +409,6 @@
CompileAsC
CompileAsC
-
- CompileAsC
- CompileAsC
-
CompileAsC
CompileAsC
@@ -425,7 +421,29 @@
CompileAsC
CompileAsC
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -434,7 +452,10 @@
-
+
+
+
+
diff --git a/source/g3d_viewer/main.cpp b/source/g3d_viewer/main.cpp
index b255569ba..b6383ac06 100644
--- a/source/g3d_viewer/main.cpp
+++ b/source/g3d_viewer/main.cpp
@@ -1,24 +1,21 @@
+// This file is part of ZetaGlest
//
-// g3d_viewer:main.cpp:
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
-//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "main.h"
@@ -370,7 +367,7 @@ namespace Shared {
//menu
menuFile = new wxMenu();
- menuFile->Append(miFileLoad, wxT("&Load G3d model\tCtrl+L"), wxT("Load 3D model"));
+ menuFile->Append(miFileLoad, wxT("&Load G3D model\tCtrl+L"), wxT("Load 3D model"));
menuFile->Append(miFileLoadParticleXML, wxT("Load &Particle XML\tCtrl+P"), wxT("Press ctrl before menu for keeping current particles"));
menuFile->Append(miFileLoadProjectileParticleXML, wxT("Load Pro&jectile Particle XML\tCtrl+J"), wxT("Press ctrl before menu for keeping current projectile particles"));
menuFile->Append(miFileLoadSplashParticleXML, wxT("Load &Splash Particle XML\tCtrl+S"), wxT("Press ctrl before menu for keeping current splash particles"));
diff --git a/source/g3d_viewer/main.h b/source/g3d_viewer/main.h
index 5107c73d5..a04cf9335 100644
--- a/source/g3d_viewer/main.h
+++ b/source/g3d_viewer/main.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of MegaGlest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2011 - by Mark Vejvoda
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _SHADER_G3DVIEWER_MAIN_H_
#define _SHADER_G3DVIEWER_MAIN_H_
diff --git a/source/g3d_viewer/renderer.cpp b/source/g3d_viewer/renderer.cpp
index c66809280..6a4e99634 100644
--- a/source/g3d_viewer/renderer.cpp
+++ b/source/g3d_viewer/renderer.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of MegaGlest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2011 - by Mark Vejvoda
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "renderer.h"
diff --git a/source/g3d_viewer/renderer.h b/source/g3d_viewer/renderer.h
index b770c7ee1..48c77303f 100644
--- a/source/g3d_viewer/renderer.h
+++ b/source/g3d_viewer/renderer.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of MegaGlest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2011 - by Mark Vejvoda
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _SHADER_G3DVIEWER_RENDERER_H_
#define _SHADER_G3DVIEWER_RENDERER_H_
diff --git a/source/glest_game/ai/ai.cpp b/source/glest_game/ai/ai.cpp
index 0bfcb72c5..4b6587509 100644
--- a/source/glest_game/ai/ai.cpp
+++ b/source/glest_game/ai/ai.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "ai.h"
#include "ai_interface.h"
diff --git a/source/glest_game/ai/ai.h b/source/glest_game/ai/ai.h
index a0e891f81..161eec3ed 100644
--- a/source/glest_game/ai/ai.h
+++ b/source/glest_game/ai/ai.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_AI_H_
# define _GLEST_GAME_AI_H_
diff --git a/source/glest_game/ai/ai_interface.cpp b/source/glest_game/ai/ai_interface.cpp
index bc02475ba..7558f49a6 100644
--- a/source/glest_game/ai/ai_interface.cpp
+++ b/source/glest_game/ai/ai_interface.cpp
@@ -1,24 +1,21 @@
+// This file is part of ZetaGlest
//
-// ai_interface.cpp:
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
-//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "ai_interface.h"
diff --git a/source/glest_game/ai/ai_interface.h b/source/glest_game/ai/ai_interface.h
index 4639ed31b..deda909b5 100644
--- a/source/glest_game/ai/ai_interface.h
+++ b/source/glest_game/ai/ai_interface.h
@@ -1,24 +1,21 @@
+// This file is part of ZetaGlest
//
-// ai_interface.h:
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
-//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_AIINTERFACE_H_
# define _GLEST_GAME_AIINTERFACE_H_
diff --git a/source/glest_game/ai/ai_rule.cpp b/source/glest_game/ai/ai_rule.cpp
index 4f4afec8f..cc6ba04d9 100644
--- a/source/glest_game/ai/ai_rule.cpp
+++ b/source/glest_game/ai/ai_rule.cpp
@@ -1,13 +1,22 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
+
#include "ai_rule.h"
#include
diff --git a/source/glest_game/ai/ai_rule.h b/source/glest_game/ai/ai_rule.h
index d96f2ea91..3b0ec922f 100644
--- a/source/glest_game/ai/ai_rule.h
+++ b/source/glest_game/ai/ai_rule.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_AIRULE_H_
# define _GLEST_GAME_AIRULE_H_
diff --git a/source/glest_game/ai/path_finder.cpp b/source/glest_game/ai/path_finder.cpp
index d03016ec7..8aa6f0730 100644
--- a/source/glest_game/ai/path_finder.cpp
+++ b/source/glest_game/ai/path_finder.cpp
@@ -1,12 +1,21 @@
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "path_finder.h"
diff --git a/source/glest_game/ai/path_finder.h b/source/glest_game/ai/path_finder.h
index 4ef765a56..1bc25f0f6 100644
--- a/source/glest_game/ai/path_finder.h
+++ b/source/glest_game/ai/path_finder.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_PATHFINDER_H_
# define _GLEST_GAME_PATHFINDER_H_
diff --git a/source/glest_game/facilities/auto_test.cpp b/source/glest_game/facilities/auto_test.cpp
index 28fdb3a72..c26d56701 100644
--- a/source/glest_game/facilities/auto_test.cpp
+++ b/source/glest_game/facilities/auto_test.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2009 Martio Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "auto_test.h"
diff --git a/source/glest_game/facilities/auto_test.h b/source/glest_game/facilities/auto_test.h
index da6d8c891..37b97754f 100644
--- a/source/glest_game/facilities/auto_test.h
+++ b/source/glest_game/facilities/auto_test.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2009 Martio Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _SHARED_UTIL_AUTO_TEST_H_
#define _SHARED_UTIL_AUTO_TEST_H_
diff --git a/source/glest_game/facilities/components.cpp b/source/glest_game/facilities/components.cpp
index 8ca81a57d..e0540c48b 100644
--- a/source/glest_game/facilities/components.cpp
+++ b/source/glest_game/facilities/components.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "components.h"
diff --git a/source/glest_game/facilities/components.h b/source/glest_game/facilities/components.h
index cd094347f..749abfdfb 100644
--- a/source/glest_game/facilities/components.h
+++ b/source/glest_game/facilities/components.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_GRAPHCOMPONENT_H_
#define _GLEST_GAME_GRAPHCOMPONENT_H_
diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index 74e7349f1..dc97feb7b 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -1,24 +1,21 @@
+// This file is part of ZetaGlest
//
-// game_util.cpp:
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "game_util.h"
diff --git a/source/glest_game/facilities/game_util.h b/source/glest_game/facilities/game_util.h
index c4071ffa8..0a360b93a 100644
--- a/source/glest_game/facilities/game_util.h
+++ b/source/glest_game/facilities/game_util.h
@@ -1,24 +1,21 @@
+// This file is part of ZetaGlest
//
-// game_util.h:
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_GAMEUTIL_H_
# define _GLEST_GAME_GAMEUTIL_H_
diff --git a/source/glest_game/facilities/logger.cpp b/source/glest_game/facilities/logger.cpp
index 87dff7ca1..64e09aaf3 100644
--- a/source/glest_game/facilities/logger.cpp
+++ b/source/glest_game/facilities/logger.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "logger.h"
diff --git a/source/glest_game/facilities/logger.h b/source/glest_game/facilities/logger.h
index cd7940753..c763dda28 100644
--- a/source/glest_game/facilities/logger.h
+++ b/source/glest_game/facilities/logger.h
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _SHARED_UTIL_LOGGER_H_
#define _SHARED_UTIL_LOGGER_H_
diff --git a/source/glest_game/game/chat_manager.cpp b/source/glest_game/game/chat_manager.cpp
index ba401b259..856402482 100644
--- a/source/glest_game/game/chat_manager.cpp
+++ b/source/glest_game/game/chat_manager.cpp
@@ -1,25 +1,21 @@
+// This file is part of ZetaGlest
//
-// chat_manager.cpp: game setup menu as it appears to
-// to the host
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include "chat_manager.h"
diff --git a/source/glest_game/game/chat_manager.h b/source/glest_game/game/chat_manager.h
index 35a2c3c40..3abfaf023 100644
--- a/source/glest_game/game/chat_manager.h
+++ b/source/glest_game/game/chat_manager.h
@@ -1,25 +1,21 @@
+// This file is part of ZetaGlest
//
-// chat_manager.h: game setup menu as it appears to
-// to the host
+// Copyright (C) 2018 The ZetaGlest team
//
-// This file is part of ZetaGlest
+// ZetaGlest is a fork of MegaGlest
//
-// Copyright (C) 2018 The ZetaGlest team
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
//
-// ZetaGlest is a fork of MegaGlest
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#ifndef _GLEST_GAME_CHATMANAGER_H_
# define _GLEST_GAME_CHATMANAGER_H_
diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp
index 4bb5dfa22..51041d7ca 100644
--- a/source/glest_game/game/commander.cpp
+++ b/source/glest_game/game/commander.cpp
@@ -1,13 +1,21 @@
-// ==============================================================
-// This file is part of Glest (www.glest.org)
+// This file is part of ZetaGlest
//
-// Copyright (C) 2001-2008 Martiño Figueroa
+// Copyright (C) 2018 The ZetaGlest team
//
-// You can redistribute this code and/or modify it under
-// the terms of the GNU General Public License as published
-// by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version
-// ==============================================================
+// ZetaGlest is a fork of MegaGlest
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see
#include