Some final things before 0.3rc1.

acmepjz · Mar 5, 2012 · 6aa3942 · 6aa3942
1 parent e4708b7
commit 6aa3942
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -89,5 +89,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION share/meandmyshadow/)
 install(TARGETS meandmyshadow RUNTIME DESTINATION bin)
 if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") 
 	install(FILES meandmyshadow.desktop DESTINATION share/applications/)
-	install(FILES meandmyshadow.xpm DESTINATION share/pixmaps/)
+	install(FILES icons/16x16/meandmyshadow.png DESTINATION share/icons/hicolor/16x16/apps/)
+	install(FILES icons/32x32/meandmyshadow.png DESTINATION share/icons/hicolor/32x32/apps/)
+	install(FILES icons/48x48/meandmyshadow.png DESTINATION share/icons/hicolor/48x48/apps/)
+	install(FILES icons/64x64/meandmyshadow.png DESTINATION share/icons/hicolor/64x64/apps/)
 endif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
diff --git a/data/music/default.list b/data/music/default.list
@@ -0,0 +1,2 @@
+name=default
+musicfile(menu.music)
diff --git a/icons/16x16/meandmyshadow.png b/icons/16x16/meandmyshadow.png
diff --git a/icons/32x32/meandmyshadow.png b/icons/32x32/meandmyshadow.png
diff --git a/icons/48x48/meandmyshadow.png b/icons/48x48/meandmyshadow.png
diff --git a/icons/64x64/meandmyshadow.png b/icons/64x64/meandmyshadow.png
diff --git a/windows-icon/meandmyshadow.ico → icons/windows-icon/meandmyshadow.ico b/windows-icon/meandmyshadow.ico → icons/windows-icon/meandmyshadow.ico
diff --git a/windows-icon/meandmyshadow.xcf → icons/windows-icon/meandmyshadow.xcf b/windows-icon/meandmyshadow.xcf → icons/windows-icon/meandmyshadow.xcf
diff --git a/windows-icon/res.rc → icons/windows-icon/res.rc b/windows-icon/res.rc → icons/windows-icon/res.rc
diff --git a/windows-icon/resource.h → icons/windows-icon/resource.h b/windows-icon/resource.h → icons/windows-icon/resource.h
diff --git a/meandmyshadow.desktop b/meandmyshadow.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=0.2
+Version=0.3
 Type=Application
 Name=MeAndMyShadow
 GenericName=Me And My Shadow

diff --git a/src/Addons.cpp b/src/Addons.cpp
@@ -130,7 +130,7 @@ Addons::~Addons(){
 
 bool Addons::getAddonsList(FILE* file){
 	//First we download the file.
-	if(downloadFile("http://meandmyshadow.sourceforge.net/game/addons02",file)==false){
+	if(downloadFile("http://meandmyshadow.sourceforge.net/game/addons03",file)==false){
 		error="ERROR: unable to download addons file!";
 		cerr<<error<<endl;
 		return false;

diff --git a/src/Globals.h b/src/Globals.h
@@ -39,7 +39,7 @@ const int SCREEN_HEIGHT=600;
 const int SCREEN_BPP=32;
 
 //Strin containing the 
-const std::string version="V0.3 Development version";
+const std::string version="V0.3";
 
 //The height of the current level.
 extern int LEVEL_HEIGHT;

diff --git a/src/Player.h b/src/Player.h
@@ -26,8 +26,8 @@
 #include <SDL/SDL.h>
 #include <SDL/SDL_ttf.h>
 
-//debug the game record file
-#define RECORD_FILE_DEBUG
+//Debug the game record file.
+//#define RECORD_FILE_DEBUG
 
 class GameObject;
 class Game;