Merge pull request #447 from MageKing17/bugfix/fred-message-delete-assert

niffiwan · niffiwan · commit e11771980e78 · 2015-11-18T09:39:35.000+10:00
Fix incorrect assertion in FRED's Event Editor when deleting a message.
diff --git a/code/fred2/eventeditor.cpp b/code/fred2/eventeditor.cpp
@@ -1299,7 +1299,7 @@ void event_editor::OnDeleteMsg()
 	char buf[256];
 
 	// handle this case somewhat gracefully
-	Assert((m_cur_msg >= 0) && (m_cur_msg < m_num_messages));
+	Assertion((m_cur_msg >= -1) && (m_cur_msg < m_num_messages), "Unexpected m_cur_msg value (%d); expected either -1, or between 0-%d. Get a coder!\n", m_cur_msg, m_num_messages - 1);
 	if((m_cur_msg < 0) || (m_cur_msg >= m_num_messages)){
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ void event_editor::OnDeleteMsg()`
`1299`	`1299`	`char buf[256];`
`1300`	`1300`
`1301`	`1301`	`// handle this case somewhat gracefully`
`1302`		`- Assert((m_cur_msg >= 0) && (m_cur_msg < m_num_messages));`
	`1302`	`+ Assertion((m_cur_msg >= -1) && (m_cur_msg < m_num_messages), "Unexpected m_cur_msg value (%d); expected either -1, or between 0-%d. Get a coder!\n", m_cur_msg, m_num_messages - 1);`
`1303`	`1303`	`if((m_cur_msg < 0) \|\| (m_cur_msg >= m_num_messages)){`
`1304`	`1304`	`return;`
`1305`	`1305`	`}`