Add support for h2d file format with first data file #3828
Next
Next commit
Add support for h2d file format with first data file
- fix farm rendering in Knight castle (#2059) - add missing farm sprite made by our artist
- Loading branch information
commit a8e84e32f307f858e171b4bbea7cacb2debdadf6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /*************************************************************************** | ||
| * Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2021 * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| * This program is distributed in the hope that it will be useful, * | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
| * GNU General Public License for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU General Public License * | ||
| * along with this program; if not, write to the * | ||
| * Free Software Foundation, Inc., * | ||
| * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | ||
| ***************************************************************************/ | ||
|
|
||
| #include "h2d.h" | ||
| #include "h2d_file.h" | ||
| #include "settings.h" | ||
|
|
||
| namespace | ||
| { | ||
| bool isInitialized = false; | ||
| fheroes2::H2RReader reader; | ||
|
|
||
ihhub marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| void initialize() | ||
| { | ||
| if ( isInitialized ) { | ||
| return; | ||
| } | ||
|
|
||
| isInitialized = true; | ||
|
|
||
| ListFiles files = Settings::FindFiles( "data", ".h2d", false ); | ||
ihhub marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if ( files.empty() ) { | ||
| return; | ||
| } | ||
|
|
||
| for ( const std::string & fileName : files ) { | ||
| if ( reader.open( fileName ) ) { | ||
| return; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| namespace fheroes2 | ||
| { | ||
| class Sprite; | ||
|
|
||
| namespace h2d | ||
| { | ||
| bool readImage( const std::string & name, Sprite & image ) | ||
| { | ||
| // Initialize only when it's requested. | ||
| initialize(); | ||
|
|
||
| return readImageFromH2D( reader, name, image ); | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /*************************************************************************** | ||
| * Free Heroes of Might and Magic II: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2021 * | ||
| * * | ||
| * This program is free software; you can redistribute it and/or modify * | ||
| * it under the terms of the GNU General Public License as published by * | ||
| * the Free Software Foundation; either version 2 of the License, or * | ||
| * (at your option) any later version. * | ||
| * * | ||
| * This program is distributed in the hope that it will be useful, * | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
| * GNU General Public License for more details. * | ||
| * * | ||
| * You should have received a copy of the GNU General Public License * | ||
| * along with this program; if not, write to the * | ||
| * Free Software Foundation, Inc., * | ||
| * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * | ||
| ***************************************************************************/ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <string> | ||
|
|
||
| namespace fheroes2 | ||
| { | ||
| class Sprite; | ||
|
|
||
| namespace h2d | ||
| { | ||
| bool readImage( const std::string & name, Sprite & image ); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.