Add ReserveSubcommandIndex()

EasyRPG · Apr 13, 2019 · 5debe86 · 5debe86
1 parent bddbf04
commit 5debe86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -262,8 +262,7 @@ int Game_Interpreter::GetThisEventId() const {
 	return event_id;
 }
 
-
-void Game_Interpreter::SetSubcommandIndex(int indent, int idx) {
+uint8_t& Game_Interpreter::ReserveSubcommandIndex(int indent) {
 	auto* frame = GetFrame();
 	assert(frame);
 
@@ -273,7 +272,11 @@ void Game_Interpreter::SetSubcommandIndex(int indent, int idx) {
 		// the array with uninitialized values.
 		path.resize(indent + 1, subcommand_sentinel);
 	}
-	path[indent] = idx;
+	return path[indent];
+}
+
+void Game_Interpreter::SetSubcommandIndex(int indent, int idx) {
+	ReserveSubcommandIndex(indent) = idx;
 }
 
 int Game_Interpreter::GetSubcommandIndex(int indent) const {

diff --git a/src/game_interpreter.h b/src/game_interpreter.h
@@ -255,6 +255,7 @@ class Game_Interpreter
 	void OnChangeSystemGraphicReady(FileRequestResult* result);
 
 	void SetSubcommandIndex(int indent, int idx);
+	uint8_t& ReserveSubcommandIndex(int indent);
 	int GetSubcommandIndex(int indent) const;
 
 	FileRequestBinding request_id;