diff options
author | Rodney Dawes <dobey@novell.com> | 2005-05-01 19:26:24 +0000 |
---|---|---|
committer | Rodney Dawes <dobey@novell.com> | 2005-05-01 19:26:24 +0000 |
commit | f61fc8ef256f43d1ada47fb5851f8954fea4cdea (patch) | |
tree | 210b0ad30ed690b63576da561954091987622fb3 /src/main.cpp | |
parent | 893cde9e754b805f1e62c517740919c04d9490e0 (diff) | |
download | mana-f61fc8ef256f43d1ada47fb5851f8954fea4cdea.tar.gz mana-f61fc8ef256f43d1ada47fb5851f8954fea4cdea.tar.bz2 mana-f61fc8ef256f43d1ada47fb5851f8954fea4cdea.tar.xz mana-f61fc8ef256f43d1ada47fb5851f8954fea4cdea.zip |
- Added installation of game data, install required on *nix systems
- Updated desktop file to work better
- Install the desktop file to the standard location
- Install the icon as tmw.png in the standard pixmaps data dir
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index ed62fe21..c8d71212 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -225,7 +225,7 @@ void init_engine() screenH = (int)config.getValue("screenheight", 600); bitDepth = (int)config.getValue("colordepth", 16); - SDL_WM_SetIcon(IMG_Load("data/icons/tmw-icon.png"), NULL); + SDL_WM_SetIcon(IMG_Load(TMW_DATADIR "data/icons/tmw-icon.png"), NULL); screen = SDL_SetVideoMode(screenW, screenH, bitDepth, displayFlags); if (screen == NULL) { @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) switch (state) { case LOGIN: logger.log("State: LOGIN"); - sound.playMusic("data/music/Ivano(de)Jeanette.ogg"); + sound.playMusic(TMW_DATADIR "data/music/Ivano(de)Jeanette.ogg"); /*bgm = resman->getMusic("music/Ivano(de)Jeanette.ogg"); bgm->play(-1);*/ login(); |