mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-09 16:59:02 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
5ce03c278b
9 changed files with 20 additions and 12 deletions
|
@ -881,14 +881,14 @@ MACRO(NL_SETUP_BUILD)
|
|||
ENDIF()
|
||||
|
||||
IF(WITH_WARNINGS)
|
||||
ADD_PLATFORM_FLAGS("-Wall -W")
|
||||
ADD_PLATFORM_FLAGS("-Wall")
|
||||
ELSE()
|
||||
# Check wrong formats in printf-like functions
|
||||
ADD_PLATFORM_FLAGS("-Wformat -Werror=format-security")
|
||||
ENDIF()
|
||||
|
||||
# never display these warnings because they are minor
|
||||
ADD_PLATFORM_FLAGS("-Wno-unused-parameter")
|
||||
ADD_PLATFORM_FLAGS("-Wno-unused-parameter -Wno-unused-private-field -Wno-unused-local-typedef -Wno-unused-variable")
|
||||
|
||||
IF(ANDROID)
|
||||
ADD_PLATFORM_FLAGS("--sysroot=${PLATFORM_ROOT}")
|
||||
|
|
|
@ -501,8 +501,11 @@ bool CDriverGL::unInit()
|
|||
// restore default X errors handler
|
||||
XSetErrorHandler(NULL);
|
||||
|
||||
XCloseDisplay(_dpy);
|
||||
_dpy = NULL;
|
||||
if (_dpy)
|
||||
{
|
||||
XCloseDisplay(_dpy);
|
||||
_dpy = NULL;
|
||||
}
|
||||
|
||||
#endif // NL_OS_UNIX
|
||||
|
||||
|
|
|
@ -724,7 +724,7 @@ uint CExportNel::buildSkinning (CMesh::CMeshBuild& buildMesh, const TInodePtrInt
|
|||
nlassert (node);
|
||||
|
||||
// Insert in the map
|
||||
weightMap.insert (std::map<float, INode*>::value_type (1, node));
|
||||
weightMap.insert (std::map<float, INode*>::value_type (1.f, node));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -589,10 +589,10 @@ void EditPatchMod::UpdateSelectDisplay()
|
|||
for (j = 0; j < thePatch->tileSel.GetSize(); j++)
|
||||
if (thePatch->tileSel[j])
|
||||
break;
|
||||
buf.printf("Tile %d Selected", j + 1);
|
||||
buf.printf(_T("Tile %d Selected"), j + 1);
|
||||
}
|
||||
else
|
||||
buf.printf("%d Tiles Selected", num);
|
||||
buf.printf(_T("%d Tiles Selected"), num);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
@ -733,7 +733,7 @@ void EditPatchMod::DoVertReset ()
|
|||
}
|
||||
|
||||
ResolveTopoChanges();
|
||||
theHold.Accept("Reset Vertex");
|
||||
theHold.Accept(_M("Reset Vertex"));
|
||||
/*if (holdNeeded)
|
||||
{
|
||||
ResolveTopoChanges();
|
||||
|
|
|
@ -223,7 +223,7 @@ BOOL CALLBACK PatchObjSurfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM
|
|||
|
||||
ep =(EditPatchMod *)lParam;
|
||||
ep->hSurfPanel = hDlg;
|
||||
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG)ep);
|
||||
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)ep);
|
||||
if (!ep->settingViewportTess && ep->settingDisp && ep->GetProdTess().type == TESS_SET)
|
||||
ep->settingDisp = FALSE;
|
||||
TessApprox t;
|
||||
|
|
|
@ -64,7 +64,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
|
|||
__declspec( dllexport ) const TCHAR *
|
||||
LibDescription()
|
||||
{
|
||||
return "NeL patch painter";
|
||||
return _T("NeL patch painter");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -8852,7 +8852,7 @@ void CCharacterCL::animIndex(TAnimationType channel, CAnimation::TAnimId index)
|
|||
else
|
||||
{
|
||||
// Check the AnimSet needed to get the animation Id.
|
||||
CHECK(_CurrentAnimSet[channel]);
|
||||
CHECK(_CurrentAnimSet[channel] != NULL);
|
||||
// Get the Pointer on the animation state, if Null, return empty
|
||||
const CAnimationState *animStatePtr = _CurrentAnimSet[channel]->getAnimationState( (animState(channel)==CAnimationStateSheet::Emote)?_SubStateKey:animState(channel));
|
||||
if(animStatePtr == 0)
|
||||
|
|
|
@ -386,7 +386,7 @@ void CInstanceMapDeco::onUpdate(CGroupMap &groupMap)
|
|||
}
|
||||
float size = CV_MapEntityFarArrowSize.get();
|
||||
// TMP TMP
|
||||
size = size;
|
||||
// size = size;
|
||||
float bias = 1.f;
|
||||
dir.normalize();
|
||||
CVector2f winInter;
|
||||
|
|
5
dist/snap/readme.txt
vendored
Normal file
5
dist/snap/readme.txt
vendored
Normal file
|
@ -0,0 +1,5 @@
|
|||
- to install snapcraft : sudo apt-get install snapcraft snapd
|
||||
- to generate snap : snapcraft
|
||||
- to clean build directory : snapcraft clean ryzom --step build
|
||||
- to install a .snap : sudo snap install <file .snap> --dangerous
|
||||
- to uninstall an installed .snap : sudo snap remove ryzom
|
Loading…
Reference in a new issue