diff_tool_compile_fatal.patch
| b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_view.cpp Sat May 15 00:12:30 2010 +0800 | ||
|---|---|---|
| 303 | 303 |
} |
| 304 | 304 |
|
| 305 | 305 |
// Should be found |
| 306 |
nlassert (tabSelected!=-1) |
|
| 306 |
nlassert (tabSelected!=-1);
|
|
| 307 | 307 |
TabCtrl.SetCurSel (tabSelected); |
| 308 | 308 |
|
| 309 | 309 |
UpdateData (FALSE); |
| b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.cpp Sat May 15 00:12:30 2010 +0800 | ||
|---|---|---|
| 1708 | 1708 |
|
| 1709 | 1709 |
bool CActionRotate::getText (string &result) |
| 1710 | 1710 |
{
|
| 1711 |
result = toString ("Rotate %.2f?", 180*_Angle/Pi);
|
|
| 1711 |
result = toString ("Rotate %.2f", 180*_Angle/Pi);
|
|
| 1712 | 1712 |
return true; |
| 1713 | 1713 |
} |
| 1714 | 1714 |
|
| b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.cpp Sat May 15 00:12:30 2010 +0800 | ||
|---|---|---|
| 2170 | 2170 |
|
| 2171 | 2171 |
if ((CNELU::Driver == NULL)||(_MainFrame == NULL)) return; |
| 2172 | 2172 |
|
| 2173 |
nlassert (!_MouseLeftDown) |
|
| 2173 |
nlassert (!_MouseLeftDown);
|
|
| 2174 | 2174 |
_MouseLeftDown = true; |
| 2175 | 2175 |
|
| 2176 | 2176 |
// Mouse capture On ! |
| b/code/ryzom/tools/leveldesign/world_editor/world_editor/main_frm.cpp Sat May 15 00:12:30 2010 +0800 | ||
|---|---|---|
| 1839 | 1839 |
if (!getDocument()->isPrimitiveLoaded(path)) |
| 1840 | 1840 |
getDocument ()->addModification (new CActionLoadPrimitive (path.c_str())); |
| 1841 | 1841 |
else |
| 1842 |
infoMessage("Primitive d?j? pr?sente : %s", path.c_str());
|
|
| 1842 |
infoMessage("Primitive d?j?pr?sente : %s", path.c_str());
|
|
| 1843 | 1843 |
} |
| 1844 | 1844 |
} |
| 1845 | 1845 |
getDocument ()->endModification (); |
| ... | ... | |
| 2616 | 2616 |
void CMainFrame::OnOpenFile (UINT nID) |
| 2617 | 2617 |
{
|
| 2618 | 2618 |
// Single selection |
| 2619 |
nlassert (Selection.size () == 1) |
|
| 2619 |
nlassert (Selection.size () == 1);
|
|
| 2620 | 2620 |
|
| 2621 | 2621 |
// Good id |
| 2622 | 2622 |
nID -= ID_EDIT_OPEN_FILE_BEGIN; |
| ... | ... | |
| 4278 | 4278 |
if (!getDocument()->isPrimitiveLoaded(path)) |
| 4279 | 4279 |
getDocument ()->addModification (new CActionLoadPrimitive (path.c_str())); |
| 4280 | 4280 |
else |
| 4281 |
infoMessage("Primitive d?j? pr?sente : %s", path.c_str());
|
|
| 4281 |
infoMessage("Primitive d?j?pr?sente : %s", path.c_str());
|
|
| 4282 | 4282 |
|
| 4283 | 4283 |
getDocument()->endModification (); |
| 4284 | 4284 |
|
| ... | ... | |
| 4291 | 4291 |
// Can be extended to support more file types |
| 4292 | 4292 |
else |
| 4293 | 4293 |
{
|
| 4294 |
errorMessage("Fichier non support?: %s", pFilename);
|
|
| 4294 |
errorMessage("Fichier non support? %s", pFilename);
|
|
| 4295 | 4295 |
} |
| 4296 | 4296 |
} |
| 4297 | 4297 |
} |