Changed: #825 Remove all warning when compiling Ryzom

code/nel/tools/misc/branch_patcher/branch_patcher.cpp

@@ -52,15 +52,9 @@ BOOL CBranch_patcherApp::InitInstance()
 {
 	// Standard initialization
 
-#ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
-#else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
-#endif
-
 	CBranch_patcherDlg dlg;
 	m_pMainWnd = &dlg;
-	int nResponse = dlg.DoModal();
+	INT_PTR nResponse = dlg.DoModal();
 	if (nResponse == IDOK)
 	{
 	}

code/nel/tools/misc/data_mirror/data_mirror.cpp

@@ -191,7 +191,7 @@ BOOL CData_mirrorApp::InitInstance()
 			while (fgets (line, 512, file))
 			{
 				// Remove last back
-				int n = strlen (line);
+				int n = (int)strlen (line);
 				if (n && (line[n-1] == '\n'))
 					line[n-1] = 0;
 				IgnoreFiles.insert (line);
@@ -203,15 +203,9 @@ BOOL CData_mirrorApp::InitInstance()
 		MessageBox (NULL, e.what (), "NeL Data Mirror", MB_OK|MB_ICONEXCLAMATION);
 	}
 
-#ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
-#else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
-#endif
-
 	CData_mirrorDlg dlg;
 	m_pMainWnd = &dlg;
-	int nResponse = dlg.DoModal();
+	INT_PTR nResponse = dlg.DoModal();
 	if (nResponse == IDOK)
 	{
 		// TODO: Place code here to handle when the dialog is
@@ -241,11 +235,11 @@ bool RegisterDirectoryAppCommand (const char *appName, const char *command, cons
 		if (RegCreateKey (hKey, tmp, &hKey) == ERROR_SUCCESS)
 		{
 			// Set the description
-			RegSetValue (hKey, "", REG_SZ, command, strlen (command));
+			RegSetValue (hKey, "", REG_SZ, command, (DWORD)strlen (command));
 			if (RegCreateKey (hKey, "command", &hKey) == ERROR_SUCCESS)
 			{
 				// Set the description
-				RegSetValue (hKey, "", REG_SZ, app, strlen (app));
+				RegSetValue (hKey, "", REG_SZ, app, (DWORD)strlen (app));
 				return true;
 			}
 		}

code/nel/tools/misc/data_mirror/data_mirrorDlg.cpp

@@ -432,7 +432,7 @@ void CData_mirrorDlg::OnOK()
 	progress.ShowWindow (SW_SHOW);
 	progress.progress (0);
 
-	const uint totalCount = FilesToUpdate[Modified].size () + FilesToUpdate[Added].size () + FilesToUpdate[Removed].size ();
+	uint totalCount = (uint)FilesToUpdate[Modified].size () + (uint)FilesToUpdate[Added].size () + (uint)FilesToUpdate[Removed].size ();
 	uint currentFile = 0;
 
 	// System time
@@ -443,7 +443,7 @@ void CData_mirrorDlg::OnOK()
 
 	// Update files
 	std::vector<string> &modifiedList = FilesToUpdate[Modified];
-	uint count = modifiedList.size ();
+	uint count = (uint)modifiedList.size ();
 	uint i;
 	for (i=0; i<count; i++)
 	{
@@ -479,7 +479,7 @@ void CData_mirrorDlg::OnOK()
 	}
 
 	std::vector<string> &addedList = FilesToUpdate[Added];
-	count = addedList.size ();
+	count = (uint)addedList.size ();
 	for (i=0; i<count; i++)
 	{
 		// Copy it
@@ -514,7 +514,7 @@ void CData_mirrorDlg::OnOK()
 	}
 
 	std::vector<string> &removedList = FilesToUpdate[Removed];
-	count = removedList.size ();
+	count = (uint)removedList.size ();
 	for (i=0; i<count; i++)
 	{
 		// Copy it
@@ -608,7 +608,7 @@ void CData_mirrorDlg::buildSourceFiles ()
 	vector<string> fileSource;
 	CPath::getPathContent (MainDirectory+CurrentDir, true, false, true, fileSource);
 	uint i;
-	const uint count = fileSource.size ();
+	uint count = (uint)fileSource.size ();
 	for (i=0; i<count; i++)
 	{
 		// Get the filename
@@ -696,7 +696,7 @@ void CData_mirrorDlg::buildSourceFiles ()
 	// List all files in mirror
 	fileSource.clear ();
 	CPath::getPathContent (MirrorDirectory+CurrentDir, true, false, true, fileSource);
-	const uint count2 = fileSource.size ();
+	uint count2 = (uint)fileSource.size ();
 	for (i=0; i<count2; i++)
 	{
 		// Get the filename

code/nel/tools/misc/extract_filename/extract_filename.cpp

@@ -438,7 +438,7 @@ bool loadConfigFiles (const char *ext, const char *input_files, const char *avai
 
 #define BAR_LENGTH 21
 
-char *progressbar[BAR_LENGTH]=
+const char *progressbar[BAR_LENGTH]=
 {
 	"[                    ]",
 	"[.                   ]",
@@ -474,7 +474,7 @@ void progress (const char *message, float progress)
 	for (i=(uint)strlen(msg); i<79; i++)
 		msg[i]=' ';
 	msg[i]=0;
-	printf (msg);
+	printf ("%s", msg);
 	printf ("\r");
 }
 

code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.cpp

@@ -25,15 +25,13 @@
 // be enabled in the DLL, and vice versa.
 //
 
-#include "stdafx.h"
-
 #define LOG_ANALYSER_PLUGIN_EXPORTS
 #include "extract_warnings.h"
 #include <stdio.h>
 #include <string>
 using namespace std;
 
-#include <nel/misc/mem_displayer.h>
+#include "nel/misc/mem_displayer.h"
 #include "nel/misc/app_context.h"
 
 // Using directly the log report class from nelns

code/nel/tools/misc/log_analyser_plug_ins/extract_warnings/extract_warnings.h

@@ -18,7 +18,7 @@
 #ifndef EXTRACT_WARNINGS_H
 #define EXTRACT_WARNINGS_H
 
-#include <nel/misc/types_nl.h>
+#include "nel/misc/types_nl.h"
 #include <vector>
 #include <string>
 

code/nel/tools/misc/message_box/message_box.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include <windows.h>
 #include <string>
 #include <stdio.h>
 

code/nel/tools/misc/multi_cd_setup_fix/multi_cd_setup_fix.cpp

@@ -14,7 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include <windows.h>
+#include <stdio.h>
 #include "resource.h"
 
 INT_PTR CALLBACK MyDialogProc(
@@ -105,7 +106,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 		RegCreateKey (HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Runonce", &hKey);
 		char batFileReg[1024];
 		sprintf (batFileReg, "\"%s\"", batFile);
-		RegSetValueEx(hKey, "RyzomSetupClean", 0, REG_SZ, (const unsigned char*)batFileReg, strlen (batFileReg)+1);
+		RegSetValueEx(hKey, "RyzomSetupClean", 0, REG_SZ, (const unsigned char*)batFileReg, (DWORD)strlen (batFileReg)+1);
 
 		pump ();
 		// Get the current path

code/nel/tools/misc/words_dic/DicSplashScreen.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "words_dic.h"
 #include "DicSplashScreen.h"
 

code/nel/tools/misc/words_dic/StdAfx.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include "StdAfx.h"
 
 
 

code/nel/tools/misc/words_dic/words_dic.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "words_dic.h"
 #include "words_dicDlg.h"
 #include "nel/misc/app_context.h"
@@ -61,15 +61,10 @@ BOOL CWords_dicApp::InitInstance()
 	//  the specific initialization routines you do not need.
 
 	NLMISC::CApplicationContext myApplicationContext;
-#ifdef _AFXDLL
-	Enable3dControls();			// Call this when using MFC in a shared DLL
-#else
-	Enable3dControlsStatic();	// Call this when linking to MFC statically
-#endif
 
 	CWords_dicDlg dlg;
 	m_pMainWnd = &dlg;
-	int nResponse = dlg.DoModal();
+	INT_PTR nResponse = dlg.DoModal();
 	if (nResponse == IDOK)
 	{
 		// TODO: Place code here to handle when the dialog is

code/nel/tools/misc/words_dic/words_dic.h

@@ -22,7 +22,7 @@
 #endif // _MSC_VER > 1000
 
 #ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
+	#error include 'StdAfx.h' before including this file for PCH
 #endif
 
 #include "resource.h"		// main symbols

code/nel/tools/misc/words_dic/words_dicDlg.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdafx.h"
+#include "StdAfx.h"
 #include "words_dic.h"
 #include "words_dicDlg.h"
 #include "DicSplashScreen.h"
@@ -25,7 +25,7 @@
 static char THIS_FILE[] = __FILE__;
 #endif
 
-#include <nel/misc/words_dictionary.h>
+#include "nel/misc/words_dictionary.h"
 
 using namespace std;
 using namespace NLMISC;

code/ryzom/client/src/interface_v3/chat_window.cpp

@@ -627,7 +627,6 @@ void CChatGroupWindow::displayTellMessage(const ucstring &msg, NLMISC::CRGBA col
 
 	CInterfaceManager::getInstance()->setTopWindow(gcChat);
 
-
 	// add the text to this window
 	CGroupList *gl = dynamic_cast<CGroupList *>(gcChat->getGroup("text_list"));
 	if (gl == NULL)

code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp

@@ -640,7 +640,7 @@ bool CDBGroupListSheetTrade::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup
 	prop= (char*) xmlGetProp( cur, (xmlChar*)"filter_seller_type" );
 	if(prop)
 	{
-		string	lwrFilter= toLower((const char *)prop);
+		string	lwrFilter= toLower(std::string((const char *)prop));
 		if(lwrFilter=="npc")
 			_SellerTypeFilter= NPC;
 		else if(lwrFilter=="resale")

code/ryzom/client/src/interface_v3/group_html.h

@@ -52,7 +52,7 @@ class CGroupHTML : public CGroupScrollText
 {
 public:
 	friend void TextAdd (struct _HText *me, const char * buf, int len);
-	friend void	TextBeginElement (_HText *me, int element_number, const BOOL *present, const char **	value);
+	friend void TextBeginElement (_HText *me, int element_number, const BOOL *present, const char **	value);
 	friend void TextEndElement (_HText *me, int element_number);
 	friend void TextLink (struct _HText *me, int element_number, int attribute_number, struct _HTChildAnchor *anchor, const BOOL *present, const char **value);
 	friend void TextBuild (HText * me, HTextStatus status);

code/ryzom/client/src/net_manager.cpp

@@ -1129,7 +1129,7 @@ static void setupBotChatBotGift(CInterfaceGroup *botChatGroup)
 //-----------------------------------------------
 // impulseBotChatSetInterface :
 //-----------------------------------------------
-/*
+#if 0
 void impulseBotChatSetInterface(NLMISC::CBitMemStream &impulse)
 {
 	// received ADD_DYN_STR
@@ -1174,10 +1174,10 @@ void impulseBotChatSetInterface(NLMISC::CBitMemStream &impulse)
 		inter2->NetworkTextId.Args.push_back(20);
 		inter2->NetworkTextId.Args.push_back(1);
 		inter2->NetworkTextId.Args.push_back(2);
-*/	/*}
+*/	}
 
 	// FOR THE DEMO, find and set a fake news:
-/*	setFakeNews ();
+//	setFakeNews ();
 
 	string interfaceName = getInterfaceNameFromId (botType, interfaceId);
 
@@ -1206,7 +1206,8 @@ void impulseBotChatSetInterface(NLMISC::CBitMemStream &impulse)
 			}
 		}
 	}
-}*/
+}
+#endif
 
 
 
@@ -1824,7 +1825,7 @@ void impulseTeamContactRemove(NLMISC::CBitMemStream &impulse)
 	}
 
 	CGuildManager::getInstance()->init(AllMembers);
-}/*
+}*/
 
 
 //-----------------------------------------------

code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp

@@ -835,7 +835,6 @@ void CGuildManager::createGuildStep2(uint32 guildId, const ucstring &guildName,
 //	stringEId.setType( RYZOMID::guildDescription );
 //	EGSPD::PDSLib.getStringManager().addString( stringEId, pgc.Description );
 
-
 	// create a new guild member
 	CGuildMember * memberCore = guild->newMember( proxy.getId() );
 //	guild->decGradeCount( EGSPD::CGuildGrade::Member );
@@ -858,7 +857,7 @@ void CGuildManager::createGuildStep2(uint32 guildId, const ucstring &guildName,
 	/// end current bot chat
 	proxy.endBotChat();
 	proxy.updateTarget();
-	_ExistingGuildNames.insert( NLMISC::toLower( guild->getName().toString().c_str() ) );
+	_ExistingGuildNames.insert( NLMISC::toLower( guild->getName().toString() ) );
 
 	// ask the client to open it's guild interface
 	PlayerManager.sendImpulseToClient( proxy.getId(),"GUILD:OPEN_GUILD_WINDOW" );
@@ -905,7 +904,7 @@ void CGuildManager::deleteGuild(uint32 id)
 		CStatDB::getInstance()->removeGuild(id);
 	}
 
-	_ExistingGuildNames.erase( NLMISC::toLower( guild->getName().toString().c_str() ) );
+	_ExistingGuildNames.erase( NLMISC::toLower( guild->getName().toString() ) );
 	guild->unregisterGuild();
 
 	if (!guild->isProxy())
@@ -1425,7 +1424,7 @@ void CGuildManager::registerGuildAfterLoading(CGuild *guildToRegister)
 //			_GuildsAwaitingString.insert( make_pair( str, guildToRegister->getId() ) );
 //		}
 
-		_ExistingGuildNames.insert( NLMISC::toLower( guildToRegister->getName().toString().c_str() ) );
+		_ExistingGuildNames.insert( NLMISC::toLower( guildToRegister->getName().toString() ) );
 	}
 }
 

code/ryzom/server/src/server_share/bmp4image.h

@@ -43,7 +43,7 @@ public:
 		for (int j=0;j<H;j++)
 			for (int i=0;i<W;i++)
 			{
-				double pi=atan2(1,0)*2;
+				double pi=atan2(1.0,0.0)*2;
 				double angle=atan2(double(i)-double(W-1)/2,double(j)-double(H-1)/2);
 				double angle01=7.5*angle/pi;
 				if (angle01<0) angle01-=0.5;

code/ryzom/tools/translation_tools/main.cpp

@@ -3146,7 +3146,7 @@ int main(int argc, char *argv[])
 	std::string argv1(argv[1]);
 	
 	// create the diff version.
-	char temp[1024];
+	char temp[16];
 	sprintf(temp, "%8.8X", (uint) ::time(NULL));
 	diffVersion = temp;