Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed clang compile error and some warnings. #170

Merged
merged 1 commit into from
Aug 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chunk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ void Chunk::loadSection1519(ChunkSection *cs, const Tag *section) {
for (int i = 0; i < 4096; i++) {
cs->blocks[4095-i] = getBits(byteData, i*bitSize, bitSize);
}
delete byteData;
delete[] byteData;
} else {
// set everything to 0 (minecraft:air)
memset(cs->blocks, 0, sizeof(cs->blocks));
Expand Down
2 changes: 1 addition & 1 deletion chunkrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ChunkRenderer : public QObject, public QRunnable {
void run();

public: // public to allow usage from WorldSave
void ChunkRenderer::renderChunk(Chunk *chunk);
void renderChunk(Chunk *chunk);

signals:
void rendered(int cx, int cz);
Expand Down
8 changes: 4 additions & 4 deletions definitionmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

DefinitionManager::DefinitionManager(QWidget *parent) :
QWidget(parent),
isUpdating(false),
dimensionManager(DimensionIdentifier::Instance()),
blockManager(BlockIdentifier::Instance()),
biomeManager(BiomeIdentifier::Instance()),
blockManager(BlockIdentifier::Instance()),
dimensionManager(DimensionIdentifier::Instance()),
entityManager(EntityIdentifier::Instance()),
flatteningConverter(FlatteningConverter::Instance())
flatteningConverter(FlatteningConverter::Instance()),
isUpdating(false)
{
setWindowFlags(Qt::Window);
setWindowTitle(tr("Definitions"));
Expand Down