* updated Code::Blocks project file
* fixed some gcc warnings (mainly newlines at EOF)
This commit is contained in:
parent
4c5c350e59
commit
3c236757ce
@ -15,4 +15,4 @@ private:
|
|||||||
PseuInstance *_instance;
|
PseuInstance *_instance;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -41,4 +41,4 @@ typedef long double ldbl;
|
|||||||
#define PRINT_DEBUG def_print
|
#define PRINT_DEBUG def_print
|
||||||
#define PRINT_ERROR def_print
|
#define PRINT_ERROR def_print
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -232,7 +232,7 @@ DefReturnResult DefScriptPackage::func_fwriteb(CmdSet& Set)
|
|||||||
fh->write((char*)&o,sizeof(double));
|
fh->write((char*)&o,sizeof(double));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -358,4 +358,4 @@ DefReturnResult DefScriptPackage::func_fseekr(CmdSet& Set)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -120,7 +120,7 @@ IImage* CImageLoaderBLP::loadImage(io::IReadFile* file) const
|
|||||||
u32 alpha=255;
|
u32 alpha=255;
|
||||||
u32 a[8];
|
u32 a[8];
|
||||||
u32 r1, g1,b1,r2,g2,b2;
|
u32 r1, g1,b1,r2,g2,b2;
|
||||||
u64 temptransp;
|
u64 temptransp=0;
|
||||||
bool transparency_bit=false;
|
bool transparency_bit=false;
|
||||||
for(u32 y=0;y<header.y_res;y=y+4)
|
for(u32 y=0;y<header.y_res;y=y+4)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -59,4 +59,4 @@ private:
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -90,4 +90,4 @@ struct MovementInfo
|
|||||||
|
|
||||||
bool IsFloatField(uint8, uint32);
|
bool IsFloatField(uint8, uint32);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -47,7 +47,7 @@ void World::Update(void)
|
|||||||
_lastx = _x;
|
_lastx = _x;
|
||||||
_lasty = _y;
|
_lasty = _y;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::UpdatePos(float x, float y, uint32 m)
|
void World::UpdatePos(float x, float y, uint32 m)
|
||||||
@ -71,4 +71,3 @@ float World::GetPosZ(float x, float y)
|
|||||||
logdebug("WORLD: GetPosZ() called, but no MapMgr exists (do you really use maps?)");
|
logdebug("WORLD: GetPosZ() called, but no MapMgr exists (do you really use maps?)");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,7 +32,6 @@
|
|||||||
</Target>
|
</Target>
|
||||||
</Build>
|
</Build>
|
||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-O2" />
|
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
<Add directory="shared" />
|
<Add directory="shared" />
|
||||||
<Add directory="Client" />
|
<Add directory="Client" />
|
||||||
@ -71,6 +70,12 @@
|
|||||||
<Unit filename="Client/DefScriptInterface.cpp" />
|
<Unit filename="Client/DefScriptInterface.cpp" />
|
||||||
<Unit filename="Client/DefScriptInterface.h" />
|
<Unit filename="Client/DefScriptInterface.h" />
|
||||||
<Unit filename="Client/DefScriptInterfaceInclude.h" />
|
<Unit filename="Client/DefScriptInterfaceInclude.h" />
|
||||||
|
<Unit filename="Client/GUI/CCursorController.cpp" />
|
||||||
|
<Unit filename="Client/GUI/CCursorController.h" />
|
||||||
|
<Unit filename="Client/GUI/CImageLoaderBLP.cpp" />
|
||||||
|
<Unit filename="Client/GUI/CImageLoaderBLP.h" />
|
||||||
|
<Unit filename="Client/GUI/CM2MeshFileLoader.cpp" />
|
||||||
|
<Unit filename="Client/GUI/CM2MeshFileLoader.h" />
|
||||||
<Unit filename="Client/GUI/DrawObjMgr.cpp" />
|
<Unit filename="Client/GUI/DrawObjMgr.cpp" />
|
||||||
<Unit filename="Client/GUI/DrawObjMgr.h" />
|
<Unit filename="Client/GUI/DrawObjMgr.h" />
|
||||||
<Unit filename="Client/GUI/DrawObject.cpp" />
|
<Unit filename="Client/GUI/DrawObject.cpp" />
|
||||||
@ -79,6 +84,8 @@
|
|||||||
<Unit filename="Client/GUI/MInput.h" />
|
<Unit filename="Client/GUI/MInput.h" />
|
||||||
<Unit filename="Client/GUI/PseuGUI.cpp" />
|
<Unit filename="Client/GUI/PseuGUI.cpp" />
|
||||||
<Unit filename="Client/GUI/PseuGUI.h" />
|
<Unit filename="Client/GUI/PseuGUI.h" />
|
||||||
|
<Unit filename="Client/GUI/SImage.cpp" />
|
||||||
|
<Unit filename="Client/GUI/SImage.h" />
|
||||||
<Unit filename="Client/GUI/Scene.cpp" />
|
<Unit filename="Client/GUI/Scene.cpp" />
|
||||||
<Unit filename="Client/GUI/Scene.h" />
|
<Unit filename="Client/GUI/Scene.h" />
|
||||||
<Unit filename="Client/GUI/SceneGuiStart.cpp" />
|
<Unit filename="Client/GUI/SceneGuiStart.cpp" />
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user