summary refs log tree commit diff stats
path: root/src/mapview.cpp
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2015-02-21 19:21:17 -0500
committerKelly Rauchenberger <fefferburbia@gmail.com>2015-02-21 19:21:17 -0500
commitcecdba5cd996cea3ebd2534aea7a3e3a41205b9c (patch)
treee955d61534a17678fe6f0e17b69f506f9d03a948 /src/mapview.cpp
parent59860415a2782694f630f7803ae4bcf445b3f5f1 (diff)
downloadtherapy-cecdba5cd996cea3ebd2534aea7a3e3a41205b9c.tar.gz
therapy-cecdba5cd996cea3ebd2534aea7a3e3a41205b9c.tar.bz2
therapy-cecdba5cd996cea3ebd2534aea7a3e3a41205b9c.zip
Changed to using stb_image for image loading, also alpha blending works!
Diffstat (limited to 'src/mapview.cpp')
-rw-r--r--src/mapview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mapview.cpp b/src/mapview.cpp index 76d7f02..a85bb31 100644 --- a/src/mapview.cpp +++ b/src/mapview.cpp
@@ -28,8 +28,8 @@ MapView::MapView(Map* first, int x, int y)
28 player->animFrame = 0; 28 player->animFrame = 0;
29 29
30 bg = createTexture(GAME_WIDTH, GAME_HEIGHT); 30 bg = createTexture(GAME_WIDTH, GAME_HEIGHT);
31 chara = loadTextureFromBMP("../res/Starla.bmp"); 31 chara = loadTextureFromBMP("../res/Starla.png");
32 tiles = loadTextureFromBMP("../res/tiles2.bmp"); 32 tiles = loadTextureFromBMP("../res/tiles.png");
33 33
34 loadMap(first); 34 loadMap(first);
35} 35}