diff options
| author | sfan5 <sfan5@live.de> | 2021-03-31 13:15:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 13:15:47 +0200 |
| commit | 1e4913cd76f5d31456d04a5ce23e66d5c60060de (patch) | |
| tree | b97fe77b159d158d88ff87df59effd821c0b2e1d /src/irrlicht_changes/CGUITTFont.cpp | |
| parent | 0d90ed6d921baefbb1a969df69f7b86e702e962f (diff) | |
| download | hax-minetest-server-1e4913cd76f5d31456d04a5ce23e66d5c60060de.tar.gz hax-minetest-server-1e4913cd76f5d31456d04a5ce23e66d5c60060de.zip | |
Irrlicht support code maintenance
Diffstat (limited to 'src/irrlicht_changes/CGUITTFont.cpp')
| -rw-r--r-- | src/irrlicht_changes/CGUITTFont.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp index 8b01e88ae..05a1ae43e 100644 --- a/src/irrlicht_changes/CGUITTFont.cpp +++ b/src/irrlicht_changes/CGUITTFont.cpp @@ -1021,11 +1021,7 @@ video::IImage* CGUITTFont::createTextureFromChar(const uchar32_t& ch) video::ITexture* tex = page->texture; // Acquire a read-only lock of the corresponding page texture. - #if IRRLICHT_VERSION_MAJOR==1 && IRRLICHT_VERSION_MINOR>=8 void* ptr = tex->lock(video::ETLM_READ_ONLY); - #else - void* ptr = tex->lock(true); - #endif video::ECOLOR_FORMAT format = tex->getColorFormat(); core::dimension2du tex_size = tex->getOriginalSize(); @@ -1182,11 +1178,7 @@ core::array<scene::ISceneNode*> CGUITTFont::addTextSceneNode(const wchar_t* text // Now we copy planes corresponding to the letter size. IMeshManipulator* mani = smgr->getMeshManipulator(); IMesh* meshcopy = mani->createMeshCopy(shared_plane_ptr_); - #if IRRLICHT_VERSION_MAJOR==1 && IRRLICHT_VERSION_MINOR>=8 mani->scale(meshcopy, vector3df((f32)letter_size.Width, (f32)letter_size.Height, 1)); - #else - mani->scaleMesh(meshcopy, vector3df((f32)letter_size.Width, (f32)letter_size.Height, 1)); - #endif ISceneNode* current_node = smgr->addMeshSceneNode(meshcopy, parent, -1, current_pos); meshcopy->drop(); |