- fixed: The 'new format only' flag for MAPINFO options was never checked.

(ZDoom itself doesn't use it yet so it's only relevant for child ports.)



SVN r1964 (trunk)

docs/rh-log.txt

@@ -1,3 +1,7 @@
+November 5, 2009  (Changes by Graf Zahl)
+- fixed: The 'new format only' flag for MAPINFO options was never checked.
+  (ZDoom itself doesn't use it yet so it's only relevant for child ports.)
+  
 November 3, 2009
 - Fixed: S_RestartSound() cleared the evicted flag even if the sound
   was not restarted because it was too close to too many other identical

src/g_mapinfo.cpp

@@ -1461,6 +1461,10 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
 			{
 				if (sc.Compare(((FMapOptInfo *)(*probe))->name))
 				{
+					if (!((FMapOptInfo *)(*probe))->old && format_type != FMT_New)
+					{
+						sc.ScriptError("MAPINFO option '%s' requires the new MAPINFO format", sc.String);
+					}
 					((FMapOptInfo *)(*probe))->handler(*this, &info);
 					success = true;
 					break;

src/v_video.h

@@ -403,6 +403,8 @@ public:
 	virtual bool WipeDo(int ticks);
 	virtual void WipeCleanup();
 
+	DWORD GetLastFPS() const { return LastCount; }
+
 #ifdef _WIN32
 	virtual void PaletteChanged () = 0;
 	virtual int QueryNewPalette () = 0;