medfall

commit ba9b35355d232a9b919800a197d69981d2d6526e
parent f5c74091885914aa528bea6f53a4ccbe0defa7f3
Author: Michael Savage <mikejsavage@gmail.com>
Date:   Tue Dec 15 19:42:16 +0000

Bitmap -> BitmapData

Diffstat:
assets.h
 | 
4
++--
hm.cc
 | 
2
+-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/assets.h b/assets.h
@@ -17,7 +17,7 @@ enum AssetHandle {
 	ASSET_COUNT,
 };
 
-struct Bitmap {
+struct BitmapData {
 	u32 width;
 	u32 height;
 	u8 * data;
@@ -35,7 +35,7 @@ struct Asset {
 	AssetType type;
 	union {
 		struct {
-			Bitmap bitmap;
+			BitmapData bitmap;
 			GLuint texture;
 		};
 		SoundData sound;
diff --git a/hm.cc b/hm.cc
@@ -152,7 +152,7 @@ extern "C" GAME_INIT( game_init ) {
 
 	free( arial );
 
-	Bitmap font_bitmap = { };
+	BitmapData font_bitmap = { };
 	font_bitmap.width = 512;
 	font_bitmap.height = 256;
 	font_bitmap.data = font_memory;