summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-07-17 20:15:15 -0500
committercamthesaxman <cameronghall@cox.net>2017-07-17 20:15:15 -0500
commite2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch)
tree843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /include/sprite.h
parentd4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff)
parent67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff)
fix merge conflicts
Diffstat (limited to 'include/sprite.h')
-rw-r--r--include/sprite.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sprite.h b/include/sprite.h
index a65e71bd9..733231eb5 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -19,7 +19,7 @@ struct CompressedSpriteSheet
struct SpriteFrameImage
{
- u8 *data;
+ const u8 *data;
u16 size;
};