summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-17 20:56:23 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-01-17 20:56:23 +0000
commitd6047de8171b3a6c2afd2197dc460e954057494d (patch)
treeacd81f7944bfba53f91d479a5bbfab666042e50c /src/main.cpp
parent1cf3f44e6930621ae4af014089a30648b2a38475 (diff)
downloadMana-d6047de8171b3a6c2afd2197dc460e954057494d.tar.gz
Mana-d6047de8171b3a6c2afd2197dc460e954057494d.tar.bz2
Mana-d6047de8171b3a6c2afd2197dc460e954057494d.tar.xz
Mana-d6047de8171b3a6c2afd2197dc460e954057494d.zip
ESC works again for quit and Ctrl+F switched windowed/fullscreen in X11
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 4d6651b6..e15ae0e1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -217,9 +217,9 @@ void init_engine() {
Image *hairImg = resman->getImage(
"core/graphics/sprites/player_male_hair.png");
- if (!login_wallpaper) error("Couldn't load login.bmp");
- if (!playerImg) error("Couldn't load playerset.png");
- if (!hairImg) error("Couldn't load hairset.bmp");
+ if (!login_wallpaper) error("Couldn't load login_wallpaper.png");
+ if (!playerImg) error("Couldn't load player_male_base.png");
+ if (!hairImg) error("Couldn't load player_male_hair.png");
playerset = new Spriteset(playerImg, 160, 120);
hairset = new Spriteset(hairImg, 40, 40);