Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2467 from dumganhar/master 

Fixing compilation errors for linux port.
This commit is contained in:
James Chen 2013-04-26 18:35:05 -07:00
parent f0b792eb2d 8c779ff98f
commit 98a2cdaf28
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/spine/Skeleton.cpp
View File

@ -58,7 +58,7 @@ Skeleton* Skeleton_create (SkeletonData* data) {
SlotData *slotData = data->slots[i]; SlotData *slotData = data->slots[i];
/* Find bone for the slotData's boneData. */ /* Find bone for the slotData's boneData. */
Bone *bone; Bone *bone = NULL;
for (ii = 0; ii < self->boneCount; ++ii) { for (ii = 0; ii < self->boneCount; ++ii) {
if (data->bones[ii] == slotData->boneData) { if (data->bones[ii] == slotData->boneData) {
bone = self->bones[ii]; bone = self->bones[ii];

3
extensions/spine/extension.cpp
View File

@ -59,8 +59,9 @@ char* _readFile (const char* path, int* length) {
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
char* data = MALLOC(char, *length); char* data = MALLOC(char, *length);
fread(data, 1, *length, file); int rtn = fread(data, 1, *length, file);
fclose(file); fclose(file);
if (rtn != *length) return 0;
return data; return data;
} }

2
scripting/lua/cocos2dx_support/Cocos2dxLuaLoader.cpp
View File

@ -32,7 +32,7 @@ extern "C"
int cocos2dx_lua_loader(lua_State *L) int cocos2dx_lua_loader(lua_State *L)
{ {
std::string filename(luaL_checkstring(L, 1)); std::string filename(luaL_checkstring(L, 1));
int pos = filename.rfind(".lua"); size_t pos = filename.rfind(".lua");
if (pos != std::string::npos) if (pos != std::string::npos)
{ {
filename = filename.substr(0, pos); filename = filename.substr(0, pos);