Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-18 21:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

reorganize some stuff

Browse Source
This commit is contained in:
Eduardo Bart
2012-01-04 23:28:29 -02:00
parent a92af44eb6
commit 30ce5e2ba9
69 changed files with 143 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/framework/graphics/font.cpp
View File

@@ -28,7 +28,8 @@
void Font::load(const OTMLNodePtr& fontNode)
{
std::string textureName = fontNode->valueAt("texture");
OTMLNodePtr textureNode = fontNode->at("texture");
std::string textureFile = Fw::resolvePath(textureNode->value(), textureNode->source());
Size glyphSize = fontNode->valueAt<Size>("glyph-size");
m_glyphHeight = fontNode->valueAt<int>("height");
m_yOffset = fontNode->valueAt("y-offset", 0);
@@ -36,7 +37,7 @@ void Font::load(const OTMLNodePtr& fontNode)
m_glyphSpacing = fontNode->valueAt("spacing", Size(0,0));
// load font texture
m_texture = g_textures.getTexture(textureName);
m_texture = g_textures.getTexture(textureFile);
if(OTMLNodePtr node = fontNode->get("fixed-glyph-width")) {
for(int glyph = m_firstGlyph; glyph < 256; ++glyph)

1
src/framework/graphics/particleaffector.h
View File

@@ -29,7 +29,6 @@
class ParticleAffector {
public:
ParticleAffector();
virtual ~ParticleAffector() { dump << "ParticleAffector deleted"; }
void update(double elapsedTime);
virtual bool load(const OTMLNodePtr& node);

1
src/framework/graphics/particleemitter.h
View File

@@ -33,7 +33,6 @@ class ParticleEmitter {
public:
ParticleEmitter(const ParticleSystemPtr& parent);
~ParticleEmitter() { dump << "ParticleEmitter deleted"; }
bool load(const OTMLNodePtr& node);

1
src/framework/graphics/particlesystem.h
View File

@@ -30,7 +30,6 @@
class ParticleSystem : public std::enable_shared_from_this<ParticleSystem> {
public:
ParticleSystem();
~ParticleSystem() { dump << "ParticleSystem deleted"; }
bool load(const OTMLNodePtr& node);