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

issue #81: remove including header of "platform/platform.h"

This commit is contained in:
Ming 2010-08-25 03:14:34 +00:00
parent ecd8b2e9e4
commit 25f49cac40
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocos2dx/cocos2dx-uphone.vcproj
View File

@ -521,19 +521,6 @@
>
</File>
</Filter>
<Filter
Name="Makefiles"
Filter="TMK3;ARM"
>
<File
RelativePath=".\cocos2dx_Arm.TMK3"
>
</File>
<File
RelativePath=".\Makefile.ARM"
>
</File>
</Filter>
<Filter
Name="label_nodes"
>

5
cocos2dx/include/CCBitmapFontAtlas.h
View File

@ -24,7 +24,6 @@ THE SOFTWARE.
#ifndef __CCBITMAP_FONT_ATLAS_H__
#define __CCBITMAP_FONT_ATLAS_H__
#include "CCSpriteSheet.h"
#include "platform/platform.h"
namespace cocos2d{
struct _KerningHashElement;
@ -75,7 +74,7 @@ namespace cocos2d{
// The characters building up the font
ccBitmapFontDef m_pBitmapFontArray[kCCBitmapFontAtlasMaxChars];
// FNTConfig: Common Height
UINT32 m_uCommonHeight;
unsigned int m_uCommonHeight;
// Padding
ccBitmapFontPadding m_tPadding;
// atlas name
@ -168,7 +167,7 @@ namespace cocos2d{
#endif // CC_BITMAPFONTATLAS_DEBUG_DRAW
private:
char * atlasNameFromFntFile(const char *fntFile);
int kerningAmountForFirst(INT16 first, INT16 second);
int kerningAmountForFirst(unsigned short first, unsigned short second);
};

3
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
View File

@ -27,6 +27,7 @@ THE SOFTWARE.
#include "CCDrawingPrimitives.h"
#include "CCSprite.h"
#include "CGPointExtension.h"
#include "platform/platform.h"
namespace cocos2d{
//
@ -380,7 +381,7 @@ namespace cocos2d{
}
// BitmapFontAtlas - Atlas generation
int CCBitmapFontAtlas::kerningAmountForFirst(INT16 first, INT16 second)
int CCBitmapFontAtlas::kerningAmountForFirst(unsigned short first, unsigned short second)
{
int ret = 0;
unsigned int key = (first<<16) | (second & 0xffff);