DoomView - WIP

Add Walls
EasyRPG-NewFeatures · Oct 17, 2024 · 079ab79 · 079ab79
1 parent 82966ad
commit 079ab79
Show file tree

Hide file tree

Showing 6 changed files with 405 additions and 39 deletions.
diff --git a/src/game_interpreter.cpp b/src/game_interpreter.cpp
@@ -826,6 +826,8 @@ bool Game_Interpreter::ExecuteCommand(lcf::rpg::EventCommand const& com) {
 			return CommandManiacControlStrings(com);
 		case Cmd::Maniac_CallCommand:
 			return CommandManiacCallCommand(com);
+		case 9900:
+			return CommandSetDoomMap(com);
 		case 9901:
 			return Command3DPicture(com);
 		case 9902:
@@ -5209,3 +5211,12 @@ bool Game_Interpreter::CommandGet3DPictureRotate(lcf::rpg::EventCommand const& c
 	return true;
 }
 
+bool Game_Interpreter::CommandSetDoomMap(lcf::rpg::EventCommand const& com) {
+
+	int picID = ValueOrVariable(com.parameters[0], com.parameters[1]);
+
+	Main_Data::game_pictures->ShowDoomMap(picID);
+
+	return true;
+}
+
diff --git a/src/game_interpreter.h b/src/game_interpreter.h
@@ -292,6 +292,7 @@ class Game_Interpreter
 	bool Command3DPicture(lcf::rpg::EventCommand const& com);
 	bool Command3DPictureRotate(lcf::rpg::EventCommand const& com);
 	bool CommandGet3DPictureRotate(lcf::rpg::EventCommand const& com);
+	bool CommandSetDoomMap(lcf::rpg::EventCommand const& com);
 
 	int DecodeInt(lcf::DBArray<int32_t>::const_iterator& it);
 	const std::string DecodeString(lcf::DBArray<int32_t>::const_iterator& it);

diff --git a/src/game_pictures.cpp b/src/game_pictures.cpp
@@ -676,6 +676,10 @@ void Game_Pictures::Get3DRotation(int picID, int vx, int vy, int vz) {
 	auto& pic = GetPicture(picID);
 	pic.Get3DRotation(vx, vy, vz);
 }
+void Game_Pictures::ShowDoomMap(int picID) {
+	auto& pic = GetPicture(picID);
+	pic.ShowDoomMap();
+}
 
 void Game_Pictures::Picture::Show3D(std::string n, int zoom, int dx, int dy, int rx, int ry, int rz) {
 	pic3D = new Spriteset_MapDoom(n, zoom, dx, dy, rx, ry, rz);
@@ -698,4 +702,14 @@ void Game_Pictures::Picture::Get3DRotation(int vx, int vy, int vz) {
 	}
 }
 
+void Game_Pictures::Picture::ShowDoomMap() {
+	pic3D = new Spriteset_MapDoom();
+
+	if (!sprite) {
+		CreateSprite();
+		needs_update = true;
+	}
+
+}
+
 
diff --git a/src/game_pictures.h b/src/game_pictures.h
@@ -88,6 +88,7 @@ class Game_Pictures {
 	void Show3D(std::string n, int picID, int zoom, int dx, int dy, int rx, int ry, int rz);
 	void Rotate3D(int picID, int rx, int ry, int rz);
 	void Get3DRotation(int picID, int vx, int vy, int vz);
+	void ShowDoomMap(int picID);
 	void Erase(int id);
 	void EraseAll();
 
@@ -136,6 +137,7 @@ class Game_Pictures {
 		void Show3D(std::string n, int zoom, int dx, int dy, int rx, int ry, int rz);
 		void Rotate3D(int rx, int ry, int rz);
 		void Get3DRotation(int vx, int vy, int vz);
+		void ShowDoomMap();
 		Spriteset_MapDoom* pic3D = nullptr;
 	};