zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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)
This commit is contained in:
Christoph Oelckers 2009-11-06 06:56:25 +00:00
parent 704895f9b9
commit d8acbf71fa
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/rh-log.txt
View File

@ -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 November 3, 2009
- Fixed: S_RestartSound() cleared the evicted flag even if the sound - Fixed: S_RestartSound() cleared the evicted flag even if the sound
was not restarted because it was too close to too many other identical was not restarted because it was too close to too many other identical

4
src/g_mapinfo.cpp
View File

@ -1461,6 +1461,10 @@ void FMapInfoParser::ParseMapDefinition(level_info_t &info)
{ {
if (sc.Compare(((FMapOptInfo *)(*probe))->name)) 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); ((FMapOptInfo *)(*probe))->handler(*this, &info);
success = true; success = true;
break; break;

2
src/v_video.h
View File

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