Minor SDL improvements

This reverts commit 71b5c5f2e4.

.gitignore

@@ -1,3 +1,4 @@
+/modules/.project
 build*
 CMakeCache.txt
 CMakeFiles
@@ -35,3 +36,6 @@ otclient.map
 otclient.layout
 LOCALTODO
 tags
+Thumbs.db
+.directory
+src/framework/graphics/dx/

.travis.yml

@@ -2,7 +2,7 @@ language: cpp
 compiler:
   - gcc
 before_script:
-  - sudo apt-get install libboost-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev
+  - sudo apt-get install libboost1.48-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev -y
 script: |
   cmake . -DCMAKE_BUILD_TYPE=Release
   make

CMakeLists.txt

@@ -1,18 +1,21 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.5.3")
+set(VERSION "0.6.2")
+
+option(FRAMEWORK_SOUND "Use SOUND " ON)
+option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON)
+option(FRAMEWORK_XML "Use XML " ON)
+option(FRAMEWORK_NET "Use NET " ON)
+option(FRAMEWORK_SQL "Use SQL" OFF)
 
-set(FRAMEWORK_SOUND ON)
-set(FRAMEWORK_GRAPHICS ON)
-set(FRAMEWORK_XML ON)
-set(FRAMEWORK_NET ON)
-#set(FRAMEWORK_GIT ON)
 include(src/framework/CMakeLists.txt)
-include(src/otclient/CMakeLists.txt)
+include(src/client/CMakeLists.txt)
 
 # functions map for reading backtraces
-set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=otclient.map")
+if(NOT APPLE)
+    set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map")
+endif()
 
 option(USE_PCH "Use precompiled header (speed up compile)" OFF)
 
@@ -32,25 +35,25 @@ endif()
 
 add_definitions(-D"VERSION=\\"${VERSION}\\"")
 
-# add otclient executable
-add_executable(otclient ${framework_SOURCES} ${otclient_SOURCES} ${executable_SOURCES})
+# add client executable
+add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES})
 
 # target link libraries
-target_link_libraries(otclient ${framework_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES})
 
 if(USE_PCH)
     include(cotire)
-    cotire(otclient)
+    cotire(${PROJECT_NAME})
     message(STATUS "Use precompiled header: ON")
 else()
     message(STATUS "Use precompiled header: OFF")
 endif()
 
 # installation
-set(DATA_INSTALL_DIR share/otclient)
-install(TARGETS otclient RUNTIME DESTINATION bin)
-install(FILES README.md BUGS LICENSE AUTHORS init.lua otclientrc.lua DESTINATION ${DATA_INSTALL_DIR})
-install(DIRECTORY modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE)
+set(DATA_INSTALL_DIR share/${PROJECT_NAME})
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+install(FILES README.md BUGS LICENSE AUTHORS init.lua ${PROJECT_NAME}rc.lua DESTINATION ${DATA_INSTALL_DIR})
+install(DIRECTORY data modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE)
 
 # add "make run"
-add_custom_target(run COMMAND otclient DEPENDS otclient WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})
+add_custom_target(run COMMAND ${PROJECT_NAME} DEPENDS ${PROJECT_NAME} WORKING_DIRECTORY ${CMAKE_PROJECT_DIR})

README.md

@@ -31,7 +31,8 @@ In short, if you need to compile OTClient, follow these tutorials:
 
 ### Need help?
 
-Try to ask questions in [otland](http://otland.net/forum.php) or talk with us at #otclient irc.freenode.net
+Try to ask questions in [otland](http://otland.net/f494/), now we have a board for the project there,
+or talk with us at #otclient irc.freenode.net
 
 ### Bugs
 

data/cursors/cursors.otml

@@ -0,0 +1,13 @@
+Cursors
+  target:
+    image: targetcursor
+    hot-spot: 9 9
+  horizontal:
+    image: horizontalcursor
+    hot-spot: 9 4
+  vertical:
+    image: verticalcursor
+    hot-spot: 4 9
+  text:
+    image: textcursor
+    hot-spot: 4 9

data/fonts/sans-bold-16px.otfont

@@ -0,0 +1,6 @@
+Font
+  name: sans-bold-16px
+  texture: sans-bold-16px_cp1252
+  height: 20
+  glyph-size: 24 24
+  space-width: 3

data/fonts/terminus-10px.otfont

@@ -0,0 +1,8 @@
+Font
+  name: terminus-10px
+  texture: terminus-10px
+  height: 12
+  y-offset: 0
+  glyph-size: 16 16
+  fixed-glyph-width: 6
+  space-width: 6

data/fonts/terminus-14px-bold.otfont

@@ -1,6 +1,6 @@
 Font
   name: terminus-14px-bold
-  texture: terminus-14px-bold.png
+  texture: terminus-14px-bold
   height: 16
   y-offset: 2
   glyph-size: 16 16

data/fonts/verdana-11px-antialised.otfont

@@ -1,6 +1,7 @@
 Font
   name: verdana-11px-antialised
-  texture: verdana-11px-antialised_cp1252.png
+  texture: verdana-11px-antialised_cp1252
   height: 14
   glyph-size: 16 16
   space-width: 4
+  default: true

data/fonts/verdana-11px-monochrome.otfont

@@ -1,6 +1,6 @@
 Font
   name: verdana-11px-monochrome
-  texture: verdana-11px-monochrome_cp1252.png
+  texture: verdana-11px-monochrome_cp1252
   height: 14
   glyph-size: 16 16
   space-width: 3

data/fonts/verdana-11px-rounded.otfont

@@ -1,6 +1,6 @@
 Font
   name: verdana-11px-rounded
-  texture: verdana-11px-rounded_cp1252.png
+  texture: verdana-11px-rounded_cp1252
   height: 16
   glyph-size: 16 16
   y-offset: -2