From e890bfad639ccd949da101845041d517d711de4c Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Sat, 9 Sep 2023 10:41:57 -0700
Subject: [PATCH] fix multiple array index bugs

---
 src/Episode3/CardSpecial.cc | 4 ++--
 src/Episode3/PlayerState.cc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Episode3/CardSpecial.cc b/src/Episode3/CardSpecial.cc
index 8ac8ed22..8cf5beda 100644
--- a/src/Episode3/CardSpecial.cc
+++ b/src/Episode3/CardSpecial.cc
@@ -2458,7 +2458,7 @@ const char* CardSpecial::get_next_expr_token(
 
   if ((*expr >= 'a') && (*expr <= 'z')) {
     string token_buf;
-    for (; ('a' <= *expr) && (*expr < 'z'); expr++) {
+    for (; (*expr >= 'a') && (*expr <= 'z'); expr++) {
       token_buf.push_back(*expr);
     }
 
@@ -3368,7 +3368,7 @@ void CardSpecial::update_condition_orders(shared_ptr<Card> card) {
   bool modified = true;
   while (modified) {
     modified = false;
-    for (size_t index_offset = 0; index_offset < cond_indexes.size() - 1; index_offset++) {
+    for (size_t index_offset = 0; (index_offset + 1) < cond_indexes.size(); index_offset++) {
       size_t this_index = cond_indexes[index_offset];
       size_t next_index = cond_indexes[index_offset + 1];
       uint8_t this_cond_order = card->action_chain.conditions[this_index].order;
diff --git a/src/Episode3/PlayerState.cc b/src/Episode3/PlayerState.cc
index 5b0f7cd8..af6b85e8 100644
--- a/src/Episode3/PlayerState.cc
+++ b/src/Episode3/PlayerState.cc
@@ -1710,7 +1710,7 @@ bool PlayerState::set_action_cards_for_action_state(const ActionState& pa) {
     cmd.entry_count = 1;
     s->send(cmd);
   }
-  for (size_t z = 0; (z < 4 * 9) && (pa.action_card_refs[z] != 0xFFFF); z++) {
+  for (size_t z = 0; (z < pa.action_card_refs.size()) && (pa.action_card_refs[z] != 0xFFFF); z++) {
     this->discard_ref_from_hand(pa.action_card_refs[z]);
   }
   this->update_hand_and_equip_state_and_send_6xB4x02_if_needed();