aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
dnk-88 2012-01-15 20:54:00 +03:00
commit 02b2da219d
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/src/3d/patchdlm_context.cpp
View file

@ -1018,8 +1018,8 @@ void CPatchDLMContext::computeTextureFar()
// compute src pixel
const CRGBA *srcPixel= pTile->getPixels(CTileFarBank::diffuse, CTileFarBank::order1);
// compute src info, for this tile rot and 256x256 context.
sint srcDeltaX;
sint srcDeltaY;
sint srcDeltaX = 0;
sint srcDeltaY = 0;
srcPixel= computeTileFarSrcDeltas(nRot, is256x256, uvOff, srcPixel, srcDeltaX, srcDeltaY);
// compute dst coordinate. start writing at pixel (1,1)

2
code/nel/src/ligo/primitive.cpp
View file

@ -2118,7 +2118,7 @@ bool CPrimAlias::read (xmlNodePtr xmlNode, const char *filename, uint version, C
xmlNodePtr ptNode = CIXml::getFirstChildNode (xmlNode, "ALIAS");
if (ptNode)
{
int val;
sint val = 0;
if (ReadInt ("VALUE", val, filename, ptNode))
{
_Alias = uint32(val);

1
code/ryzom/client/src/app_bundle_utils.cpp
View file

@ -14,6 +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 "stdpch.h"
#include "app_bundle_utils.h"
#if defined(NL_OS_MAC)

6
code/ryzom/tools/client/client_patcher/CMakeLists.txt
View file

@ -1,4 +1,5 @@
FILE(GLOB SRC main.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp
@ -21,6 +22,11 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher
ryzom_sevenzip
${CURL_LIBRARIES})
IF(APPLE)
FIND_LIBRARY(FOUNDATION_LIBRARY Foundation)
TARGET_LINK_LIBRARIES(ryzom_client_patcher ${FOUNDATION_LIBRARY})
ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP)
NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")