chore: fix compiler warnings + extra includes

2 files changed, 13 insertions, 15 deletions

diff --git a/editor/editor-main.cpp b/editor/editor-main.cpp
index 2dee016..4e26472 100644
--- a/editor/editor-main.cpp
+++ b/editor/editor-main.cpp
@@ -3,10 +3,8 @@
 #include "arg-handler.hpp"
 #include "plugins.hpp"
 #include "editor.hpp"
-#include "event.hpp"
 #include "game.hpp"
 #include "game-settings.hpp"
-#include "window-types.hpp"
 
 void signal_handler(int signal_num) {
 	fprintf(stdout, "Received signal: %d - shutting down\n", signal_num);
diff --git a/editor/editor.cpp b/editor/editor.cpp
index 2bcca0a..dfa766c 100644
--- a/editor/editor.cpp
+++ b/editor/editor.cpp
@@ -476,11 +476,11 @@ struct AssetPickerSearchStruct {
 void RecordImGui_AssetPicker(AssetPickerSearchStruct &apss) {
 	if (shouldRebuildAssetList == true) {
 		if (assetEntries.Count() == 0) {
-			uint64_t bCount = AM_GetBucketCount();
-			for (uint64_t b = 0; b < bCount; ++b) {
-				uint64_t iCount = 0;
+			pk_handle_bucket_index_T bCount = AM_GetBucketCount();
+			for (pk_handle_bucket_index_T b = 0; b < bCount; ++b) {
+				pk_handle_item_index_T iCount = 0;
 				Asset *assets = AM_GetAssets(b, iCount);
-				for (long i = 0; i < iCount; ++i) {
+				for (pk_handle_item_index_T i = 0; i < iCount; ++i) {
 					const Asset &a = assets[i];
 					assetLabel &al = assetEntries.Push();
 					memcpy(al.key, a.key, AssetKeyLength);
@@ -702,13 +702,13 @@ void RecordImGuiEntityTypes() {
 
 void RecordImGuiCameras() {
 	CompInstance *activeInst = nullptr;
-	CompInstance *activeTargetInst = nullptr;
+	// CompInstance *activeTargetInst = nullptr;
 	if (!ImGui::Begin("Cameras")) {
 		ImGui::End();
 		return;
 	}
 	activeInst = ECS_GetInstance(ActiveCamera->phys.instHandle);
-	activeTargetInst = ECS_GetInstance(ActiveCamera->phys.targetInstHandle);
+	// activeTargetInst = ECS_GetInstance(ActiveCamera->phys.targetInstHandle);
 	if (ImGui::Button("Create")) {
 		InstPos instPos{};
 		instPos.mass = 1.f;
@@ -737,12 +737,12 @@ void RecordImGuiCameras() {
 		ImGui::TableSetupColumn("Controls");
 		ImGui::TableHeadersRow();
 
-		int64_t cameraBucketCount = PkeCamera_GetBucketCount();
-		for (long b = 0; b < cameraBucketCount; ++b) {
-			int64_t count;
+		pk_handle_bucket_index_T cameraBucketCount = PkeCamera_GetBucketCount();
+		for (pk_handle_bucket_index_T b = 0; b < cameraBucketCount; ++b) {
+			pk_handle_item_index_T count;
 			auto *cameras = PkeCamera_GetCameras(b, count);
 			ImGui::PushID(b);
-			for (long i = 0; i < count; ++i) {
+			for (pk_handle_item_index_T i = 0; i < count; ++i) {
 				const auto &cam = cameras[i];
 				if (cam.handle == CameraHandle_MAX)
 					continue;
@@ -793,7 +793,7 @@ void RecordImGuiCameras() {
 	}
 
 	if (selectedCamera != CameraHandle_MAX) {
-		int inputTextFlags = ImGuiInputTextFlags_ReadOnly;
+		// int inputTextFlags = ImGuiInputTextFlags_ReadOnly;
 		auto *cam = PkeCamera_Get(selectedCamera);
 		if (cam) {
 			bool isOrientTarget{bool(static_cast<PkeCameraView_T>(cam->view & PKE_CAMERA_VIEW_TARGET))};
@@ -1259,8 +1259,8 @@ void RecordImGuiSceneBrowser() {
 	NULL_CHAR_ARR(text, 128);
 	CompInstance *instances;
 	EntityType *entType;
-	uint64_t i, k;
-	uint64_t bucketCount, itemCount;
+	pk_handle_bucket_index_T bucketCount, i;
+	pk_handle_item_index_T itemCount, k;
 	if (!ImGui::Begin("SceneBrowser", &pkeSettings.editorSettings.isShowingSceneEditor)) {
 		ImGui::End();
 		return;