ALL: synced with ScummVM

This commit is contained in:
Pawel Kolodziejski 2013-07-07 15:29:33 +02:00
parent 1f3ad19a38
commit 068ff94d20
228 changed files with 11689 additions and 4232 deletions

View file

@ -24,6 +24,7 @@
#define PLATFORM_SDL_H
#include "backends/platform/sdl/sdl-sys.h"
// ResidualVM specific:
#ifdef USE_OPENGL
#include <SDL_opengl.h>
#endif
@ -72,10 +73,11 @@ public:
virtual void setWindowCaption(const char *caption);
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
virtual uint32 getMillis();
virtual uint32 getMillis(bool skipRecord = false);
virtual void delayMillis(uint msecs);
virtual void getTimeAndDate(TimeDate &td) const;
virtual Audio::Mixer *getMixer();
virtual Common::TimerManager *getTimerManager();
protected:
bool _inited;