From 0acc98b10518bbc870f30ff53859ddc835f906c6 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 14 May 2010 18:38:48 +0200 Subject: [PATCH] Fixed: #902 tool projects build failed issue (patch provided by kuo) --- .../tools/leveldesign/georges_dll/georges_edit_view.cpp | 2 +- .../leveldesign/world_editor/world_editor/action.cpp | 2 +- .../leveldesign/world_editor/world_editor/display.cpp | 2 +- .../leveldesign/world_editor/world_editor/main_frm.cpp | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp index e530010a9..929299b89 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp @@ -303,7 +303,7 @@ void CGeorgesEditView::updateTab () } // Should be found - nlassert (tabSelected!=-1) + nlassert (tabSelected!=-1); TabCtrl.SetCurSel (tabSelected); UpdateData (FALSE); diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp index ddef447d9..71265a528 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp @@ -1708,7 +1708,7 @@ bool CActionRotate::redo () bool CActionRotate::getText (string &result) { - result = toString ("Rotate %.2f°", 180*_Angle/Pi); + result = toString ("Rotate %.2f degrees", 180*_Angle/Pi); return true; } diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp index 9148af386..6b0d64015 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp @@ -2170,7 +2170,7 @@ void CDisplay::OnLButtonDown (UINT nFlags, CPoint point) if ((CNELU::Driver == NULL)||(_MainFrame == NULL)) return; - nlassert (!_MouseLeftDown) + nlassert (!_MouseLeftDown); _MouseLeftDown = true; // Mouse capture On ! diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp index 419558c87..446fd2ebc 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp @@ -1839,7 +1839,7 @@ void CMainFrame::OnProjectAddPrimitive() if (!getDocument()->isPrimitiveLoaded(path)) getDocument ()->addModification (new CActionLoadPrimitive (path.c_str())); else - infoMessage("Primitive déjà présente : %s", path.c_str()); + infoMessage("Primitive already existing: %s", path.c_str()); } } getDocument ()->endModification (); @@ -2616,7 +2616,7 @@ void CMainFrame::buildFilenameVector (const IPrimitive &primitive, std::vectorisPrimitiveLoaded(path)) getDocument ()->addModification (new CActionLoadPrimitive (path.c_str())); else - infoMessage("Primitive déjà présente : %s", path.c_str()); + infoMessage("Primitive already existing: %s", path.c_str()); getDocument()->endModification (); @@ -4291,7 +4291,7 @@ void CMainFrame::OnDropFiles(HDROP hDropInfo) // Can be extended to support more file types else { - errorMessage("Fichier non supporté: %s", pFilename); + errorMessage("File not supported? %s", pFilename); } } }