[Scummvm-git-logs] scummvm master -> 39f7490356a8f6b49cdff0c2e8617ecfb378cfff

aquadran aquadran at gmail.com
Sat Mar 13 13:22:45 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
39f7490356 ICB: Remove dead code


Commit: 39f7490356a8f6b49cdff0c2e8617ecfb378cfff
    https://github.com/scummvm/scummvm/commit/39f7490356a8f6b49cdff0c2e8617ecfb378cfff
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-03-13T14:22:41+01:00

Commit Message:
ICB: Remove dead code

Changed paths:
    engines/icb/map_marker.h
    engines/icb/map_marker_pc.cpp


diff --git a/engines/icb/map_marker.h b/engines/icb/map_marker.h
index b41e3617d5..a4fcf57e0b 100644
--- a/engines/icb/map_marker.h
+++ b/engines/icb/map_marker.h
@@ -58,7 +58,6 @@ typedef struct {
 class _marker {
 public:
 	void ___init();
-	void Write_markers();
 	_map_marker *Fetch_marker_by_object_name(const char *name);
 	_map_marker *Create_new_marker(const char *name);
 	uint32 num_markers;
diff --git a/engines/icb/map_marker_pc.cpp b/engines/icb/map_marker_pc.cpp
index 62756473a3..a2bbad95e4 100644
--- a/engines/icb/map_marker_pc.cpp
+++ b/engines/icb/map_marker_pc.cpp
@@ -34,30 +34,6 @@
 
 namespace ICB {
 
-void _marker::Write_markers() {
-	uint32 j, len;
-	Common::WriteStream *stream = 0; // file pointer
-
-	// For clusters hacky stuff to point to the correct directory
-	len = sprintf(temp_buf, "..\\..\\..\\..\\..\\..\\..\\missions\\%smarkers.linked", g_mission->session->Fetch_session_name());
-	if (len > ENGINE_STRING_LEN)
-		Fatal_error("_marker::Write_markers string error");
-
-	if (num_markers) {
-		// write the file out
-		stream = openDiskWriteStream(temp_buf); // attempt to open the file for writing
-		if (stream == NULL)
-			Fatal_error("Write_markers cannot *OPEN* %s", temp_buf);
-
-		for (j = 0; j < num_markers; j++)                                             // save out actual amount to save a few bytes of cd space
-			if (MS->objects->Try_fetch_item_by_name(marks[j].name))               // if object exists
-				stream->write(&marks[j], sizeof(char) * sizeof(_map_marker)); // TODO: Don't write like this.
-			else
-				Message_box("stripping out marker for deleted object '%s'", marks[j].name);
-		delete stream;
-	}
-}
-
 void _marker::___init() {
 	// read in the session markers file - this is the engine written file not the max Nico file
 	// read data into a structure as it needs to be modifiable and saveable which isnt posible with res_man files




More information about the Scummvm-git-logs mailing list