Fix some minor issues picked up by xcode

sirjuddington · Sep 26, 2016 · 650fe41 · 650fe41
1 parent 6bc88ef
commit 650fe41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Application/MainApp.cpp b/src/Application/MainApp.cpp
@@ -416,7 +416,7 @@ class MainAppFLConnection : public wxConnection
 	MainAppFLConnection() {}
 	~MainAppFLConnection() {}
 
-	bool OnAdvise(const wxString& topic, const wxString& item, char* data, int size, wxIPCFormat format)
+	bool OnAdvise(const wxString& topic, const wxString& item, const void* data, size_t size, wxIPCFormat format)
 	{
 		return true;
 	}

diff --git a/src/MainEditor/EntryOperations.cpp b/src/MainEditor/EntryOperations.cpp
@@ -172,7 +172,8 @@ bool EntryOperations::modifyGfxOffsets(ArchiveEntry* entry, ModifyOffsetsDialog*
 	EntryType* type = entry->getType();
 	string entryformat = type->getFormat();
 	if (!(entryformat == "img_doom" || entryformat == "img_doom_arah" ||
-	        entryformat == "img_doom_alpha" || "img_doom_beta" || entryformat == "img_png"))
+		entryformat == "img_doom_alpha" || entryformat == "img_doom_beta" ||
+		entryformat == "img_png"))
 	{
 		wxLogMessage("Entry \"%s\" is of type \"%s\" which does not support offsets", entry->getName(), entry->getType()->getName());
 		return false;
@@ -323,7 +324,8 @@ bool EntryOperations::setGfxOffsets(ArchiveEntry* entry, int x, int y)
 	EntryType* type = entry->getType();
 	string entryformat = type->getFormat();
 	if (!(entryformat == "img_doom" || entryformat == "img_doom_arah" ||
-		entryformat == "img_doom_alpha" || "img_doom_beta" || entryformat == "img_png"))
+		entryformat == "img_doom_alpha" || entryformat == "img_doom_beta" ||
+		entryformat == "img_png"))
 	{
 		wxLogMessage("Entry \"%s\" is of type \"%s\" which does not support offsets", entry->getName(), entry->getType()->getName());
 		return false;

diff --git a/src/MainEditor/UI/EntryPanel/DataEntryPanel.cpp b/src/MainEditor/UI/EntryPanel/DataEntryPanel.cpp
@@ -168,7 +168,7 @@ string DataEntryTable::GetValue(int row, int col)
 	// Custom value column
 	else if (columns[col].type == COL_CUSTOM_VALUE)
 	{
-		int value;
+		int value = 0;
 		if (columns[col].size == 1)
 		{
 			int8_t val;