From 122577a916a310d41e4da128b6f4f157c005809b Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Tue, 8 Jan 2013 16:21:54 -0200 Subject: [PATCH] Just rename some files * Fix a server ping issue --- CMakeLists.txt | 20 +++---- src/{otclient => client}/CMakeLists.txt | 10 ++-- src/{otclient => client}/animatedtext.cpp | 2 +- src/{otclient => client}/animatedtext.h | 2 +- .../otclient.cpp => client/client.cpp} | 11 ++-- src/{otclient/otclient.h => client/client.h} | 12 ++-- src/{otclient => client}/const.h | 2 +- src/{otclient => client}/container.cpp | 2 +- src/{otclient => client}/container.h | 2 +- src/{otclient => client}/creature.cpp | 2 +- src/{otclient => client}/creature.h | 2 +- src/{otclient => client}/creatures.cpp | 2 +- src/{otclient => client}/creatures.h | 2 +- src/{otclient => client}/declarations.h | 2 +- src/{otclient => client}/effect.cpp | 2 +- src/{otclient => client}/effect.h | 2 +- src/{otclient => client}/game.cpp | 20 ++++++- src/{otclient => client}/game.h | 3 +- src/{otclient => client}/global.h | 2 +- src/{otclient => client}/houses.cpp | 2 +- src/{otclient => client}/houses.h | 2 +- src/{otclient => client}/item.cpp | 2 +- src/{otclient => client}/item.h | 2 +- src/{otclient => client}/itemtype.cpp | 2 +- src/{otclient => client}/itemtype.h | 2 +- src/{otclient => client}/lightview.cpp | 2 +- src/{otclient => client}/lightview.h | 2 +- src/{otclient => client}/localplayer.cpp | 2 +- src/{otclient => client}/localplayer.h | 2 +- src/{otclient => client}/luafunctions.cpp | 9 +-- src/{otclient => client}/luavaluecasts.cpp | 2 +- src/{otclient => client}/luavaluecasts.h | 2 +- src/{otclient => client}/map.cpp | 2 +- src/{otclient => client}/map.h | 2 +- src/{otclient => client}/mapio.cpp | 2 +- src/{otclient => client}/mapview.cpp | 2 +- src/{otclient => client}/mapview.h | 2 +- src/{otclient => client}/minimap.cpp | 2 +- src/{otclient => client}/minimap.h | 2 +- src/{otclient => client}/missile.cpp | 2 +- src/{otclient => client}/missile.h | 2 +- src/{otclient => client}/outfit.cpp | 2 +- src/{otclient => client}/outfit.h | 2 +- src/{otclient => client}/player.cpp | 2 +- src/{otclient => client}/player.h | 2 +- src/{otclient => client}/position.h | 2 +- src/{otclient => client}/protocolcodes.cpp | 2 +- src/{otclient => client}/protocolcodes.h | 2 +- src/{otclient => client}/protocolgame.cpp | 2 +- src/{otclient => client}/protocolgame.h | 2 +- .../protocolgameparse.cpp | 3 +- src/{otclient => client}/protocolgamesend.cpp | 2 +- src/{otclient => client}/shadermanager.cpp | 2 +- src/{otclient => client}/shadermanager.h | 2 +- src/{otclient => client}/spritemanager.cpp | 2 +- src/{otclient => client}/spritemanager.h | 2 +- src/{otclient => client}/statictext.cpp | 2 +- src/{otclient => client}/statictext.h | 2 +- src/{otclient => client}/thing.cpp | 2 +- src/{otclient => client}/thing.h | 2 +- src/{otclient => client}/thingstype.h | 2 +- src/{otclient => client}/thingtype.cpp | 2 +- src/{otclient => client}/thingtype.h | 2 +- src/{otclient => client}/thingtypemanager.cpp | 2 +- src/{otclient => client}/thingtypemanager.h | 2 +- src/{otclient => client}/tile.cpp | 2 +- src/{otclient => client}/tile.h | 2 +- src/{otclient => client}/towns.cpp | 2 +- src/{otclient => client}/towns.h | 2 +- src/{otclient => client}/uicreature.cpp | 2 +- src/{otclient => client}/uicreature.h | 2 +- src/{otclient => client}/uiitem.cpp | 2 +- src/{otclient => client}/uiitem.h | 2 +- src/{otclient => client}/uimap.cpp | 2 +- src/{otclient => client}/uimap.h | 2 +- src/{otclient => client}/uiprogressrect.cpp | 2 +- src/{otclient => client}/uiprogressrect.h | 2 +- src/framework/CMakeLists.txt | 14 ----- src/framework/const.h | 2 +- src/framework/core/adaptativeframecounter.cpp | 2 +- src/framework/core/adaptativeframecounter.h | 2 +- src/framework/core/application.cpp | 2 +- src/framework/core/application.h | 2 +- src/framework/core/binarytree.cpp | 2 +- src/framework/core/binarytree.h | 4 +- src/framework/core/clock.cpp | 2 +- src/framework/core/clock.h | 2 +- src/framework/core/configmanager.cpp | 2 +- src/framework/core/configmanager.h | 2 +- src/framework/core/consoleapplication.cpp | 2 +- src/framework/core/consoleapplication.h | 2 +- src/framework/core/declarations.h | 2 +- src/framework/core/event.cpp | 2 +- src/framework/core/event.h | 2 +- src/framework/core/eventdispatcher.cpp | 2 +- src/framework/core/eventdispatcher.h | 2 +- src/framework/core/filestream.cpp | 2 +- src/framework/core/filestream.h | 4 +- src/framework/core/graphicalapplication.cpp | 2 +- src/framework/core/graphicalapplication.h | 2 +- src/framework/core/inputevent.h | 2 +- src/framework/core/logger.cpp | 2 +- src/framework/core/logger.h | 2 +- src/framework/core/module.cpp | 2 +- src/framework/core/module.h | 2 +- src/framework/core/modulemanager.cpp | 2 +- src/framework/core/modulemanager.h | 2 +- src/framework/core/resourcemanager.cpp | 2 +- src/framework/core/resourcemanager.cpp.rej | 30 ++++++++++ src/framework/core/resourcemanager.h | 2 +- src/framework/core/scheduledevent.cpp | 2 +- src/framework/core/scheduledevent.h | 2 +- src/framework/core/timer.cpp | 2 +- src/framework/core/timer.h | 2 +- src/framework/git/declarations.h | 31 ---------- src/framework/git/gitrepository.cpp | 56 ------------------- src/framework/git/gitrepository.h | 44 --------------- src/framework/global.h | 2 +- src/framework/graphics/animatedtexture.cpp | 2 +- src/framework/graphics/animatedtexture.h | 2 +- src/framework/graphics/apngloader.h | 2 +- src/framework/graphics/bitmapfont.cpp | 2 +- src/framework/graphics/bitmapfont.h | 2 +- src/framework/graphics/cachedtext.cpp | 2 +- src/framework/graphics/cachedtext.h | 2 +- src/framework/graphics/coordsbuffer.cpp | 2 +- src/framework/graphics/coordsbuffer.h | 2 +- src/framework/graphics/declarations.h | 2 +- src/framework/graphics/fontmanager.cpp | 2 +- src/framework/graphics/fontmanager.h | 2 +- src/framework/graphics/framebuffer.cpp | 2 +- src/framework/graphics/framebuffer.h | 2 +- src/framework/graphics/framebuffermanager.cpp | 2 +- src/framework/graphics/framebuffermanager.h | 2 +- src/framework/graphics/glutil.h | 2 +- src/framework/graphics/graphics.cpp | 2 +- src/framework/graphics/graphics.h | 2 +- src/framework/graphics/hardwarebuffer.cpp | 2 +- src/framework/graphics/hardwarebuffer.h | 2 +- src/framework/graphics/image.cpp | 2 +- src/framework/graphics/image.h | 2 +- src/framework/graphics/painter.cpp | 2 +- src/framework/graphics/painter.h | 2 +- src/framework/graphics/painterogl1.cpp | 2 +- src/framework/graphics/painterogl1.h | 2 +- src/framework/graphics/painterogl2.cpp | 2 +- src/framework/graphics/painterogl2.h | 2 +- .../graphics/painterogl2_shadersources.h | 2 +- .../graphics/paintershaderprogram.cpp | 2 +- src/framework/graphics/paintershaderprogram.h | 2 +- src/framework/graphics/particle.cpp | 2 +- src/framework/graphics/particle.h | 2 +- src/framework/graphics/particleaffector.cpp | 2 +- src/framework/graphics/particleaffector.h | 2 +- src/framework/graphics/particleeffect.cpp | 2 +- src/framework/graphics/particleeffect.h | 2 +- src/framework/graphics/particleemitter.cpp | 2 +- src/framework/graphics/particleemitter.h | 2 +- src/framework/graphics/particlemanager.cpp | 2 +- src/framework/graphics/particlemanager.h | 2 +- src/framework/graphics/particlesystem.cpp | 2 +- src/framework/graphics/particlesystem.h | 2 +- src/framework/graphics/shader.cpp | 2 +- src/framework/graphics/shader.h | 2 +- src/framework/graphics/shaderprogram.cpp | 2 +- src/framework/graphics/shaderprogram.h | 2 +- src/framework/graphics/texture.cpp | 2 +- src/framework/graphics/texture.h | 2 +- src/framework/graphics/texturemanager.cpp | 2 +- src/framework/graphics/texturemanager.h | 2 +- src/framework/graphics/vertexarray.h | 2 +- src/framework/input/mouse.cpp | 2 +- src/framework/input/mouse.h | 2 +- src/framework/luaengine/declarations.h | 2 +- src/framework/luaengine/lbitlib.h | 2 +- src/framework/luaengine/luabinder.h | 2 +- src/framework/luaengine/luaexception.cpp | 2 +- src/framework/luaengine/luaexception.h | 2 +- src/framework/luaengine/luainterface.cpp | 2 +- src/framework/luaengine/luainterface.h | 2 +- src/framework/luaengine/luaobject.cpp | 2 +- src/framework/luaengine/luaobject.h | 2 +- src/framework/luaengine/luavaluecasts.cpp | 2 +- src/framework/luaengine/luavaluecasts.h | 2 +- src/framework/luafunctions.cpp | 2 +- src/framework/net/connection.cpp | 2 +- src/framework/net/connection.h | 2 +- src/framework/net/declarations.h | 2 +- src/framework/net/inputmessage.cpp | 2 +- src/framework/net/inputmessage.h | 2 +- src/framework/net/outputmessage.cpp | 2 +- src/framework/net/outputmessage.h | 2 +- src/framework/net/protocol.cpp | 2 +- src/framework/net/protocol.h | 2 +- src/framework/net/protocolhttp.cpp | 2 +- src/framework/net/protocolhttp.h | 2 +- src/framework/net/server.cpp | 2 +- src/framework/net/server.h | 2 +- src/framework/otml/declarations.h | 2 +- src/framework/otml/otml.h | 2 +- src/framework/otml/otmldocument.cpp | 2 +- src/framework/otml/otmldocument.h | 2 +- src/framework/otml/otmlemitter.cpp | 2 +- src/framework/otml/otmlemitter.h | 2 +- src/framework/otml/otmlexception.cpp | 2 +- src/framework/otml/otmlexception.h | 2 +- src/framework/otml/otmlnode.cpp | 2 +- src/framework/otml/otmlnode.h | 2 +- src/framework/otml/otmlparser.cpp | 2 +- src/framework/otml/otmlparser.h | 2 +- src/framework/pch.h | 2 +- src/framework/platform/crashhandler.h | 2 +- src/framework/platform/platformwindow.cpp | 2 +- src/framework/platform/platformwindow.h | 2 +- src/framework/platform/unixcrashhandler.cpp | 2 +- src/framework/platform/win32crashhandler.cpp | 2 +- src/framework/platform/win32window.cpp | 2 +- src/framework/platform/win32window.h | 2 +- src/framework/platform/x11window.cpp | 2 +- src/framework/platform/x11window.h | 2 +- src/framework/sound/combinedsoundsource.cpp | 2 +- src/framework/sound/combinedsoundsource.h | 2 +- src/framework/sound/declarations.h | 2 +- src/framework/sound/oggsoundfile.cpp | 2 +- src/framework/sound/oggsoundfile.h | 2 +- src/framework/sound/soundbuffer.cpp | 2 +- src/framework/sound/soundbuffer.h | 2 +- src/framework/sound/soundfile.cpp | 2 +- src/framework/sound/soundfile.h | 2 +- src/framework/sound/soundmanager.cpp | 2 +- src/framework/sound/soundmanager.h | 2 +- src/framework/sound/soundsource.cpp | 2 +- src/framework/sound/soundsource.h | 2 +- src/framework/sound/streamsoundsource.cpp | 2 +- src/framework/sound/streamsoundsource.h | 2 +- src/framework/sql/database.cpp | 2 +- src/framework/sql/database.h | 2 +- src/framework/sql/declarations.h | 2 +- src/framework/sql/mysql.cpp | 2 +- src/framework/sql/mysql.h | 2 +- src/framework/stdext/any.h | 2 +- src/framework/stdext/boolean.h | 2 +- src/framework/stdext/cast.h | 2 +- src/framework/stdext/compiler.h | 2 +- src/framework/stdext/coroutine.h | 2 +- src/framework/stdext/demangle.cpp | 2 +- src/framework/stdext/demangle.h | 2 +- src/framework/stdext/dumper.h | 2 +- src/framework/stdext/dynamic_storage.h | 2 +- src/framework/stdext/exception.h | 2 +- src/framework/stdext/format.h | 2 +- src/framework/stdext/math.cpp | 2 +- src/framework/stdext/math.h | 2 +- src/framework/stdext/net.cpp | 2 +- src/framework/stdext/net.h | 2 +- src/framework/stdext/packed_any.h | 2 +- src/framework/stdext/packed_storage.h | 2 +- src/framework/stdext/packed_vector.h | 2 +- src/framework/stdext/shared_object.h | 2 +- src/framework/stdext/stdext.h | 2 +- src/framework/stdext/string.cpp | 2 +- src/framework/stdext/string.h | 2 +- src/framework/stdext/thread.h | 2 +- src/framework/stdext/time.cpp | 2 +- src/framework/stdext/time.h | 2 +- src/framework/stdext/traits.h | 2 +- src/framework/stdext/types.h | 2 +- src/framework/ui/declarations.h | 2 +- src/framework/ui/ui.h | 2 +- src/framework/ui/uianchorlayout.cpp | 2 +- src/framework/ui/uianchorlayout.h | 2 +- src/framework/ui/uiboxlayout.cpp | 2 +- src/framework/ui/uiboxlayout.h | 2 +- src/framework/ui/uigridlayout.cpp | 2 +- src/framework/ui/uigridlayout.h | 2 +- src/framework/ui/uihorizontallayout.cpp | 2 +- src/framework/ui/uihorizontallayout.h | 2 +- src/framework/ui/uilayout.cpp | 2 +- src/framework/ui/uilayout.h | 2 +- src/framework/ui/uimanager.cpp | 2 +- src/framework/ui/uimanager.h | 2 +- src/framework/ui/uiparticles.cpp | 2 +- src/framework/ui/uiparticles.h | 2 +- src/framework/ui/uirichtext.cpp | 2 +- src/framework/ui/uirichtext.h | 2 +- src/framework/ui/uitextedit.cpp | 2 +- src/framework/ui/uitextedit.h | 2 +- src/framework/ui/uitranslator.cpp | 2 +- src/framework/ui/uitranslator.h | 2 +- src/framework/ui/uiverticallayout.cpp | 2 +- src/framework/ui/uiverticallayout.h | 2 +- src/framework/ui/uiwidget.cpp | 2 +- src/framework/ui/uiwidget.h | 2 +- src/framework/ui/uiwidgetbasestyle.cpp | 2 +- src/framework/ui/uiwidgetimage.cpp | 2 +- src/framework/ui/uiwidgettext.cpp | 2 +- src/framework/util/color.cpp | 2 +- src/framework/util/color.h | 2 +- src/framework/util/crypt.cpp | 2 +- src/framework/util/crypt.h | 2 +- src/framework/util/databuffer.h | 2 +- src/framework/util/matrix.h | 2 +- src/framework/util/point.h | 2 +- src/framework/util/rect.h | 2 +- src/framework/util/size.h | 2 +- src/framework/xml/tinyxml.h | 2 +- src/main.cpp | 8 +-- 307 files changed, 383 insertions(+), 478 deletions(-) rename src/{otclient => client}/CMakeLists.txt (95%) rename src/{otclient => client}/animatedtext.cpp (97%) rename src/{otclient => client}/animatedtext.h (96%) rename src/{otclient/otclient.cpp => client/client.cpp} (94%) rename src/{otclient/otclient.h => client/client.h} (85%) rename src/{otclient => client}/const.h (99%) rename src/{otclient => client}/container.cpp (97%) rename src/{otclient => client}/container.h (97%) rename src/{otclient => client}/creature.cpp (99%) rename src/{otclient => client}/creature.h (99%) rename src/{otclient => client}/creatures.cpp (99%) rename src/{otclient => client}/creatures.h (98%) rename src/{otclient => client}/declarations.h (98%) rename src/{otclient => client}/effect.cpp (97%) rename src/{otclient => client}/effect.h (96%) rename src/{otclient => client}/game.cpp (98%) rename src/{otclient => client}/game.h (99%) rename src/{otclient => client}/global.h (95%) rename src/{otclient => client}/houses.cpp (98%) rename src/{otclient => client}/houses.h (98%) rename src/{otclient => client}/item.cpp (99%) rename src/{otclient => client}/item.h (98%) rename src/{otclient => client}/itemtype.cpp (97%) rename src/{otclient => client}/itemtype.h (98%) rename src/{otclient => client}/lightview.cpp (98%) rename src/{otclient => client}/lightview.h (96%) rename src/{otclient => client}/localplayer.cpp (99%) rename src/{otclient => client}/localplayer.h (98%) rename src/{otclient => client}/luafunctions.cpp (99%) rename src/{otclient => client}/luavaluecasts.cpp (98%) rename src/{otclient => client}/luavaluecasts.h (96%) rename src/{otclient => client}/map.cpp (99%) rename src/{otclient => client}/map.h (99%) rename src/{otclient => client}/mapio.cpp (99%) rename src/{otclient => client}/mapview.cpp (99%) rename src/{otclient => client}/mapview.h (98%) rename src/{otclient => client}/minimap.cpp (94%) rename src/{otclient => client}/minimap.h (96%) rename src/{otclient => client}/missile.cpp (98%) rename src/{otclient => client}/missile.h (96%) rename src/{otclient => client}/outfit.cpp (98%) rename src/{otclient => client}/outfit.h (97%) rename src/{otclient => client}/player.cpp (94%) rename src/{otclient => client}/player.h (95%) rename src/{otclient => client}/position.h (99%) rename src/{otclient => client}/protocolcodes.cpp (99%) rename src/{otclient => client}/protocolcodes.h (99%) rename src/{otclient => client}/protocolgame.cpp (97%) rename src/{otclient => client}/protocolgame.h (99%) rename src/{otclient => client}/protocolgameparse.cpp (99%) rename src/{otclient => client}/protocolgamesend.cpp (99%) rename src/{otclient => client}/shadermanager.cpp (98%) rename src/{otclient => client}/shadermanager.h (97%) rename src/{otclient => client}/spritemanager.cpp (98%) rename src/{otclient => client}/spritemanager.h (96%) rename src/{otclient => client}/statictext.cpp (98%) rename src/{otclient => client}/statictext.h (97%) rename src/{otclient => client}/thing.cpp (97%) rename src/{otclient => client}/thing.h (99%) rename src/{otclient => client}/thingstype.h (97%) rename src/{otclient => client}/thingtype.cpp (99%) rename src/{otclient => client}/thingtype.h (99%) rename src/{otclient => client}/thingtypemanager.cpp (99%) rename src/{otclient => client}/thingtypemanager.h (98%) rename src/{otclient => client}/tile.cpp (99%) rename src/{otclient => client}/tile.h (98%) rename src/{otclient => client}/towns.cpp (97%) rename src/{otclient => client}/towns.h (97%) rename src/{otclient => client}/uicreature.cpp (96%) rename src/{otclient => client}/uicreature.h (96%) rename src/{otclient => client}/uiitem.cpp (98%) rename src/{otclient => client}/uiitem.h (97%) rename src/{otclient => client}/uimap.cpp (99%) rename src/{otclient => client}/uimap.h (98%) rename src/{otclient => client}/uiprogressrect.cpp (98%) rename src/{otclient => client}/uiprogressrect.h (96%) create mode 100644 src/framework/core/resourcemanager.cpp.rej delete mode 100644 src/framework/git/declarations.h delete mode 100644 src/framework/git/gitrepository.cpp delete mode 100644 src/framework/git/gitrepository.h diff --git a/CMakeLists.txt b/CMakeLists.txt index d2041c08..ffbd3348 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,10 @@ 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") +set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -Wl,-Map=${PROJECT_NAME}.map") option(USE_PCH "Use precompiled header (speed up compile)" OFF) @@ -32,25 +32,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}) +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 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}) diff --git a/src/otclient/CMakeLists.txt b/src/client/CMakeLists.txt similarity index 95% rename from src/otclient/CMakeLists.txt rename to src/client/CMakeLists.txt index 86c91ffe..a356e9a4 100644 --- a/src/otclient/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -3,7 +3,7 @@ if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 6) get_filename_component(CMAKE_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) endif(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 6) -# otclient options +# client options add_definitions(-DOTCLIENT) option(BOT_PROTECTION "Enable bot protection" ON) if(BOT_PROTECTION) @@ -13,13 +13,13 @@ else(BOT_PROTECTION) message(STATUS "Bot protection: OFF") endif(BOT_PROTECTION) -set(otclient_SOURCES ${otclient_SOURCES} - # otclient +set(client_SOURCES ${client_SOURCES} + # client ${CMAKE_CURRENT_LIST_DIR}/const.h ${CMAKE_CURRENT_LIST_DIR}/global.h ${CMAKE_CURRENT_LIST_DIR}/luafunctions.cpp - ${CMAKE_CURRENT_LIST_DIR}/otclient.cpp - ${CMAKE_CURRENT_LIST_DIR}/otclient.h + ${CMAKE_CURRENT_LIST_DIR}/client.cpp + ${CMAKE_CURRENT_LIST_DIR}/client.h # core ${CMAKE_CURRENT_LIST_DIR}/animatedtext.cpp diff --git a/src/otclient/animatedtext.cpp b/src/client/animatedtext.cpp similarity index 97% rename from src/otclient/animatedtext.cpp rename to src/client/animatedtext.cpp index adcfb855..7ac92427 100644 --- a/src/otclient/animatedtext.cpp +++ b/src/client/animatedtext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/animatedtext.h b/src/client/animatedtext.h similarity index 96% rename from src/otclient/animatedtext.h rename to src/client/animatedtext.h index 02fa6759..728564d3 100644 --- a/src/otclient/animatedtext.h +++ b/src/client/animatedtext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/otclient.cpp b/src/client/client.cpp similarity index 94% rename from src/otclient/otclient.cpp rename to src/client/client.cpp index bd077404..eb63f61e 100644 --- a/src/otclient/otclient.cpp +++ b/src/client/client.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -#include "otclient.h" +#include "client.h" #include #include #include @@ -30,13 +30,14 @@ #include "spritemanager.h" #include -OTClient g_otclient; +Client g_client; -void OTClient::init(const std::vector& args) +void Client::init(std::vector& args) { // register needed lua functions registerLuaFunctions(); + g_game.init(); g_shaders.init(); g_things.init(); @@ -77,7 +78,7 @@ void OTClient::init(const std::vector& args) */ } -void OTClient::terminate() +void Client::terminate() { g_creatures.terminate(); g_game.terminate(); diff --git a/src/otclient/otclient.h b/src/client/client.h similarity index 85% rename from src/otclient/otclient.h rename to src/client/client.h index 1b5e470e..58d1930a 100644 --- a/src/otclient/otclient.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -20,19 +20,19 @@ * THE SOFTWARE. */ -#ifndef OTCLIENT_H -#define OTCLIENT_H +#ifndef CLIENT_H +#define CLIENT_H #include "global.h" -class OTClient +class Client { public: - void init(const std::vector& args); + void init(std::vector& args); void terminate(); void registerLuaFunctions(); }; -extern OTClient g_otclient; +extern Client g_client; #endif diff --git a/src/otclient/const.h b/src/client/const.h similarity index 99% rename from src/otclient/const.h rename to src/client/const.h index 72e43b01..4fb9cade 100644 --- a/src/otclient/const.h +++ b/src/client/const.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/container.cpp b/src/client/container.cpp similarity index 97% rename from src/otclient/container.cpp rename to src/client/container.cpp index 4e21ba13..d9f7a0f3 100644 --- a/src/otclient/container.cpp +++ b/src/client/container.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/container.h b/src/client/container.h similarity index 97% rename from src/otclient/container.h rename to src/client/container.h index 3976f034..350bd3a9 100644 --- a/src/otclient/container.h +++ b/src/client/container.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/creature.cpp b/src/client/creature.cpp similarity index 99% rename from src/otclient/creature.cpp rename to src/client/creature.cpp index a695749e..6ae35a7d 100644 --- a/src/otclient/creature.cpp +++ b/src/client/creature.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/creature.h b/src/client/creature.h similarity index 99% rename from src/otclient/creature.h rename to src/client/creature.h index b187a490..aebec973 100644 --- a/src/otclient/creature.h +++ b/src/client/creature.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/creatures.cpp b/src/client/creatures.cpp similarity index 99% rename from src/otclient/creatures.cpp rename to src/client/creatures.cpp index 305adf07..26dc2cfc 100644 --- a/src/otclient/creatures.cpp +++ b/src/client/creatures.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/creatures.h b/src/client/creatures.h similarity index 98% rename from src/otclient/creatures.h rename to src/client/creatures.h index 8d637d4d..16690a76 100644 --- a/src/otclient/creatures.h +++ b/src/client/creatures.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/declarations.h b/src/client/declarations.h similarity index 98% rename from src/otclient/declarations.h rename to src/client/declarations.h index 19758dcf..476a61a0 100644 --- a/src/otclient/declarations.h +++ b/src/client/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/effect.cpp b/src/client/effect.cpp similarity index 97% rename from src/otclient/effect.cpp rename to src/client/effect.cpp index 48999f14..4fb1e777 100644 --- a/src/otclient/effect.cpp +++ b/src/client/effect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/effect.h b/src/client/effect.h similarity index 96% rename from src/otclient/effect.h rename to src/client/effect.h index 934c5f94..1be41231 100644 --- a/src/otclient/effect.h +++ b/src/client/effect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/game.cpp b/src/client/game.cpp similarity index 98% rename from src/otclient/game.cpp rename to src/client/game.cpp index 99512104..7d82ea1c 100644 --- a/src/otclient/game.cpp +++ b/src/client/game.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -41,6 +41,21 @@ Game::Game() resetGameStates(); m_protocolVersion = 0; m_clientVersion = 0; + m_online = false; + m_denyBotCall = false; + m_dead = false; + m_serverBeat = 50; + m_seq = 0; + m_ping = -1; + m_canReportBugs = false; + m_fightMode = Otc::FightBalanced; + m_chaseMode = Otc::DontChase; + m_safeFight = true; +} + +void Game::init() +{ + resetGameStates(); } void Game::terminate() @@ -193,6 +208,9 @@ void Game::processGMActions(const std::vector& actions) void Game::processPing() { g_lua.callGlobalField("g_game", "onPing"); + enableBotCall(); + m_protocolGame->sendPingBack(); + disableBotCall(); } void Game::processPingBack(int elapsed) diff --git a/src/otclient/game.h b/src/client/game.h similarity index 99% rename from src/otclient/game.h rename to src/client/game.h index 00c4dddb..9d3825ec 100644 --- a/src/otclient/game.h +++ b/src/client/game.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -44,6 +44,7 @@ class Game public: Game(); + void init(); void terminate(); private: diff --git a/src/otclient/global.h b/src/client/global.h similarity index 95% rename from src/otclient/global.h rename to src/client/global.h index aee9243e..e4e1932b 100644 --- a/src/otclient/global.h +++ b/src/client/global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/houses.cpp b/src/client/houses.cpp similarity index 98% rename from src/otclient/houses.cpp rename to src/client/houses.cpp index 3846bc3b..f6d81d03 100644 --- a/src/otclient/houses.cpp +++ b/src/client/houses.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/houses.h b/src/client/houses.h similarity index 98% rename from src/otclient/houses.h rename to src/client/houses.h index ea73676a..67f03932 100644 --- a/src/otclient/houses.h +++ b/src/client/houses.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/item.cpp b/src/client/item.cpp similarity index 99% rename from src/otclient/item.cpp rename to src/client/item.cpp index 54c600f1..5237efca 100644 --- a/src/otclient/item.cpp +++ b/src/client/item.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/item.h b/src/client/item.h similarity index 98% rename from src/otclient/item.h rename to src/client/item.h index fde875ac..79e01704 100644 --- a/src/otclient/item.h +++ b/src/client/item.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/itemtype.cpp b/src/client/itemtype.cpp similarity index 97% rename from src/otclient/itemtype.cpp rename to src/client/itemtype.cpp index cb2b7154..57faf8c3 100644 --- a/src/otclient/itemtype.cpp +++ b/src/client/itemtype.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/itemtype.h b/src/client/itemtype.h similarity index 98% rename from src/otclient/itemtype.h rename to src/client/itemtype.h index 8ed94b1a..950315b0 100644 --- a/src/otclient/itemtype.h +++ b/src/client/itemtype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/lightview.cpp b/src/client/lightview.cpp similarity index 98% rename from src/otclient/lightview.cpp rename to src/client/lightview.cpp index 04402960..9ca8d9ee 100644 --- a/src/otclient/lightview.cpp +++ b/src/client/lightview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/lightview.h b/src/client/lightview.h similarity index 96% rename from src/otclient/lightview.h rename to src/client/lightview.h index 7a9d6760..7f3d4564 100644 --- a/src/otclient/lightview.h +++ b/src/client/lightview.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/localplayer.cpp b/src/client/localplayer.cpp similarity index 99% rename from src/otclient/localplayer.cpp rename to src/client/localplayer.cpp index f3e5a07f..3fa39e75 100644 --- a/src/otclient/localplayer.cpp +++ b/src/client/localplayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/localplayer.h b/src/client/localplayer.h similarity index 98% rename from src/otclient/localplayer.h rename to src/client/localplayer.h index a15b602a..d721b6f2 100644 --- a/src/otclient/localplayer.h +++ b/src/client/localplayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/luafunctions.cpp b/src/client/luafunctions.cpp similarity index 99% rename from src/otclient/luafunctions.cpp rename to src/client/luafunctions.cpp index c280b8c3..ee3dd551 100644 --- a/src/otclient/luafunctions.cpp +++ b/src/client/luafunctions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -20,8 +20,7 @@ * THE SOFTWARE. */ -#include "otclient.h" -#include +#include "client.h" #include "luavaluecasts.h" #include "game.h" #include "tile.h" @@ -47,7 +46,9 @@ #include "uiprogressrect.h" #include "outfit.h" -void OTClient::registerLuaFunctions() +#include + +void Client::registerLuaFunctions() { g_lua.registerSingletonClass("g_things"); g_lua.bindSingletonFunction("g_things", "loadDat", &ThingTypeManager::loadDat, &g_things); diff --git a/src/otclient/luavaluecasts.cpp b/src/client/luavaluecasts.cpp similarity index 98% rename from src/otclient/luavaluecasts.cpp rename to src/client/luavaluecasts.cpp index 4a536fa8..cc787695 100644 --- a/src/otclient/luavaluecasts.cpp +++ b/src/client/luavaluecasts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/luavaluecasts.h b/src/client/luavaluecasts.h similarity index 96% rename from src/otclient/luavaluecasts.h rename to src/client/luavaluecasts.h index 38b4b01d..0478d35b 100644 --- a/src/otclient/luavaluecasts.h +++ b/src/client/luavaluecasts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/map.cpp b/src/client/map.cpp similarity index 99% rename from src/otclient/map.cpp rename to src/client/map.cpp index b06c7008..080bd47f 100644 --- a/src/otclient/map.cpp +++ b/src/client/map.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/map.h b/src/client/map.h similarity index 99% rename from src/otclient/map.h rename to src/client/map.h index 8ac0bcdd..07de2154 100644 --- a/src/otclient/map.h +++ b/src/client/map.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/mapio.cpp b/src/client/mapio.cpp similarity index 99% rename from src/otclient/mapio.cpp rename to src/client/mapio.cpp index 45577a6a..dae3c34b 100644 --- a/src/otclient/mapio.cpp +++ b/src/client/mapio.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/mapview.cpp b/src/client/mapview.cpp similarity index 99% rename from src/otclient/mapview.cpp rename to src/client/mapview.cpp index c9e35c70..b6e8affc 100644 --- a/src/otclient/mapview.cpp +++ b/src/client/mapview.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/mapview.h b/src/client/mapview.h similarity index 98% rename from src/otclient/mapview.h rename to src/client/mapview.h index bed821a1..d915353b 100644 --- a/src/otclient/mapview.h +++ b/src/client/mapview.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/minimap.cpp b/src/client/minimap.cpp similarity index 94% rename from src/otclient/minimap.cpp rename to src/client/minimap.cpp index 561b63f3..47b46047 100644 --- a/src/otclient/minimap.cpp +++ b/src/client/minimap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/minimap.h b/src/client/minimap.h similarity index 96% rename from src/otclient/minimap.h rename to src/client/minimap.h index 84540f39..fe91aa07 100644 --- a/src/otclient/minimap.h +++ b/src/client/minimap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/missile.cpp b/src/client/missile.cpp similarity index 98% rename from src/otclient/missile.cpp rename to src/client/missile.cpp index 93efad2f..068a5f46 100644 --- a/src/otclient/missile.cpp +++ b/src/client/missile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/missile.h b/src/client/missile.h similarity index 96% rename from src/otclient/missile.h rename to src/client/missile.h index eecddb97..0474de7f 100644 --- a/src/otclient/missile.h +++ b/src/client/missile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/outfit.cpp b/src/client/outfit.cpp similarity index 98% rename from src/otclient/outfit.cpp rename to src/client/outfit.cpp index d0605bd6..991e2b6b 100644 --- a/src/otclient/outfit.cpp +++ b/src/client/outfit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/outfit.h b/src/client/outfit.h similarity index 97% rename from src/otclient/outfit.h rename to src/client/outfit.h index 71c18a1d..7a1632d4 100644 --- a/src/otclient/outfit.h +++ b/src/client/outfit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/player.cpp b/src/client/player.cpp similarity index 94% rename from src/otclient/player.cpp rename to src/client/player.cpp index 237e5355..8079235e 100644 --- a/src/otclient/player.cpp +++ b/src/client/player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/player.h b/src/client/player.h similarity index 95% rename from src/otclient/player.h rename to src/client/player.h index aa68b600..e2725fde 100644 --- a/src/otclient/player.h +++ b/src/client/player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/position.h b/src/client/position.h similarity index 99% rename from src/otclient/position.h rename to src/client/position.h index 3c87e556..6fb638a8 100644 --- a/src/otclient/position.h +++ b/src/client/position.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/protocolcodes.cpp b/src/client/protocolcodes.cpp similarity index 99% rename from src/otclient/protocolcodes.cpp rename to src/client/protocolcodes.cpp index 40825f2f..41d19ec2 100644 --- a/src/otclient/protocolcodes.cpp +++ b/src/client/protocolcodes.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/protocolcodes.h b/src/client/protocolcodes.h similarity index 99% rename from src/otclient/protocolcodes.h rename to src/client/protocolcodes.h index 5441ad0e..ea1e1ebe 100644 --- a/src/otclient/protocolcodes.h +++ b/src/client/protocolcodes.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/protocolgame.cpp b/src/client/protocolgame.cpp similarity index 97% rename from src/otclient/protocolgame.cpp rename to src/client/protocolgame.cpp index e35cbb36..4dd934b5 100644 --- a/src/otclient/protocolgame.cpp +++ b/src/client/protocolgame.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/protocolgame.h b/src/client/protocolgame.h similarity index 99% rename from src/otclient/protocolgame.h rename to src/client/protocolgame.h index 8e8f8aac..3bc03152 100644 --- a/src/otclient/protocolgame.h +++ b/src/client/protocolgame.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/protocolgameparse.cpp b/src/client/protocolgameparse.cpp similarity index 99% rename from src/otclient/protocolgameparse.cpp rename to src/client/protocolgameparse.cpp index fd460818..58dd5edb 100644 --- a/src/otclient/protocolgameparse.cpp +++ b/src/client/protocolgameparse.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -411,7 +411,6 @@ void ProtocolGame::parseLoginWait(const InputMessagePtr& msg) void ProtocolGame::parsePing(const InputMessagePtr& msg) { g_game.processPing(); - sendPingBack(); } void ProtocolGame::parsePingBack(const InputMessagePtr& msg) diff --git a/src/otclient/protocolgamesend.cpp b/src/client/protocolgamesend.cpp similarity index 99% rename from src/otclient/protocolgamesend.cpp rename to src/client/protocolgamesend.cpp index c48401ba..dcaf4c48 100644 --- a/src/otclient/protocolgamesend.cpp +++ b/src/client/protocolgamesend.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/shadermanager.cpp b/src/client/shadermanager.cpp similarity index 98% rename from src/otclient/shadermanager.cpp rename to src/client/shadermanager.cpp index 5f06cee0..3cecfb3d 100644 --- a/src/otclient/shadermanager.cpp +++ b/src/client/shadermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/shadermanager.h b/src/client/shadermanager.h similarity index 97% rename from src/otclient/shadermanager.h rename to src/client/shadermanager.h index 0e3bb172..0d375b27 100644 --- a/src/otclient/shadermanager.h +++ b/src/client/shadermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/spritemanager.cpp b/src/client/spritemanager.cpp similarity index 98% rename from src/otclient/spritemanager.cpp rename to src/client/spritemanager.cpp index 6ff08670..0b07dec8 100644 --- a/src/otclient/spritemanager.cpp +++ b/src/client/spritemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/spritemanager.h b/src/client/spritemanager.h similarity index 96% rename from src/otclient/spritemanager.h rename to src/client/spritemanager.h index 40ff7309..e07ab621 100644 --- a/src/otclient/spritemanager.h +++ b/src/client/spritemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/statictext.cpp b/src/client/statictext.cpp similarity index 98% rename from src/otclient/statictext.cpp rename to src/client/statictext.cpp index cafa8121..cb195c93 100644 --- a/src/otclient/statictext.cpp +++ b/src/client/statictext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/statictext.h b/src/client/statictext.h similarity index 97% rename from src/otclient/statictext.h rename to src/client/statictext.h index 006e9372..e0825b1a 100644 --- a/src/otclient/statictext.h +++ b/src/client/statictext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thing.cpp b/src/client/thing.cpp similarity index 97% rename from src/otclient/thing.cpp rename to src/client/thing.cpp index 31c4e22e..2d0261da 100644 --- a/src/otclient/thing.cpp +++ b/src/client/thing.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thing.h b/src/client/thing.h similarity index 99% rename from src/otclient/thing.h rename to src/client/thing.h index 0fbc831a..7a660530 100644 --- a/src/otclient/thing.h +++ b/src/client/thing.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thingstype.h b/src/client/thingstype.h similarity index 97% rename from src/otclient/thingstype.h rename to src/client/thingstype.h index 9995ff14..55367a16 100644 --- a/src/otclient/thingstype.h +++ b/src/client/thingstype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thingtype.cpp b/src/client/thingtype.cpp similarity index 99% rename from src/otclient/thingtype.cpp rename to src/client/thingtype.cpp index f05f221f..3943ae0d 100644 --- a/src/otclient/thingtype.cpp +++ b/src/client/thingtype.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thingtype.h b/src/client/thingtype.h similarity index 99% rename from src/otclient/thingtype.h rename to src/client/thingtype.h index 25cc18b0..6e7afcce 100644 --- a/src/otclient/thingtype.h +++ b/src/client/thingtype.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thingtypemanager.cpp b/src/client/thingtypemanager.cpp similarity index 99% rename from src/otclient/thingtypemanager.cpp rename to src/client/thingtypemanager.cpp index da0829a0..6c86cacb 100644 --- a/src/otclient/thingtypemanager.cpp +++ b/src/client/thingtypemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/thingtypemanager.h b/src/client/thingtypemanager.h similarity index 98% rename from src/otclient/thingtypemanager.h rename to src/client/thingtypemanager.h index b20f1907..35a0954e 100644 --- a/src/otclient/thingtypemanager.h +++ b/src/client/thingtypemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/tile.cpp b/src/client/tile.cpp similarity index 99% rename from src/otclient/tile.cpp rename to src/client/tile.cpp index 02016642..86cec657 100644 --- a/src/otclient/tile.cpp +++ b/src/client/tile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/tile.h b/src/client/tile.h similarity index 98% rename from src/otclient/tile.h rename to src/client/tile.h index ebed86f3..eb20313b 100644 --- a/src/otclient/tile.h +++ b/src/client/tile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/towns.cpp b/src/client/towns.cpp similarity index 97% rename from src/otclient/towns.cpp rename to src/client/towns.cpp index 5d90a0e9..17d1deba 100644 --- a/src/otclient/towns.cpp +++ b/src/client/towns.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/towns.h b/src/client/towns.h similarity index 97% rename from src/otclient/towns.h rename to src/client/towns.h index 440b1859..b50e4fa6 100644 --- a/src/otclient/towns.h +++ b/src/client/towns.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uicreature.cpp b/src/client/uicreature.cpp similarity index 96% rename from src/otclient/uicreature.cpp rename to src/client/uicreature.cpp index 26c2a2eb..86c1f1b0 100644 --- a/src/otclient/uicreature.cpp +++ b/src/client/uicreature.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uicreature.h b/src/client/uicreature.h similarity index 96% rename from src/otclient/uicreature.h rename to src/client/uicreature.h index b8fe04a3..da6eba5b 100644 --- a/src/otclient/uicreature.h +++ b/src/client/uicreature.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uiitem.cpp b/src/client/uiitem.cpp similarity index 98% rename from src/otclient/uiitem.cpp rename to src/client/uiitem.cpp index c27e0cde..9491017d 100644 --- a/src/otclient/uiitem.cpp +++ b/src/client/uiitem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uiitem.h b/src/client/uiitem.h similarity index 97% rename from src/otclient/uiitem.h rename to src/client/uiitem.h index 8d84491e..8bcbf952 100644 --- a/src/otclient/uiitem.h +++ b/src/client/uiitem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uimap.cpp b/src/client/uimap.cpp similarity index 99% rename from src/otclient/uimap.cpp rename to src/client/uimap.cpp index 1c71f9c9..ee7b4fdf 100644 --- a/src/otclient/uimap.cpp +++ b/src/client/uimap.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uimap.h b/src/client/uimap.h similarity index 98% rename from src/otclient/uimap.h rename to src/client/uimap.h index d3cfb0fc..49cbbb93 100644 --- a/src/otclient/uimap.h +++ b/src/client/uimap.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uiprogressrect.cpp b/src/client/uiprogressrect.cpp similarity index 98% rename from src/otclient/uiprogressrect.cpp rename to src/client/uiprogressrect.cpp index c74ff034..7f20d812 100644 --- a/src/otclient/uiprogressrect.cpp +++ b/src/client/uiprogressrect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/otclient/uiprogressrect.h b/src/client/uiprogressrect.h similarity index 96% rename from src/otclient/uiprogressrect.h rename to src/client/uiprogressrect.h index 104a6672..aeb7e46d 100644 --- a/src/otclient/uiprogressrect.h +++ b/src/client/uiprogressrect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt index 0debf650..5c2f05fe 100644 --- a/src/framework/CMakeLists.txt +++ b/src/framework/CMakeLists.txt @@ -478,19 +478,5 @@ if(FRAMEWORK_SQL) set(framework_DEFINITIONS ${framework_DEFINITIONS} -DFW_SQL) endif() -if(FRAMEWORK_GIT) - find_package(Git2 REQUIRED) - - set(framework_INCLUDE_DIRS ${framework_INCLUDE_DIRS} ${GIT2_INCLUDE_DIR}) - set(framework_LIBRARIES ${GIT2_LIBRARY} ${framework_LIBRARIES}) - - set(framework_SOURCES ${framework_SOURCES} - ${CMAKE_CURRENT_LIST_DIR}/git/declarations.h - ${CMAKE_CURRENT_LIST_DIR}/git/gitrepository.h - ${CMAKE_CURRENT_LIST_DIR}/git/gitrepository.cpp - ) - set(framework_DEFINITIONS ${framework_DEFINITIONS} -DFW_GIT) -endif() - include_directories(${framework_INCLUDE_DIRS}) add_definitions(${framework_DEFINITIONS}) diff --git a/src/framework/const.h b/src/framework/const.h index a95d1f9d..125c973b 100644 --- a/src/framework/const.h +++ b/src/framework/const.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/adaptativeframecounter.cpp b/src/framework/core/adaptativeframecounter.cpp index 2e1b1cfe..005bae48 100644 --- a/src/framework/core/adaptativeframecounter.cpp +++ b/src/framework/core/adaptativeframecounter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/adaptativeframecounter.h b/src/framework/core/adaptativeframecounter.h index 0527d08f..ce410406 100644 --- a/src/framework/core/adaptativeframecounter.h +++ b/src/framework/core/adaptativeframecounter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp index b83448bf..574b1113 100644 --- a/src/framework/core/application.cpp +++ b/src/framework/core/application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/application.h b/src/framework/core/application.h index 9b48e8e4..5c57ab26 100644 --- a/src/framework/core/application.h +++ b/src/framework/core/application.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/binarytree.cpp b/src/framework/core/binarytree.cpp index 420e8a1f..2bc78f49 100644 --- a/src/framework/core/binarytree.cpp +++ b/src/framework/core/binarytree.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/binarytree.h b/src/framework/core/binarytree.h index 1842205b..8d1c73ab 100644 --- a/src/framework/core/binarytree.h +++ b/src/framework/core/binarytree.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,7 +25,7 @@ #include "declarations.h" #include -#include +#include #include enum { diff --git a/src/framework/core/clock.cpp b/src/framework/core/clock.cpp index 04ddda0c..701a9a0b 100644 --- a/src/framework/core/clock.cpp +++ b/src/framework/core/clock.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/clock.h b/src/framework/core/clock.h index fe494f95..45770a54 100644 --- a/src/framework/core/clock.h +++ b/src/framework/core/clock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/configmanager.cpp b/src/framework/core/configmanager.cpp index f88be11d..f0ec36e8 100644 --- a/src/framework/core/configmanager.cpp +++ b/src/framework/core/configmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/configmanager.h b/src/framework/core/configmanager.h index b06bf12a..2f5cb70e 100644 --- a/src/framework/core/configmanager.h +++ b/src/framework/core/configmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/consoleapplication.cpp b/src/framework/core/consoleapplication.cpp index 0fa5b583..a40b0b55 100644 --- a/src/framework/core/consoleapplication.cpp +++ b/src/framework/core/consoleapplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/consoleapplication.h b/src/framework/core/consoleapplication.h index fee7c4c4..38092b3b 100644 --- a/src/framework/core/consoleapplication.h +++ b/src/framework/core/consoleapplication.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/declarations.h b/src/framework/core/declarations.h index 65bf7e3e..5f943623 100644 --- a/src/framework/core/declarations.h +++ b/src/framework/core/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/event.cpp b/src/framework/core/event.cpp index f607c893..ec33ed68 100644 --- a/src/framework/core/event.cpp +++ b/src/framework/core/event.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/event.h b/src/framework/core/event.h index 18438b1f..036a1acb 100644 --- a/src/framework/core/event.h +++ b/src/framework/core/event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/eventdispatcher.cpp b/src/framework/core/eventdispatcher.cpp index 80dcb112..10365003 100644 --- a/src/framework/core/eventdispatcher.cpp +++ b/src/framework/core/eventdispatcher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/eventdispatcher.h b/src/framework/core/eventdispatcher.h index bb1c46ab..0ae83a19 100644 --- a/src/framework/core/eventdispatcher.h +++ b/src/framework/core/eventdispatcher.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/filestream.cpp b/src/framework/core/filestream.cpp index 10556d42..71588ce0 100644 --- a/src/framework/core/filestream.cpp +++ b/src/framework/core/filestream.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/filestream.h b/src/framework/core/filestream.h index 2126fb9e..3e51d905 100644 --- a/src/framework/core/filestream.h +++ b/src/framework/core/filestream.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -26,7 +26,7 @@ #include "declarations.h" #include #include -#include +#include #include struct PHYSFS_File; diff --git a/src/framework/core/graphicalapplication.cpp b/src/framework/core/graphicalapplication.cpp index c1bc0e82..dc2914e1 100644 --- a/src/framework/core/graphicalapplication.cpp +++ b/src/framework/core/graphicalapplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/graphicalapplication.h b/src/framework/core/graphicalapplication.h index 3fc4fc9f..93e902da 100644 --- a/src/framework/core/graphicalapplication.h +++ b/src/framework/core/graphicalapplication.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/inputevent.h b/src/framework/core/inputevent.h index c065d1c9..e7cd6752 100644 --- a/src/framework/core/inputevent.h +++ b/src/framework/core/inputevent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/logger.cpp b/src/framework/core/logger.cpp index 8ba729e4..916988aa 100644 --- a/src/framework/core/logger.cpp +++ b/src/framework/core/logger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/logger.h b/src/framework/core/logger.h index d34c7c1d..665e8044 100644 --- a/src/framework/core/logger.h +++ b/src/framework/core/logger.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/module.cpp b/src/framework/core/module.cpp index fd772ed4..81bce815 100644 --- a/src/framework/core/module.cpp +++ b/src/framework/core/module.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/module.h b/src/framework/core/module.h index 30814f08..e73517a8 100644 --- a/src/framework/core/module.h +++ b/src/framework/core/module.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/modulemanager.cpp b/src/framework/core/modulemanager.cpp index dc7d115b..745baa5e 100644 --- a/src/framework/core/modulemanager.cpp +++ b/src/framework/core/modulemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/modulemanager.h b/src/framework/core/modulemanager.h index a2b012dd..ed6a035f 100644 --- a/src/framework/core/modulemanager.h +++ b/src/framework/core/modulemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/resourcemanager.cpp b/src/framework/core/resourcemanager.cpp index 02f68e45..e84516ef 100644 --- a/src/framework/core/resourcemanager.cpp +++ b/src/framework/core/resourcemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/resourcemanager.cpp.rej b/src/framework/core/resourcemanager.cpp.rej new file mode 100644 index 00000000..ec8fa930 --- /dev/null +++ b/src/framework/core/resourcemanager.cpp.rej @@ -0,0 +1,30 @@ +--- src/framework/core/resourcemanager.cpp ++++ src/framework/core/resourcemanager.cpp +@@ -34,19 +35,21 @@ + void ResourceManager::discoverWorkDir(const std::string& existentFile) + { + // search for modules directory +- std::string sep = PHYSFS_getDirSeparator(); +- std::string possiblePaths[] = { boost::filesystem::current_path().generic_string() + sep, +- g_resources.getBaseDir() + ".." + sep}; ++ std::string possiblePaths[] = { g_resources.getCurrentDir(), ++ g_resources.getBaseDir(), ++ g_resources.getBaseDir() + "../" }; + bool found = false; + for(const std::string& dir : possiblePaths) { +- // try to directory to modules path to see if it exists +- std::ifstream fin(dir + existentFile); +- if(fin) { ++ if(!PHYSFS_addToSearchPath(dir.c_str(), 0)) ++ continue; ++ ++ if(PHYSFS_exists(existentFile.c_str())) { + g_logger.debug(stdext::format("Found work dir at '%s'", dir.c_str())); + m_workDir = dir; + found = true; + break; + } ++ PHYSFS_removeFromSearchPath(dir.c_str()); + } + + if(!found) diff --git a/src/framework/core/resourcemanager.h b/src/framework/core/resourcemanager.h index bfa6a931..5c99650e 100644 --- a/src/framework/core/resourcemanager.h +++ b/src/framework/core/resourcemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/scheduledevent.cpp b/src/framework/core/scheduledevent.cpp index 8ef33c7c..0c6a5e94 100644 --- a/src/framework/core/scheduledevent.cpp +++ b/src/framework/core/scheduledevent.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/scheduledevent.h b/src/framework/core/scheduledevent.h index f07a9593..6e7f0c61 100644 --- a/src/framework/core/scheduledevent.h +++ b/src/framework/core/scheduledevent.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/timer.cpp b/src/framework/core/timer.cpp index 5da192ea..2ecb4a8e 100644 --- a/src/framework/core/timer.cpp +++ b/src/framework/core/timer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/core/timer.h b/src/framework/core/timer.h index 5a2b82c1..52bbb74f 100644 --- a/src/framework/core/timer.h +++ b/src/framework/core/timer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/git/declarations.h b/src/framework/git/declarations.h deleted file mode 100644 index 871d7553..00000000 --- a/src/framework/git/declarations.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2010-2012 OTClient - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef FRAMEWORK_GIT_DECLARATIONS_H -#define FRAMEWORK_GIT_DECLARATIONS_H - -#include - -class GitRepository; -typedef stdext::shared_object_ptr GitRepositoryPtr; - -#endif diff --git a/src/framework/git/gitrepository.cpp b/src/framework/git/gitrepository.cpp deleted file mode 100644 index 41e58f4d..00000000 --- a/src/framework/git/gitrepository.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2010-2012 OTClient - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "gitrepository.h" -#include - -#include - -GitRepository::GitRepository() -{ - m_repo = nullptr; -} - -GitRepository::~GitRepository() -{ - if(m_repo) { - git_repository_free(m_repo); - } -} - -bool GitRepository::open(const std::string& path) -{ - int error = git_repository_open(&m_repo, path.c_str()); - if(error < 0) { - m_lastError = "failed to open repository"; - return false; - } - return true; -} - - -void GitRepository::fetch(const std::string& remoteUrl) -{ - //git_remote *remote = nullptr; -} - - diff --git a/src/framework/git/gitrepository.h b/src/framework/git/gitrepository.h deleted file mode 100644 index 8703a704..00000000 --- a/src/framework/git/gitrepository.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2010-2012 OTClient - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef GITREPOSITORY_H -#define GITREPOSITORY_H - -#include "declarations.h" - -struct git_repository; - -class GitRepository -{ -public: - GitRepository(); - ~GitRepository(); - - bool open(const std::string& path); - void fetch(const std::string& remoteUrl); - -private: - git_repository *m_repo; - std::string m_lastError; -}; - -#endif diff --git a/src/framework/global.h b/src/framework/global.h index 04764c27..2eafbf68 100644 --- a/src/framework/global.h +++ b/src/framework/global.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/animatedtexture.cpp b/src/framework/graphics/animatedtexture.cpp index 63c5f459..74fc2535 100644 --- a/src/framework/graphics/animatedtexture.cpp +++ b/src/framework/graphics/animatedtexture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/animatedtexture.h b/src/framework/graphics/animatedtexture.h index 977ab4e1..8598969c 100644 --- a/src/framework/graphics/animatedtexture.h +++ b/src/framework/graphics/animatedtexture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/apngloader.h b/src/framework/graphics/apngloader.h index 92257823..e061d8f3 100644 --- a/src/framework/graphics/apngloader.h +++ b/src/framework/graphics/apngloader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/bitmapfont.cpp b/src/framework/graphics/bitmapfont.cpp index 741653cd..9e2d47a1 100644 --- a/src/framework/graphics/bitmapfont.cpp +++ b/src/framework/graphics/bitmapfont.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/bitmapfont.h b/src/framework/graphics/bitmapfont.h index d30be619..0ee9d477 100644 --- a/src/framework/graphics/bitmapfont.h +++ b/src/framework/graphics/bitmapfont.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/cachedtext.cpp b/src/framework/graphics/cachedtext.cpp index 9da13939..3205e431 100644 --- a/src/framework/graphics/cachedtext.cpp +++ b/src/framework/graphics/cachedtext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/cachedtext.h b/src/framework/graphics/cachedtext.h index 4db2f07b..a0228c52 100644 --- a/src/framework/graphics/cachedtext.h +++ b/src/framework/graphics/cachedtext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/coordsbuffer.cpp b/src/framework/graphics/coordsbuffer.cpp index 17043a52..6f27a09e 100644 --- a/src/framework/graphics/coordsbuffer.cpp +++ b/src/framework/graphics/coordsbuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/coordsbuffer.h b/src/framework/graphics/coordsbuffer.h index 485a86ec..b7023dbe 100644 --- a/src/framework/graphics/coordsbuffer.h +++ b/src/framework/graphics/coordsbuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/declarations.h b/src/framework/graphics/declarations.h index 1533faf4..dcf427b5 100644 --- a/src/framework/graphics/declarations.h +++ b/src/framework/graphics/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/fontmanager.cpp b/src/framework/graphics/fontmanager.cpp index 0f2480d0..a6aeaaca 100644 --- a/src/framework/graphics/fontmanager.cpp +++ b/src/framework/graphics/fontmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/fontmanager.h b/src/framework/graphics/fontmanager.h index 01b9ef52..37b94fd7 100644 --- a/src/framework/graphics/fontmanager.h +++ b/src/framework/graphics/fontmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffer.cpp b/src/framework/graphics/framebuffer.cpp index 0b02efd2..aced6ba8 100644 --- a/src/framework/graphics/framebuffer.cpp +++ b/src/framework/graphics/framebuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffer.h b/src/framework/graphics/framebuffer.h index 4645313f..70df4870 100644 --- a/src/framework/graphics/framebuffer.h +++ b/src/framework/graphics/framebuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffermanager.cpp b/src/framework/graphics/framebuffermanager.cpp index a82136fa..ccf40abf 100644 --- a/src/framework/graphics/framebuffermanager.cpp +++ b/src/framework/graphics/framebuffermanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/framebuffermanager.h b/src/framework/graphics/framebuffermanager.h index 2d2c7365..327e635f 100644 --- a/src/framework/graphics/framebuffermanager.h +++ b/src/framework/graphics/framebuffermanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/glutil.h b/src/framework/graphics/glutil.h index 000502b5..a0f73b8d 100644 --- a/src/framework/graphics/glutil.h +++ b/src/framework/graphics/glutil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/graphics.cpp b/src/framework/graphics/graphics.cpp index d4aa2c1f..3b9d4204 100644 --- a/src/framework/graphics/graphics.cpp +++ b/src/framework/graphics/graphics.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/graphics.h b/src/framework/graphics/graphics.h index f3f315a6..fc30493c 100644 --- a/src/framework/graphics/graphics.h +++ b/src/framework/graphics/graphics.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/hardwarebuffer.cpp b/src/framework/graphics/hardwarebuffer.cpp index bd206afe..ce159ec7 100644 --- a/src/framework/graphics/hardwarebuffer.cpp +++ b/src/framework/graphics/hardwarebuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/hardwarebuffer.h b/src/framework/graphics/hardwarebuffer.h index 923530d2..3b9570b0 100644 --- a/src/framework/graphics/hardwarebuffer.h +++ b/src/framework/graphics/hardwarebuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/image.cpp b/src/framework/graphics/image.cpp index 2561925e..ebab8857 100644 --- a/src/framework/graphics/image.cpp +++ b/src/framework/graphics/image.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/image.h b/src/framework/graphics/image.h index 6608fb6c..a7235cd3 100644 --- a/src/framework/graphics/image.h +++ b/src/framework/graphics/image.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painter.cpp b/src/framework/graphics/painter.cpp index 780abac7..25162b4c 100644 --- a/src/framework/graphics/painter.cpp +++ b/src/framework/graphics/painter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painter.h b/src/framework/graphics/painter.h index 103ca6f3..58b68b47 100644 --- a/src/framework/graphics/painter.h +++ b/src/framework/graphics/painter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painterogl1.cpp b/src/framework/graphics/painterogl1.cpp index 429cd92f..72b62d98 100644 --- a/src/framework/graphics/painterogl1.cpp +++ b/src/framework/graphics/painterogl1.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painterogl1.h b/src/framework/graphics/painterogl1.h index 0d0bc1d0..247cd547 100644 --- a/src/framework/graphics/painterogl1.h +++ b/src/framework/graphics/painterogl1.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painterogl2.cpp b/src/framework/graphics/painterogl2.cpp index 097d0dde..f41d9ca4 100644 --- a/src/framework/graphics/painterogl2.cpp +++ b/src/framework/graphics/painterogl2.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painterogl2.h b/src/framework/graphics/painterogl2.h index 281e9e95..86d5ef0e 100644 --- a/src/framework/graphics/painterogl2.h +++ b/src/framework/graphics/painterogl2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/painterogl2_shadersources.h b/src/framework/graphics/painterogl2_shadersources.h index b6898c4a..c531c24f 100644 --- a/src/framework/graphics/painterogl2_shadersources.h +++ b/src/framework/graphics/painterogl2_shadersources.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/paintershaderprogram.cpp b/src/framework/graphics/paintershaderprogram.cpp index faac9a66..6d941776 100644 --- a/src/framework/graphics/paintershaderprogram.cpp +++ b/src/framework/graphics/paintershaderprogram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/paintershaderprogram.h b/src/framework/graphics/paintershaderprogram.h index 49809a63..0db1520d 100644 --- a/src/framework/graphics/paintershaderprogram.h +++ b/src/framework/graphics/paintershaderprogram.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particle.cpp b/src/framework/graphics/particle.cpp index 2a277601..1b464a2e 100644 --- a/src/framework/graphics/particle.cpp +++ b/src/framework/graphics/particle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particle.h b/src/framework/graphics/particle.h index 8a86f743..5ce697ce 100644 --- a/src/framework/graphics/particle.h +++ b/src/framework/graphics/particle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleaffector.cpp b/src/framework/graphics/particleaffector.cpp index 0ffcee79..f9a9eb6d 100644 --- a/src/framework/graphics/particleaffector.cpp +++ b/src/framework/graphics/particleaffector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleaffector.h b/src/framework/graphics/particleaffector.h index e2692dc8..5cac17bd 100644 --- a/src/framework/graphics/particleaffector.h +++ b/src/framework/graphics/particleaffector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleeffect.cpp b/src/framework/graphics/particleeffect.cpp index 3aaeb6ed..2d604b2b 100644 --- a/src/framework/graphics/particleeffect.cpp +++ b/src/framework/graphics/particleeffect.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleeffect.h b/src/framework/graphics/particleeffect.h index fbb4f796..4de607f6 100644 --- a/src/framework/graphics/particleeffect.h +++ b/src/framework/graphics/particleeffect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleemitter.cpp b/src/framework/graphics/particleemitter.cpp index 1d503986..043d51c5 100644 --- a/src/framework/graphics/particleemitter.cpp +++ b/src/framework/graphics/particleemitter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particleemitter.h b/src/framework/graphics/particleemitter.h index c40999b4..c8b069f9 100644 --- a/src/framework/graphics/particleemitter.h +++ b/src/framework/graphics/particleemitter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlemanager.cpp b/src/framework/graphics/particlemanager.cpp index 148006c9..a099372c 100644 --- a/src/framework/graphics/particlemanager.cpp +++ b/src/framework/graphics/particlemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlemanager.h b/src/framework/graphics/particlemanager.h index cbc07313..2a88ff95 100644 --- a/src/framework/graphics/particlemanager.h +++ b/src/framework/graphics/particlemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlesystem.cpp b/src/framework/graphics/particlesystem.cpp index cd71ff4b..20dabbc0 100644 --- a/src/framework/graphics/particlesystem.cpp +++ b/src/framework/graphics/particlesystem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/particlesystem.h b/src/framework/graphics/particlesystem.h index 9c203998..ea15d13f 100644 --- a/src/framework/graphics/particlesystem.h +++ b/src/framework/graphics/particlesystem.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shader.cpp b/src/framework/graphics/shader.cpp index 7be3d438..e663f5c5 100644 --- a/src/framework/graphics/shader.cpp +++ b/src/framework/graphics/shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shader.h b/src/framework/graphics/shader.h index d3f5d703..064f66d1 100644 --- a/src/framework/graphics/shader.h +++ b/src/framework/graphics/shader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shaderprogram.cpp b/src/framework/graphics/shaderprogram.cpp index cc9f9252..b2efc6f2 100644 --- a/src/framework/graphics/shaderprogram.cpp +++ b/src/framework/graphics/shaderprogram.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/shaderprogram.h b/src/framework/graphics/shaderprogram.h index 47521d1d..2e4149c6 100644 --- a/src/framework/graphics/shaderprogram.h +++ b/src/framework/graphics/shaderprogram.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texture.cpp b/src/framework/graphics/texture.cpp index 3aff20ec..15eb3077 100644 --- a/src/framework/graphics/texture.cpp +++ b/src/framework/graphics/texture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texture.h b/src/framework/graphics/texture.h index 562ef360..1d1389bf 100644 --- a/src/framework/graphics/texture.h +++ b/src/framework/graphics/texture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texturemanager.cpp b/src/framework/graphics/texturemanager.cpp index 8d0bfacb..4251d2a6 100644 --- a/src/framework/graphics/texturemanager.cpp +++ b/src/framework/graphics/texturemanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/texturemanager.h b/src/framework/graphics/texturemanager.h index 79ee2f95..9a1775a1 100644 --- a/src/framework/graphics/texturemanager.h +++ b/src/framework/graphics/texturemanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/graphics/vertexarray.h b/src/framework/graphics/vertexarray.h index 12ea87f7..8e3b1e32 100644 --- a/src/framework/graphics/vertexarray.h +++ b/src/framework/graphics/vertexarray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/input/mouse.cpp b/src/framework/input/mouse.cpp index 8983d595..aea6da6b 100644 --- a/src/framework/input/mouse.cpp +++ b/src/framework/input/mouse.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/input/mouse.h b/src/framework/input/mouse.h index 4b55bc3a..06d89fc1 100644 --- a/src/framework/input/mouse.h +++ b/src/framework/input/mouse.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/declarations.h b/src/framework/luaengine/declarations.h index f34d0204..55ddaee2 100644 --- a/src/framework/luaengine/declarations.h +++ b/src/framework/luaengine/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/lbitlib.h b/src/framework/luaengine/lbitlib.h index afbc7e99..b0c7542c 100644 --- a/src/framework/luaengine/lbitlib.h +++ b/src/framework/luaengine/lbitlib.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luabinder.h b/src/framework/luaengine/luabinder.h index 0c3b9757..d58ef085 100644 --- a/src/framework/luaengine/luabinder.h +++ b/src/framework/luaengine/luabinder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaexception.cpp b/src/framework/luaengine/luaexception.cpp index 3ba990a7..d5cacae5 100644 --- a/src/framework/luaengine/luaexception.cpp +++ b/src/framework/luaengine/luaexception.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaexception.h b/src/framework/luaengine/luaexception.h index 4fd3beeb..1ba2182a 100644 --- a/src/framework/luaengine/luaexception.h +++ b/src/framework/luaengine/luaexception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luainterface.cpp b/src/framework/luaengine/luainterface.cpp index e4b19299..6bb7a34b 100644 --- a/src/framework/luaengine/luainterface.cpp +++ b/src/framework/luaengine/luainterface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luainterface.h b/src/framework/luaengine/luainterface.h index 2a223899..9e642641 100644 --- a/src/framework/luaengine/luainterface.h +++ b/src/framework/luaengine/luainterface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaobject.cpp b/src/framework/luaengine/luaobject.cpp index ce94f53e..033662ae 100644 --- a/src/framework/luaengine/luaobject.cpp +++ b/src/framework/luaengine/luaobject.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luaobject.h b/src/framework/luaengine/luaobject.h index 41ce637e..b7689498 100644 --- a/src/framework/luaengine/luaobject.h +++ b/src/framework/luaengine/luaobject.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luavaluecasts.cpp b/src/framework/luaengine/luavaluecasts.cpp index d82920f2..b696057f 100644 --- a/src/framework/luaengine/luavaluecasts.cpp +++ b/src/framework/luaengine/luavaluecasts.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luaengine/luavaluecasts.h b/src/framework/luaengine/luavaluecasts.h index c87dff1a..b5ff81f2 100644 --- a/src/framework/luaengine/luavaluecasts.h +++ b/src/framework/luaengine/luavaluecasts.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/luafunctions.cpp b/src/framework/luafunctions.cpp index 8d2d2592..220d44ed 100644 --- a/src/framework/luafunctions.cpp +++ b/src/framework/luafunctions.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/connection.cpp b/src/framework/net/connection.cpp index c44442b7..bcfb61f5 100644 --- a/src/framework/net/connection.cpp +++ b/src/framework/net/connection.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/connection.h b/src/framework/net/connection.h index dc567bb1..78075178 100644 --- a/src/framework/net/connection.h +++ b/src/framework/net/connection.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/declarations.h b/src/framework/net/declarations.h index cfd9d8fe..ab4a7d5e 100644 --- a/src/framework/net/declarations.h +++ b/src/framework/net/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/inputmessage.cpp b/src/framework/net/inputmessage.cpp index 3ed922eb..656b0360 100644 --- a/src/framework/net/inputmessage.cpp +++ b/src/framework/net/inputmessage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/inputmessage.h b/src/framework/net/inputmessage.h index 0485e543..9f19e487 100644 --- a/src/framework/net/inputmessage.h +++ b/src/framework/net/inputmessage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/outputmessage.cpp b/src/framework/net/outputmessage.cpp index 3b076812..3be8da0f 100644 --- a/src/framework/net/outputmessage.cpp +++ b/src/framework/net/outputmessage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/outputmessage.h b/src/framework/net/outputmessage.h index 4123b05c..1da91d39 100644 --- a/src/framework/net/outputmessage.h +++ b/src/framework/net/outputmessage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocol.cpp b/src/framework/net/protocol.cpp index 66bb50a5..e90b3f0d 100644 --- a/src/framework/net/protocol.cpp +++ b/src/framework/net/protocol.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocol.h b/src/framework/net/protocol.h index 5edc06d1..7c71f588 100644 --- a/src/framework/net/protocol.h +++ b/src/framework/net/protocol.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocolhttp.cpp b/src/framework/net/protocolhttp.cpp index 6f3d9404..f7ec1d14 100644 --- a/src/framework/net/protocolhttp.cpp +++ b/src/framework/net/protocolhttp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/protocolhttp.h b/src/framework/net/protocolhttp.h index 1348543e..fc06ebde 100644 --- a/src/framework/net/protocolhttp.h +++ b/src/framework/net/protocolhttp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/server.cpp b/src/framework/net/server.cpp index c7ccc1a0..d1055f1a 100644 --- a/src/framework/net/server.cpp +++ b/src/framework/net/server.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/net/server.h b/src/framework/net/server.h index d3f1bcea..e45b5a39 100644 --- a/src/framework/net/server.h +++ b/src/framework/net/server.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/declarations.h b/src/framework/otml/declarations.h index 35de3b56..5f87e32e 100644 --- a/src/framework/otml/declarations.h +++ b/src/framework/otml/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otml.h b/src/framework/otml/otml.h index a707477c..91d84e56 100644 --- a/src/framework/otml/otml.h +++ b/src/framework/otml/otml.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmldocument.cpp b/src/framework/otml/otmldocument.cpp index e7302a8c..29aa9eec 100644 --- a/src/framework/otml/otmldocument.cpp +++ b/src/framework/otml/otmldocument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmldocument.h b/src/framework/otml/otmldocument.h index ff47b172..dd26393d 100644 --- a/src/framework/otml/otmldocument.h +++ b/src/framework/otml/otmldocument.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlemitter.cpp b/src/framework/otml/otmlemitter.cpp index ae5de3ca..4f08b89c 100644 --- a/src/framework/otml/otmlemitter.cpp +++ b/src/framework/otml/otmlemitter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlemitter.h b/src/framework/otml/otmlemitter.h index 528d5d5a..2ff0dc19 100644 --- a/src/framework/otml/otmlemitter.h +++ b/src/framework/otml/otmlemitter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlexception.cpp b/src/framework/otml/otmlexception.cpp index c2700bac..7b0b7254 100644 --- a/src/framework/otml/otmlexception.cpp +++ b/src/framework/otml/otmlexception.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlexception.h b/src/framework/otml/otmlexception.h index 04cf8132..652426b7 100644 --- a/src/framework/otml/otmlexception.h +++ b/src/framework/otml/otmlexception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlnode.cpp b/src/framework/otml/otmlnode.cpp index f88ed880..8ee6d8ee 100644 --- a/src/framework/otml/otmlnode.cpp +++ b/src/framework/otml/otmlnode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlnode.h b/src/framework/otml/otmlnode.h index 6f732b6f..0ee338ea 100644 --- a/src/framework/otml/otmlnode.h +++ b/src/framework/otml/otmlnode.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlparser.cpp b/src/framework/otml/otmlparser.cpp index cda76338..4d953d9b 100644 --- a/src/framework/otml/otmlparser.cpp +++ b/src/framework/otml/otmlparser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/otml/otmlparser.h b/src/framework/otml/otmlparser.h index 1d37b201..9f9246b6 100644 --- a/src/framework/otml/otmlparser.h +++ b/src/framework/otml/otmlparser.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/pch.h b/src/framework/pch.h index de9da521..2206ed1b 100644 --- a/src/framework/pch.h +++ b/src/framework/pch.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/crashhandler.h b/src/framework/platform/crashhandler.h index 620e9d2f..4c786a0f 100644 --- a/src/framework/platform/crashhandler.h +++ b/src/framework/platform/crashhandler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platformwindow.cpp b/src/framework/platform/platformwindow.cpp index a1539984..7f9cce9c 100644 --- a/src/framework/platform/platformwindow.cpp +++ b/src/framework/platform/platformwindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/platformwindow.h b/src/framework/platform/platformwindow.h index 3b0e1461..6b6d4454 100644 --- a/src/framework/platform/platformwindow.h +++ b/src/framework/platform/platformwindow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/unixcrashhandler.cpp b/src/framework/platform/unixcrashhandler.cpp index 9388218b..a331d76e 100644 --- a/src/framework/platform/unixcrashhandler.cpp +++ b/src/framework/platform/unixcrashhandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32crashhandler.cpp b/src/framework/platform/win32crashhandler.cpp index 8ee33c7d..cac0c0e5 100644 --- a/src/framework/platform/win32crashhandler.cpp +++ b/src/framework/platform/win32crashhandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index 01e530a5..dc38e756 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/win32window.h b/src/framework/platform/win32window.h index 815355f2..77bae995 100644 --- a/src/framework/platform/win32window.h +++ b/src/framework/platform/win32window.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp index 1c9794dc..bb4be4ef 100644 --- a/src/framework/platform/x11window.cpp +++ b/src/framework/platform/x11window.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/platform/x11window.h b/src/framework/platform/x11window.h index e163f294..becde3c2 100644 --- a/src/framework/platform/x11window.h +++ b/src/framework/platform/x11window.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/combinedsoundsource.cpp b/src/framework/sound/combinedsoundsource.cpp index 018ac669..281d2d32 100644 --- a/src/framework/sound/combinedsoundsource.cpp +++ b/src/framework/sound/combinedsoundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/combinedsoundsource.h b/src/framework/sound/combinedsoundsource.h index 1a7656b2..15482dc3 100644 --- a/src/framework/sound/combinedsoundsource.h +++ b/src/framework/sound/combinedsoundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/declarations.h b/src/framework/sound/declarations.h index 251d7790..794d13a7 100644 --- a/src/framework/sound/declarations.h +++ b/src/framework/sound/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/oggsoundfile.cpp b/src/framework/sound/oggsoundfile.cpp index a38fd41c..c787579e 100644 --- a/src/framework/sound/oggsoundfile.cpp +++ b/src/framework/sound/oggsoundfile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/oggsoundfile.h b/src/framework/sound/oggsoundfile.h index 64e37488..0982bb82 100644 --- a/src/framework/sound/oggsoundfile.h +++ b/src/framework/sound/oggsoundfile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundbuffer.cpp b/src/framework/sound/soundbuffer.cpp index 30a45e9f..e7848685 100644 --- a/src/framework/sound/soundbuffer.cpp +++ b/src/framework/sound/soundbuffer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundbuffer.h b/src/framework/sound/soundbuffer.h index 1593630e..27ed13aa 100644 --- a/src/framework/sound/soundbuffer.h +++ b/src/framework/sound/soundbuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundfile.cpp b/src/framework/sound/soundfile.cpp index c22f6f8e..8c76620d 100644 --- a/src/framework/sound/soundfile.cpp +++ b/src/framework/sound/soundfile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundfile.h b/src/framework/sound/soundfile.h index 63883c8d..afed579d 100644 --- a/src/framework/sound/soundfile.h +++ b/src/framework/sound/soundfile.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundmanager.cpp b/src/framework/sound/soundmanager.cpp index 5410a256..a0f5077a 100644 --- a/src/framework/sound/soundmanager.cpp +++ b/src/framework/sound/soundmanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundmanager.h b/src/framework/sound/soundmanager.h index b5b3a78f..2a8bf15a 100644 --- a/src/framework/sound/soundmanager.h +++ b/src/framework/sound/soundmanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundsource.cpp b/src/framework/sound/soundsource.cpp index f143c789..3bd4a3c7 100644 --- a/src/framework/sound/soundsource.cpp +++ b/src/framework/sound/soundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/soundsource.h b/src/framework/sound/soundsource.h index 5c2e4ee8..c985a93d 100644 --- a/src/framework/sound/soundsource.h +++ b/src/framework/sound/soundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/streamsoundsource.cpp b/src/framework/sound/streamsoundsource.cpp index e44e2a37..72dcd208 100644 --- a/src/framework/sound/streamsoundsource.cpp +++ b/src/framework/sound/streamsoundsource.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sound/streamsoundsource.h b/src/framework/sound/streamsoundsource.h index 55e412dd..1a0e4593 100644 --- a/src/framework/sound/streamsoundsource.h +++ b/src/framework/sound/streamsoundsource.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/database.cpp b/src/framework/sql/database.cpp index bfd14660..76bb2719 100644 --- a/src/framework/sql/database.cpp +++ b/src/framework/sql/database.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/database.h b/src/framework/sql/database.h index 5f5bd60d..613e26bb 100644 --- a/src/framework/sql/database.h +++ b/src/framework/sql/database.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/declarations.h b/src/framework/sql/declarations.h index 2744e201..928e98dc 100644 --- a/src/framework/sql/declarations.h +++ b/src/framework/sql/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/mysql.cpp b/src/framework/sql/mysql.cpp index a9b68893..913b5094 100644 --- a/src/framework/sql/mysql.cpp +++ b/src/framework/sql/mysql.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/sql/mysql.h b/src/framework/sql/mysql.h index 6add5d80..c72791dc 100644 --- a/src/framework/sql/mysql.h +++ b/src/framework/sql/mysql.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/any.h b/src/framework/stdext/any.h index 47f979b7..08a14aae 100644 --- a/src/framework/stdext/any.h +++ b/src/framework/stdext/any.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/boolean.h b/src/framework/stdext/boolean.h index 31a1fac6..e0d1b8df 100644 --- a/src/framework/stdext/boolean.h +++ b/src/framework/stdext/boolean.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/cast.h b/src/framework/stdext/cast.h index 26337d76..58cdac8b 100644 --- a/src/framework/stdext/cast.h +++ b/src/framework/stdext/cast.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/compiler.h b/src/framework/stdext/compiler.h index b0dc2a6a..8139ff24 100644 --- a/src/framework/stdext/compiler.h +++ b/src/framework/stdext/compiler.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/coroutine.h b/src/framework/stdext/coroutine.h index 56082fb7..61c33701 100644 --- a/src/framework/stdext/coroutine.h +++ b/src/framework/stdext/coroutine.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/demangle.cpp b/src/framework/stdext/demangle.cpp index 9ba35f21..13f6bf0e 100644 --- a/src/framework/stdext/demangle.cpp +++ b/src/framework/stdext/demangle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/demangle.h b/src/framework/stdext/demangle.h index b834ef53..85be753c 100644 --- a/src/framework/stdext/demangle.h +++ b/src/framework/stdext/demangle.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/dumper.h b/src/framework/stdext/dumper.h index 3a5bb957..67733456 100644 --- a/src/framework/stdext/dumper.h +++ b/src/framework/stdext/dumper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/dynamic_storage.h b/src/framework/stdext/dynamic_storage.h index 0eb38009..4a27b21c 100644 --- a/src/framework/stdext/dynamic_storage.h +++ b/src/framework/stdext/dynamic_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/exception.h b/src/framework/stdext/exception.h index e717884a..8662c6bd 100644 --- a/src/framework/stdext/exception.h +++ b/src/framework/stdext/exception.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/format.h b/src/framework/stdext/format.h index 2b47464a..abc077cb 100644 --- a/src/framework/stdext/format.h +++ b/src/framework/stdext/format.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/math.cpp b/src/framework/stdext/math.cpp index ad92e556..9fa59cf3 100644 --- a/src/framework/stdext/math.cpp +++ b/src/framework/stdext/math.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/math.h b/src/framework/stdext/math.h index c5bbeecf..1f9c26a7 100644 --- a/src/framework/stdext/math.h +++ b/src/framework/stdext/math.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/net.cpp b/src/framework/stdext/net.cpp index 1f2186f6..6d7ab527 100644 --- a/src/framework/stdext/net.cpp +++ b/src/framework/stdext/net.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/net.h b/src/framework/stdext/net.h index 3679257c..c4e68610 100644 --- a/src/framework/stdext/net.h +++ b/src/framework/stdext/net.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_any.h b/src/framework/stdext/packed_any.h index 24748bd5..4b401e64 100644 --- a/src/framework/stdext/packed_any.h +++ b/src/framework/stdext/packed_any.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_storage.h b/src/framework/stdext/packed_storage.h index e00b9654..3be905db 100644 --- a/src/framework/stdext/packed_storage.h +++ b/src/framework/stdext/packed_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/packed_vector.h b/src/framework/stdext/packed_vector.h index 9c0a4951..c9a66c8c 100644 --- a/src/framework/stdext/packed_vector.h +++ b/src/framework/stdext/packed_vector.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/shared_object.h b/src/framework/stdext/shared_object.h index 730f966a..2dc59bec 100644 --- a/src/framework/stdext/shared_object.h +++ b/src/framework/stdext/shared_object.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/stdext.h b/src/framework/stdext/stdext.h index 01213698..3b27a51f 100644 --- a/src/framework/stdext/stdext.h +++ b/src/framework/stdext/stdext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/string.cpp b/src/framework/stdext/string.cpp index c5373819..086c4175 100644 --- a/src/framework/stdext/string.cpp +++ b/src/framework/stdext/string.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/string.h b/src/framework/stdext/string.h index a082104f..995f25b3 100644 --- a/src/framework/stdext/string.h +++ b/src/framework/stdext/string.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/thread.h b/src/framework/stdext/thread.h index d071fe86..c4b74520 100644 --- a/src/framework/stdext/thread.h +++ b/src/framework/stdext/thread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/time.cpp b/src/framework/stdext/time.cpp index 7b72671b..431551ff 100644 --- a/src/framework/stdext/time.cpp +++ b/src/framework/stdext/time.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/time.h b/src/framework/stdext/time.h index c71e77a0..fa148dca 100644 --- a/src/framework/stdext/time.h +++ b/src/framework/stdext/time.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/traits.h b/src/framework/stdext/traits.h index f4685ea3..1acfa0b1 100644 --- a/src/framework/stdext/traits.h +++ b/src/framework/stdext/traits.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/stdext/types.h b/src/framework/stdext/types.h index f3aa528b..a01e4fb6 100644 --- a/src/framework/stdext/types.h +++ b/src/framework/stdext/types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/declarations.h b/src/framework/ui/declarations.h index 5fc04ef5..6df9cd72 100644 --- a/src/framework/ui/declarations.h +++ b/src/framework/ui/declarations.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/ui.h b/src/framework/ui/ui.h index 93048fcf..3ea43a9f 100644 --- a/src/framework/ui/ui.h +++ b/src/framework/ui/ui.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uianchorlayout.cpp b/src/framework/ui/uianchorlayout.cpp index c7ba840b..6ea668ab 100644 --- a/src/framework/ui/uianchorlayout.cpp +++ b/src/framework/ui/uianchorlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uianchorlayout.h b/src/framework/ui/uianchorlayout.h index 5049cd1c..a8c5a215 100644 --- a/src/framework/ui/uianchorlayout.h +++ b/src/framework/ui/uianchorlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiboxlayout.cpp b/src/framework/ui/uiboxlayout.cpp index 9a7ee339..6fe8dc53 100644 --- a/src/framework/ui/uiboxlayout.cpp +++ b/src/framework/ui/uiboxlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiboxlayout.h b/src/framework/ui/uiboxlayout.h index 833d019b..c9ac23a7 100644 --- a/src/framework/ui/uiboxlayout.h +++ b/src/framework/ui/uiboxlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uigridlayout.cpp b/src/framework/ui/uigridlayout.cpp index 54599bd8..8a86e252 100644 --- a/src/framework/ui/uigridlayout.cpp +++ b/src/framework/ui/uigridlayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uigridlayout.h b/src/framework/ui/uigridlayout.h index e81f012a..fb679526 100644 --- a/src/framework/ui/uigridlayout.h +++ b/src/framework/ui/uigridlayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uihorizontallayout.cpp b/src/framework/ui/uihorizontallayout.cpp index f44e9f39..d64165b1 100644 --- a/src/framework/ui/uihorizontallayout.cpp +++ b/src/framework/ui/uihorizontallayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uihorizontallayout.h b/src/framework/ui/uihorizontallayout.h index d7410d66..64aa4bf4 100644 --- a/src/framework/ui/uihorizontallayout.h +++ b/src/framework/ui/uihorizontallayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uilayout.cpp b/src/framework/ui/uilayout.cpp index 6f17c28e..7ddf935f 100644 --- a/src/framework/ui/uilayout.cpp +++ b/src/framework/ui/uilayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uilayout.h b/src/framework/ui/uilayout.h index 089fc172..2ff95cd6 100644 --- a/src/framework/ui/uilayout.h +++ b/src/framework/ui/uilayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uimanager.cpp b/src/framework/ui/uimanager.cpp index 816673c5..95db36a0 100644 --- a/src/framework/ui/uimanager.cpp +++ b/src/framework/ui/uimanager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uimanager.h b/src/framework/ui/uimanager.h index 808a83f6..9e7f8eb5 100644 --- a/src/framework/ui/uimanager.h +++ b/src/framework/ui/uimanager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiparticles.cpp b/src/framework/ui/uiparticles.cpp index dec4561b..c1ee0d3d 100644 --- a/src/framework/ui/uiparticles.cpp +++ b/src/framework/ui/uiparticles.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiparticles.h b/src/framework/ui/uiparticles.h index 21d47635..3d815f8c 100644 --- a/src/framework/ui/uiparticles.h +++ b/src/framework/ui/uiparticles.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uirichtext.cpp b/src/framework/ui/uirichtext.cpp index 6334dc49..e7ba66da 100644 --- a/src/framework/ui/uirichtext.cpp +++ b/src/framework/ui/uirichtext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uirichtext.h b/src/framework/ui/uirichtext.h index dfad2720..11325d10 100644 --- a/src/framework/ui/uirichtext.h +++ b/src/framework/ui/uirichtext.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitextedit.cpp b/src/framework/ui/uitextedit.cpp index 3a8d0f11..343026e1 100644 --- a/src/framework/ui/uitextedit.cpp +++ b/src/framework/ui/uitextedit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitextedit.h b/src/framework/ui/uitextedit.h index 5e2fe721..d4d6e589 100644 --- a/src/framework/ui/uitextedit.h +++ b/src/framework/ui/uitextedit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitranslator.cpp b/src/framework/ui/uitranslator.cpp index c9fddd15..fb2cab2b 100644 --- a/src/framework/ui/uitranslator.cpp +++ b/src/framework/ui/uitranslator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uitranslator.h b/src/framework/ui/uitranslator.h index 3f0cca90..0e19031c 100644 --- a/src/framework/ui/uitranslator.h +++ b/src/framework/ui/uitranslator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiverticallayout.cpp b/src/framework/ui/uiverticallayout.cpp index 04fcaceb..463d4dd6 100644 --- a/src/framework/ui/uiverticallayout.cpp +++ b/src/framework/ui/uiverticallayout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiverticallayout.h b/src/framework/ui/uiverticallayout.h index f0d1f3ec..280cdf95 100644 --- a/src/framework/ui/uiverticallayout.h +++ b/src/framework/ui/uiverticallayout.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidget.cpp b/src/framework/ui/uiwidget.cpp index 65e6fbdd..af008778 100644 --- a/src/framework/ui/uiwidget.cpp +++ b/src/framework/ui/uiwidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidget.h b/src/framework/ui/uiwidget.h index 5f6fcb58..e6683299 100644 --- a/src/framework/ui/uiwidget.h +++ b/src/framework/ui/uiwidget.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgetbasestyle.cpp b/src/framework/ui/uiwidgetbasestyle.cpp index 6a7af66a..7f2b9f55 100644 --- a/src/framework/ui/uiwidgetbasestyle.cpp +++ b/src/framework/ui/uiwidgetbasestyle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgetimage.cpp b/src/framework/ui/uiwidgetimage.cpp index fb935209..edc9e928 100644 --- a/src/framework/ui/uiwidgetimage.cpp +++ b/src/framework/ui/uiwidgetimage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/ui/uiwidgettext.cpp b/src/framework/ui/uiwidgettext.cpp index 72e0b182..bf426b62 100644 --- a/src/framework/ui/uiwidgettext.cpp +++ b/src/framework/ui/uiwidgettext.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/color.cpp b/src/framework/util/color.cpp index bffcbbbe..0f801af9 100644 --- a/src/framework/util/color.cpp +++ b/src/framework/util/color.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/color.h b/src/framework/util/color.h index 7e5933d0..c21477d2 100644 --- a/src/framework/util/color.h +++ b/src/framework/util/color.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/crypt.cpp b/src/framework/util/crypt.cpp index 8bf4f9bb..3a94e582 100644 --- a/src/framework/util/crypt.cpp +++ b/src/framework/util/crypt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/crypt.h b/src/framework/util/crypt.h index 7a08b85a..1bda09f8 100644 --- a/src/framework/util/crypt.h +++ b/src/framework/util/crypt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/databuffer.h b/src/framework/util/databuffer.h index f6141c0b..c69dcecb 100644 --- a/src/framework/util/databuffer.h +++ b/src/framework/util/databuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/matrix.h b/src/framework/util/matrix.h index dd27d217..78532972 100644 --- a/src/framework/util/matrix.h +++ b/src/framework/util/matrix.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/point.h b/src/framework/util/point.h index 57dc1889..66487c47 100644 --- a/src/framework/util/point.h +++ b/src/framework/util/point.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/rect.h b/src/framework/util/rect.h index 52954d51..01616222 100644 --- a/src/framework/util/rect.h +++ b/src/framework/util/rect.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/util/size.h b/src/framework/util/size.h index 5ef9f6ce..d887a3a2 100644 --- a/src/framework/util/size.h +++ b/src/framework/util/size.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/framework/xml/tinyxml.h b/src/framework/xml/tinyxml.h index f402c206..3b5155f3 100644 --- a/src/framework/xml/tinyxml.h +++ b/src/framework/xml/tinyxml.h @@ -41,7 +41,7 @@ distribution. #include #include -#include +#include #include #include diff --git a/src/main.cpp b/src/main.cpp index b5b5bd7c..f9b56dde 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 OTClient + * Copyright (c) 2010-2013 OTClient * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,7 +23,7 @@ #include #include #include -#include +#include int main(int argc, const char* argv[]) { @@ -36,7 +36,7 @@ int main(int argc, const char* argv[]) // initialize application framework and otclient g_app.init(args); - g_otclient.init(args); + g_client.init(args); // find script init.lua and run it g_resources.discoverWorkDir(g_app.getCompactName(), "init.lua"); @@ -50,7 +50,7 @@ int main(int argc, const char* argv[]) g_app.deinit(); // terminate everything and free memory - g_otclient.terminate(); + g_client.terminate(); g_app.terminate(); return 0; }