summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2008-02-18 08:52:06 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2008-02-18 08:52:06 +0000
commit7e1188fd2322827d818560570cbc227d03225e59 (patch)
tree3591dfeb56265ad5eafd85ffdea3f325eeffc3f3
parent0ce528a09834b2f70ac923b22fd9def4378c5ccc (diff)
downloadmana-client-7e1188fd2322827d818560570cbc227d03225e59.tar.gz
mana-client-7e1188fd2322827d818560570cbc227d03225e59.tar.bz2
mana-client-7e1188fd2322827d818560570cbc227d03225e59.tar.xz
mana-client-7e1188fd2322827d818560570cbc227d03225e59.zip
Fixed image name.
-rw-r--r--ChangeLog5
-rw-r--r--src/sound.cpp3
-rw-r--r--src/utils/strprintf.cpp2
-rw-r--r--tmw.cbp60
4 files changed, 38 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 57fd4b89..932654c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18 Eugenio Favalli <elvenprogrammer@gmail.com>
+
+ * data/graphics/sprites/hairstyle7-female.xml, src/sound.cpp,
+ src/utils/strprintf.cpp, tmw.cbp: Fixed image name.
+
2008-02-13 Philipp Sehmisch <tmw@crushnet.org>
* data/equipment.xml, data/items.xml,
diff --git a/src/sound.cpp b/src/sound.cpp
index 063195ae..b87a550f 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -145,7 +145,8 @@ void Sound::playMusic(const std::string &filename, int loop)
Mix_PlayMusic(mMusic, loop);
}
else {
- logger->log("Sound::startMusic() Warning: error loading file.");
+ logger->log("Sound::startMusic() Warning: error loading file: ",
+ Mix_GetError());
}
}
diff --git a/src/utils/strprintf.cpp b/src/utils/strprintf.cpp
index 547d9712..352696f1 100644
--- a/src/utils/strprintf.cpp
+++ b/src/utils/strprintf.cpp
@@ -22,7 +22,7 @@
*/
#ifndef _TMW_UTILS_TOSTRING_H
-#define _TMW_UTISL_TOSTRING_H
+#define _TMW_UTILS_TOSTRING_H
#include <cstdarg>
diff --git a/tmw.cbp b/tmw.cbp
index a6851949..f3189f66 100644
--- a/tmw.cbp
+++ b/tmw.cbp
@@ -1173,6 +1173,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\resources\dye.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\resources\dye.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\resources\image.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1183,6 +1193,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\resources\imageloader.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\resources\imageloader.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\resources\imageset.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1263,16 +1283,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\openglsdlimageloader.cpp">
- <Option compilerVar="CPP"/>
- <Option target="default"/>
- </Unit>
- <Unit filename="src\resources\openglsdlimageloader.h">
- <Option compilerVar="CPP"/>
- <Option compile="0"/>
- <Option link="0"/>
- <Option target="default"/>
- </Unit>
<Unit filename="src\resources\resource.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1293,16 +1303,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\resources\sdlimageloader.cpp">
- <Option compilerVar="CPP"/>
- <Option target="default"/>
- </Unit>
- <Unit filename="src\resources\sdlimageloader.h">
- <Option compilerVar=""/>
- <Option compile="0"/>
- <Option link="0"/>
- <Option target="default"/>
- </Unit>
<Unit filename="src\resources\soundeffect.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1329,16 +1329,6 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
- <Unit filename="src\shopitem.cpp">
- <Option compilerVar="CPP"/>
- <Option target="default"/>
- </Unit>
- <Unit filename="src\shopitem.h">
- <Option compilerVar=""/>
- <Option compile="0"/>
- <Option link="0"/>
- <Option target="default"/>
- </Unit>
<Unit filename="src\simpleanimation.cpp">
<Option compilerVar="CPP"/>
<Option target="default"/>
@@ -1402,6 +1392,16 @@
<Option link="0"/>
<Option target="default"/>
</Unit>
+ <Unit filename="src\utils\strprintf.cpp">
+ <Option compilerVar="CPP"/>
+ <Option target="default"/>
+ </Unit>
+ <Unit filename="src\utils\strprintf.h">
+ <Option compilerVar=""/>
+ <Option compile="0"/>
+ <Option link="0"/>
+ <Option target="default"/>
+ </Unit>
<Unit filename="src\utils\tostring.h">
<Option compilerVar=""/>
<Option compile="0"/>