From 8ff5781b11a59cba345d1cc326c33868d4fa8a71 Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Sun, 19 Jun 2022 08:39:08 +0300
Subject: [PATCH] Cleanup queue.h

See #42
---
 src/queue.cc | 40 ++++++++++++++++++++++++++++++++--------
 src/queue.h  | 27 ---------------------------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/queue.cc b/src/queue.cc
index 34b89e8..59e3583 100644
--- a/src/queue.cc
+++ b/src/queue.cc
@@ -15,17 +15,41 @@
 #include "proto_instance.h"
 #include "scripts.h"
 
+typedef struct QueueListNode {
+    // TODO: Make unsigned.
+    int time;
+    int type;
+    Object* owner;
+    void* data;
+    struct QueueListNode* next;
+} QueueListNode;
+
+typedef struct EventTypeDescription {
+    QueueEventHandler* handlerProc;
+    QueueEventDataFreeProc* freeProc;
+    QueueEventDataReadProc* readProc;
+    QueueEventDataWriteProc* writeProc;
+    bool field_10;
+    QueueEventHandler* field_14;
+} EventTypeDescription;
+
+static int flareEventProcess(Object* obj, void* data);
+static int explosionEventProcess(Object* obj, void* data);
+static int _queue_explode_exit(Object* obj, void* data);
+static int _queue_do_explosion_(Object* obj, bool a2);
+static int explosionFailureEventProcess(Object* obj, void* data);
+
 // Last queue list node found during [queueFindFirstEvent] and
 // [queueFindNextEvent] calls.
 //
 // 0x51C690
-QueueListNode* gLastFoundQueueListNode = NULL;
+static QueueListNode* gLastFoundQueueListNode = NULL;
 
 // 0x6648C0
-QueueListNode* gQueueListHead;
+static QueueListNode* gQueueListHead;
 
 // 0x51C540
-EventTypeDescription gEventTypeDescriptions[EVENT_TYPE_COUNT] = {
+static EventTypeDescription gEventTypeDescriptions[EVENT_TYPE_COUNT] = {
     { drugEffectEventProcess, internal_free, drugEffectEventRead, drugEffectEventWrite, true, _item_d_clear },
     { knockoutEventProcess, NULL, NULL, NULL, true, _critter_wake_clear },
     { withdrawalEventProcess, internal_free, withdrawalEventRead, withdrawalEventWrite, true, _item_wd_clear },
@@ -419,26 +443,26 @@ int queueGetNextEventTime()
 }
 
 // 0x4A281C
-int flareEventProcess(Object* obj, void* data)
+static int flareEventProcess(Object* obj, void* data)
 {
     _obj_destroy(obj);
     return 1;
 }
 
 // 0x4A2828
-int explosionEventProcess(Object* obj, void* data)
+static int explosionEventProcess(Object* obj, void* data)
 {
     return _queue_do_explosion_(obj, true);
 }
 
 // 0x4A2830
-int _queue_explode_exit(Object* obj, void* data)
+static int _queue_explode_exit(Object* obj, void* data)
 {
     return _queue_do_explosion_(obj, false);
 }
 
 // 0x4A2834
-int _queue_do_explosion_(Object* explosive, bool a2)
+static int _queue_do_explosion_(Object* explosive, bool a2)
 {
     int tile;
     int elevation;
@@ -483,7 +507,7 @@ int _queue_do_explosion_(Object* explosive, bool a2)
 }
 
 // 0x4A28E4
-int explosionFailureEventProcess(Object* obj, void* data)
+static int explosionFailureEventProcess(Object* obj, void* data)
 {
     MessageListItem msg;
 
diff --git a/src/queue.h b/src/queue.h
index 22ac198..756617e 100644
--- a/src/queue.h
+++ b/src/queue.h
@@ -48,33 +48,11 @@ typedef struct AmbientSoundEffectEvent {
     int ambientSoundEffectIndex;
 } AmbientSoundEffectEvent;
 
-typedef struct QueueListNode {
-    // TODO: Make unsigned.
-    int time;
-    int type;
-    Object* owner;
-    void* data;
-    struct QueueListNode* next;
-} QueueListNode;
-
 typedef int QueueEventHandler(Object* owner, void* data);
 typedef void QueueEventDataFreeProc(void* data);
 typedef int QueueEventDataReadProc(File* stream, void** dataPtr);
 typedef int QueueEventDataWriteProc(File* stream, void* data);
 
-typedef struct EventTypeDescription {
-    QueueEventHandler* handlerProc;
-    QueueEventDataFreeProc* freeProc;
-    QueueEventDataReadProc* readProc;
-    QueueEventDataWriteProc* writeProc;
-    bool field_10;
-    QueueEventHandler* field_14;
-} EventTypeDescription;
-
-extern QueueListNode* gLastFoundQueueListNode;
-extern QueueListNode* gQueueListHead;
-extern EventTypeDescription gEventTypeDescriptions[EVENT_TYPE_COUNT];
-
 void queueInit();
 int queueExit();
 int queueLoad(File* stream);
@@ -87,11 +65,6 @@ int queueProcessEvents();
 void queueClear();
 void _queue_clear_type(int eventType, QueueEventHandler* fn);
 int queueGetNextEventTime();
-int flareEventProcess(Object* obj, void* data);
-int explosionEventProcess(Object* obj, void* data);
-int _queue_explode_exit(Object* obj, void* data);
-int _queue_do_explosion_(Object* obj, bool a2);
-int explosionFailureEventProcess(Object* obj, void* data);
 void _queue_leaving_map();
 bool queueIsEmpty();
 void* queueFindFirstEvent(Object* owner, int eventType);