zNPCTypePrawn: matches on zNPCPrawn, aqua_beam, and helpers

Author: aokennard

src/SB/Core/x/containers.h

@@ -174,16 +174,60 @@ template <class T, U32 N> struct fixed_queue
     U32 _last;
     T _buffer[N + 1];
 
-    void reset();
-    T& front();
-    T& pop_front();
-    void push_front(const T& element);
-    void push_back(const T& element);
-    bool full() const;
-    T& back();
-    T& pop_back();
-    bool empty() const;
-    U32 size() const;
+    void reset()
+    {
+        clear();
+    }
+    void clear()
+    {
+        _last = 0;
+        _first = 0;
+    }
+    T& front()
+    {
+        fixed_queue<T, N>::iterator it = begin();
+        return *it;
+    }
+    void pop_front()
+    {
+        _first = (_first + 1) & N;
+    }
+    void push_front()
+    {
+        _first = (_first + N) & N; 
+    }
+    void push_front(const T& data)
+    {
+        push_front();
+        T& new_front = front();
+        new_front = data;
+    }
+    void push_back();
+    U32 max_size() const
+    {
+        return N;
+    }
+    bool full() const
+    {
+        return size() == max_size();
+    }
+    T& back()
+    {
+        fixed_queue<T, N>::iterator it = end() - 1;
+        return *it;
+    }
+    void pop_back()
+    {
+        _last = (_last + N) & N;
+    }
+    bool empty() const
+    {
+        return _last == _first;
+    }
+    U32 size() const
+    {
+        return _last - _first;
+    }
 
     struct iterator {
         U32 _it;
@@ -201,15 +245,32 @@ template <class T, U32 N> struct fixed_queue
 
         iterator* operator+=(S32 value)
         {
-            // This operation should be equivalent to 1 << ceil(logbase2(N)), which can be used as a mask
-            // for doing a fast modulus. This should be computed compile time, but there is no constexpr here
-            // And I don't know if this fixed_queue will see use again. So here it sits
-            const S32 mask = ((1 << (31 - __cntlzw(N))) - 1);
             value += _it;
-            _it = value & mask;
+            _it = (value + N) & N;
             return this;
         }
 
+        iterator* operator-=(S32 value)
+        {
+            iterator* tmp = operator+=(-value);
+            return tmp;
+        }
+
+        iterator* operator--()
+        {
+            *this -= 1;
+            return this;
+        }
+
+        iterator operator-(S32 value) const
+        {
+            iterator tmp;
+            tmp._it = _it;
+            tmp._owner = _owner;
+            tmp -= value;
+            return tmp;
+        }
+
         iterator* operator++()
         {
             *this += 1;

src/SB/Game/zNPCTypePrawn.cpp

@@ -538,6 +538,15 @@ void aqua_beam::update(F32 dt)
     update_rings(dt);
 }
 
+void aqua_beam::emit_ring()
+{
+    if (!ring.queue.full())
+    {
+        kill_ring();
+    }
+    ring.queue.push_front();
+}
+
 void aqua_beam::render()
 {
     fixed_queue<aqua_beam::ring_segment, 31>::iterator entry = ring.queue.begin();

src/SB/Game/zNPCTypePrawn.h

@@ -189,6 +189,7 @@ struct aqua_beam
     void kill_ring();
     void render();
     void render_ring(aqua_beam::ring_segment&);
+    void emit_ring();
 };
 
 struct zNPCPrawn : zNPCSubBoss

src/SB/Game/zTalkBox.cpp

@@ -32,8 +32,8 @@ namespace
 
         if (shared.delay_events == 0)
         {
-            shared.triggered.push_back();
-            shared.triggered.back();
+            shared.triggered.push_back(); // wrong
+            shared.triggered.back(); // wrong
             shared.active->id = 0;
         }
         else