diff options
| author | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-23 16:21:46 -0400 |
|---|---|---|
| committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 11:41:02 -0400 |
| commit | db855be41816b3319d1eb268159cc3d568b37e52 (patch) | |
| tree | 3a2b0cad88b9c861fbd6b2251aa5503fe3fb5343 /crawl-ref/source/windowmanager-sdl.cc | |
| parent | 628a7cdd6f98325059fe118837b72eddfacd5f86 (diff) | |
| download | crawl-ref-db855be41816b3319d1eb268159cc3d568b37e52.tar.gz crawl-ref-db855be41816b3319d1eb268159cc3d568b37e52.zip | |
Don't allow event_count to return a negative.
If SDL considers -1 to be an error, just handle that internally and don't
pollute the API with that.
Diffstat (limited to 'crawl-ref/source/windowmanager-sdl.cc')
| -rw-r--r-- | crawl-ref/source/windowmanager-sdl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc index 3c20218057..4d2caa3db8 100644 --- a/crawl-ref/source/windowmanager-sdl.cc +++ b/crawl-ref/source/windowmanager-sdl.cc @@ -517,8 +517,9 @@ unsigned int SDLWrapper::get_event_count(wm_event_type type) // Note: this returns -1 for error. int count = SDL_PeepEvents(&store, 1, SDL_PEEKEVENT, eventmask); + assert(count >= 0); - return (count); + return (std::max(count, 0)); } bool SDLWrapper::load_texture(GenericTexture *tex, const char *filename, |