diff --git a/code/nel/include/nel/3d/seg_remanence.h b/code/nel/include/nel/3d/seg_remanence.h
index deb56399b..8e1d00d22 100644
--- a/code/nel/include/nel/3d/seg_remanence.h
+++ b/code/nel/include/nel/3d/seg_remanence.h
@@ -1,5 +1,18 @@
-
-
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
#ifndef NL_SEG_REMANENCE_H
#define NL_SEG_REMANENCE_H
diff --git a/code/nel/include/nel/misc/win32_util.h b/code/nel/include/nel/misc/win32_util.h
index ce2a3bca4..1d57fd3b9 100644
--- a/code/nel/include/nel/misc/win32_util.h
+++ b/code/nel/include/nel/misc/win32_util.h
@@ -1,3 +1,19 @@
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
#ifndef NL_WIN32_UTIL_H
#define NL_WIN32_UTIL_H
diff --git a/code/nel/include/nel/misc/win_tray.h b/code/nel/include/nel/misc/win_tray.h
index e69de29bb..c002bbed9 100644
--- a/code/nel/include/nel/misc/win_tray.h
+++ b/code/nel/include/nel/misc/win_tray.h
@@ -0,0 +1,15 @@
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
diff --git a/code/nel/include/nel/misc/xml_pack.h b/code/nel/include/nel/misc/xml_pack.h
index 8dffbf85f..96b1b1ff9 100644
--- a/code/nel/include/nel/misc/xml_pack.h
+++ b/code/nel/include/nel/misc/xml_pack.h
@@ -1,3 +1,18 @@
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
#ifndef XML_PACK_H
#define XML_PACK_H
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
index c09f4045a..2024e26e6 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
@@ -1235,8 +1235,9 @@ bool CDriverGL::getModes(std::vector &modes)
GfxMode mode;
mode.Width = (uint16)ms[j]->hdisplay;
mode.Height = (uint16)ms[j]->vdisplay;
- mode.Frequency = 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal);
- nldebug("3D: Mode %d: %dx%d, %d Hz", j, ms[j]->hdisplay,ms[j]->vdisplay, 1000 * ms[j]->dotclock / (ms[j]->htotal * ms[j]->vtotal));
+ const uint16 pixelsCount = ms[j]->htotal * ms[j]->vtotal;
+ mode.Frequency = pixelsCount ? 1000 * ms[j]->dotclock / pixelsCount:0;
+ nldebug("3D: Mode %d: %dx%d, %d Hz", j, mode.Width, mode.Height, mode.Frequency);
modes.push_back (mode);
}
XFree(ms);
@@ -1271,7 +1272,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
mode.Width = (uint16)devmode.dmPelsWidth;
mode.Height = (uint16)devmode.dmPelsHeight;
mode.AntiAlias = _AntiAliasing;
-
+
#elif defined(NL_OS_MAC) && defined(NL_MAC_NATIVE)
NL3D::MAC::getCurrentScreenMode(_win, mode);
@@ -1280,7 +1281,7 @@ bool CDriverGL::getCurrentScreenMode(GfxMode &mode)
/*
TODO this is just a hack to get the ryzom client running on mac os x x11.
the implementation below relies on the vidmode extension which is not
- availeble on mac os x's x11. for that reason the color depth value is
+ available on mac os x's x11. for that reason the color depth value is
hard coded here.
FIXME replace this hack by native cocoa color depth retrieval
*/
diff --git a/code/nel/src/3d/std3d.cpp b/code/nel/src/3d/std3d.cpp
index a1d48d564..af5b3d147 100644
--- a/code/nel/src/3d/std3d.cpp
+++ b/code/nel/src/3d/std3d.cpp
@@ -1,3 +1,18 @@
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
#include "std3d.h"
diff --git a/code/nel/src/3d/std3d.h b/code/nel/src/3d/std3d.h
index a4c626608..7afc496ea 100644
--- a/code/nel/src/3d/std3d.h
+++ b/code/nel/src/3d/std3d.h
@@ -1,3 +1,18 @@
+// NeL - MMORPG Framework
+// Copyright (C) 2010 Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
#include "nel/misc/types_nl.h"
diff --git a/code/nel/tools/misc/bnp_make/main.cpp b/code/nel/tools/misc/bnp_make/main.cpp
index c1fb19a65..d2a64b2c7 100644
--- a/code/nel/tools/misc/bnp_make/main.cpp
+++ b/code/nel/tools/misc/bnp_make/main.cpp
@@ -359,7 +359,7 @@ int main (int nNbArg, char **ppArgs)
gBNPHeader.OffsetFromBeginning = 0;
packSubRecurse();
gBNPHeader.append (gDestBNPFile);
- return 1;
+ return 0;
}
if ((strcmp(ppArgs[1], "/u") == 0) || (strcmp(ppArgs[1], "/U") == 0) ||
@@ -405,7 +405,7 @@ int main (int nNbArg, char **ppArgs)
unpack (dirName);
- return 1;
+ return 0;
}
if ((strcmp(ppArgs[1], "/l") == 0) || (strcmp(ppArgs[1], "/L") == 0) ||
@@ -450,7 +450,7 @@ int main (int nNbArg, char **ppArgs)
for (i = 0; i < gBNPHeader.Files.size(); ++i)
printf ("%s\n", gBNPHeader.Files[i].Name.c_str());
- return 1;
+ return 0;
}
usage ();
diff --git a/code/ryzom/tools/all.sln b/code/ryzom/tools/all.sln
index 7bf63041f..325bfb0b6 100644
--- a/code/ryzom/tools/all.sln
+++ b/code/ryzom/tools/all.sln
@@ -176,6 +176,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icon_search", "leveldesign\
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alias_synchronizer", "leveldesign\alias_synchronizer\alias_synchronizer.vcproj", "{3ECD7F32-6603-45D2-91AB-5FBC278F6DC8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
+ {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C} = {1DDC11C7-AF79-40F3-A6D4-F84BA8644B5C}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "land_export", "leveldesign\world_editor\land_export\land_export.vcproj", "{FECBB892-F33C-4195-AB69-9B708BFBCDEA}"
ProjectSection(ProjectDependencies) = postProject
@@ -214,6 +218,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "georges_convert", "leveldes
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "export", "leveldesign\export\export.vcproj", "{577230FF-399C-4C9D-9495-CEC106326441}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patch_gen", "patch_gen\patch_gen.vcproj", "{E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516}
+ {4B320F68-0B9B-4065-A2ED-AF5D4B163006} = {4B320F68-0B9B-4065-A2ED-AF5D4B163006}
+ {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} = {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -550,6 +561,14 @@ Global
{577230FF-399C-4C9D-9495-CEC106326441}.Release|Win32.Build.0 = Release|Win32
{577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.ActiveCfg = Release|x64
{577230FF-399C-4C9D-9495-CEC106326441}.Release|x64.Build.0 = Release|x64
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|Win32.Build.0 = Debug|Win32
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|x64.ActiveCfg = Debug|x64
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Debug|x64.Build.0 = Debug|x64
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|Win32.ActiveCfg = Release|Win32
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|Win32.Build.0 = Release|Win32
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.ActiveCfg = Release|x64
+ {E6D3EADB-D6E4-42FC-87A3-4A98A6AAA67A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/code/ryzom/tools/patch_gen/patch_gen.vcproj b/code/ryzom/tools/patch_gen/patch_gen.vcproj
new file mode 100644
index 000000000..77649479d
--- /dev/null
+++ b/code/ryzom/tools/patch_gen/patch_gen.vcproj
@@ -0,0 +1,392 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+