diff options
| author | Florian Diebold <flodiebold@gmail.com> | 2012-11-08 21:15:31 +0100 |
|---|---|---|
| committer | Florian Diebold <flodiebold@gmail.com> | 2012-11-08 21:15:50 +0100 |
| commit | 786430b5b6a480098cfabb884d892a1472f2be9d (patch) | |
| tree | ed4a578abba14a4d91ed5e64e3c45372dad0f6c5 /crawl-ref/source/tilemcache.h | |
| parent | 8b60bdd72997dc04cbe34241655ef38d3f582bd6 (diff) | |
| download | crawl-ref-786430b5b6a480098cfabb884d892a1472f2be9d.tar.gz crawl-ref-786430b5b6a480098cfabb884d892a1472f2be9d.zip | |
Fix a crash with draconians with shields in tiles (#6340, #6345).
The addition of shields made draconians use 4 tiles, but
MAX_INFO_COUNT was still 3. That didn't cause problems when
optimizations were disabled (probably because there was padding
between stack frames), but in optimized binaries it led to overwriting
the this pointer of a previous stack frame, which caused the
crashes. Fun.
Diffstat (limited to 'crawl-ref/source/tilemcache.h')
| -rw-r--r-- | crawl-ref/source/tilemcache.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tilemcache.h b/crawl-ref/source/tilemcache.h index 06f27877f4..36db9552e7 100644 --- a/crawl-ref/source/tilemcache.h +++ b/crawl-ref/source/tilemcache.h @@ -45,7 +45,7 @@ public: enum { // The maximum number of values written in the info function. - MAX_INFO_COUNT = 3 + MAX_INFO_COUNT = 4 }; virtual int info(tile_draw_info *dinfo) const { return 0; } |