summaryrefslogtreecommitdiff
path: root/include/sprite.h
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-07-16 20:09:46 -0400
commit93f767e26de82d1d4133e719a758578ede98b306 (patch)
tree0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /include/sprite.h
parentdd7e19107879f74d8f962a6a47d619470eaefbcd (diff)
parente50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff)
resolve conflict
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;
};