From dae400031fe389025955bee423f9b327fd596b1d Mon Sep 17 00:00:00 2001
From: John McCardle <mccardle.john@gmail.com>
Date: Thu, 3 Jul 2025 21:12:29 -0400
Subject: [PATCH] Remove deprecated player_input and turn-based functions for
 Issue #3

Removed the commented-out player_input(), computerTurn(), and playerTurn()
functions that were part of the old turn-based system. These are no longer
needed as input is now handled through Scene callbacks.

Partial fix for #3
---
 ROADMAP.md         |  2 +-
 src/McRFPy_API.cpp | 61 ++--------------------------------------------
 src/McRFPy_API.h   |  3 ---
 3 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index a0f36b0..c8f3b68 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -202,7 +202,7 @@ Created comprehensive test suite with 13 tests covering all Python-exposed metho
 REMAINING IN PHASE 1:
 9. ✅ Fix #73 - Entity.index() method for removal
 10. ✅ Fix #27 - EntityCollection.extend() method
-11. Fix #33 - Sprite index validation
+11. ✅ Fix #33 - Sprite index validation
 12. Alpha Blockers (#3, #2) - Remove deprecated methods
 ```
 
diff --git a/src/McRFPy_API.cpp b/src/McRFPy_API.cpp
index 531ec5d..5bc92ca 100644
--- a/src/McRFPy_API.cpp
+++ b/src/McRFPy_API.cpp
@@ -473,65 +473,8 @@ PyObject* McRFPy_API::_getSoundVolume(PyObject* self, PyObject* args) {
 	return Py_BuildValue("f", McRFPy_API::sfx.getVolume());
 }
 
-/*
-void McRFPy_API::player_input(int dx, int dy) {
-	//std::cout << "# entities tagged 'player': " << McRFPy_API::entities.getEntities("player").size() << std::endl;
-	auto player_entity = McRFPy_API::entities.getEntities("player")[0];
-	auto grid = player_entity->cGrid->grid;
-	//std::cout << "Grid pointed to: " << (long)player_entity->cGrid->grid << std::endl;
-	if (McRFPy_API::input_mode.compare("playerturn") != 0) {
-		// no input accepted while computer moving
-		//std::cout << "Can't move while it's not player's turn." << std::endl;
-		return;
-	}
-	// TODO: selection cursor via keyboard
-	// else if (!input_mode.compare("selectpoint") {}
-	// else if (!input_mode.compare("selectentity") {}
-	
-	// grid bounds check
-	if (player_entity->cGrid->x + dx < 0 ||
-	    player_entity->cGrid->y + dy < 0 ||
-	    player_entity->cGrid->x + dx > grid->grid_x - 1 ||
-	    player_entity->cGrid->y + dy > grid->grid_y - 1) {
-	    //std::cout << "(" << player_entity->cGrid->x << ", " << player_entity->cGrid->y <<
-	    //  ") + (" << dx << ", " << dy << ") is OOB." << std::endl;
-	    return;
-	}
-	//std::cout << PyUnicode_AsUTF8(PyObject_Repr(player_entity->cBehavior->object)) << std::endl;
-	PyObject* move_fn = PyObject_GetAttrString(player_entity->cBehavior->object, "move");
-	//std::cout << PyUnicode_AsUTF8(PyObject_Repr(move_fn)) << std::endl;
-	if (move_fn) {
-		//std::cout << "Calling `move`" << std::endl;
-		PyObject* move_args = Py_BuildValue("(ii)", dx, dy);
-		PyObject_CallObject((PyObject*) move_fn, move_args);
-	} else {
-		//std::cout << "player_input called on entity with no `move` method" << std::endl;
-	}
-}
-
-
-void McRFPy_API::computerTurn() {
-	McRFPy_API::input_mode = "computerturnrunning";
-	for (auto e : McRFPy_API::grids[McRFPy_API::active_grid]->entities) {
-		if (e->cBehavior) {
-			PyObject_Call(PyObject_GetAttrString(e->cBehavior->object, "ai_act"), PyTuple_New(0), NULL);
-		}
-	}
-}
-
-void McRFPy_API::playerTurn() {
-	McRFPy_API::input_mode = "playerturn";
-	for (auto e : McRFPy_API::entities.getEntities("player")) {
-		if (e->cBehavior) {
-			PyObject_Call(PyObject_GetAttrString(e->cBehavior->object, "player_act"), PyTuple_New(0), NULL);
-		}
-	}
-}
-
-void McRFPy_API::camFollow() {
-	if (!McRFPy_API::do_camfollow) return;
-	auto& ag = McRFPy_API::grids[McRFPy_API::active_grid];
-	for (auto e : McRFPy_API::entities.getEntities("player")) {
+// Removed deprecated player_input, computerTurn, playerTurn functions
+// These were part of the old turn-based system that is no longer used
 		//std::cout << "grid center: " << ag->center_x << ", " << ag->center_y << std::endl <<
 		//             "player grid pos: " << e->cGrid->x << ", " << e->cGrid->y << std::endl <<
 		//             "player sprite pos: " << e->cGrid->indexsprite.x << ", " << e->cGrid->indexsprite.y << std::endl;
diff --git a/src/McRFPy_API.h b/src/McRFPy_API.h
index 758eb17..c2538f8 100644
--- a/src/McRFPy_API.h
+++ b/src/McRFPy_API.h
@@ -69,9 +69,6 @@ public:
 
     // accept keyboard input from scene
     static sf::Vector2i cursor_position;
-    static void player_input(int, int);
-    static void computerTurn();
-    static void playerTurn();
     
     static void doAction(std::string);