From: <ave...@us...> - 2008-09-01 19:36:19
|
Revision: 5246 http://gemrb.svn.sourceforge.net/gemrb/?rev=5246&view=rev Author: avenger_teambg Date: 2008-09-01 19:36:29 +0000 (Mon, 01 Sep 2008) Log Message: ----------- applied Zefklop's cmake patch (without much testing) [ 2085249 ] cmake for unix Modified Paths: -------------- gemrb/trunk/CMakeLists.txt gemrb/trunk/gemrb/CMakeLists.txt gemrb/trunk/gemrb/includes/ie_types.h gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2008-09-01 19:34:30 UTC (rev 5245) +++ gemrb/trunk/CMakeLists.txt 2008-09-01 19:36:29 UTC (rev 5246) @@ -2,7 +2,7 @@ PROJECT(GemRB) IF( NOT PLUGIN_INSTALL_DIR ) - SET( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/Plugins ) + SET( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/plugins ) ENDIF( NOT PLUGIN_INSTALL_DIR ) IF( NOT OVERRIDE_INSTALL_DIR ) @@ -13,6 +13,15 @@ SET( GUISCRIPTS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/GUIScripts ) ENDIF( NOT GUISCRIPTS_INSTALL_DIR ) +MESSAGE(STATUS "Looking for Python libraries") +INCLUDE(FindPythonLibs) +IF(PYTHON_LIBRARY) + MESSAGE(STATUS "Python Libraries Found") +ELSE(PYTHON_LIBRARY) + MESSAGE(FATAL_ERROR "Unable to find Python development libraries. Please get it from www.python.org") +ENDIF(PYTHON_LIBRARY) + +MESSAGE(STATUS "Looking for openAL libraries") INCLUDE(FindOpenAL) IF(OPENAL_FOUND) MESSAGE(STATUS "openal found") @@ -40,4 +49,32 @@ MESSAGE( STATUS "WARNING : GemRB will be built without any PNG support. Get it from www.libpng.org" ) ENDIF(PNG_FOUND) +IF(UNIX) + MESSAGE(STATUS "Looking for dl library") + FIND_LIBRARY(DLD_LIBRARY_PATH dl dld) + IF(DLD_LIBRARY_PATH) + MESSAGE(STATUS "dl library found") + ELSE(DLD_LIBRARY_PATH) + MESSAGE(FATAL_ERROR "dl library not found") + ENDIF(DLD_LIBRARY_PATH) +ENDIF(UNIX) + +MESSAGE(STATUS "Looking for Ogg Vorbis support") +FIND_LIBRARY(VORBIS_LIBRARY vorbisfile) + +ADD_DEFINITIONS("-DHAVE_CONFIG_H") + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) + +#Platform checks +INCLUDE (CheckTypeSize) +CHECK_TYPE_SIZE("int" SIZEOF_INT) +CHECK_TYPE_SIZE("long int" SIZEOF_LONG_INT) + +INCLUDE (CheckFunctionExists) +CHECK_FUNCTION_EXISTS("snprintf" HAVE_SNPRINTF) + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINA +RY_DIR}/config.h) + ADD_SUBDIRECTORY( gemrb ) Modified: gemrb/trunk/gemrb/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/CMakeLists.txt 2008-09-01 19:34:30 UTC (rev 5245) +++ gemrb/trunk/gemrb/CMakeLists.txt 2008-09-01 19:36:29 UTC (rev 5246) @@ -4,7 +4,11 @@ ADD_EXECUTABLE(gemrb GemRB.cpp ) -TARGET_LINK_LIBRARIES(gemrb gemrb_core ) +IF(UNIX) + TARGET_LINK_LIBRARIES(gemrb gemrb_core ${DLD_LIBRARY_PATH}) +ELSE(UNIX) + TARGET_LINK_LIBRARIES(gemrb gemrb_core) +ENDIF(UNIX) INSTALL( TARGETS gemrb DESTINATION ${CMAKE_INSTALL_PREFIX} ) INSTALL( FILES GemRB.cfg.sample GemRB.cfg.subdir.sample DESTINATION ${CMAKE_INSTALL_PREFIX} ) Modified: gemrb/trunk/gemrb/includes/ie_types.h =================================================================== --- gemrb/trunk/gemrb/includes/ie_types.h 2008-09-01 19:34:30 UTC (rev 5245) +++ gemrb/trunk/gemrb/includes/ie_types.h 2008-09-01 19:36:29 UTC (rev 5246) @@ -30,7 +30,7 @@ #define IE_TYPES_H #if HAVE_CONFIG_H -#include "../../config.h" +#include <config.h> #endif //we need this for Windows Modified: gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-09-01 19:34:30 UTC (rev 5245) +++ gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-09-01 19:36:29 UTC (rev 5246) @@ -6,5 +6,4 @@ ADD_LIBRARY(gemrb_core SHARED ${gemrb_core_LIB_SRCS} ) -INSTALL( TARGETS gemrb_core RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) +INSTALL( TARGETS gemrb_core DESTINATION ${CMAKE_INSTALL_PREFIX} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-09-25 11:02:46
|
Revision: 5358 http://gemrb.svn.sourceforge.net/gemrb/?rev=5358&view=rev Author: lynxlupodian Date: 2008-09-25 11:02:38 +0000 (Thu, 25 Sep 2008) Log Message: ----------- changed version to 0.3.1 Modified Paths: -------------- gemrb/trunk/configure.in gemrb/trunk/gemrb/includes/globals.h Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2008-09-25 08:23:26 UTC (rev 5357) +++ gemrb/trunk/configure.in 2008-09-25 11:02:38 UTC (rev 5358) @@ -28,7 +28,7 @@ dnl Initialize autoconf and automake AC_PREREQ([2.57]) -AC_INIT(gemrb, 0.3.0) +AC_INIT(gemrb, 0.3.1) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_SRCDIR([gemrb/]) AC_CANONICAL_SYSTEM Modified: gemrb/trunk/gemrb/includes/globals.h =================================================================== --- gemrb/trunk/gemrb/includes/globals.h 2008-09-25 08:23:26 UTC (rev 5357) +++ gemrb/trunk/gemrb/includes/globals.h 2008-09-25 11:02:38 UTC (rev 5358) @@ -35,7 +35,7 @@ #include "ie_types.h" -#define VERSION_GEMRB "0.3.0" +#define VERSION_GEMRB "0.3.1" #define GEMRB_STRING "GemRB v" VERSION_GEMRB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-09-27 08:57:44
|
Revision: 5364 http://gemrb.svn.sourceforge.net/gemrb/?rev=5364&view=rev Author: lynxlupodian Date: 2008-09-27 08:57:33 +0000 (Sat, 27 Sep 2008) Log Message: ----------- [ 2085249 ] cmake for unix revisited Modified Paths: -------------- gemrb/trunk/CMakeLists.txt Added Paths: ----------- gemrb/trunk/cmake_config.h.in Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2008-09-27 07:57:23 UTC (rev 5363) +++ gemrb/trunk/CMakeLists.txt 2008-09-27 08:57:33 UTC (rev 5364) @@ -74,6 +74,18 @@ INCLUDE (CheckFunctionExists) CHECK_FUNCTION_EXISTS("snprintf" HAVE_SNPRINTF) +INCLUDE (CheckCXXSourceCompiles) +CHECK_CXX_SOURCE_COMPILES("typedef void *(* voidvoid)(void); + +void *object = 0; +voidvoid function; +function = (voidvoid) object; +", PERMITS_OBJECT_TO_FUNCTION_CAST) + +IF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST ) + SET(HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1) +ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST ) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) ADD_SUBDIRECTORY( gemrb ) Added: gemrb/trunk/cmake_config.h.in =================================================================== --- gemrb/trunk/cmake_config.h.in (rev 0) +++ gemrb/trunk/cmake_config.h.in 2008-09-27 08:57:33 UTC (rev 5364) @@ -0,0 +1,6 @@ +#define PACKAGE "gemrb" + +#cmakedefine SIZEOF_INT ${SIZEOF_INT} +#cmakedefine SIZEOF_LONG_INT ${SIZEOF_LONG_INT} +#cmakedefine HAVE_SNPRINTF 1 +#cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-10-04 20:09:12
|
Revision: 5391 http://gemrb.svn.sourceforge.net/gemrb/?rev=5391&view=rev Author: lynxlupodian Date: 2008-10-04 20:09:01 +0000 (Sat, 04 Oct 2008) Log Message: ----------- [ 2085249 ] cmake for unix patch 4 :) Modified Paths: -------------- gemrb/trunk/CMakeLists.txt gemrb/trunk/cmake_config.h.in gemrb/trunk/gemrb/CMakeLists.txt gemrb/trunk/gemrb/includes/win32def.h gemrb/trunk/gemrb/plugins/2DAImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/AREImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/BAMImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/BIFImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/BMPImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/CHUImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/CREImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt gemrb/trunk/gemrb/plugins/DLGImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/EFFImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/FXOpcodes/CMakeLists.txt gemrb/trunk/gemrb/plugins/GAMImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/GUIScript/CMakeLists.txt gemrb/trunk/gemrb/plugins/IDSImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/INIImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/ITMImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/IWDOpcodes/CMakeLists.txt gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/MOSImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/MUSImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt gemrb/trunk/gemrb/plugins/NullSound/CMakeLists.txt gemrb/trunk/gemrb/plugins/OpenALAudio/CMakeLists.txt gemrb/trunk/gemrb/plugins/PLTImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/PNGImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/PROImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/PSTOpcodes/CMakeLists.txt gemrb/trunk/gemrb/plugins/SDLVideo/CMakeLists.txt gemrb/trunk/gemrb/plugins/SPLImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/STOImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/TISImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/TLKImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/WEDImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/WMPImporter/CMakeLists.txt gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -74,6 +74,8 @@ INCLUDE (CheckFunctionExists) CHECK_FUNCTION_EXISTS("snprintf" HAVE_SNPRINTF) +#Unneeded on windows +IF(NOT WIN32) INCLUDE (CheckCXXSourceCompiles) CHECK_CXX_SOURCE_COMPILES("typedef void *(* voidvoid)(void); @@ -85,7 +87,16 @@ IF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST ) SET(HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1) ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST ) +ENDIF(NOT WIN32) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +#Plugin addtion macro +MACRO(ADD_GEMRB_PLUGIN plugin_name) +ADD_LIBRARY(${plugin_name} MODULE ${ARGN}) +IF(WIN32) + TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core) +ENDIF(WIN32) +ENDMACRO(ADD_GEMRB_PLUGIN) + ADD_SUBDIRECTORY( gemrb ) Modified: gemrb/trunk/cmake_config.h.in =================================================================== --- gemrb/trunk/cmake_config.h.in 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/cmake_config.h.in 2008-10-04 20:09:01 UTC (rev 5391) @@ -2,5 +2,7 @@ #cmakedefine SIZEOF_INT ${SIZEOF_INT} #cmakedefine SIZEOF_LONG_INT ${SIZEOF_LONG_INT} +#ifndef HAVE_SNPRINTF #cmakedefine HAVE_SNPRINTF 1 +#endif #cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1 Modified: gemrb/trunk/gemrb/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -3,12 +3,12 @@ ADD_SUBDIRECTORY( GUIScripts ) ADD_EXECUTABLE(gemrb GemRB.cpp ) - -IF(UNIX) +IF(WIN32) + TARGET_LINK_LIBRARIES(gemrb gemrb_core) +ELSE(WIN32) TARGET_LINK_LIBRARIES(gemrb gemrb_core ${DLD_LIBRARY_PATH}) -ELSE(UNIX) - TARGET_LINK_LIBRARIES(gemrb gemrb_core) -ENDIF(UNIX) + SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${PLUGIN_INSTALL_DIR}) +ENDIF(WIN32) -INSTALL( TARGETS gemrb DESTINATION ${CMAKE_INSTALL_PREFIX} ) +INSTALL( TARGETS gemrb DESTINATION ${CMAKE_INSTALL_PREFIX}) INSTALL( FILES GemRB.cfg.sample GemRB.cfg.subdir.sample DESTINATION ${CMAKE_INSTALL_PREFIX} ) Modified: gemrb/trunk/gemrb/includes/win32def.h =================================================================== --- gemrb/trunk/gemrb/includes/win32def.h 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/includes/win32def.h 2008-10-04 20:09:01 UTC (rev 5391) @@ -48,7 +48,7 @@ #ifndef __MINGW32__ #define printf cprintf //broken in mingw !! -#else +#elif not defined HAVE_SNPRINTF #define HAVE_SNPRINTF #endif Modified: gemrb/trunk/gemrb/plugins/2DAImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/2DAImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/2DAImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,5 +1,3 @@ -ADD_LIBRARY(2DAImporter MODULE 2DAImp.cpp 2DAImpCD.cpp 2DAImporter.cpp 2DAImp.h 2DAImpCD.h ) +ADD_GEMRB_PLUGIN(2DAImporter 2DAImp.cpp 2DAImpCD.cpp 2DAImporter.cpp 2DAImp.h 2DAImpCD.h ) -TARGET_LINK_LIBRARIES(2DAImporter gemrb_core) - -INSTALL( TARGETS 2DAImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS 2DAImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,9 +1,9 @@ -INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ) +INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ) FILE( GLOB ACMImporter_files *.cpp ) -ADD_LIBRARY(ACMImporter MODULE ${ACMImporter_files}) +ADD_GEMRB_PLUGIN (ACMImporter ${ACMImporter_files}) -TARGET_LINK_LIBRARIES(ACMImporter gemrb_core ${OPENAL_LIBRARY} ${SDL_LIBRARY}) +TARGET_LINK_LIBRARIES(ACMImporter ${SDL_LIBRARY}) INSTALL( TARGETS ACMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file Modified: gemrb/trunk/gemrb/plugins/AREImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/AREImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/AREImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,5 +1,3 @@ -ADD_LIBRARY(AREImporter MODULE AREImp.cpp AREImpCD.cpp AREImporter.cpp) +ADD_GEMRB_PLUGIN (AREImporter AREImp.cpp AREImpCD.cpp AREImporter.cpp) -TARGET_LINK_LIBRARIES(AREImporter gemrb_core) - -INSTALL( TARGETS AREImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS AREImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/BAMImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/BAMImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/BAMImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(BAMImporter MODULE BAMImp.cpp BAMImpCD.cpp BAMImporter.cpp) -TARGET_LINK_LIBRARIES( BAMImporter gemrb_core ) +ADD_GEMRB_PLUGIN (BAMImporter BAMImp.cpp BAMImpCD.cpp BAMImporter.cpp) -INSTALL( TARGETS BAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS BAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/BIFImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/BIFImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/BIFImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(BIFImporter MODULE BIFImp.cpp BIFImpCD.cpp BIFImporter.cpp) -TARGET_LINK_LIBRARIES( BIFImporter gemrb_core ) +ADD_GEMRB_PLUGIN (BIFImporter BIFImp.cpp BIFImpCD.cpp BIFImporter.cpp) -INSTALL( TARGETS BIFImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS BIFImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/BMPImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/BMPImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/BMPImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(BMPImporter MODULE BMPImp.cpp BMPImpCD.cpp BMPImporter.cpp) -TARGET_LINK_LIBRARIES( BMPImporter gemrb_core ) +ADD_GEMRB_PLUGIN (BMPImporter BMPImp.cpp BMPImpCD.cpp BMPImporter.cpp) -INSTALL( TARGETS BMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS BMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/CHUImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/CHUImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/CHUImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(CHUImporter MODULE CHUImp.cpp CHUImpCD.cpp CHUImporter.cpp) -TARGET_LINK_LIBRARIES( CHUImporter gemrb_core ) +ADD_GEMRB_PLUGIN (CHUImporter CHUImp.cpp CHUImpCD.cpp CHUImporter.cpp) -INSTALL( TARGETS CHUImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS CHUImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/CREImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/CREImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/CREImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(CREImporter MODULE CREImp.cpp CREImpCD.cpp CREImporter.cpp) -TARGET_LINK_LIBRARIES( CREImporter gemrb_core ) +ADD_GEMRB_PLUGIN (CREImporter CREImp.cpp CREImpCD.cpp CREImporter.cpp) -INSTALL( TARGETS CREImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS CREImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/Core/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -6,4 +6,8 @@ ADD_LIBRARY(gemrb_core SHARED ${gemrb_core_LIB_SRCS} ) -INSTALL( TARGETS gemrb_core DESTINATION ${CMAKE_INSTALL_PREFIX} ) +IF(WIN32) + INSTALL(TARGETS gemrb_core RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) +ELSE(WIN32) + INSTALL(TARGETS gemrb_core LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}) +ENDIF(WIN32) Modified: gemrb/trunk/gemrb/plugins/DLGImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/DLGImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/DLGImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(DLGImporter MODULE DLGImp.cpp DLGImpCD.cpp DLGImporter.cpp) -TARGET_LINK_LIBRARIES( DLGImporter gemrb_core ) +ADD_GEMRB_PLUGIN (DLGImporter DLGImp.cpp DLGImpCD.cpp DLGImporter.cpp) -INSTALL( TARGETS DLGImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS DLGImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/EFFImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/EFFImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/EFFImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(EFFImporter MODULE EFFImp.cpp EFFImpCD.cpp EFFImporter.cpp) -TARGET_LINK_LIBRARIES( EFFImporter gemrb_core ) +ADD_GEMRB_PLUGIN (EFFImporter EFFImp.cpp EFFImpCD.cpp EFFImporter.cpp) -INSTALL( TARGETS EFFImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS EFFImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/FXOpcodes/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/FXOpcodes/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/FXOpcodes/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(FXOpcodes MODULE FXOpc.cpp FXOpcodesCD.cpp FXOpcodes.cpp) -TARGET_LINK_LIBRARIES( FXOpcodes gemrb_core ) +ADD_GEMRB_PLUGIN (FXOpcodes FXOpc.cpp FXOpcodesCD.cpp FXOpcodes.cpp) -INSTALL( TARGETS FXOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS FXOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/GAMImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/GAMImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/GAMImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(GAMImporter MODULE GAMImp.cpp GAMImpCD.cpp GAMImporter.cpp) -TARGET_LINK_LIBRARIES( GAMImporter gemrb_core ) +ADD_GEMRB_PLUGIN (GAMImporter GAMImp.cpp GAMImpCD.cpp GAMImporter.cpp) -INSTALL( TARGETS GAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS GAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/GUIScript/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/GUIScript/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/GUIScript/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,7 +1,7 @@ INCLUDE(FindPythonLibs) INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH}) -ADD_LIBRARY(GUIScript MODULE GUIScript.cpp GUIScriptCD.cpp GUIScriptEngine.cpp) -TARGET_LINK_LIBRARIES( GUIScript gemrb_core ${PYTHON_LIBRARIES} ) +ADD_GEMRB_PLUGIN (GUIScript GUIScript.cpp GUIScriptCD.cpp GUIScriptEngine.cpp) +TARGET_LINK_LIBRARIES( GUIScript ${PYTHON_LIBRARIES} ) INSTALL( TARGETS GUIScript DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file Modified: gemrb/trunk/gemrb/plugins/IDSImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/IDSImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/IDSImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(IDSImporter MODULE IDSImp.cpp IDSImpCD.cpp IDSImporter.cpp) -TARGET_LINK_LIBRARIES( IDSImporter gemrb_core ) +ADD_GEMRB_PLUGIN (IDSImporter IDSImp.cpp IDSImpCD.cpp IDSImporter.cpp) -INSTALL( TARGETS IDSImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS IDSImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/INIImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/INIImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/INIImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(INIImporter MODULE INIImp.cpp INIImpCD.cpp INIImporter.cpp) -TARGET_LINK_LIBRARIES( INIImporter gemrb_core ) +ADD_GEMRB_PLUGIN (INIImporter INIImp.cpp INIImpCD.cpp INIImporter.cpp) -INSTALL( TARGETS INIImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS INIImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/ITMImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/ITMImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/ITMImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(ITMImporter MODULE ITMImp.cpp ITMImpCD.cpp ITMImporter.cpp) -TARGET_LINK_LIBRARIES( ITMImporter gemrb_core ) +ADD_GEMRB_PLUGIN (ITMImporter ITMImp.cpp ITMImpCD.cpp ITMImporter.cpp) -INSTALL( TARGETS ITMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS ITMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/IWDOpcodes/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/IWDOpcodes/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/IWDOpcodes/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(IWDOpcodes MODULE IWDOpc.cpp IWDOpcodes.cpp IWDOpcodesCD.cpp) -TARGET_LINK_LIBRARIES( IWDOpcodes gemrb_core ) +ADD_GEMRB_PLUGIN (IWDOpcodes IWDOpc.cpp IWDOpcodes.cpp IWDOpcodesCD.cpp) -INSTALL( TARGETS IWDOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS IWDOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/KEYImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(KEYImporter MODULE KeyImp.cpp KEYImpCD.cpp KEYImporter.cpp Dictionary.cpp) -TARGET_LINK_LIBRARIES( KEYImporter gemrb_core ) +ADD_GEMRB_PLUGIN (KEYImporter KeyImp.cpp KEYImpCD.cpp KEYImporter.cpp Dictionary.cpp) INSTALL( TARGETS KEYImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/MOSImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/MOSImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/MOSImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(MOSImporter MODULE MOSImp.cpp MOSImpCD.cpp MOSImporter.cpp) -TARGET_LINK_LIBRARIES( MOSImporter gemrb_core ) +ADD_GEMRB_PLUGIN (MOSImporter MOSImp.cpp MOSImpCD.cpp MOSImporter.cpp) INSTALL( TARGETS MOSImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file Modified: gemrb/trunk/gemrb/plugins/MUSImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/MUSImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/MUSImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(MUSImporter MODULE MUSImp.cpp MUSImpCD.cpp MUSImporter.cpp) -TARGET_LINK_LIBRARIES( MUSImporter gemrb_core ) +ADD_GEMRB_PLUGIN (MUSImporter MUSImp.cpp MUSImpCD.cpp MUSImporter.cpp) -INSTALL( TARGETS MUSImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS MUSImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,7 +1,3 @@ -INCLUDE_DIRECTORIES( ${OPENAL_INCLUDE_DIR} ) +ADD_GEMRB_PLUGIN ( MVEPlayer decoder16.cpp decoder8.cpp mve_audio.cpp mve_play.cpp mvelib.cpp MVEPlay.cpp MVEPlayer.cpp MVEPlayerDesc.cpp ) -ADD_LIBRARY( MVEPlayer MODULE decoder16.cpp decoder8.cpp mve_audio.cpp mve_play.cpp mvelib.cpp MVEPlay.cpp MVEPlayer.cpp MVEPlayerDesc.cpp ) - -TARGET_LINK_LIBRARIES( MVEPlayer gemrb_core ${OPENAL_LIBRARY} ) - -INSTALL( TARGETS MVEPlayer DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS MVEPlayer DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/NullSound/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/NullSound/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/NullSound/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(NullSound MODULE NullSnd.cpp NullSound.cpp NullSoundCD.cpp ) -TARGET_LINK_LIBRARIES(NullSound gemrb_core) +ADD_GEMRB_PLUGIN (NullSound NullSnd.cpp NullSound.cpp NullSoundCD.cpp ) -INSTALL( TARGETS NullSound DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS NullSound DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/OpenALAudio/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/OpenALAudio/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/OpenALAudio/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,9 +1,8 @@ +#Don't build if openal is not there +IF(OPENAL_FOUND) INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} ) - FILE( GLOB OpenALAudio_files *.cpp ) - -ADD_LIBRARY(OpenALAudio MODULE ${OpenALAudio_files} ) - -TARGET_LINK_LIBRARIES(OpenALAudio gemrb_core ${OPENAL_LIBRARY} ${SDL_LIBRARY} ) - +ADD_GEMRB_PLUGIN (OpenALAudio ${OpenALAudio_files} ) +TARGET_LINK_LIBRARIES(OpenALAudio ${OPENAL_LIBRARY} ${SDL_LIBRARY} ) INSTALL( TARGETS OpenALAudio DESTINATION ${PLUGIN_INSTALL_DIR} ) +ENDIF(OPENAL_FOUND) Modified: gemrb/trunk/gemrb/plugins/PLTImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/PLTImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/PLTImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(PLTImporter MODULE PLTImp.cpp PLTImpCD.cpp PLTImporter.cpp) -TARGET_LINK_LIBRARIES( PLTImporter gemrb_core ) +ADD_GEMRB_PLUGIN (PLTImporter PLTImp.cpp PLTImpCD.cpp PLTImporter.cpp) -INSTALL( TARGETS PLTImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS PLTImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/PNGImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/PNGImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/PNGImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,7 +1,6 @@ IF(PNG_FOUND) INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} ) -ADD_LIBRARY(PNGImporter MODULE PNGImp.cpp PNGImpCD.cpp PNGImporter.cpp) -TARGET_LINK_LIBRARIES( PNGImporter gemrb_core ${PNG_LIBRARY} ) +ADD_GEMRB_PLUGIN (PNGImporter PNGImp.cpp PNGImpCD.cpp PNGImporter.cpp) +TARGET_LINK_LIBRARIES( PNGImporter ${PNG_LIBRARY} ) +INSTALL( TARGETS PNGImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) ENDIF( PNG_FOUND ) - -INSTALL( TARGETS PNGImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file Modified: gemrb/trunk/gemrb/plugins/PROImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/PROImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/PROImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(PROImporter MODULE PROImp.cpp PROImpCD.cpp PROImporter.cpp) -TARGET_LINK_LIBRARIES( PROImporter gemrb_core ) +ADD_GEMRB_PLUGIN (PROImporter PROImp.cpp PROImpCD.cpp PROImporter.cpp) -INSTALL( TARGETS PROImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS PROImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/PSTOpcodes/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/PSTOpcodes/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/PSTOpcodes/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(PSTOpcodes MODULE PSTOpc.cpp PSTOpcodes.cpp PSTOpcodesCD.cpp) -TARGET_LINK_LIBRARIES( PSTOpcodes gemrb_core ) +ADD_GEMRB_PLUGIN (PSTOpcodes PSTOpc.cpp PSTOpcodes.cpp PSTOpcodesCD.cpp) -INSTALL( TARGETS PSTOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS PSTOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/SDLVideo/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/SDLVideo/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/SDLVideo/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,6 +1,6 @@ INCLUDE_DIRECTORIES( ${SDL_INCLUDE_DIR} ) -ADD_LIBRARY(SDLVideo MODULE SDLVideo.cpp SDLVideoDC.cpp SDLVideoDriver.cpp SDLVideoDriver.inl) -TARGET_LINK_LIBRARIES( SDLVideo gemrb_core ${SDL_LIBRARY} ) +ADD_GEMRB_PLUGIN (SDLVideo SDLVideo.cpp SDLVideoDC.cpp SDLVideoDriver.cpp) +TARGET_LINK_LIBRARIES( SDLVideo ${SDL_LIBRARY} ) -INSTALL( TARGETS SDLVideo DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS SDLVideo DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/SPLImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/SPLImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/SPLImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(SPLImporter MODULE SPLImp.cpp SPLImpCD.cpp SPLImporter.cpp) -TARGET_LINK_LIBRARIES( SPLImporter gemrb_core ) +ADD_GEMRB_PLUGIN (SPLImporter SPLImp.cpp SPLImpCD.cpp SPLImporter.cpp) -INSTALL( TARGETS SPLImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS SPLImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/STOImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/STOImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/STOImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(STOImporter MODULE STOImp.cpp STOImpCD.cpp STOImporter.cpp) -TARGET_LINK_LIBRARIES( STOImporter gemrb_core ) +ADD_GEMRB_PLUGIN (STOImporter STOImp.cpp STOImpCD.cpp STOImporter.cpp) -INSTALL( TARGETS STOImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS STOImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/TISImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/TISImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/TISImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(TISImporter MODULE TISImp.cpp TISImpCD.cpp TISImporter.cpp) -TARGET_LINK_LIBRARIES( TISImporter gemrb_core ) +ADD_GEMRB_PLUGIN (TISImporter TISImp.cpp TISImpCD.cpp TISImporter.cpp) -INSTALL( TARGETS TISImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS TISImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/TLKImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/TLKImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/TLKImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(TLKImporter MODULE TLKImp.cpp TLKImpCD.cpp TLKImporter.cpp TlkOverride.cpp) -TARGET_LINK_LIBRARIES( TLKImporter gemrb_core ) +ADD_GEMRB_PLUGIN (TLKImporter TLKImp.cpp TLKImpCD.cpp TLKImporter.cpp TlkOverride.cpp) -INSTALL( TARGETS TLKImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS TLKImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/WEDImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/WEDImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/WEDImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(WEDImporter MODULE WEDImp.cpp WEDImpCD.cpp WEDImporter.cpp) -TARGET_LINK_LIBRARIES( WEDImporter gemrb_core ) +ADD_GEMRB_PLUGIN (WEDImporter WEDImp.cpp WEDImpCD.cpp WEDImporter.cpp) -INSTALL( TARGETS WEDImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS WEDImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/WMPImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/WMPImporter/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/WMPImporter/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,3 @@ -ADD_LIBRARY(WMPImporter MODULE WMPImp.cpp WMPImpCD.cpp WMPImporter.cpp) -TARGET_LINK_LIBRARIES( WMPImporter gemrb_core ) +ADD_GEMRB_PLUGIN (WMPImporter WMPImp.cpp WMPImpCD.cpp WMPImporter.cpp) -INSTALL( TARGETS WMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file +INSTALL( TARGETS WMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt 2008-10-04 17:55:04 UTC (rev 5390) +++ gemrb/trunk/gemrb/plugins/ZLibMgr/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) @@ -1,4 +1,4 @@ -ADD_LIBRARY(ZLibMgr MODULE ZLibManager.cpp ZLibMgr.cpp ZLibMgrDesc.cpp ) -TARGET_LINK_LIBRARIES( ZLibMgr gemrb_core ${ZLIB_LIBRARY} ) +ADD_GEMRB_PLUGIN (ZLibMgr ZLibManager.cpp ZLibMgr.cpp ZLibMgrDesc.cpp ) +TARGET_LINK_LIBRARIES( ZLibMgr ${ZLIB_LIBRARY} ) INSTALL(TARGETS ZLibMgr DESTINATION ${PLUGIN_INSTALL_DIR} ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-10-04 20:25:40
|
Revision: 5392 http://gemrb.svn.sourceforge.net/gemrb/?rev=5392&view=rev Author: lynxlupodian Date: 2008-10-04 20:21:17 +0000 (Sat, 04 Oct 2008) Log Message: ----------- cmake: added missing strndup check Modified Paths: -------------- gemrb/trunk/CMakeLists.txt gemrb/trunk/cmake_config.h.in Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2008-10-04 20:09:01 UTC (rev 5391) +++ gemrb/trunk/CMakeLists.txt 2008-10-04 20:21:17 UTC (rev 5392) @@ -73,6 +73,7 @@ INCLUDE (CheckFunctionExists) CHECK_FUNCTION_EXISTS("snprintf" HAVE_SNPRINTF) +CHECK_FUNCTION_EXISTS("strndup" HAVE_STRNDUP) #Unneeded on windows IF(NOT WIN32) Modified: gemrb/trunk/cmake_config.h.in =================================================================== --- gemrb/trunk/cmake_config.h.in 2008-10-04 20:09:01 UTC (rev 5391) +++ gemrb/trunk/cmake_config.h.in 2008-10-04 20:21:17 UTC (rev 5392) @@ -5,4 +5,7 @@ #ifndef HAVE_SNPRINTF #cmakedefine HAVE_SNPRINTF 1 #endif +#ifndef HAVE_STRNDUP +#cmakedefine HAVE_STRNDUP 1 +#endif #cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2008-10-04 20:43:26
|
Revision: 5393 http://gemrb.svn.sourceforge.net/gemrb/?rev=5393&view=rev Author: lynxlupodian Date: 2008-10-04 20:40:45 +0000 (Sat, 04 Oct 2008) Log Message: ----------- cmake: another patch by zefklop for better vorbis detection Modified Paths: -------------- gemrb/trunk/CMakeLists.txt gemrb/trunk/cmake_config.h.in gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2008-10-04 20:21:17 UTC (rev 5392) +++ gemrb/trunk/CMakeLists.txt 2008-10-04 20:40:45 UTC (rev 5393) @@ -90,6 +90,10 @@ ENDIF( NOT PERMITS_OBJECT_TO_FUNCTION_CAST ) ENDIF(NOT WIN32) +IF(VORBIS_LIBRARY) + SET(HAS_VORBIS_SUPPORT 1) +ENDIF(VORBIS_LIBRARY) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) #Plugin addtion macro Modified: gemrb/trunk/cmake_config.h.in =================================================================== --- gemrb/trunk/cmake_config.h.in 2008-10-04 20:21:17 UTC (rev 5392) +++ gemrb/trunk/cmake_config.h.in 2008-10-04 20:40:45 UTC (rev 5393) @@ -9,3 +9,4 @@ #cmakedefine HAVE_STRNDUP 1 #endif #cmakedefine HAVE_FORBIDDEN_OBJECT_TO_FUNCTION_CAST 1 +#cmakedefine HAS_VORBIS_SUPPORT 1 Modified: gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt 2008-10-04 20:21:17 UTC (rev 5392) +++ gemrb/trunk/gemrb/plugins/ACMImporter/CMakeLists.txt 2008-10-04 20:40:45 UTC (rev 5393) @@ -4,6 +4,6 @@ ADD_GEMRB_PLUGIN (ACMImporter ${ACMImporter_files}) -TARGET_LINK_LIBRARIES(ACMImporter ${SDL_LIBRARY}) +TARGET_LINK_LIBRARIES(ACMImporter ${VORBIS_LIBRARY}) INSTALL( TARGETS ACMImporter DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edh...@us...> - 2008-10-05 21:28:54
|
Revision: 5405 http://gemrb.svn.sourceforge.net/gemrb/?rev=5405&view=rev Author: edheldil Date: 2008-10-05 21:28:46 +0000 (Sun, 05 Oct 2008) Log Message: ----------- Implemeted hairy check for openal lib, based on the SDL one. Modified Paths: -------------- gemrb/trunk/acinclude.m4 gemrb/trunk/configure.in Modified: gemrb/trunk/acinclude.m4 =================================================================== --- gemrb/trunk/acinclude.m4 2008-10-05 21:21:10 UTC (rev 5404) +++ gemrb/trunk/acinclude.m4 2008-10-05 21:28:46 UTC (rev 5405) @@ -198,7 +198,181 @@ rm -f conf.sdltest ]) +################################################### +dnl Configure paths for OPENAL +dnl AM_PATH_OPENAL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for OPENAL, and define OPENAL_CFLAGS and OPENAL_LIBS +dnl +AC_DEFUN([AM_PATH_OPENAL], +[dnl +dnl Get the cflags and libraries from the openal-config script +dnl +AC_ARG_WITH(openal-prefix,[ --with-openal-prefix=PFX Prefix where OPENAL is installed (optional)], + openal_prefix="$withval", openal_prefix="") +AC_ARG_WITH(openal-exec-prefix,[ --with-openal-exec-prefix=PFX Exec prefix where OPENAL is installed (optional)], + openal_exec_prefix="$withval", openal_exec_prefix="") +AC_ARG_ENABLE(openaltest, [ --disable-openaltest Do not try to compile and run a test OPENAL program], + , enable_openaltest=yes) + + if test x$openal_exec_prefix != x ; then + openal_args="$openal_args --exec-prefix=$openal_exec_prefix" + if test x${OPENAL_CONFIG+set} != xset ; then + OPENAL_CONFIG=$openal_exec_prefix/bin/openal-config + fi + fi + if test x$openal_prefix != x ; then + openal_args="$openal_args --prefix=$openal_prefix" + if test x${OPENAL_CONFIG+set} != xset ; then + OPENAL_CONFIG=$openal_prefix/bin/openal-config + fi + fi + + AC_REQUIRE([AC_CANONICAL_TARGET]) + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + AC_PATH_PROG(OPENAL_CONFIG, openal-config, no, [$PATH]) + min_openal_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for OPENAL - version >= $min_openal_version) + no_openal="" + if test "$OPENAL_CONFIG" = "no" ; then + no_openal=yes + else + OPENAL_CFLAGS=`$OPENAL_CONFIG $openalconf_args --cflags` + OPENAL_LIBS="`$OPENAL_CONFIG $openalconf_args --libs` $LIBPTHREAD" + + openal_major_version=`$OPENAL_CONFIG $openal_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + openal_minor_version=`$OPENAL_CONFIG $openal_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + openal_micro_version=`$OPENAL_CONFIG $openal_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_openaltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $OPENAL_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPENAL_CFLAGS" + LIBS="$LIBS $OPENAL_LIBS" +dnl +dnl Now check if the installed OPENAL is sufficiently new. (Also sanity +dnl checks the results of openal-config to some extent +dnl + rm -f conf.openaltest + AC_TRY_RUN([ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "AL/al.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.openaltest"); + */ + { FILE *fp = fopen("conf.openaltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_openal_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_openal_version"); + exit(1); + } + + if (($openal_major_version > major) || + (($openal_major_version == major) && ($openal_minor_version > minor)) || + (($openal_major_version == major) && ($openal_minor_version == minor) && ($openal_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'openal-config --version' returned %d.%d.%d, but the minimum version\n", $openal_major_version, $openal_minor_version, $openal_micro_version); + printf("*** of OPENAL required is %d.%d.%d. If openal-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If openal-config was wrong, set the environment variable OPENAL_CONFIG\n"); + printf("*** to point to the correct copy of openal-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_openal=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_openal" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$OPENAL_CONFIG" = "no" ; then + echo "*** The openal-config script installed by OPENAL could not be found" + echo "*** If OPENAL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the OPENAL_CONFIG environment variable to the" + echo "*** full path to openal-config." + else + if test -f conf.openaltest ; then + : + else + echo "*** Could not run OPENAL test program, checking why..." + CFLAGS="$CFLAGS $OPENAL_CFLAGS" + LIBS="$LIBS $OPENAL_LIBS" + AC_TRY_LINK([ +#include <stdio.h> +#include "AL/al.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding OPENAL or finding the wrong" + echo "*** version of OPENAL. If it is not finding OPENAL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means OPENAL was incorrectly installed" + echo "*** or that you have moved OPENAL since it was installed. In the latter case, you" + echo "*** may want to edit the openal-config script: $OPENAL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + OPENAL_CFLAGS="" + OPENAL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(OPENAL_CFLAGS) + AC_SUBST(OPENAL_LIBS) + rm -f conf.openaltest +]) + + + ################################################### dnl Configure paths for python dnl Shamelessly ripped from dia 0.92 Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2008-10-05 21:21:10 UTC (rev 5404) +++ gemrb/trunk/configure.in 2008-10-05 21:28:46 UTC (rev 5405) @@ -125,15 +125,21 @@ ])]) dnl Check for OpenAL, fail if not found. -AC_CHECK_LIB([openal], [alGetError], [ $(which true) ], [AC_MSG_ERROR([ -*** You need OpenAL (www.openal.org) to compile GemRB +dnl Check for libSDL Version 1.2 or greater, fail if not found. +AM_PATH_OPENAL(0.0.7, [], [AC_MSG_ERROR([ + +*** You need OpenAL (www.openal.org) version 0.0.7 or greater to compile GemRB ])]) -#AC_CHECK_LIB([alut], [alutInit], [ $(which true) ], [AC_MSG_ERROR([ + +#AC_CHECK_LIB([openal], [alGetError], [ $(which true) ], [AC_MSG_ERROR([ #*** You need OpenAL (www.openal.org) to compile GemRB #])]) -OPENAL_LIBS="`openal-config --libs`" +##AC_CHECK_LIB([alut], [alutInit], [ $(which true) ], [AC_MSG_ERROR([ +##*** You need OpenAL (www.openal.org) to compile GemRB +##])]) +#OPENAL_LIBS="`openal-config --libs`" -#GEMRB_CHECK_ALUT() +##GEMRB_CHECK_ALUT() dnl Check for Python version >= 2.3.0, fail if not found. AM_PATH_PYTHON(2.3.0, [], [AC_MSG_ERROR([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <edh...@us...> - 2008-10-06 00:35:23
|
Revision: 5407 http://gemrb.svn.sourceforge.net/gemrb/?rev=5407&view=rev Author: edheldil Date: 2008-10-06 00:35:14 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Removed version check from AM_PATH_OPENAL, check for alGetError() Modified Paths: -------------- gemrb/trunk/acinclude.m4 gemrb/trunk/configure.in Modified: gemrb/trunk/acinclude.m4 =================================================================== --- gemrb/trunk/acinclude.m4 2008-10-05 21:36:49 UTC (rev 5406) +++ gemrb/trunk/acinclude.m4 2008-10-06 00:35:14 UTC (rev 5407) @@ -200,7 +200,7 @@ ################################################### dnl Configure paths for OPENAL -dnl AM_PATH_OPENAL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl AM_PATH_OPENAL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for OPENAL, and define OPENAL_CFLAGS and OPENAL_LIBS dnl @@ -231,8 +231,7 @@ AC_REQUIRE([AC_CANONICAL_TARGET]) PATH="$prefix/bin:$prefix/usr/bin:$PATH" AC_PATH_PROG(OPENAL_CONFIG, openal-config, no, [$PATH]) - min_openal_version=ifelse([$1], ,0.11.0,$1) - AC_MSG_CHECKING(for OPENAL - version >= $min_openal_version) + AC_MSG_CHECKING(for OPENAL library) no_openal="" if test "$OPENAL_CONFIG" = "no" ; then no_openal=yes @@ -240,12 +239,6 @@ OPENAL_CFLAGS=`$OPENAL_CONFIG $openalconf_args --cflags` OPENAL_LIBS="`$OPENAL_CONFIG $openalconf_args --libs` $LIBPTHREAD" - openal_major_version=`$OPENAL_CONFIG $openal_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - openal_minor_version=`$OPENAL_CONFIG $openal_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - openal_micro_version=`$OPENAL_CONFIG $openal_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` if test "x$enable_openaltest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" @@ -253,118 +246,29 @@ CXXFLAGS="$CXXFLAGS $OPENAL_CFLAGS" LIBS="$LIBS $OPENAL_LIBS" dnl -dnl Now check if the installed OPENAL is sufficiently new. (Also sanity -dnl checks the results of openal-config to some extent +dnl Now check if the installed OPENAL is sufficiently new. dnl rm -f conf.openaltest - AC_TRY_RUN([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> + AC_TRY_LINK([ #include "AL/al.h" - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (int argc, char *argv[]) -{ - int major, minor, micro; - char *tmp_version; - - /* This hangs on some systems (?) - system ("touch conf.openaltest"); - */ - { FILE *fp = fopen("conf.openaltest", "a"); if ( fp ) fclose(fp); } - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_openal_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_openal_version"); - exit(1); - } - - if (($openal_major_version > major) || - (($openal_major_version == major) && ($openal_minor_version > minor)) || - (($openal_major_version == major) && ($openal_minor_version == minor) && ($openal_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'openal-config --version' returned %d.%d.%d, but the minimum version\n", $openal_major_version, $openal_minor_version, $openal_micro_version); - printf("*** of OPENAL required is %d.%d.%d. If openal-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If openal-config was wrong, set the environment variable OPENAL_CONFIG\n"); - printf("*** to point to the correct copy of openal-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_openal=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +],[ return alGetError(); ],no_openal="",no_openal=yes) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi fi if test "x$no_openal" = x ; then AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) + ifelse([$1], , :, [$1]) else AC_MSG_RESULT(no) - if test "$OPENAL_CONFIG" = "no" ; then - echo "*** The openal-config script installed by OPENAL could not be found" - echo "*** If OPENAL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the OPENAL_CONFIG environment variable to the" - echo "*** full path to openal-config." - else - if test -f conf.openaltest ; then - : - else - echo "*** Could not run OPENAL test program, checking why..." - CFLAGS="$CFLAGS $OPENAL_CFLAGS" - LIBS="$LIBS $OPENAL_LIBS" - AC_TRY_LINK([ -#include <stdio.h> -#include "AL/al.h" - -int main(int argc, char *argv[]) -{ return 0; } -#undef main -#define main K_and_R_C_main -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding OPENAL or finding the wrong" - echo "*** version of OPENAL. If it is not finding OPENAL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means OPENAL was incorrectly installed" - echo "*** or that you have moved OPENAL since it was installed. In the latter case, you" - echo "*** may want to edit the openal-config script: $OPENAL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means OPENAL is not installed," + echo "*** that it's installed incorrectly or that it has been moved since" + echo "*** installation. In the latter case, you may want to edit the " + echo "*** openal-config script: $OPENAL_CONFIG" OPENAL_CFLAGS="" OPENAL_LIBS="" - ifelse([$3], , :, [$3]) + ifelse([$2], , :, [$2]) fi AC_SUBST(OPENAL_CFLAGS) AC_SUBST(OPENAL_LIBS) Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2008-10-05 21:36:49 UTC (rev 5406) +++ gemrb/trunk/configure.in 2008-10-06 00:35:14 UTC (rev 5407) @@ -126,9 +126,9 @@ dnl Check for OpenAL, fail if not found. dnl Check for libSDL Version 1.2 or greater, fail if not found. -AM_PATH_OPENAL(0.0.7, [], [AC_MSG_ERROR([ +AM_PATH_OPENAL([], [AC_MSG_ERROR([ -*** You need OpenAL (www.openal.org) version 0.0.7 or greater to compile GemRB +*** You need OpenAL (www.openal.org) to compile GemRB ])]) #AC_CHECK_LIB([openal], [alGetError], [ $(which true) ], [AC_MSG_ERROR([ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-01-02 11:00:01
|
Revision: 5508 http://gemrb.svn.sourceforge.net/gemrb/?rev=5508&view=rev Author: lynxlupodian Date: 2009-01-02 10:59:55 +0000 (Fri, 02 Jan 2009) Log Message: ----------- [ 2481346 ] Move man page to section 6 cmake doesn't install it yet Modified Paths: -------------- gemrb/trunk/Makefile.am gemrb/trunk/README Added Paths: ----------- gemrb/trunk/gemrb.6 Removed Paths: ------------- gemrb/trunk/gemrb.1 Modified: gemrb/trunk/Makefile.am =================================================================== --- gemrb/trunk/Makefile.am 2008-12-25 17:53:02 UTC (rev 5507) +++ gemrb/trunk/Makefile.am 2009-01-02 10:59:55 UTC (rev 5508) @@ -18,7 +18,7 @@ admin/mkinstalldirs \ admin/py-compile -dist_man1_MANS = gemrb.1 +dist_man6_MANS = gemrb.6 install-data-hook: rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so Modified: gemrb/trunk/README =================================================================== --- gemrb/trunk/README 2008-12-25 17:53:02 UTC (rev 5507) +++ gemrb/trunk/README 2009-01-02 10:59:55 UTC (rev 5508) @@ -20,7 +20,7 @@ What little documentation exists is mostly in gemrb/docs/en/ and -subdirectories, the gemrb.1 man page and this file. +subdirectories, the gemrb.6 man page and this file. Supported (i.e. we got reports about successfully running GemRB) systems: Deleted: gemrb/trunk/gemrb.1 =================================================================== --- gemrb/trunk/gemrb.1 2008-12-25 17:53:02 UTC (rev 5507) +++ gemrb/trunk/gemrb.1 2009-01-02 10:59:55 UTC (rev 5508) @@ -1,355 +0,0 @@ -.\"Title and section -.TH GEMRB 1 - -.\"################################################### -.SH NAME -.B gemrb -\- emulator for Infinity Engine-based games - -.\"################################################### -.SH SYNOPSIS -.B gemrb -[-c config-file] -.br -.B torment -.br - -.\"################################################### -.SH DESCRIPTION -.I gemrb -is an emulator for Infinity Engine-based games, fine RPGs like Baldur's Gate, -Icewind Dale or Planescape: Torment. - -.I gemrb -is only an engine; to actually play anything you have to have -data from the original games installed where they can be found by -.IR gemrb . - -.\"################################################### -.SH OPTIONS -.TP -.B \-c -.I FILE -.br -use other configuration file than default -.IR gemrb.cfg . - -.B Note: -You can also use program's name as a mean to select the configuration file. -For example, if the program's name is -.I torment -instead of -.IR gemrb , -the engine first seaches for -.I torment.cfg -and only if it's not found it searches for -.IR gemrb.cfg . - -To use this feature, just create a symbolic link -.I torment -pointing to -.I gemrb -binary and run -.IR torment . - -.\"################################################### -.SH Configuration File -.PD 0 -Configuration file consists of pairs -.IR PARAMETER=VALUE , -each on its own line. The case of PARAMETER is not significant, -GameType is the same as GAMETYPE. If the same PARAMETER is defined -more than once, only the last occurence is used. - -Empty lines and lines starting with `#' (hash sign) are ignored. - -.B Parameters: - -.TP -.BR GameType =(bg1|bg2|iwd|iwd2|how|pst) -Type of the game. The value is a name of subdirectory in override/ -and GUIScripts/ directories -with game type-specific files and scripts. It is at present also used -for various tweaks hardcoded in GemRB engine. - -.TP -.BR GameName =STRING -Arbitrary name of the game. It will be displayed in the window's title bar. - -.TP -.BR GamePath =PATH -Path to the directory where the original game is installed. If you can't -install the game under MS Windows or with WINE, you can try to unpack the data files -with the -.I unshield -program found at -.IR http://synce.sourceforge.net . - -.TP -.BR CD1 =PATH -.TP -.BR CD2 =PATH -.TP -.BR CDn =... -Path to the data files for the game's particular CDs. - -.\".TP -.\".BR INIConfig =FILE -.\"Name of the game's INI file, relative to -.\".IR GamePath . -.\"E.g. for Baldur's Gate game it is baldur.ini. - - -.TP -.BR Width =INT -Game window width (in pixels). - -.TP -.BR Height =INT -Game window height (in pixels). - -.TP -.BR Bpp =INT -Color depth of the game window (in bits per pixel). - -.TP -.BR Fullscreen =(0|1) -Whether the game should run in fullscreen mode. (Note that fullcreen mode is -currently buggy). - -.\".TP -.\".BR ForceStereo =(0|1) -.\"Some older games such as BG1 and PST need this parameter to be -.\".IR 1 . -.\"For other game types set it to -.\".IR 0 . - -.TP -.BR TooltipDelay =INT -Delay (in ms) before tooltips are displayed when the mouse is not moving. -Reasonable number for this option is e.g. -.IR 500 . - -.TP -.BR VolumeAmbients =INT -Volume of ambient sounds in percents. The default is -.IR 100 . - -.TP -.BR VolumeMovie =INT -Volume during movie playback in percents. The default is -.IR 100 . - -.TP -.BR VolumeMusic =INT -Volume of background music in percents. The default is -.IR 100 . - -.TP -.BR VolumeSFX =INT -Volume of sound effects in percents. The default is -.IR 100 . - -.TP -.BR VolumeVoices =INT -Volume of PC or NPC voices in percents. The default is -.IR 100 . - - -.TP -.BR SkipIntroVideos =(0|1) -This parameter is meant for developers. If set to -.IR 1 , -the intro and logo videos are skipped to save developer's nerves. The default is -.IR 0 . - -.TP -.BR DrawFPS =(0|1) -This parameter is meant for developers. If set to -.IR 1 , -the current FPS (Frames per Second) value is drawn in the top left window corner. The default is -.IR 0 . - -.TP -.BR FogOfWar =(0|1) -This parameter is meant for developers. If set to -.IR 1 , -the unexplored parts of an area are blacked out. Since the unexplored bitmap is -not updated by actors yet, it's set to -.I 0 -by default. - -.TP -.BR EnableCheatKeys =(0|1) -This parameter is meant for developers. If set to -.IR 1 , -certain keys allow you to inspect the internal state of objects, do forbidden things, etc. -The keys are listed in the -.I CheatKeys.txt -file. Do NOT use this option unless you want to make your hands dirty :-). The default is -.IR 0 . - -.TP -.BR ScriptDebugMode =(n) -This parameter is meant for developers. It is a combination of bit values - -.IR 1 -- count references, - -.IR 2 -- display cutscene warnings, - -.IR 4 -- display variable warnings, - -.IR 8 -- display action warnings, - -.IR 16 -- display trigger warnings. - -The default is -.IR 0 . - -.TP -.BR CaseSensitive =(0|1) -When -this parameter is set to -.IR 1 , -the engine will try to find files regardless of their names' case at the cost -of a slight speed penalty. This is especially important when using -game files on CD-ROMs, where the files can't be renamed. Like -many Windows programs, the original games use inconsistent mix -of lower/upper case letters for naming and referencing their files. - -Set this parameter to -.I 1 -on Unix-like systems. - -.TP -.BR SaveAsOriginal =(0|1) -Set this parameter to -.IR 1 , -if you want to keep the save game compatible with the original engine. - -.TP -.BR CachePath =PATH -User-writable directory where the engine caches uncompressed and temporary -files. - -.TP -.BR GemRBPath =PATH -Path to the GemRB installation. (To be obsoleted). - -.TP -.BR GUIScriptsPath =PATH -Path to the directory with scripts controlling the game's GUI. - -.TP -.BR SavePath =PATH -Path to the directory with save games. Note that this directory has to -contain -.I save/ -and/or eventually -.I mpsave/ -subdirectories and that only these subdirectories contain the actual -saved games. - -.I SavePath -defaults to -.IR GamePath . - -.TP -.BR GameOnCD =(0|1) -defaults to -.IR 0 . - - -.TP -.BR GameDataPath =PATH -Path to the original game's installed data files, relative to GamePath. -Usually it's -.IR data . - - -.TP -.BR GameOverridePath =PATH -Path to the original game's override dir, relative to GamePath. -Usually it's -.IR override . -Original games use this directory to place last-minute patches. - -.TP -.BR GemRBOverridePath =PATH -Path where gemrb looks for its game override directory. -It defaults to -.IR GemRBPath . -The original games hardcoded this information in the engine. - - -.\"################################################### -.SH FILES -.PD 0 -.TP 20 -.B /usr/local/etc/gemrb.cfg -system-wide configuration file - -.TP -.B /usr/local/share/gemrb/override/ -directory with -.IR gemrb -distributed -data files. These used to be hardcoded in the original engine. The files -are sorted into directories for specific games. - -.TP -.B /usr/local/share/gemrb/GUIScripts/ -directory with Python scripts providing GUI setup and interaction. The files -are sorted into directories for specific games. - -.TP -.B ~/.gemrb/gemrb.cfg -.TP -.B ~/.gemrb/override/ -.TP -.B ~/.gemrb/GUIScripts/ -user's own configuration and data files. -.TP -.B ~/.gemrb/cache/ -cache directory -.PD - -.\"################################################### -.SH BUGS -Many. -.I gemrb -is still in an early development stage and not nearly complete. - -If you stumble over something which is supposed to work, either make a bug report -at http://sourceforge.net/projects/gemrb or come to IRC channel -.I #GemRB -at FreeNode. - -.\"################################################### -.SH AUTHOR -The GemRB Project development team at http://gemrb.sourceforge.net - -.\"################################################### -.SH COPYING -Copyright (C) 2003-2008 The GemRB Project - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -.\"################################################### -.\"End of file gemrb.man Copied: gemrb/trunk/gemrb.6 (from rev 5500, gemrb/trunk/gemrb.1) =================================================================== --- gemrb/trunk/gemrb.6 (rev 0) +++ gemrb/trunk/gemrb.6 2009-01-02 10:59:55 UTC (rev 5508) @@ -0,0 +1,355 @@ +.\"Title and section +.TH GEMRB 6 + +.\"################################################### +.SH NAME +.B gemrb +\- emulator for Infinity Engine-based games + +.\"################################################### +.SH SYNOPSIS +.B gemrb +[-c config-file] +.br +.B torment +.br + +.\"################################################### +.SH DESCRIPTION +.I gemrb +is an emulator for Infinity Engine-based games, fine RPGs like Baldur's Gate, +Icewind Dale or Planescape: Torment. + +.I gemrb +is only an engine; to actually play anything you have to have +data from the original games installed where they can be found by +.IR gemrb . + +.\"################################################### +.SH OPTIONS +.TP +.B \-c +.I FILE +.br +use other configuration file than default +.IR gemrb.cfg . + +.B Note: +You can also use program's name as a mean to select the configuration file. +For example, if the program's name is +.I torment +instead of +.IR gemrb , +the engine first seaches for +.I torment.cfg +and only if it's not found it searches for +.IR gemrb.cfg . + +To use this feature, just create a symbolic link +.I torment +pointing to +.I gemrb +binary and run +.IR torment . + +.\"################################################### +.SH Configuration File +.PD 0 +Configuration file consists of pairs +.IR PARAMETER=VALUE , +each on its own line. The case of PARAMETER is not significant, +GameType is the same as GAMETYPE. If the same PARAMETER is defined +more than once, only the last occurence is used. + +Empty lines and lines starting with `#' (hash sign) are ignored. + +.B Parameters: + +.TP +.BR GameType =(bg1|bg2|iwd|iwd2|how|pst) +Type of the game. The value is a name of subdirectory in override/ +and GUIScripts/ directories +with game type-specific files and scripts. It is at present also used +for various tweaks hardcoded in GemRB engine. + +.TP +.BR GameName =STRING +Arbitrary name of the game. It will be displayed in the window's title bar. + +.TP +.BR GamePath =PATH +Path to the directory where the original game is installed. If you can't +install the game under MS Windows or with WINE, you can try to unpack the data files +with the +.I unshield +program found at +.IR http://synce.sourceforge.net . + +.TP +.BR CD1 =PATH +.TP +.BR CD2 =PATH +.TP +.BR CDn =... +Path to the data files for the game's particular CDs. + +.\".TP +.\".BR INIConfig =FILE +.\"Name of the game's INI file, relative to +.\".IR GamePath . +.\"E.g. for Baldur's Gate game it is baldur.ini. + + +.TP +.BR Width =INT +Game window width (in pixels). + +.TP +.BR Height =INT +Game window height (in pixels). + +.TP +.BR Bpp =INT +Color depth of the game window (in bits per pixel). + +.TP +.BR Fullscreen =(0|1) +Whether the game should run in fullscreen mode. (Note that fullcreen mode is +currently buggy). + +.\".TP +.\".BR ForceStereo =(0|1) +.\"Some older games such as BG1 and PST need this parameter to be +.\".IR 1 . +.\"For other game types set it to +.\".IR 0 . + +.TP +.BR TooltipDelay =INT +Delay (in ms) before tooltips are displayed when the mouse is not moving. +Reasonable number for this option is e.g. +.IR 500 . + +.TP +.BR VolumeAmbients =INT +Volume of ambient sounds in percents. The default is +.IR 100 . + +.TP +.BR VolumeMovie =INT +Volume during movie playback in percents. The default is +.IR 100 . + +.TP +.BR VolumeMusic =INT +Volume of background music in percents. The default is +.IR 100 . + +.TP +.BR VolumeSFX =INT +Volume of sound effects in percents. The default is +.IR 100 . + +.TP +.BR VolumeVoices =INT +Volume of PC or NPC voices in percents. The default is +.IR 100 . + + +.TP +.BR SkipIntroVideos =(0|1) +This parameter is meant for developers. If set to +.IR 1 , +the intro and logo videos are skipped to save developer's nerves. The default is +.IR 0 . + +.TP +.BR DrawFPS =(0|1) +This parameter is meant for developers. If set to +.IR 1 , +the current FPS (Frames per Second) value is drawn in the top left window corner. The default is +.IR 0 . + +.TP +.BR FogOfWar =(0|1) +This parameter is meant for developers. If set to +.IR 1 , +the unexplored parts of an area are blacked out. Since the unexplored bitmap is +not updated by actors yet, it's set to +.I 0 +by default. + +.TP +.BR EnableCheatKeys =(0|1) +This parameter is meant for developers. If set to +.IR 1 , +certain keys allow you to inspect the internal state of objects, do forbidden things, etc. +The keys are listed in the +.I CheatKeys.txt +file. Do NOT use this option unless you want to make your hands dirty :-). The default is +.IR 0 . + +.TP +.BR ScriptDebugMode =(n) +This parameter is meant for developers. It is a combination of bit values + +.IR 1 +- count references, + +.IR 2 +- display cutscene warnings, + +.IR 4 +- display variable warnings, + +.IR 8 +- display action warnings, + +.IR 16 +- display trigger warnings. + +The default is +.IR 0 . + +.TP +.BR CaseSensitive =(0|1) +When +this parameter is set to +.IR 1 , +the engine will try to find files regardless of their names' case at the cost +of a slight speed penalty. This is especially important when using +game files on CD-ROMs, where the files can't be renamed. Like +many Windows programs, the original games use inconsistent mix +of lower/upper case letters for naming and referencing their files. + +Set this parameter to +.I 1 +on Unix-like systems. + +.TP +.BR SaveAsOriginal =(0|1) +Set this parameter to +.IR 1 , +if you want to keep the save game compatible with the original engine. + +.TP +.BR CachePath =PATH +User-writable directory where the engine caches uncompressed and temporary +files. + +.TP +.BR GemRBPath =PATH +Path to the GemRB installation. (To be obsoleted). + +.TP +.BR GUIScriptsPath =PATH +Path to the directory with scripts controlling the game's GUI. + +.TP +.BR SavePath =PATH +Path to the directory with save games. Note that this directory has to +contain +.I save/ +and/or eventually +.I mpsave/ +subdirectories and that only these subdirectories contain the actual +saved games. + +.I SavePath +defaults to +.IR GamePath . + +.TP +.BR GameOnCD =(0|1) +defaults to +.IR 0 . + + +.TP +.BR GameDataPath =PATH +Path to the original game's installed data files, relative to GamePath. +Usually it's +.IR data . + + +.TP +.BR GameOverridePath =PATH +Path to the original game's override dir, relative to GamePath. +Usually it's +.IR override . +Original games use this directory to place last-minute patches. + +.TP +.BR GemRBOverridePath =PATH +Path where gemrb looks for its game override directory. +It defaults to +.IR GemRBPath . +The original games hardcoded this information in the engine. + + +.\"################################################### +.SH FILES +.PD 0 +.TP 20 +.B /usr/local/etc/gemrb.cfg +system-wide configuration file + +.TP +.B /usr/local/share/gemrb/override/ +directory with +.IR gemrb -distributed +data files. These used to be hardcoded in the original engine. The files +are sorted into directories for specific games. + +.TP +.B /usr/local/share/gemrb/GUIScripts/ +directory with Python scripts providing GUI setup and interaction. The files +are sorted into directories for specific games. + +.TP +.B ~/.gemrb/gemrb.cfg +.TP +.B ~/.gemrb/override/ +.TP +.B ~/.gemrb/GUIScripts/ +user's own configuration and data files. +.TP +.B ~/.gemrb/cache/ +cache directory +.PD + +.\"################################################### +.SH BUGS +Many. +.I gemrb +is still in an early development stage and not nearly complete. + +If you stumble over something which is supposed to work, either make a bug report +at http://sourceforge.net/projects/gemrb or come to IRC channel +.I #GemRB +at FreeNode. + +.\"################################################### +.SH AUTHOR +The GemRB Project development team at http://gemrb.sourceforge.net + +.\"################################################### +.SH COPYING +Copyright (C) 2003-2008 The GemRB Project + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +.\"################################################### +.\"End of file gemrb.man Property changes on: gemrb/trunk/gemrb.6 ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:mergeinfo + Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-01-06 22:14:38
|
Revision: 5511 http://gemrb.svn.sourceforge.net/gemrb/?rev=5511&view=rev Author: lynxlupodian Date: 2009-01-06 22:14:28 +0000 (Tue, 06 Jan 2009) Log Message: ----------- [ 2481318 ] Move plugins into separate folder ubuntu packages :) Modified Paths: -------------- gemrb/trunk/autogen.sh gemrb/trunk/configure.in Modified: gemrb/trunk/autogen.sh =================================================================== --- gemrb/trunk/autogen.sh 2009-01-06 17:54:07 UTC (rev 5510) +++ gemrb/trunk/autogen.sh 2009-01-06 22:14:28 UTC (rev 5511) @@ -164,7 +164,7 @@ echo Running configure -cmd="./configure --prefix=$dest/ --bindir=$dest/ --sysconfdir=$dest/ --datadir=$dest/ --libdir=$dest/plugins/ --disable-subdirs" +cmd="./configure --prefix=$dest/ --bindir=$dest/ --sysconfdir=$dest/ --datadir=$dest/ --libdir=$dest --disable-subdirs" $cmd echo Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-01-06 17:54:07 UTC (rev 5510) +++ gemrb/trunk/configure.in 2009-01-06 22:14:28 UTC (rev 5511) @@ -56,10 +56,10 @@ AC_ARG_ENABLE(subdirs, AS_HELP_STRING(--disable-subdirs,Install plugins and data directly to LIBDIR and DATADIR), gemrb_use_subdirs=$enableval, gemrb_use_subdirs=yes) if test "x$gemrb_use_subdirs" = "xno" ; then - plugindir=$libdir + plugindir=$libdir/plugins moddir=$datadir else - plugindir=$libdir/gemrb + plugindir=$libdir/gemrb/plugins moddir=$datadir/gemrb fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-01-26 09:50:23
|
Revision: 5539 http://gemrb.svn.sourceforge.net/gemrb/?rev=5539&view=rev Author: lynxlupodian Date: 2009-01-26 09:50:07 +0000 (Mon, 26 Jan 2009) Log Message: ----------- use pkg-config if openal-config isn't found, since both openal and openal-soft provide a pc file, but only openal provides openal-config [ 2505884 ] Configure doesn't see recent openal installs Modified Paths: -------------- gemrb/trunk/acinclude.m4 gemrb/trunk/configure.in Modified: gemrb/trunk/acinclude.m4 =================================================================== --- gemrb/trunk/acinclude.m4 2009-01-25 22:09:39 UTC (rev 5538) +++ gemrb/trunk/acinclude.m4 2009-01-26 09:50:07 UTC (rev 5539) @@ -231,13 +231,19 @@ AC_REQUIRE([AC_CANONICAL_TARGET]) PATH="$prefix/bin:$prefix/usr/bin:$PATH" AC_PATH_PROG(OPENAL_CONFIG, openal-config, no, [$PATH]) + AC_PATH_PROG(PKGCONFIG, pkg-config, no, [$PATH]) AC_MSG_CHECKING(for OPENAL library) no_openal="" - if test "$OPENAL_CONFIG" = "no" ; then + if test "$OPENAL_CONFIG" = "no" && test "$PKGCONFIG" = "no" ; then no_openal=yes else - OPENAL_CFLAGS=`$OPENAL_CONFIG $openalconf_args --cflags` - OPENAL_LIBS="`$OPENAL_CONFIG $openalconf_args --libs` $LIBPTHREAD" + if test "$OPENAL_CONFIG" = "no" ; then + OPENAL_CFLAGS=`$PKGCONFIG openal --cflags` + OPENAL_LIBS="`$PKGCONFIG openal --libs` $LIBPTHREAD" + else + OPENAL_CFLAGS=`$OPENAL_CONFIG $openalconf_args --cflags` + OPENAL_LIBS="`$OPENAL_CONFIG $openalconf_args --libs` $LIBPTHREAD" + fi if test "x$enable_openaltest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-01-25 22:09:39 UTC (rev 5538) +++ gemrb/trunk/configure.in 2009-01-26 09:50:07 UTC (rev 5539) @@ -125,7 +125,6 @@ ])]) dnl Check for OpenAL, fail if not found. -dnl Check for libSDL Version 1.2 or greater, fail if not found. AM_PATH_OPENAL([], [AC_MSG_ERROR([ *** You need OpenAL (www.openal.org) to compile GemRB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-01-31 19:19:35
|
Revision: 5596 http://gemrb.svn.sourceforge.net/gemrb/?rev=5596&view=rev Author: lynxlupodian Date: 2009-01-31 19:19:16 +0000 (Sat, 31 Jan 2009) Log Message: ----------- change the hard pause key to h, to avoid conflicting with tooltip display + removed a duplicate NEWS entry Modified Paths: -------------- gemrb/trunk/NEWS gemrb/trunk/gemrb/plugins/Core/GameControl.cpp Modified: gemrb/trunk/NEWS =================================================================== --- gemrb/trunk/NEWS 2009-01-31 18:56:30 UTC (rev 5595) +++ gemrb/trunk/NEWS 2009-01-31 19:19:16 UTC (rev 5596) @@ -4,14 +4,13 @@ - trap detection, removal, triggering, xp, feedback, autopause - modal effects - proper xp award for dual- and multiclass actors - - extended night (alternative lightmap, tileset, minimap, switching movies) - double click (used in the map window) - click-and-hold incrementing/decrementing - accumulate kill statistics - characters can move while the map is open - sound on item equip - arbitrary feat prerequisites in iwd2 - - hard pause/TAB for all games (originally a ToB feature) + - hard pause for all games (originally a ToB feature); triggered with 'h' - extended night areas (originally a bg2 feature) Improved features: Modified: gemrb/trunk/gemrb/plugins/Core/GameControl.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2009-01-31 18:56:30 UTC (rev 5595) +++ gemrb/trunk/gemrb/plugins/Core/GameControl.cpp 2009-01-31 19:19:16 UTC (rev 5596) @@ -859,7 +859,7 @@ return; //return from cheatkeys } switch (Key) { - case '\t': + case 'h': if (DialogueFlags & DF_FREEZE_SCRIPTS) break; //fallthrough case ' ': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2009-02-02 22:16:22
|
Revision: 5627 http://gemrb.svn.sourceforge.net/gemrb/?rev=5627&view=rev Author: fuzzie Date: 2009-02-02 22:01:00 +0000 (Mon, 02 Feb 2009) Log Message: ----------- oops, fix 2BY3 formation Modified Paths: -------------- gemrb/trunk/admin/make_formation.py gemrb/trunk/gemrb/override/bg1/formatio.2da gemrb/trunk/gemrb/override/bg2/formatio.2da gemrb/trunk/gemrb/override/how/formatio.2da gemrb/trunk/gemrb/override/iwd/formatio.2da gemrb/trunk/gemrb/override/iwd2/formatio.2da Modified: gemrb/trunk/admin/make_formation.py =================================================================== --- gemrb/trunk/admin/make_formation.py 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/admin/make_formation.py 2009-02-02 22:01:00 UTC (rev 5627) @@ -189,14 +189,15 @@ for i in range(num_coords): if left_side: # left print -24, + print yloc, else: # right print 24, + print yloc, # first step back is 48, then 36 if yloc == 0: yloc = 48 else: yloc += 36 - print yloc, left_side = not left_side print Modified: gemrb/trunk/gemrb/override/bg1/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-02 22:01:00 UTC (rev 5627) @@ -8,7 +8,7 @@ 4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 -2BY3 -24 0 24 48 -24 48 24 84 -24 84 24 120 -24 120 24 156 -24 156 24 192 -24 192 24 228 -24 228 24 264 -24 264 24 300 -24 300 24 336 -24 336 24 372 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 Modified: gemrb/trunk/gemrb/override/bg2/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/bg2/formatio.2da 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/gemrb/override/bg2/formatio.2da 2009-02-02 22:01:00 UTC (rev 5627) @@ -8,7 +8,7 @@ S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 -2BY3 -24 0 24 48 -24 48 24 84 -24 84 24 120 -24 120 24 156 -24 156 24 192 -24 192 24 228 -24 228 24 264 -24 264 24 300 -24 300 24 336 -24 336 24 372 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 Modified: gemrb/trunk/gemrb/override/how/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-02 22:01:00 UTC (rev 5627) @@ -8,7 +8,7 @@ 4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 -2BY3 -24 0 24 48 -24 48 24 84 -24 84 24 120 -24 120 24 156 -24 156 24 192 -24 192 24 228 -24 228 24 264 -24 264 24 300 -24 300 24 336 -24 336 24 372 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 Modified: gemrb/trunk/gemrb/override/iwd/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-02 22:01:00 UTC (rev 5627) @@ -8,7 +8,7 @@ 4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 -2BY3 -24 0 24 48 -24 48 24 84 -24 84 24 120 -24 120 24 156 -24 156 24 192 -24 192 24 228 -24 228 24 264 -24 264 24 300 -24 300 24 336 -24 336 24 372 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 Modified: gemrb/trunk/gemrb/override/iwd2/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-02 21:51:34 UTC (rev 5626) +++ gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-02 22:01:00 UTC (rev 5627) @@ -8,7 +8,7 @@ 4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 -2BY3 -24 0 24 48 -24 48 24 84 -24 84 24 120 -24 120 24 156 -24 156 24 192 -24 192 24 228 -24 228 24 264 -24 264 24 300 -24 300 24 336 -24 336 24 372 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2009-02-02 22:44:52
|
Revision: 5629 http://gemrb.svn.sourceforge.net/gemrb/?rev=5629&view=rev Author: fuzzie Date: 2009-02-02 22:44:45 +0000 (Mon, 02 Feb 2009) Log Message: ----------- hardcode some old data for a temporary semi-fix for non-bg2 formations Modified Paths: -------------- gemrb/trunk/admin/make_formation.py gemrb/trunk/gemrb/override/bg1/formatio.2da gemrb/trunk/gemrb/override/bg2/formatio.2da gemrb/trunk/gemrb/override/how/formatio.2da gemrb/trunk/gemrb/override/iwd/formatio.2da gemrb/trunk/gemrb/override/iwd2/formatio.2da gemrb/trunk/gemrb/override/pst/formatio.2da gemrb/trunk/gemrb/override/test1/formatio.2da Modified: gemrb/trunk/admin/make_formation.py =================================================================== --- gemrb/trunk/admin/make_formation.py 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/admin/make_formation.py 2009-02-02 22:44:45 UTC (rev 5629) @@ -99,9 +99,21 @@ print yloc, print -# A wavy-line formation. +# TODO: not finished/correct def generate_4and2(): print "4AND2", + print "0 0", + print "30 0", + print "-30 0", + print "60 0", + print "0 30", + print "30 30", + print "0 60", + print + +# A wavy-line formation. +def generate_s(): + print "S", for i in range(num_coords): # x coordinate: +/- 15 if i % 2 == 0: @@ -125,8 +137,8 @@ # A wavy-line formation, with the lead character in the 4th position and # the other characters in order (even if this leaves spaces!). -def generate_s(): - print "S", +def generate_wavyline(): + print "WAVYLINE", for i in range(num_coords): pos = corrected_position_for_actor(i, 3) @@ -214,11 +226,23 @@ print 0, print +# TODO: not finished/correct +def generate_v(): + print "V", + print "0 0", + print "30 0", + print "-30 30", + print "60 30", + print "-60 60", + print "90 60", + print "-90 90", + print + # A triangle with the lead character at the back. Focal point is at the # front. Other characters are placed row-by-row starting at the front row, # middle then left then right, with the maximum width being 3. -def generate_v(): - print "V", +def generate_triangle(): + print "TRIANGLE", for i in range(num_coords): pos = corrected_position_for_actor(i, 3) if pos == 0: @@ -287,7 +311,7 @@ generate_gather() generate_4and2() generate_3by2() - generate_protect() + generate_protect() # TODO: wrong formation for bg1 or others? generate_2by3() generate_rank() generate_v() @@ -296,6 +320,18 @@ generate_line("LINE") if argv[1] == "pst": + generate_line("FOLLOW") # TODO: should be hard-coded game logic + generate_t() + generate_gather() + generate_4and2() + generate_3by2() + generate_protect() + generate_2by3() + generate_rank() + generate_v() + generate_wedge() + generate_s() + generate_line("LINE") print "NONE", for i in range(num_coords): print "0 0", @@ -305,14 +341,14 @@ generate_line("FOLLOW") # TODO: should be hard-coded game logic generate_t() generate_gather() - generate_s() + generate_wavyline() generate_3by2() generate_protect() generate_2by3() generate_rank() - generate_v() + generate_triangle() generate_wedge() - generate_4and2() + generate_s() generate_line("LINE") if argv[1] == "test1": Modified: gemrb/trunk/gemrb/override/bg1/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/bg2/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/bg2/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/bg2/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +WAVYLINE -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +TRIANGLE 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/how/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/iwd/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/iwd2/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S -15 72 15 0 -15 24 15 48 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/pst/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/pst/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/pst/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -2,4 +2,16 @@ -10 # generated by make_formation.py, do not edit X1 Y1 X2 Y2 X3 Y3 X4 Y4 X5 Y5 X6 Y6 X7 Y7 X8 Y8 X9 Y9 X10 Y10 X11 Y11 X12 Y12 X13 Y13 X14 Y14 X15 Y15 X16 Y16 X17 Y17 X18 Y18 X19 Y19 X20 Y20 +FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 +T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 +GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 +4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 +PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 +2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 +RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 +S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 NONE 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Modified: gemrb/trunk/gemrb/override/test1/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/test1/formatio.2da 2009-02-02 22:39:42 UTC (rev 5628) +++ gemrb/trunk/gemrb/override/test1/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) @@ -4,4 +4,4 @@ X1 Y1 X2 Y2 X3 Y3 X4 Y4 X5 Y5 X6 Y6 X7 Y7 X8 Y8 X9 Y9 X10 Y10 X11 Y11 X12 Y12 X13 Y13 X14 Y14 X15 Y15 X16 Y16 X17 Y17 X18 Y18 X19 Y19 X20 Y20 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 -V 0 72 0 0 -32 36 32 36 -64 72 64 72 0 108 -64 108 64 108 0 144 -64 144 64 144 0 180 -64 180 64 180 0 216 -64 216 64 216 0 252 -64 252 +V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fu...@us...> - 2009-02-03 12:02:23
|
Revision: 5630 http://gemrb.svn.sourceforge.net/gemrb/?rev=5630&view=rev Author: fuzzie Date: 2009-02-03 11:59:48 +0000 (Tue, 03 Feb 2009) Log Message: ----------- yet more formation work Modified Paths: -------------- gemrb/trunk/admin/make_formation.py gemrb/trunk/gemrb/override/bg1/formatio.2da gemrb/trunk/gemrb/override/how/formatio.2da gemrb/trunk/gemrb/override/iwd/formatio.2da gemrb/trunk/gemrb/override/iwd2/formatio.2da gemrb/trunk/gemrb/override/pst/formatio.2da gemrb/trunk/gemrb/override/test1/formatio.2da Added Paths: ----------- gemrb/trunk/admin/generate_formation_files.sh Added: gemrb/trunk/admin/generate_formation_files.sh =================================================================== --- gemrb/trunk/admin/generate_formation_files.sh (rev 0) +++ gemrb/trunk/admin/generate_formation_files.sh 2009-02-03 11:59:48 UTC (rev 5630) @@ -0,0 +1,9 @@ +#!/bin/sh +./make_formation.py bg1 > ../gemrb/override/bg1/formatio.2da +./make_formation.py bg2 > ../gemrb/override/bg2/formatio.2da +./make_formation.py iwd > ../gemrb/override/iwd/formatio.2da +./make_formation.py iwd2 > ../gemrb/override/iwd2/formatio.2da +./make_formation.py pst > ../gemrb/override/pst/formatio.2da +./make_formation.py how > ../gemrb/override/how/formatio.2da +./make_formation.py test1 > ../gemrb/override/test1/formatio.2da + Property changes on: gemrb/trunk/admin/generate_formation_files.sh ___________________________________________________________________ Added: svn:executable + * Modified: gemrb/trunk/admin/make_formation.py =================================================================== --- gemrb/trunk/admin/make_formation.py 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/admin/make_formation.py 2009-02-03 11:59:48 UTC (rev 5630) @@ -25,6 +25,10 @@ # written (badly, sorry!) by fuzzie, feb 2nd 2009 +# TODO: older games have focus points in different positions and different +# spacing (ie, coordinates have different offsets) +# eg, pst seems to usually have the focus point always on the lead char + num_coords = 20 def generate_header(): @@ -99,27 +103,37 @@ print yloc, print -# TODO: not finished/correct +# A block formation which places 4 on a row - first two in the +# middle (left then right), then two on the outside (left then right). +# With a party size of 6 this results in 4 on the first row and 2 on the +# second, hence the name. def generate_4and2(): print "4AND2", - print "0 0", - print "30 0", - print "-30 0", - print "60 0", - print "0 30", - print "30 30", - print "0 60", + for i in range(num_coords): + if i % 4 == 0: + xloc = 0 + elif i % 4 == 1: + xloc = 64 + elif i % 4 == 2: + xloc = -64 + else: + xloc = 128 + yloc = (i / 4) * 48 + print xloc, + print yloc, print # A wavy-line formation. -def generate_s(): +def generate_s(bg2style): print "S", for i in range(num_coords): - # x coordinate: +/- 15 + # x coordinate: +/- 15 for bg2, 0/64 otherwise if i % 2 == 0: - print 15, # on right + if bg2style: print 15, # on right + else: print 0, # on left else: - print -15, # on left + if bg2style: print -15, # on left + else: print 64, # on right # y coordinate: 24 each print i * 24, @@ -226,16 +240,16 @@ print 0, print -# TODO: not finished/correct def generate_v(): print "V", - print "0 0", - print "30 0", - print "-30 30", - print "60 30", - print "-60 60", - print "90 60", - print "-90 90", + for i in range(num_coords): + if i % 2 == 0: + xpos = (i / 2) * -15 + else: + xpos = 64 + (i / 2) * -15 + ypos = (i / 2) * 48 + print xpos, + print ypos, print # A triangle with the lead character at the back. Focal point is at the @@ -270,6 +284,7 @@ # A wide triangle with the lead character at the front. Characters are placed # row-by-row. Second row: right then left. Third row: left then right then # middle. Other rows: Middle first, left, right. +# TODO: the older games seem to have the third row ordered the same as the other ones def generate_wedge(): print "WEDGE", for i in range(num_coords): @@ -316,7 +331,7 @@ generate_rank() generate_v() generate_wedge() - generate_s() + generate_s(False) generate_line("LINE") if argv[1] == "pst": @@ -330,7 +345,7 @@ generate_rank() generate_v() generate_wedge() - generate_s() + generate_s(False) generate_line("LINE") print "NONE", for i in range(num_coords): @@ -348,7 +363,7 @@ generate_rank() generate_triangle() generate_wedge() - generate_s() + generate_s(True) generate_line("LINE") if argv[1] == "test1": Modified: gemrb/trunk/gemrb/override/bg1/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/bg1/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +4AND2 0 0 64 0 -64 0 128 0 0 48 64 48 -64 48 128 48 0 96 64 96 -64 96 128 96 0 144 64 144 -64 144 128 144 0 192 64 192 -64 192 128 192 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 0 0 64 24 0 48 64 72 0 96 64 120 0 144 64 168 0 192 64 216 0 240 64 264 0 288 64 312 0 336 64 360 0 384 64 408 0 432 64 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/how/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/how/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +4AND2 0 0 64 0 -64 0 128 0 0 48 64 48 -64 48 128 48 0 96 64 96 -64 96 128 96 0 144 64 144 -64 144 128 144 0 192 64 192 -64 192 128 192 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 0 0 64 24 0 48 64 72 0 96 64 120 0 144 64 168 0 192 64 216 0 240 64 264 0 288 64 312 0 336 64 360 0 384 64 408 0 432 64 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/iwd/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/iwd/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +4AND2 0 0 64 0 -64 0 128 0 0 48 64 48 -64 48 128 48 0 96 64 96 -64 96 128 96 0 144 64 144 -64 144 128 144 0 192 64 192 -64 192 128 192 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 0 0 64 24 0 48 64 72 0 96 64 120 0 144 64 168 0 192 64 216 0 240 64 264 0 288 64 312 0 336 64 360 0 384 64 408 0 432 64 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/iwd2/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/iwd2/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -5,12 +5,12 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +4AND2 0 0 64 0 -64 0 128 0 0 48 64 48 -64 48 128 48 0 96 64 96 -64 96 128 96 0 144 64 144 -64 144 128 144 0 192 64 192 -64 192 128 192 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 0 0 64 24 0 48 64 72 0 96 64 120 0 144 64 168 0 192 64 216 0 240 64 264 0 288 64 312 0 336 64 360 0 384 64 408 0 432 64 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 Modified: gemrb/trunk/gemrb/override/pst/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/pst/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/pst/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -5,13 +5,13 @@ FOLLOW 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 GATHER 0 -36 48 -24 -48 -24 48 24 -48 24 0 36 48 48 -48 48 0 72 48 72 -48 72 0 108 48 96 -48 96 0 144 48 120 -48 120 0 180 48 144 -48 144 -4AND2 0 0 30 0 -30 0 60 0 0 30 30 30 0 60 +4AND2 0 0 64 0 -64 0 128 0 0 48 64 48 -64 48 128 48 0 96 64 96 -64 96 128 96 0 144 64 144 -64 144 128 144 0 192 64 192 -64 192 128 192 3BY2 0 0 64 0 -64 0 0 48 64 48 -64 48 0 96 64 96 -64 96 0 144 64 144 -64 144 0 192 64 192 -64 192 0 240 64 240 -64 240 0 288 64 288 PROTECT 0 0 0 -36 -64 0 64 0 -32 48 32 48 0 24 0 48 0 72 0 96 0 120 0 144 0 168 0 192 0 216 0 240 0 264 0 288 0 312 0 336 2BY3 -24 0 24 0 -24 48 24 48 -24 84 24 84 -24 120 24 120 -24 156 24 156 -24 192 24 192 -24 228 24 228 -24 264 24 264 -24 300 24 300 -24 336 24 336 RANK -32 0 32 0 -96 0 96 0 -160 0 160 0 -224 0 224 0 -288 0 288 0 -352 0 352 0 -416 0 416 0 -480 0 480 0 -544 0 544 0 -608 0 608 0 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 WEDGE 0 0 64 36 -64 36 -124 72 124 72 0 72 0 144 -124 144 124 144 0 180 -124 180 124 180 0 216 -124 216 124 216 0 252 -124 252 124 252 0 288 -124 288 -S 15 0 -15 24 15 48 -15 72 15 96 -15 120 15 144 -15 168 15 192 -15 216 15 240 -15 264 15 288 -15 312 15 336 -15 360 15 384 -15 408 15 432 -15 456 +S 0 0 64 24 0 48 64 72 0 96 64 120 0 144 64 168 0 192 64 216 0 240 64 264 0 288 64 312 0 336 64 360 0 384 64 408 0 432 64 456 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 NONE 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Modified: gemrb/trunk/gemrb/override/test1/formatio.2da =================================================================== --- gemrb/trunk/gemrb/override/test1/formatio.2da 2009-02-02 22:44:45 UTC (rev 5629) +++ gemrb/trunk/gemrb/override/test1/formatio.2da 2009-02-03 11:59:48 UTC (rev 5630) @@ -4,4 +4,4 @@ X1 Y1 X2 Y2 X3 Y3 X4 Y4 X5 Y5 X6 Y6 X7 Y7 X8 Y8 X9 Y9 X10 Y10 X11 Y11 X12 Y12 X13 Y13 X14 Y14 X15 Y15 X16 Y16 X17 Y17 X18 Y18 X19 Y19 X20 Y20 LINE 0 0 0 36 0 72 0 108 0 144 0 180 0 216 0 252 0 288 0 324 0 360 0 396 0 432 0 468 0 504 0 540 0 576 0 612 0 648 0 684 T 0 0 48 0 -48 0 0 48 0 84 0 120 0 156 0 192 0 228 0 264 0 300 0 336 0 372 0 408 0 444 0 480 0 516 0 552 0 588 0 624 -V 0 0 30 0 -30 30 60 30 -60 60 90 60 -90 90 +V 0 0 64 0 -15 48 49 48 -30 96 34 96 -45 144 19 144 -60 192 4 192 -75 240 -11 240 -90 288 -26 288 -105 336 -41 336 -120 384 -56 384 -135 432 -71 432 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-02-16 14:39:08
|
Revision: 5700 http://gemrb.svn.sourceforge.net/gemrb/?rev=5700&view=rev Author: lynxlupodian Date: 2009-02-16 14:39:04 +0000 (Mon, 16 Feb 2009) Log Message: ----------- change the version to 0.3.2 Modified Paths: -------------- gemrb/trunk/configure.in gemrb/trunk/gemrb/includes/globals.h Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-02-16 14:36:30 UTC (rev 5699) +++ gemrb/trunk/configure.in 2009-02-16 14:39:04 UTC (rev 5700) @@ -28,7 +28,7 @@ dnl Initialize autoconf and automake AC_PREREQ([2.57]) -AC_INIT(gemrb, 0.3.1) +AC_INIT(gemrb, 0.3.2) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_SRCDIR([gemrb/]) AC_CANONICAL_SYSTEM Modified: gemrb/trunk/gemrb/includes/globals.h =================================================================== --- gemrb/trunk/gemrb/includes/globals.h 2009-02-16 14:36:30 UTC (rev 5699) +++ gemrb/trunk/gemrb/includes/globals.h 2009-02-16 14:39:04 UTC (rev 5700) @@ -35,7 +35,7 @@ #include "ie_types.h" -#define VERSION_GEMRB "0.3.1" +#define VERSION_GEMRB "0.3.2" #define GEMRB_STRING "GemRB v" VERSION_GEMRB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2009-03-15 09:13:22
|
Revision: 5801 http://gemrb.svn.sourceforge.net/gemrb/?rev=5801&view=rev Author: zefklop Date: 2009-03-15 09:13:20 +0000 (Sun, 15 Mar 2009) Log Message: ----------- cmake : better gemrb overrides installation. Modified Paths: -------------- gemrb/trunk/CMakeLists.txt gemrb/trunk/gemrb/override/bg1/CMakeLists.txt gemrb/trunk/gemrb/override/bg2/CMakeLists.txt gemrb/trunk/gemrb/override/how/CMakeLists.txt gemrb/trunk/gemrb/override/iwd/CMakeLists.txt gemrb/trunk/gemrb/override/iwd2/CMakeLists.txt gemrb/trunk/gemrb/override/pst/CMakeLists.txt gemrb/trunk/gemrb/override/test1/CMakeLists.txt Modified: gemrb/trunk/CMakeLists.txt =================================================================== --- gemrb/trunk/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -19,7 +19,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror") -ENDIF(CMAKE_COMPILE_IS_GNUCXX) +ENDIF(CMAKE_COMPILER_IS_GNUCXX) MESSAGE(STATUS "Looking for Python libraries") INCLUDE(FindPythonLibs) @@ -114,5 +114,11 @@ ENDIF(WIN32) ENDMACRO(ADD_GEMRB_PLUGIN) +#gemrb overrides macro +MACRO(ADD_GEMRB_OVERRIDE game_name) +FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.bcs *.vvc *.mos *.spl *.wav ) +INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/${game_name} ) +ENDMACRO(ADD_GEMRB_OVERRIDE ) + ADD_SUBDIRECTORY( gemrb ) INSTALL( FILES gemrb.6 DESTINATION ${MANPAGE_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/override/bg1/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/bg1/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/bg1/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/bg1 ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (bg1) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/bg2/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/bg2/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/bg2/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.vvc) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/bg2 ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (bg2) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/how/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/how/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/how/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/how ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (how) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/iwd/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/iwd/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/iwd/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/iwd ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (iwd) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/iwd2/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/iwd2/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/iwd2/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/iwd2 ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (iwd2) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/pst/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/pst/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/pst/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.bcs ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/pst ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (pst) \ No newline at end of file Modified: gemrb/trunk/gemrb/override/test1/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/override/test1/CMakeLists.txt 2009-03-14 23:11:12 UTC (rev 5800) +++ gemrb/trunk/gemrb/override/test1/CMakeLists.txt 2009-03-15 09:13:20 UTC (rev 5801) @@ -1,3 +1 @@ -FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.wav ) - -INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/test1 ) \ No newline at end of file +ADD_GEMRB_OVERRIDE (test1) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-05-19 10:23:18
|
Revision: 6005 http://gemrb.svn.sourceforge.net/gemrb/?rev=6005&view=rev Author: lynxlupodian Date: 2009-05-19 10:21:38 +0000 (Tue, 19 May 2009) Log Message: ----------- updated fsf address Modified Paths: -------------- gemrb/trunk/acinclude.m4 gemrb/trunk/admin/check_copyright.pl gemrb/trunk/admin/make_formation.py gemrb/trunk/configure.in gemrb/trunk/gemrb/Config/Config.cpp gemrb/trunk/gemrb/GUIScripts/GUIClasses.py gemrb/trunk/gemrb/GUIScripts/GUICommon.py gemrb/trunk/gemrb/GUIScripts/GUIDefines.py gemrb/trunk/gemrb/GUIScripts/MetaClasses.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/bg1/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/bg1/QuitGame.py gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen2.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen3.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen4.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen5.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen6.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen7.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/bg2/LUHLASelection.py gemrb/trunk/gemrb/GUIScripts/bg2/LUSpellSelection.py gemrb/trunk/gemrb/GUIScripts/bg2/LevelUp.py gemrb/trunk/gemrb/GUIScripts/bg2/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/bg2/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/bg2/QuitGame.py gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/ie_action.py gemrb/trunk/gemrb/GUIScripts/ie_restype.py gemrb/trunk/gemrb/GUIScripts/ie_slots.py gemrb/trunk/gemrb/GUIScripts/ie_stats.py gemrb/trunk/gemrb/GUIScripts/iwd/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/iwd/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMG.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIPR.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/iwd/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/iwd/PartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd/QuitGame.py gemrb/trunk/gemrb/GUIScripts/iwd/Start.py gemrb/trunk/gemrb/GUIScripts/iwd/TextScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/AutoPause.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIINV.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIMA.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIREC.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISPL.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/iwd2/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/iwd2/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/iwd2/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/iwd2/Options.py gemrb/trunk/gemrb/GUIScripts/iwd2/QuitGame.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPPartyFormation.py gemrb/trunk/gemrb/GUIScripts/iwd2/Start.py gemrb/trunk/gemrb/GUIScripts/iwd2/TextScreen.py gemrb/trunk/gemrb/GUIScripts/pst/FloatMenuWindow.py gemrb/trunk/gemrb/GUIScripts/pst/GUICommonWindows.py gemrb/trunk/gemrb/GUIScripts/pst/GUIINV.py gemrb/trunk/gemrb/GUIScripts/pst/GUIJRNL.py gemrb/trunk/gemrb/GUIScripts/pst/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/pst/GUIMA.py gemrb/trunk/gemrb/GUIScripts/pst/GUIMG.py gemrb/trunk/gemrb/GUIScripts/pst/GUIOPT.py gemrb/trunk/gemrb/GUIScripts/pst/GUIPR.py gemrb/trunk/gemrb/GUIScripts/pst/GUIREC.py gemrb/trunk/gemrb/GUIScripts/pst/GUISAVE.py gemrb/trunk/gemrb/GUIScripts/pst/GUISTORE.py gemrb/trunk/gemrb/GUIScripts/pst/GUIWORLD.py gemrb/trunk/gemrb/GUIScripts/pst/LoadScreen.py gemrb/trunk/gemrb/GUIScripts/pst/MessageWindow.py gemrb/trunk/gemrb/GUIScripts/pst/NewLife.py gemrb/trunk/gemrb/GUIScripts/pst/QuitGame.py gemrb/trunk/gemrb/GUIScripts/pst/Start.py gemrb/trunk/gemrb/GUIScripts/test1/LoadScreen.py gemrb/trunk/gemrb/GemRB.cpp gemrb/trunk/gemrb/includes/SClassID.h gemrb/trunk/gemrb/includes/defsounds.h gemrb/trunk/gemrb/includes/globals.h gemrb/trunk/gemrb/includes/ie_stats.h gemrb/trunk/gemrb/includes/ie_types.h gemrb/trunk/gemrb/includes/opcode_params.h gemrb/trunk/gemrb/includes/overlays.h gemrb/trunk/gemrb/includes/strrefs.h gemrb/trunk/gemrb/includes/win32def.h gemrb/trunk/gemrb/override/bg1/gemrb.ini gemrb/trunk/gemrb/override/bg2/gemrb.ini gemrb/trunk/gemrb/override/how/gemrb.ini gemrb/trunk/gemrb/override/iwd/gemrb.ini gemrb/trunk/gemrb/override/iwd2/gemrb.ini gemrb/trunk/gemrb/override/pst/gemrb.ini gemrb/trunk/gemrb/override/test1/gemrb.ini gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.cpp gemrb/trunk/gemrb/plugins/2DAImporter/2DAImp.h gemrb/trunk/gemrb/plugins/2DAImporter/2DAImpCD.cpp gemrb/trunk/gemrb/plugins/2DAImporter/2DAImpCD.h gemrb/trunk/gemrb/plugins/2DAImporter/2DAImporter.cpp gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.cpp gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.h gemrb/trunk/gemrb/plugins/ACMImporter/ACMImporter.cpp gemrb/trunk/gemrb/plugins/ACMImporter/ACMImporterCD.cpp gemrb/trunk/gemrb/plugins/ACMImporter/ACMImporterCD.h gemrb/trunk/gemrb/plugins/ACMImporter/decoder.cpp gemrb/trunk/gemrb/plugins/ACMImporter/decoder.h gemrb/trunk/gemrb/plugins/ACMImporter/general.h gemrb/trunk/gemrb/plugins/ACMImporter/readers.cpp gemrb/trunk/gemrb/plugins/ACMImporter/readers.h gemrb/trunk/gemrb/plugins/ACMImporter/riffhdr.cpp gemrb/trunk/gemrb/plugins/ACMImporter/riffhdr.h gemrb/trunk/gemrb/plugins/ACMImporter/unpacker.cpp gemrb/trunk/gemrb/plugins/ACMImporter/unpacker.h gemrb/trunk/gemrb/plugins/AREImporter/AREImp.cpp gemrb/trunk/gemrb/plugins/AREImporter/AREImp.h gemrb/trunk/gemrb/plugins/AREImporter/AREImpCD.cpp gemrb/trunk/gemrb/plugins/AREImporter/AREImpCD.h gemrb/trunk/gemrb/plugins/AREImporter/AREImporter.cpp gemrb/trunk/gemrb/plugins/BAMImporter/BAMImp.cpp gemrb/trunk/gemrb/plugins/BAMImporter/BAMImp.h gemrb/trunk/gemrb/plugins/BAMImporter/BAMImpCD.cpp gemrb/trunk/gemrb/plugins/BAMImporter/BAMImpCD.h gemrb/trunk/gemrb/plugins/BAMImporter/BAMImporter.cpp gemrb/trunk/gemrb/plugins/BIFImporter/BIFImp.cpp gemrb/trunk/gemrb/plugins/BIFImporter/BIFImp.h gemrb/trunk/gemrb/plugins/BIFImporter/BIFImpCD.cpp gemrb/trunk/gemrb/plugins/BIFImporter/BIFImpCD.h gemrb/trunk/gemrb/plugins/BIFImporter/BIFImporter.cpp gemrb/trunk/gemrb/plugins/BMPImporter/BMPImp.cpp gemrb/trunk/gemrb/plugins/BMPImporter/BMPImp.h gemrb/trunk/gemrb/plugins/BMPImporter/BMPImpCD.cpp gemrb/trunk/gemrb/plugins/BMPImporter/BMPImpCD.h gemrb/trunk/gemrb/plugins/BMPImporter/BMPImporter.cpp gemrb/trunk/gemrb/plugins/CHUImporter/CHUImp.cpp gemrb/trunk/gemrb/plugins/CHUImporter/CHUImp.h gemrb/trunk/gemrb/plugins/CHUImporter/CHUImpCD.cpp gemrb/trunk/gemrb/plugins/CHUImporter/CHUImpCD.h gemrb/trunk/gemrb/plugins/CHUImporter/CHUImporter.cpp gemrb/trunk/gemrb/plugins/CREImporter/CREImp.cpp gemrb/trunk/gemrb/plugins/CREImporter/CREImp.h gemrb/trunk/gemrb/plugins/CREImporter/CREImpCD.cpp gemrb/trunk/gemrb/plugins/CREImporter/CREImpCD.h gemrb/trunk/gemrb/plugins/CREImporter/CREImporter.cpp gemrb/trunk/gemrb/plugins/Core/Actions.cpp gemrb/trunk/gemrb/plugins/Core/Actor.cpp gemrb/trunk/gemrb/plugins/Core/Actor.h gemrb/trunk/gemrb/plugins/Core/ActorBlock.cpp gemrb/trunk/gemrb/plugins/Core/ActorBlock.h gemrb/trunk/gemrb/plugins/Core/ActorMgr.cpp gemrb/trunk/gemrb/plugins/Core/ActorMgr.h gemrb/trunk/gemrb/plugins/Core/Ambient.cpp gemrb/trunk/gemrb/plugins/Core/Ambient.h gemrb/trunk/gemrb/plugins/Core/AmbientMgr.cpp gemrb/trunk/gemrb/plugins/Core/AmbientMgr.h gemrb/trunk/gemrb/plugins/Core/AnimStructures.h gemrb/trunk/gemrb/plugins/Core/Animation.cpp gemrb/trunk/gemrb/plugins/Core/Animation.h gemrb/trunk/gemrb/plugins/Core/AnimationFactory.cpp gemrb/trunk/gemrb/plugins/Core/AnimationFactory.h gemrb/trunk/gemrb/plugins/Core/AnimationMgr.cpp gemrb/trunk/gemrb/plugins/Core/AnimationMgr.h gemrb/trunk/gemrb/plugins/Core/ArchiveImporter.cpp gemrb/trunk/gemrb/plugins/Core/ArchiveImporter.h gemrb/trunk/gemrb/plugins/Core/Audio.cpp gemrb/trunk/gemrb/plugins/Core/Audio.h gemrb/trunk/gemrb/plugins/Core/Button.cpp gemrb/trunk/gemrb/plugins/Core/Button.h gemrb/trunk/gemrb/plugins/Core/Cache.cpp gemrb/trunk/gemrb/plugins/Core/Cache.h gemrb/trunk/gemrb/plugins/Core/CachedFileStream.cpp gemrb/trunk/gemrb/plugins/Core/CachedFileStream.h gemrb/trunk/gemrb/plugins/Core/CharAnimations.cpp gemrb/trunk/gemrb/plugins/Core/CharAnimations.h gemrb/trunk/gemrb/plugins/Core/ClassDesc.cpp gemrb/trunk/gemrb/plugins/Core/ClassDesc.h gemrb/trunk/gemrb/plugins/Core/Class_ID.cpp gemrb/trunk/gemrb/plugins/Core/Class_ID.h gemrb/trunk/gemrb/plugins/Core/Compressor.cpp gemrb/trunk/gemrb/plugins/Core/Compressor.h gemrb/trunk/gemrb/plugins/Core/Console.cpp gemrb/trunk/gemrb/plugins/Core/Console.h gemrb/trunk/gemrb/plugins/Core/Control.cpp gemrb/trunk/gemrb/plugins/Core/Control.h gemrb/trunk/gemrb/plugins/Core/ControlAnimation.cpp gemrb/trunk/gemrb/plugins/Core/ControlAnimation.h gemrb/trunk/gemrb/plugins/Core/Core.cpp gemrb/trunk/gemrb/plugins/Core/DataFileMgr.cpp gemrb/trunk/gemrb/plugins/Core/DataFileMgr.h gemrb/trunk/gemrb/plugins/Core/DataStream.cpp gemrb/trunk/gemrb/plugins/Core/DataStream.h gemrb/trunk/gemrb/plugins/Core/Dialog.cpp gemrb/trunk/gemrb/plugins/Core/Dialog.h gemrb/trunk/gemrb/plugins/Core/DialogMgr.cpp gemrb/trunk/gemrb/plugins/Core/DialogMgr.h gemrb/trunk/gemrb/plugins/Core/Effect.h gemrb/trunk/gemrb/plugins/Core/EffectMgr.cpp gemrb/trunk/gemrb/plugins/Core/EffectMgr.h gemrb/trunk/gemrb/plugins/Core/EffectQueue.cpp gemrb/trunk/gemrb/plugins/Core/EffectQueue.h gemrb/trunk/gemrb/plugins/Core/EventMgr.cpp gemrb/trunk/gemrb/plugins/Core/EventMgr.h gemrb/trunk/gemrb/plugins/Core/Factory.cpp gemrb/trunk/gemrb/plugins/Core/Factory.h gemrb/trunk/gemrb/plugins/Core/FactoryObject.cpp gemrb/trunk/gemrb/plugins/Core/FactoryObject.h gemrb/trunk/gemrb/plugins/Core/FileStream.cpp gemrb/trunk/gemrb/plugins/Core/FileStream.h gemrb/trunk/gemrb/plugins/Core/Font.cpp gemrb/trunk/gemrb/plugins/Core/Font.h gemrb/trunk/gemrb/plugins/Core/GSUtils.cpp gemrb/trunk/gemrb/plugins/Core/Game.cpp gemrb/trunk/gemrb/plugins/Core/Game.h gemrb/trunk/gemrb/plugins/Core/GameControl.cpp gemrb/trunk/gemrb/plugins/Core/GameControl.h gemrb/trunk/gemrb/plugins/Core/GameData.cpp gemrb/trunk/gemrb/plugins/Core/GameData.h gemrb/trunk/gemrb/plugins/Core/GameScript.cpp gemrb/trunk/gemrb/plugins/Core/GameScript.h gemrb/trunk/gemrb/plugins/Core/GlobalTimer.cpp gemrb/trunk/gemrb/plugins/Core/ImageFactory.cpp gemrb/trunk/gemrb/plugins/Core/ImageFactory.h gemrb/trunk/gemrb/plugins/Core/ImageMgr.cpp gemrb/trunk/gemrb/plugins/Core/ImageMgr.h gemrb/trunk/gemrb/plugins/Core/IniSpawn.cpp gemrb/trunk/gemrb/plugins/Core/IniSpawn.h gemrb/trunk/gemrb/plugins/Core/Interface.cpp gemrb/trunk/gemrb/plugins/Core/Interface.h gemrb/trunk/gemrb/plugins/Core/InterfaceDesc.cpp gemrb/trunk/gemrb/plugins/Core/InterfaceDesc.h gemrb/trunk/gemrb/plugins/Core/Inventory.cpp gemrb/trunk/gemrb/plugins/Core/Inventory.h gemrb/trunk/gemrb/plugins/Core/Item.cpp gemrb/trunk/gemrb/plugins/Core/Item.h gemrb/trunk/gemrb/plugins/Core/ItemMgr.cpp gemrb/trunk/gemrb/plugins/Core/ItemMgr.h gemrb/trunk/gemrb/plugins/Core/LRUCache.cpp gemrb/trunk/gemrb/plugins/Core/LRUCache.h gemrb/trunk/gemrb/plugins/Core/Label.cpp gemrb/trunk/gemrb/plugins/Core/Label.h gemrb/trunk/gemrb/plugins/Core/Map.cpp gemrb/trunk/gemrb/plugins/Core/Map.h gemrb/trunk/gemrb/plugins/Core/MapControl.cpp gemrb/trunk/gemrb/plugins/Core/MapControl.h gemrb/trunk/gemrb/plugins/Core/MapMgr.cpp gemrb/trunk/gemrb/plugins/Core/MapMgr.h gemrb/trunk/gemrb/plugins/Core/MemoryStream.cpp gemrb/trunk/gemrb/plugins/Core/MemoryStream.h gemrb/trunk/gemrb/plugins/Core/MoviePlayer.cpp gemrb/trunk/gemrb/plugins/Core/MoviePlayer.h gemrb/trunk/gemrb/plugins/Core/MusicMgr.cpp gemrb/trunk/gemrb/plugins/Core/MusicMgr.h gemrb/trunk/gemrb/plugins/Core/OpcodeMgr.cpp gemrb/trunk/gemrb/plugins/Core/OpcodeMgr.h gemrb/trunk/gemrb/plugins/Core/PCStatStruct.cpp gemrb/trunk/gemrb/plugins/Core/PCStatStruct.h gemrb/trunk/gemrb/plugins/Core/Palette.cpp gemrb/trunk/gemrb/plugins/Core/Palette.h gemrb/trunk/gemrb/plugins/Core/Particles.cpp gemrb/trunk/gemrb/plugins/Core/Particles.h gemrb/trunk/gemrb/plugins/Core/Plugin.cpp gemrb/trunk/gemrb/plugins/Core/Plugin.h gemrb/trunk/gemrb/plugins/Core/PluginMgr.cpp gemrb/trunk/gemrb/plugins/Core/PluginMgr.h gemrb/trunk/gemrb/plugins/Core/Polygon.cpp gemrb/trunk/gemrb/plugins/Core/Polygon.h gemrb/trunk/gemrb/plugins/Core/Progressbar.cpp gemrb/trunk/gemrb/plugins/Core/Progressbar.h gemrb/trunk/gemrb/plugins/Core/Projectile.cpp gemrb/trunk/gemrb/plugins/Core/Projectile.h gemrb/trunk/gemrb/plugins/Core/ProjectileMgr.cpp gemrb/trunk/gemrb/plugins/Core/ProjectileMgr.h gemrb/trunk/gemrb/plugins/Core/ProjectileServer.cpp gemrb/trunk/gemrb/plugins/Core/ProjectileServer.h gemrb/trunk/gemrb/plugins/Core/Region.cpp gemrb/trunk/gemrb/plugins/Core/Region.h gemrb/trunk/gemrb/plugins/Core/ResourceMgr.cpp gemrb/trunk/gemrb/plugins/Core/ResourceMgr.h gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.cpp gemrb/trunk/gemrb/plugins/Core/SaveGameIterator.h gemrb/trunk/gemrb/plugins/Core/SaveGameMgr.cpp gemrb/trunk/gemrb/plugins/Core/ScriptEngine.cpp gemrb/trunk/gemrb/plugins/Core/ScriptEngine.h gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.cpp gemrb/trunk/gemrb/plugins/Core/ScrollBar.cpp gemrb/trunk/gemrb/plugins/Core/ScrollBar.h gemrb/trunk/gemrb/plugins/Core/Slider.cpp gemrb/trunk/gemrb/plugins/Core/Slider.h gemrb/trunk/gemrb/plugins/Core/SoundMgr.cpp gemrb/trunk/gemrb/plugins/Core/SoundMgr.h gemrb/trunk/gemrb/plugins/Core/Spell.cpp gemrb/trunk/gemrb/plugins/Core/Spell.h gemrb/trunk/gemrb/plugins/Core/SpellMgr.cpp gemrb/trunk/gemrb/plugins/Core/SpellMgr.h gemrb/trunk/gemrb/plugins/Core/Spellbook.cpp gemrb/trunk/gemrb/plugins/Core/Spellbook.h gemrb/trunk/gemrb/plugins/Core/Sprite2D.cpp gemrb/trunk/gemrb/plugins/Core/Sprite2D.h gemrb/trunk/gemrb/plugins/Core/SpriteCover.cpp gemrb/trunk/gemrb/plugins/Core/SpriteCover.h gemrb/trunk/gemrb/plugins/Core/Store.cpp gemrb/trunk/gemrb/plugins/Core/Store.h gemrb/trunk/gemrb/plugins/Core/StoreMgr.cpp gemrb/trunk/gemrb/plugins/Core/StoreMgr.h gemrb/trunk/gemrb/plugins/Core/StringMgr.cpp gemrb/trunk/gemrb/plugins/Core/StringMgr.h gemrb/trunk/gemrb/plugins/Core/SymbolMgr.cpp gemrb/trunk/gemrb/plugins/Core/SymbolMgr.h gemrb/trunk/gemrb/plugins/Core/TableMgr.cpp gemrb/trunk/gemrb/plugins/Core/TableMgr.h gemrb/trunk/gemrb/plugins/Core/TextArea.cpp gemrb/trunk/gemrb/plugins/Core/TextArea.h gemrb/trunk/gemrb/plugins/Core/TextEdit.cpp gemrb/trunk/gemrb/plugins/Core/TextEdit.h gemrb/trunk/gemrb/plugins/Core/Tile.cpp gemrb/trunk/gemrb/plugins/Core/Tile.h gemrb/trunk/gemrb/plugins/Core/TileMap.cpp gemrb/trunk/gemrb/plugins/Core/TileMap.h gemrb/trunk/gemrb/plugins/Core/TileMapMgr.cpp gemrb/trunk/gemrb/plugins/Core/TileMapMgr.h gemrb/trunk/gemrb/plugins/Core/TileOverlay.cpp gemrb/trunk/gemrb/plugins/Core/TileOverlay.h gemrb/trunk/gemrb/plugins/Core/TileSetMgr.cpp gemrb/trunk/gemrb/plugins/Core/TileSetMgr.h gemrb/trunk/gemrb/plugins/Core/Triggers.cpp gemrb/trunk/gemrb/plugins/Core/VFS.cpp gemrb/trunk/gemrb/plugins/Core/VFS.h gemrb/trunk/gemrb/plugins/Core/Variables.cpp gemrb/trunk/gemrb/plugins/Core/Variables.h gemrb/trunk/gemrb/plugins/Core/Video.cpp gemrb/trunk/gemrb/plugins/Core/Video.h gemrb/trunk/gemrb/plugins/Core/VideoMode.cpp gemrb/trunk/gemrb/plugins/Core/VideoMode.h gemrb/trunk/gemrb/plugins/Core/VideoModes.cpp gemrb/trunk/gemrb/plugins/Core/VideoModes.h gemrb/trunk/gemrb/plugins/Core/Window.cpp gemrb/trunk/gemrb/plugins/Core/Window.h gemrb/trunk/gemrb/plugins/Core/WindowMgr.cpp gemrb/trunk/gemrb/plugins/Core/WindowMgr.h gemrb/trunk/gemrb/plugins/Core/WorldMap.cpp gemrb/trunk/gemrb/plugins/Core/WorldMap.h gemrb/trunk/gemrb/plugins/Core/WorldMapControl.cpp gemrb/trunk/gemrb/plugins/Core/WorldMapControl.h gemrb/trunk/gemrb/plugins/Core/WorldMapMgr.cpp gemrb/trunk/gemrb/plugins/Core/WorldMapMgr.h gemrb/trunk/gemrb/plugins/DLGImporter/DLGImp.cpp gemrb/trunk/gemrb/plugins/DLGImporter/DLGImp.h gemrb/trunk/gemrb/plugins/DLGImporter/DLGImpCD.cpp gemrb/trunk/gemrb/plugins/DLGImporter/DLGImpCD.h gemrb/trunk/gemrb/plugins/DLGImporter/DLGImporter.cpp gemrb/trunk/gemrb/plugins/EFFImporter/EFFImp.cpp gemrb/trunk/gemrb/plugins/EFFImporter/EFFImp.h gemrb/trunk/gemrb/plugins/EFFImporter/EFFImpCD.cpp gemrb/trunk/gemrb/plugins/EFFImporter/EFFImpCD.h gemrb/trunk/gemrb/plugins/EFFImporter/EFFImporter.cpp gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.cpp gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpc.h gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpcodes.cpp gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpcodesCD.cpp gemrb/trunk/gemrb/plugins/FXOpcodes/FXOpcodesCD.h gemrb/trunk/gemrb/plugins/GAMImporter/GAMImp.cpp gemrb/trunk/gemrb/plugins/GAMImporter/GAMImp.h gemrb/trunk/gemrb/plugins/GAMImporter/GAMImpCD.cpp gemrb/trunk/gemrb/plugins/GAMImporter/GAMImpCD.h gemrb/trunk/gemrb/plugins/GAMImporter/GAMImporter.cpp gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.cpp gemrb/trunk/gemrb/plugins/GUIScript/GUIScript.h gemrb/trunk/gemrb/plugins/GUIScript/GUIScriptCD.cpp gemrb/trunk/gemrb/plugins/GUIScript/GUIScriptCD.h gemrb/trunk/gemrb/plugins/GUIScript/GUIScriptEngine.cpp gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.cpp gemrb/trunk/gemrb/plugins/IDSImporter/IDSImp.h gemrb/trunk/gemrb/plugins/IDSImporter/IDSImpCD.cpp gemrb/trunk/gemrb/plugins/IDSImporter/IDSImpCD.h gemrb/trunk/gemrb/plugins/IDSImporter/IDSImpDefs.h gemrb/trunk/gemrb/plugins/IDSImporter/IDSImporter.cpp gemrb/trunk/gemrb/plugins/INIImporter/INIImp.cpp gemrb/trunk/gemrb/plugins/INIImporter/INIImp.h gemrb/trunk/gemrb/plugins/INIImporter/INIImpCD.cpp gemrb/trunk/gemrb/plugins/INIImporter/INIImpCD.h gemrb/trunk/gemrb/plugins/INIImporter/INIImporter.cpp gemrb/trunk/gemrb/plugins/ITMImporter/ITMImp.cpp gemrb/trunk/gemrb/plugins/ITMImporter/ITMImp.h gemrb/trunk/gemrb/plugins/ITMImporter/ITMImpCD.cpp gemrb/trunk/gemrb/plugins/ITMImporter/ITMImpCD.h gemrb/trunk/gemrb/plugins/ITMImporter/ITMImporter.cpp gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpc.cpp gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpc.h gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpcodesCD.cpp gemrb/trunk/gemrb/plugins/IWDOpcodes/IWDOpcodesCD.h gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.cpp gemrb/trunk/gemrb/plugins/KEYImporter/Dictionary.h gemrb/trunk/gemrb/plugins/KEYImporter/KEYImpCD.cpp gemrb/trunk/gemrb/plugins/KEYImporter/KEYImpCD.h gemrb/trunk/gemrb/plugins/KEYImporter/KEYImporter.cpp gemrb/trunk/gemrb/plugins/KEYImporter/KeyImp.cpp gemrb/trunk/gemrb/plugins/KEYImporter/KeyImp.h gemrb/trunk/gemrb/plugins/MOSImporter/MOSImp.cpp gemrb/trunk/gemrb/plugins/MOSImporter/MOSImp.h gemrb/trunk/gemrb/plugins/MOSImporter/MOSImpCD.cpp gemrb/trunk/gemrb/plugins/MOSImporter/MOSImpCD.h gemrb/trunk/gemrb/plugins/MOSImporter/MOSImporter.cpp gemrb/trunk/gemrb/plugins/MUSImporter/MUSImp.cpp gemrb/trunk/gemrb/plugins/MUSImporter/MUSImp.h gemrb/trunk/gemrb/plugins/MUSImporter/MUSImpCD.cpp gemrb/trunk/gemrb/plugins/MUSImporter/MUSImpCD.h gemrb/trunk/gemrb/plugins/MUSImporter/MUSImporter.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.h gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlayer.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlayerDesc.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlayerDesc.h gemrb/trunk/gemrb/plugins/NullSound/NullSnd.cpp gemrb/trunk/gemrb/plugins/NullSound/NullSnd.h gemrb/trunk/gemrb/plugins/NullSound/NullSound.cpp gemrb/trunk/gemrb/plugins/NullSound/NullSoundCD.cpp gemrb/trunk/gemrb/plugins/NullSound/NullSoundCD.h gemrb/trunk/gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp gemrb/trunk/gemrb/plugins/OpenALAudio/AmbientMgrAL.h gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.cpp gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.h gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudioCD.cpp gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudioCD.h gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudioDriver.cpp gemrb/trunk/gemrb/plugins/OpenALAudio/StackLock.cpp gemrb/trunk/gemrb/plugins/OpenALAudio/StackLock.h gemrb/trunk/gemrb/plugins/PLTImporter/PLTImp.cpp gemrb/trunk/gemrb/plugins/PLTImporter/PLTImp.h gemrb/trunk/gemrb/plugins/PLTImporter/PLTImpCD.cpp gemrb/trunk/gemrb/plugins/PLTImporter/PLTImpCD.h gemrb/trunk/gemrb/plugins/PLTImporter/PLTImporter.cpp gemrb/trunk/gemrb/plugins/PNGImporter/PNGImp.cpp gemrb/trunk/gemrb/plugins/PNGImporter/PNGImp.h gemrb/trunk/gemrb/plugins/PNGImporter/PNGImpCD.cpp gemrb/trunk/gemrb/plugins/PNGImporter/PNGImpCD.h gemrb/trunk/gemrb/plugins/PNGImporter/PNGImporter.cpp gemrb/trunk/gemrb/plugins/PROImporter/PROImp.cpp gemrb/trunk/gemrb/plugins/PROImporter/PROImp.h gemrb/trunk/gemrb/plugins/PROImporter/PROImpCD.cpp gemrb/trunk/gemrb/plugins/PROImporter/PROImpCD.h gemrb/trunk/gemrb/plugins/PROImporter/PROImporter.cpp gemrb/trunk/gemrb/plugins/PSTOpcodes/PSTOpc.cpp gemrb/trunk/gemrb/plugins/PSTOpcodes/PSTOpc.h gemrb/trunk/gemrb/plugins/PSTOpcodes/PSTOpcodes.cpp gemrb/trunk/gemrb/plugins/PSTOpcodes/PSTOpcodesCD.cpp gemrb/trunk/gemrb/plugins/PSTOpcodes/PSTOpcodesCD.h gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideo.cpp gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDC.cpp gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDC.h gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.h gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.inl gemrb/trunk/gemrb/plugins/SPLImporter/SPLImp.cpp gemrb/trunk/gemrb/plugins/SPLImporter/SPLImp.h gemrb/trunk/gemrb/plugins/SPLImporter/SPLImpCD.cpp gemrb/trunk/gemrb/plugins/SPLImporter/SPLImpCD.h gemrb/trunk/gemrb/plugins/SPLImporter/SPLImporter.cpp gemrb/trunk/gemrb/plugins/STOImporter/STOImp.cpp gemrb/trunk/gemrb/plugins/STOImporter/STOImp.h gemrb/trunk/gemrb/plugins/STOImporter/STOImpCD.cpp gemrb/trunk/gemrb/plugins/STOImporter/STOImpCD.h gemrb/trunk/gemrb/plugins/STOImporter/STOImporter.cpp gemrb/trunk/gemrb/plugins/TISImporter/TISImp.cpp gemrb/trunk/gemrb/plugins/TISImporter/TISImp.h gemrb/trunk/gemrb/plugins/TISImporter/TISImpCD.cpp gemrb/trunk/gemrb/plugins/TISImporter/TISImpCD.h gemrb/trunk/gemrb/plugins/TISImporter/TISImporter.cpp gemrb/trunk/gemrb/plugins/TLKImporter/TLKImp.cpp gemrb/trunk/gemrb/plugins/TLKImporter/TLKImp.h gemrb/trunk/gemrb/plugins/TLKImporter/TLKImpCD.cpp gemrb/trunk/gemrb/plugins/TLKImporter/TLKImpCD.h gemrb/trunk/gemrb/plugins/TLKImporter/TLKImporter.cpp gemrb/trunk/gemrb/plugins/TLKImporter/TlkOverride.cpp gemrb/trunk/gemrb/plugins/WEDImporter/WEDImp.cpp gemrb/trunk/gemrb/plugins/WEDImporter/WEDImp.h gemrb/trunk/gemrb/plugins/WEDImporter/WEDImpCD.cpp gemrb/trunk/gemrb/plugins/WEDImporter/WEDImpCD.h gemrb/trunk/gemrb/plugins/WEDImporter/WEDImporter.cpp gemrb/trunk/gemrb/plugins/WMPImporter/WMPImp.cpp gemrb/trunk/gemrb/plugins/WMPImporter/WMPImp.h gemrb/trunk/gemrb/plugins/WMPImporter/WMPImpCD.cpp gemrb/trunk/gemrb/plugins/WMPImporter/WMPImpCD.h gemrb/trunk/gemrb/plugins/WMPImporter/WMPImporter.cpp gemrb/trunk/gemrb/plugins/ZLibMgr/ZLibManager.cpp gemrb/trunk/gemrb/plugins/ZLibMgr/ZLibManager.h gemrb/trunk/gemrb/plugins/ZLibMgr/ZLibMgr.cpp gemrb/trunk/gemrb/plugins/ZLibMgr/ZLibMgrDesc.cpp gemrb/trunk/gemrb/plugins/ZLibMgr/ZLibMgrDesc.h gemrb/trunk/gemrb.6 Modified: gemrb/trunk/acinclude.m4 =================================================================== --- gemrb/trunk/acinclude.m4 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/acinclude.m4 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/admin/check_copyright.pl =================================================================== --- gemrb/trunk/admin/check_copyright.pl 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/admin/check_copyright.pl 2009-05-19 10:21:38 UTC (rev 6005) @@ -23,10 +23,6 @@ my $TGT_DIR = "gemrb"; -# -# TODO: possibly replace the FSF address with: -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# # TODO: use list of exceptions, i.e. pairs file, boilerplate to use # @@ -47,7 +43,7 @@ \\* You should have received a copy of the GNU General Public License \\* along with this program; if not, write to the Free Software - \\* Foundation, Inc\\., 59 Temple Place - Suite 330, Boston, MA 02111\\-1307, USA\\. + \\* Foundation, Inc\\., 51 Franklin Street, Fifth Floor, Boston, MA 02111\\-1301, USA\\. \\* \\* \\\$[I]d:.* \\\$ \\* @@ -77,7 +73,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc\\., 59 Temple Place \\- Suite 330, Boston, MA 02111\\-1307, USA\\. +# Foundation, Inc\\., 51 Franklin Street, Fifth Floor, Boston, MA 02111\\-1301, USA\\. # # \\\$[I]d: .* \\\$ EOT Modified: gemrb/trunk/admin/make_formation.py =================================================================== --- gemrb/trunk/admin/make_formation.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/admin/make_formation.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # This generates a formatio.2da file for GemRB, because it was becoming # far too tedious to do this by hand. The output files have pairs of Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/configure.in 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/Config/Config.cpp =================================================================== --- gemrb/trunk/gemrb/Config/Config.cpp 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/Config/Config.cpp 2009-05-19 10:21:38 UTC (rev 6005) @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ * Modified: gemrb/trunk/gemrb/GUIScripts/GUIClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/GUIClasses.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/GUICommon.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUICommon.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/GUICommon.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # Modified: gemrb/trunk/gemrb/GUIScripts/GUIDefines.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/GUIDefines.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/MetaClasses.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/MetaClasses.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/MetaClasses.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG7.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation, mage spells (GUICG7) Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICommonWindows.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIINV.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # #$Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIJRNL.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUILOAD.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMA.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMG.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIOPT.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIPR.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIREC.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISAVE.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUISTORE.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIWORLD.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/LoadScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/LoadScreen.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/LoadScreen.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/MessageWindow.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/QuitGame.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/QuitGame.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/QuitGame.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg1/TextScreen.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen2.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen2.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation - gender; next race (CharGen2) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen3.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen3.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation - race; next class/kit (CharGen3) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen4.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen4.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation - classes+kits; next alignment/reputation(CharGen4.py) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen5.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen5.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen5.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ #character generation - alignment; next abilities (GUICG 0) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen6.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen6.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation - ability; next skills/profs/spells (CharGen6) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen7.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen7.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen7.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ #character generation - skills/profs/spells; next apearance/sound (CharGen7) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen9.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation (CharGen9.py) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG22.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ #character generation, class kit (GUICG22) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG7.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ # character generation, mage spells (GUICG7) Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICommonWindows.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIINV.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # #You should have received a copy of the GNU General Public License #along with this program; if not, write to the Free Software -#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # #$Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIJRNL.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIJRNL.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIJRNL.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMA.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIMG.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIPR.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIREC.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISAVE.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUISTORE.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUIWORLD.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/LUHLASelection.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/LUHLASelection.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/LUHLASelection.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id:$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/LUSpellSelection.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/LUSpellSelection.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/LUSpellSelection.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id:$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/LevelUp.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/LevelUp.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/LevelUp.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id:$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/LoadScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/LoadScreen.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/LoadScreen.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/MessageWindow.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/MessageWindow.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/MessageWindow.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/QuitGame.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/QuitGame.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/QuitGame.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2009-05-19 07:15:09 UTC (rev 6004) +++ gemrb/trunk/gemrb/GUIScripts/bg2/TextScreen.py 2009-05-19 10:21:38 UTC (rev 6005) @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # $Id$ Modified: gemrb/trunk/gemrb/GUIScripts/ie_action.py ====... [truncated message content] |
From: <fu...@us...> - 2009-05-20 19:10:31
|
Revision: 6012 http://gemrb.svn.sourceforge.net/gemrb/?rev=6012&view=rev Author: fuzzie Date: 2009-05-20 19:10:20 +0000 (Wed, 20 May 2009) Log Message: ----------- rewrite MVE player Modified Paths: -------------- gemrb/trunk/NEWS gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.h gemrb/trunk/gemrb/plugins/MVEPlayer/Makefile.am Added Paths: ----------- gemrb/trunk/gemrb/plugins/MVEPlayer/gstmvedemux.h gemrb/trunk/gemrb/plugins/MVEPlayer/mve.h gemrb/trunk/gemrb/plugins/MVEPlayer/mve_player.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mve_player.h gemrb/trunk/gemrb/plugins/MVEPlayer/mveaudiodec.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mvevideodec16.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mvevideodec8.cpp Removed Paths: ------------- gemrb/trunk/gemrb/plugins/MVEPlayer/decoder16.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/decoder8.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/decoders.h gemrb/trunk/gemrb/plugins/MVEPlayer/libmve.h gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.h gemrb/trunk/gemrb/plugins/MVEPlayer/mve_play.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mvelib.cpp gemrb/trunk/gemrb/plugins/MVEPlayer/mvelib.h Modified: gemrb/trunk/NEWS =================================================================== --- gemrb/trunk/NEWS 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/NEWS 2009-05-20 19:10:20 UTC (rev 6012) @@ -21,6 +21,7 @@ - regeneration, hp bonuses, healing - animations and projectiles - various guiscripts + - rewritten MVE player - bugfixes Applied patches: Modified: gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/CMakeLists.txt 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,3 +1,3 @@ -ADD_GEMRB_PLUGIN ( MVEPlayer decoder16.cpp decoder8.cpp mve_audio.cpp mve_play.cpp mvelib.cpp MVEPlay.cpp MVEPlayer.cpp MVEPlayerDesc.cpp ) +ADD_GEMRB_PLUGIN ( MVEPlayer mvevideodec8.cpp mvevideodec16.cpp mveaudiodec.cpp mve_player.cpp MVEPlay.cpp MVEPlayer.cpp MVEPlayerDesc.cpp ) INSTALL( TARGETS MVEPlayer DESTINATION ${PLUGIN_INSTALL_DIR} ) Modified: gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.cpp 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.cpp 2009-05-20 19:10:20 UTC (rev 6012) @@ -28,7 +28,7 @@ #include "../Core/Audio.h" #include "../Core/Variables.h" #include "MVEPlay.h" -#include "libmve.h" +#include "mve_player.h" #include "../../includes/ie_types.h" static const char MVESignature[] = "Interplay MVE File\x1A"; @@ -134,55 +134,44 @@ } //Start Movie Playback frameCount = 0; - doPlay( str ); - return 0; + return doPlay( ); } -int MVEPlay::doPlay(const DataStream* mve) +int MVEPlay::doPlay() { - int result; int done = 0; - int bpp = 0; - MVE_videoSpec vSpec; + MVEPlayer player(this); memset( g_palette, 0, 768 ); - ieDword volume; - core->GetDictionary()->Lookup( "Volume Movie", volume ); - MVE_sndInit( core->GetAudioDrv()->CanPlay()?1:-1, volume ); - MVE_memCallbacks( malloc, free ); - MVE_ioCallbacks( fileRead ); - MVE_sfCallbacks( showFrame ); - MVE_palCallbacks( setPalette ); - MVE_audioCallbacks( setAudioStream, freeAudioStream, queueBuffer ) ; + //ieDword volume; + //core->GetDictionary()->Lookup( "Volume Movie", volume ); + player.sound_init( core->GetAudioDrv()->CanPlay() ); int w,h; video->InitMovieScreen(w,h); - MVE_rmPrepMovie( ( void * ) mve, -1, -1, 1 ); + player.video_init(w, h); - vSpec.screenWidth = w; - vSpec.screenHeight = h; + if (!player.start_playback()) { + printf("Failed to decode movie!\n"); + return 1; + } - MVE_getVideoSpec( &vSpec ); - bpp = vSpec.truecolor ? 16 : 8; + g_truecolor = player.is_truecolour(); - g_truecolor = vSpec.truecolor; - - while (!done && ( result = MVE_rmStepMovie() ) == 0) { + while (!done && player.next_frame()) { done = video->PollMovieEvents(); } - MVE_rmEndMovie(); - return 0; } -unsigned int MVEPlay::fileRead(void* handle, void* buf, unsigned int count) +unsigned int MVEPlay::fileRead(void* buf, unsigned int count) { unsigned numread; - numread = ( ( DataStream * ) handle )->Read( buf, count );//fread(buf, 1, count, (FILE *)handle); + numread = str->Read( buf, count ); return ( numread == count ); } Modified: gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.h 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/MVEPlay.h 2009-05-20 19:10:20 UTC (rev 6012) @@ -28,21 +28,23 @@ #include "../Core/Interface.h" class MVEPlay : public MoviePlayer { + friend class MVEPlayer; + private: DataStream* str; bool autoFree; bool validVideo; - static int doPlay(const DataStream* mve); - static unsigned int fileRead(void* handle, void* buf, unsigned int count); - static void showFrame(unsigned char* buf, unsigned int bufw, + int doPlay(); + unsigned int fileRead(void* buf, unsigned int count); + void showFrame(unsigned char* buf, unsigned int bufw, unsigned int bufh, unsigned int sx, unsigned int sy, unsigned int w, unsigned int h, unsigned int dstx, unsigned int dsty); - static void setPalette(unsigned char* p, unsigned start, unsigned count); - static int pollEvents(); - static int setAudioStream(); - static void freeAudioStream(int stream); - static void queueBuffer(int stream, unsigned short bits, + void setPalette(unsigned char* p, unsigned start, unsigned count); + int pollEvents(); + int setAudioStream(); + void freeAudioStream(int stream); + void queueBuffer(int stream, unsigned short bits, int channels, short* memory, int size, int samplerate); public: Modified: gemrb/trunk/gemrb/plugins/MVEPlayer/Makefile.am =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/Makefile.am 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/Makefile.am 2009-05-20 19:10:20 UTC (rev 6012) @@ -6,10 +6,9 @@ MVEPlay.cpp \ MVEPlayer.cpp \ MVEPlayerDesc.cpp \ - decoder16.cpp \ - decoder8.cpp \ - mve_audio.cpp \ - mve_play.cpp \ - mvelib.cpp + mvevideodec8.cpp \ + mvevideodec16.cpp \ + mveaudiodec.cpp \ + mve_player.cpp -noinst_HEADERS = MVEPlayerDesc.h MVEPlay.h decoders.h libmve.h mve_audio.h mvelib.h +noinst_HEADERS = MVEPlayerDesc.h MVEPlay.h gstmvedemux.h mve.h mve_player.h Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/decoder16.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/decoder16.cpp 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/decoder16.cpp 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,671 +0,0 @@ -/* 16 bit decoding routines */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "decoders.h" - -static unsigned short* backBuf1, * backBuf2; -static int lookup_initialized; - -static void dispatchDecoder16(unsigned short** pFrame, unsigned char codeType, - unsigned char** pData, unsigned char** pOffData, int* pDataRemain, - int* curXb, int* curYb); -static void genLoopkupTable(); - -void decodeFrame16(unsigned char* pFrame, unsigned char* pMap, int mapRemain, - unsigned char* pData, int dataRemain) -{ - unsigned char * pOrig; - unsigned char * pOffData, * pEnd; - unsigned short offset; - unsigned short * FramePtr = ( unsigned short * ) pFrame; - int length; - int op; - int i, j; - int xb, yb; - - if (!lookup_initialized) { - genLoopkupTable(); - } - - backBuf1 = ( unsigned short * ) g_vBackBuf1; - backBuf2 = ( unsigned short * ) g_vBackBuf2; - - xb = g_width >> 3; - yb = g_height >> 3; - - offset = pData[0] | ( pData[1] << 8 ); - - pOffData = pData + offset; - pEnd = pData + offset; - - pData += 2; - - pOrig = pData; - length = offset - 2; /*dataRemain-2;*/ - - for (j = 0; j < yb; j++) { - for (i = 0; i < xb / 2; i++) { - op = ( *pMap ) & 0xf; - dispatchDecoder16( &FramePtr, op, &pData, &pOffData, &dataRemain, - &i, &j ); - - /* - if (FramePtr < backBuf1) - fprintf(stderr, "danger! pointing out of bounds below after dispatch decoder: %d, %d (1) [%x]\n", i, j, (*pMap) & 0xf); - else if (FramePtr >= backBuf1 + g_width*g_height) - fprintf(stderr, "danger! pointing out of bounds above after dispatch decoder: %d, %d (1) [%x]\n", i, j, (*pMap) & 0xf); - */ - - op = ( ( *pMap ) >> 4 ) & 0xf; - dispatchDecoder16( &FramePtr, op, &pData, &pOffData, &dataRemain, - &i, &j ); - - /* - if (FramePtr < backBuf1) - fprintf(stderr, "danger! pointing out of bounds below after dispatch decoder: %d, %d (2) [%x]\n", i, j, (*pMap) >> 4); - else if (FramePtr >= backBuf1 + g_width*g_height) - fprintf(stderr, "danger! pointing out of bounds above after dispatch decoder: %d, %d (2) [%x]\n", i, j, (*pMap) >> 4); - */ - - ++pMap; - --mapRemain; - } - - FramePtr += 7 * g_width; - } -/* - if (( length - ( pData - pOrig ) ) != 0) { - fprintf( stderr, "DEBUG: junk left over: %d,%d,%d\n", - ( pData - pOrig ), length, ( length - ( pData - pOrig ) ) ); - } -*/ -} - -static unsigned short GETPIXEL(unsigned char** buf, int off) -{ - unsigned short val = ( *buf )[0 + off] | ( ( *buf )[1 + off] << 8 ); - return val; -} - -static unsigned short GETPIXELI(unsigned char** buf, int off) -{ - unsigned short val = ( *buf )[0 + off] | ( ( *buf )[1 + off] << 8 ); - ( *buf ) += 2; - return val; -} - -static void relClose(int i, int* x, int* y) -{ - int ma, mi; - - ma = i >> 4; - mi = i & 0xf; - - *x = mi - 8; - *y = ma - 8; -} - -static void relFar(int i, int sign, int* x, int* y) -{ - if (i < 56) { - *x = sign * ( 8 + ( i % 7 ) ); - *y = sign * ( i / 7 ); - } else { - *x = sign * ( -14 + ( i - 56 ) % 29 ); - *y = sign * ( 8 + ( i - 56 ) / 29 ); - } -} - -static int close_table[512]; -static int far_p_table[512]; -static int far_n_table[512]; - -static void genLoopkupTable() -{ - int i; - int x, y; - - for (i = 0; i < 256; i++) { - relClose( i, &x, &y ); - - close_table[i * 2 + 0] = x; - close_table[i * 2 + 1] = y; - - relFar( i, 1, &x, &y ); - - far_p_table[i * 2 + 0] = x; - far_p_table[i * 2 + 1] = y; - - relFar( i, -1, &x, &y ); - - far_n_table[i * 2 + 0] = x; - far_n_table[i * 2 + 1] = y; - } - - lookup_initialized = 1; -} - -static void copyFrame(unsigned short* pDest, unsigned short* pSrc) -{ - int i; - - for (i = 0; i < 8; i++) { - memcpy( pDest, pSrc, 16 ); - pDest += g_width; - pSrc += g_width; - } -} - -static void patternRow4Pixels(unsigned short* pFrame, unsigned char pat0, - unsigned char pat1, unsigned short* p) -{ - unsigned short mask = 0x0003; - unsigned short shift = 0; - unsigned short pattern = ( pat1 << 8 ) | pat0; - - while (mask != 0) { - *pFrame++ = p[( mask & pattern ) >> shift]; - mask <<= 2; - shift += 2; - } -} - -static void patternRow4Pixels2(unsigned short* pFrame, unsigned char pat0, - unsigned short* p) -{ - unsigned char mask = 0x03; - unsigned char shift = 0; - unsigned short pel; - /* ORIGINAL VERSION IS BUGGY - int skip=1; - while (mask != 0) - { - pel = p[(mask & pat0) >> shift]; - pFrame[0] = pel; - pFrame[2] = pel; - pFrame[g_width + 0] = pel; - pFrame[g_width + 2] = pel; - pFrame += skip; - skip = 4 - skip; - mask <<= 2; - shift += 2; - } - */ - while (mask != 0) { - pel = p[( mask & pat0 ) >> shift]; - pFrame[0] = pel; - pFrame[1] = pel; - pFrame[g_width + 0] = pel; - pFrame[g_width + 1] = pel; - pFrame += 2; - mask <<= 2; - shift += 2; - } -} - -static void patternRow4Pixels2x1(unsigned short* pFrame, unsigned char pat, - unsigned short* p) -{ - unsigned char mask = 0x03; - unsigned char shift = 0; - unsigned short pel; - - while (mask != 0) { - pel = p[( mask & pat ) >> shift]; - pFrame[0] = pel; - pFrame[1] = pel; - pFrame += 2; - mask <<= 2; - shift += 2; - } -} - -static void patternQuadrant4Pixels(unsigned short* pFrame, unsigned char pat0, - unsigned char pat1, unsigned char pat2, unsigned char pat3, - unsigned short* p) -{ - unsigned int mask = 0x00000003UL; - int shift = 0; - int i; - unsigned int pat = ( pat3 << 24 ) | - ( pat2 << 16 ) | - ( pat1 << 8 ) | - pat0; - - for (i = 0; i < 16; i++) { - pFrame[i & 3] = p[( pat & mask ) >> shift]; - - if (( i & 3 ) == 3) - pFrame += g_width; - - mask <<= 2; - shift += 2; - } -} - - -static void patternRow2Pixels(unsigned short* pFrame, unsigned char pat, - unsigned short* p) -{ - unsigned char mask = 0x01; - - while (mask != 0) { - *pFrame++ = p[( mask & pat ) ? 1 : 0]; - mask <<= 1; - } -} - -static void patternRow2Pixels2(unsigned short* pFrame, unsigned char pat, - unsigned short* p) -{ - unsigned short pel; - unsigned char mask = 0x1; - - /* ORIGINAL VERSION IS BUGGY - int skip=1; - while (mask != 0x10) - { - pel = p[(mask & pat) ? 1 : 0]; - pFrame[0] = pel; - pFrame[2] = pel; - pFrame[g_width + 0] = pel; - pFrame[g_width + 2] = pel; - pFrame += skip; - skip = 4 - skip; - mask <<= 1; - } - */ - while (mask != 0x10) { - pel = p[( mask & pat ) ? 1 : 0]; - - pFrame[0] = pel; - pFrame[1] = pel; - pFrame[g_width + 0] = pel; - pFrame[g_width + 1] = pel; - pFrame += 2; - - mask <<= 1; - } -} - -static void patternQuadrant2Pixels(unsigned short* pFrame, unsigned char pat0, - unsigned char pat1, unsigned short* p) -{ - unsigned short mask = 0x0001; - int i; - unsigned short pat = ( pat1 << 8 ) | pat0; - - for (i = 0; i < 16; i++) { - pFrame[i & 3] = p[( pat & mask ) ? 1 : 0]; - - if (( i & 3 ) == 3) - pFrame += g_width; - - mask <<= 1; - } -} - -static void dispatchDecoder16(unsigned short** pFrame, unsigned char codeType, - unsigned char** pData, unsigned char** pOffData, int* pDataRemain, - int* curXb, int* curYb) -{ - unsigned short p[4]; - unsigned char pat[16]; - int i, j, k; - int x, y; - unsigned short * pDstBak; - - pDstBak = *pFrame; - - switch (codeType) { - case 0x0: - copyFrame( *pFrame, *pFrame + ( backBuf2 - backBuf1 ) ); - case 0x1: - break; - case 0x2: - /* - relFar(*(*pOffData)++, 1, &x, &y); - */ - - k = *( *pOffData )++; - x = far_p_table[k * 2 + 0]; - y = far_p_table[k * 2 + 1]; - - copyFrame( *pFrame, *pFrame + x + y * g_width ); - -- * pDataRemain; - break; - case 0x3: - /* - relFar(*(*pOffData)++, -1, &x, &y); - */ - - k = *( *pOffData )++; - x = far_n_table[k * 2 + 0]; - y = far_n_table[k * 2 + 1]; - - copyFrame( *pFrame, *pFrame + x + y * g_width ); - -- * pDataRemain; - break; - case 0x4: - /* - relClose(*(*pOffData)++, &x, &y); - */ - - k = *( *pOffData )++; - x = close_table[k * 2 + 0]; - y = close_table[k * 2 + 1]; - - copyFrame( *pFrame, - *pFrame + ( backBuf2 - backBuf1 ) + x + y * g_width ); - -- * pDataRemain; - break; - case 0x5: - x = ( char ) * ( *pData )++; - y = ( char ) * ( *pData )++; - copyFrame( *pFrame, - *pFrame + ( backBuf2 - backBuf1 ) + x + y * g_width ); - *pDataRemain -= 2; - break; - case 0x6: - fprintf( stderr, "STUB: encoding 6 not tested\n" ); - for (i = 0; i < 2; i++) { - *pFrame += 16; - if (++ * curXb == ( g_width >> 3 )) { - *pFrame += 7 * g_width; - *curXb = 0; - if (++ * curYb == ( g_height >> 3 )) - return; - } - } - break; - - case 0x7: - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - - if (!( ( p[0]/*|p[1]*/ ) & 0x8000 )) { - for (i = 0; i < 8; i++) { - patternRow2Pixels( *pFrame, *( *pData ), p ); - ( *pData )++; - - *pFrame += g_width; - } - } else { - for (i = 0; i < 2; i++) { - patternRow2Pixels2( *pFrame, *( *pData ) & 0xf, p ); - *pFrame += 2 * g_width; - patternRow2Pixels2( *pFrame, *( *pData ) >> 4, p ); - ( *pData )++; - - *pFrame += 2 * g_width; - } - } - break; - - case 0x8: - p[0] = GETPIXEL( pData, 0 ); - - if (!( p[0] & 0x8000 )) { - for (i = 0; i < 4; i++) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - ( *pData ) += 2; - - patternQuadrant2Pixels( *pFrame, pat[0], pat[1], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - p[2] = GETPIXEL( pData, 8 ); - - if (!( p[2] & 0x8000 )) { - for (i = 0; i < 4; i++) { - if (( i & 1 ) == 0) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - } - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternQuadrant2Pixels( *pFrame, pat[0], pat[1], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - for (i = 0; i < 8; i++) { - if (( i & 3 ) == 0) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - } - patternRow2Pixels( *pFrame, *( *pData ), p ); - ( *pData )++; - - *pFrame += g_width; - } - } - } - break; - - case 0x9: - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - p[2] = GETPIXELI( pData, 0 ); - p[3] = GETPIXELI( pData, 0 ); - - *pDataRemain -= 8; - - if (!( p[0] & 0x8000 )) { - if (!( p[2] & 0x8000 )) { - for (i = 0; i < 8; i++) { - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - ( *pData ) += 2; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - } - *pDataRemain -= 16; - } else { - patternRow4Pixels2( *pFrame, ( *pData )[0], p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, ( *pData )[1], p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, ( *pData )[2], p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, ( *pData )[3], p ); - - ( *pData ) += 4; - *pDataRemain -= 4; - } - } else { - if (!( p[2] & 0x8000 )) { - for (i = 0; i < 8; i++) { - pat[0] = ( *pData )[0]; - ( *pData ) += 1; - patternRow4Pixels2x1( *pFrame, pat[0], p ); - *pFrame += g_width; - } - *pDataRemain -= 8; - } else { - for (i = 0; i < 4; i++) { - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - - ( *pData ) += 2; - - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - } - *pDataRemain -= 8; - } - } - break; - - case 0xa: - p[0] = GETPIXEL( pData, 0 ); - - if (!( p[0] & 0x8000 )) { - for (i = 0; i < 4; i++) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - p[2] = GETPIXELI( pData, 0 ); - p[3] = GETPIXELI( pData, 0 ); - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - pat[2] = ( *pData )[2]; - pat[3] = ( *pData )[3]; - - ( *pData ) += 4; - - patternQuadrant4Pixels( *pFrame, pat[0], pat[1], pat[2], - pat[3], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - p[0] = GETPIXEL( pData, 16 ); - - if (!( p[0] & 0x8000 )) { - for (i = 0; i < 4; i++) { - if (( i & 1 ) == 0) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - p[2] = GETPIXELI( pData, 0 ); - p[3] = GETPIXELI( pData, 0 ); - } - - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - pat[2] = ( *pData )[2]; - pat[3] = ( *pData )[3]; - - ( *pData ) += 4; - - patternQuadrant4Pixels( *pFrame, pat[0], pat[1], - pat[2], pat[3], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - for (i = 0; i < 8; i++) { - if (( i & 3 ) == 0) { - p[0] = GETPIXELI( pData, 0 ); - p[1] = GETPIXELI( pData, 0 ); - p[2] = GETPIXELI( pData, 0 ); - p[3] = GETPIXELI( pData, 0 ); - } - - pat[0] = ( *pData )[0]; - pat[1] = ( *pData )[1]; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - - ( *pData ) += 2; - } - } - } - break; - - case 0xb: - for (i = 0; i < 8; i++) { - for (j = 0; j < 8; j++) - (*pFrame)[j] = GETPIXEL ( pData, 2*j ); - *pFrame += g_width; - *pData += 16; - *pDataRemain -= 16; - } - break; - - case 0xc: - for (i = 0; i < 4; i++) { - p[0] = GETPIXEL( pData, 0 ); - p[1] = GETPIXEL( pData, 2 ); - p[2] = GETPIXEL( pData, 4 ); - p[3] = GETPIXEL( pData, 6 ); - - for (j = 0; j < 2; j++) { - for (k = 0; k < 4; k++) { - ( *pFrame )[j + 2 * k] = p[k]; - ( *pFrame )[g_width + j + 2 * k] = p[k]; - } - *pFrame += g_width; - } - *pData += 8; - *pDataRemain -= 8; - } - break; - - case 0xd: - for (i = 0; i < 2; i++) { - p[0] = GETPIXEL( pData, 0 ); - p[1] = GETPIXEL( pData, 2 ); - - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - ( *pFrame )[k * g_width + j] = p[0]; - ( *pFrame )[k * g_width + j + 4] = p[1]; - } - } - - *pFrame += 4 * g_width; - - *pData += 4; - *pDataRemain -= 4; - } - break; - - case 0xe: - p[0] = GETPIXEL( pData, 0 ); - - for (i = 0; i < 8; i++) { - for (j = 0; j < 8; j++) { - ( *pFrame )[j] = p[0]; - } - - *pFrame += g_width; - } - - *pData += 2; - *pDataRemain -= 2; - - break; - - case 0xf: - p[0] = GETPIXEL( pData, 0 ); - p[1] = GETPIXEL( pData, 1 ); - - for (i = 0; i < 8; i++) { - for (j = 0; j < 8; j++) { - ( *pFrame )[j] = p[( i + j ) & 1]; - } - *pFrame += g_width; - } - - *pData += 4; - *pDataRemain -= 4; - break; - - default: - break; - } - - *pFrame = pDstBak + 8; -} Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/decoder8.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/decoder8.cpp 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/decoder8.cpp 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,789 +0,0 @@ -/* 8 bit decoding routines */ - -#include <stdio.h> -#include <string.h> - -#include "decoders.h" - -static void dispatchDecoder(unsigned char** pFrame, unsigned char codeType, - unsigned char** pData, int* pDataRemain, int* curXb, int* curYb); - -void decodeFrame8(unsigned char* pFrame, unsigned char* pMap, int mapRemain, - unsigned char* pData, int dataRemain) -{ - int i, j; - int xb, yb; - - xb = g_width >> 3; - yb = g_height >> 3; - for (j = 0; j < yb; j++) { - for (i = 0; i < xb / 2; i++) { - dispatchDecoder( &pFrame, ( *pMap ) & 0xf, &pData, &dataRemain, - &i, &j ); - if (pFrame < ( unsigned char * ) g_vBackBuf1) - fprintf( stderr, - "danger! pointing out of bounds below after dispatch decoder: %d, %d (1) [%x]\n", - i, j, ( *pMap ) & 0xf ); - else if (pFrame >= - ( ( unsigned char * ) g_vBackBuf1 ) + - g_width * g_height) - fprintf( stderr, - "danger! pointing out of bounds above after dispatch decoder: %d, %d (1) [%x]\n", - i, j, ( *pMap ) & 0xf ); - dispatchDecoder( &pFrame, ( *pMap ) >> 4, &pData, &dataRemain, &i, - &j ); - if (pFrame < ( unsigned char * ) g_vBackBuf1) - fprintf( stderr, - "danger! pointing out of bounds below after dispatch decoder: %d, %d (2) [%x]\n", - i, j, ( *pMap ) >> - 4 ); - else if (pFrame >= - ( ( unsigned char * ) g_vBackBuf1 ) + - g_width * g_height) - fprintf( stderr, - "danger! pointing out of bounds above after dispatch decoder: %d, %d (2) [%x]\n", - i, j, ( *pMap ) >> - 4 ); - - ++pMap; - --mapRemain; - } - - pFrame += 7 * g_width; - } -} - -static void relClose(int i, int* x, int* y) -{ - int ma, mi; - - ma = i >> 4; - mi = i & 0xf; - - *x = mi - 8; - *y = ma - 8; -} - -static void relFar(int i, int sign, int* x, int* y) -{ - if (i < 56) { - *x = sign * ( 8 + ( i % 7 ) ); - *y = sign * ( i / 7 ); - } else { - *x = sign * ( -14 + ( i - 56 ) % 29 ); - *y = sign * ( 8 + ( i - 56 ) / 29 ); - } -} - -/* copies an 8x8 block from pSrc to pDest. - pDest and pSrc are both g_width bytes wide */ -static void copyFrame(unsigned char* pDest, unsigned char* pSrc) -{ - int i; - - for (i = 0; i < 8; i++) { - memcpy( pDest, pSrc, 8 ); - pDest += g_width; - pSrc += g_width; - } -} - -// Fill in the next eight bytes with p[0], p[1], p[2], or p[3], -// depending on the corresponding two-bit value in pat0 and pat1 -static void patternRow4Pixels(unsigned char* pFrame, unsigned char pat0, - unsigned char pat1, unsigned char* p) -{ - unsigned short mask = 0x0003; - unsigned short shift = 0; - unsigned short pattern = ( pat1 << 8 ) | pat0; - - while (mask != 0) { - *pFrame++ = p[( mask & pattern ) >> shift]; - mask <<= 2; - shift += 2; - } -} - -// Fill in the next four 2x2 pixel blocks with p[0], p[1], p[2], or p[3], -// depending on the corresponding two-bit value in pat0. -static void patternRow4Pixels2(unsigned char* pFrame, unsigned char pat0, - unsigned char* p) -{ - unsigned char mask = 0x03; - unsigned char shift = 0; - unsigned char pel; - - while (mask != 0) { - pel = p[( mask & pat0 ) >> shift]; - pFrame[0] = pel; - pFrame[1] = pel; - pFrame[g_width + 0] = pel; - pFrame[g_width + 1] = pel; - pFrame += 2; - mask <<= 2; - shift += 2; - } -} - -// Fill in the next four 2x1 pixel blocks with p[0], p[1], p[2], or p[3], -// depending on the corresponding two-bit value in pat. -static void patternRow4Pixels2x1(unsigned char* pFrame, unsigned char pat, - unsigned char* p) -{ - unsigned char mask = 0x03; - unsigned char shift = 0; - unsigned char pel; - - while (mask != 0) { - pel = p[( mask & pat ) >> shift]; - pFrame[0] = pel; - pFrame[1] = pel; - pFrame += 2; - mask <<= 2; - shift += 2; - } -} - -// Fill in the next 4x4 pixel block with p[0], p[1], p[2], or p[3], -// depending on the corresponding two-bit value in pat0, pat1, pat2, and pat3. -static void patternQuadrant4Pixels(unsigned char* pFrame, unsigned char pat0, - unsigned char pat1, unsigned char pat2, unsigned char pat3, - unsigned char* p) -{ - unsigned int mask = 0x00000003UL; - int shift = 0; - int i; - unsigned int pat = ( pat3 << 24 ) | - ( pat2 << 16 ) | - ( pat1 << 8 ) | - pat0; - - for (i = 0; i < 16; i++) { - pFrame[i & 3] = p[( pat & mask ) >> shift]; - - if (( i & 3 ) == 3) - pFrame += g_width; - - mask <<= 2; - shift += 2; - } -} - -// fills the next 8 pixels with either p[0] or p[1], depending on pattern -static void patternRow2Pixels(unsigned char* pFrame, unsigned char pat, - unsigned char* p) -{ - unsigned char mask = 0x01; - - while (mask != 0) { - *pFrame++ = p[( mask & pat ) ? 1 : 0]; - mask <<= 1; - } -} - -// fills the next four 2 x 2 pixel boxes with either p[0] or p[1], depending on pattern -static void patternRow2Pixels2(unsigned char* pFrame, unsigned char pat, - unsigned char* p) -{ - unsigned char pel; - unsigned char mask = 0x1; - - while (mask != 0x10) { - pel = p[( mask & pat ) ? 1 : 0]; - - pFrame[0] = pel; // upper-left - pFrame[1] = pel; // upper-right - pFrame[g_width + 0] = pel; // lower-left - pFrame[g_width + 1] = pel; // lower-right - pFrame += 2; - - mask <<= 1; - } -} - -// fills pixels in the next 4 x 4 pixel boxes with either p[0] or p[1], depending on pat0 and pat1. -static void patternQuadrant2Pixels(unsigned char* pFrame, unsigned char pat0, - unsigned char pat1, unsigned char* p) -{ - unsigned char pel; - unsigned short mask = 0x0001; - int i, j; - unsigned short pat = ( pat1 << 8 ) | pat0; - - for (i = 0; i < 4; i++) { - for (j = 0; j < 4; j++) { - pel = p[( pat & mask ) ? 1 : 0]; - - pFrame[j + i * g_width] = pel; - - mask <<= 1; - } - } -} - -static void dispatchDecoder(unsigned char** pFrame, unsigned char codeType, - unsigned char** pData, int* pDataRemain, int* curXb, int* curYb) -{ - unsigned char p[4]; - unsigned char pat[16]; - int i, j, k; - int x, y; - - /* Data is processed in 8x8 pixel blocks. - There are 16 ways to encode each block. - */ - - switch (codeType) { - case 0x0: - /* block is copied from block in current frame */ - copyFrame( *pFrame, - *pFrame + - ( ( unsigned char * ) g_vBackBuf2 - - ( unsigned char * ) g_vBackBuf1 ) ); - case 0x1: - /* block is unchanged from two frames ago */ - *pFrame += 8; - break; - - case 0x2: - /* Block is copied from nearby (below and/or to the right) within the - new frame. The offset within the buffer from which to grab the - patch of 8 pixels is given by grabbing a byte B from the data - stream, which is broken into a positive x and y offset according - to the following mapping: - if B < 56: - x = 8 + (B % 7) - y = B / 7 - else - x = -14 + ((B - 56) % 29) - y = 8 + ((B - 56) / 29) - */ - relFar( *( *pData )++, 1, &x, &y ); - copyFrame( *pFrame, *pFrame + x + y * g_width ); - *pFrame += 8; - -- * pDataRemain; - break; - - case 0x3: - /* Block is copied from nearby (above and/or to the left) within the - new frame. - if B < 56: - x = -(8 + (B % 7)) - y = -(B / 7) - else - x = -(-14 + ((B - 56) % 29)) - y = -( 8 + ((B - 56) / 29)) - */ - relFar( *( *pData )++, -1, &x, &y ); - copyFrame( *pFrame, *pFrame + x + y * g_width ); - *pFrame += 8; - -- * pDataRemain; - break; - - case 0x4: - /* Similar to 0x2 and 0x3, except this method copies from the - "current" frame, rather than the "new" frame, and instead of the - lopsided mapping they use, this one uses one which is symmetric - and centered around the top-left corner of the block. This uses - only 1 byte still, though, so the range is decreased, since we - have to encode all directions in a single byte. The byte we pull - from the data stream, I'll call B. Call the highest 4 bits of B - BH and the lowest 4 bytes BL. Then the offset from which to copy - the data is: - x = -8 + BL - y = -8 + BH - */ - relClose( *( *pData )++, &x, &y ); - copyFrame( *pFrame, - *pFrame + - ( ( unsigned char * ) g_vBackBuf2 - - ( unsigned char * ) g_vBackBuf1 ) + - x + - y * g_width ); - *pFrame += 8; - -- * pDataRemain; - break; - - case 0x5: - /* Similar to 0x4, but instead of one byte for the offset, this uses - two bytes to encode a larger range, the first being the x offset - as a signed 8-bit value, and the second being the y offset as a - signed 8-bit value. - */ - x = ( signed char ) * ( *pData )++; - y = ( signed char ) * ( *pData )++; - copyFrame( *pFrame, - *pFrame + - ( ( unsigned char * ) g_vBackBuf2 - - ( unsigned char * ) g_vBackBuf1 ) + - x + - y * g_width ); - *pFrame += 8; - *pDataRemain -= 2; - break; - - case 0x6: - /* I can't figure out how any file containing a block of this type - could still be playable, since it appears that it would leave the - internal bookkeeping in an inconsistent state in the BG player - code. Ahh, well. Perhaps it was a bug in the BG player code that - just didn't happen to be exposed by any of the included movies. - Anyway, this skips the next two blocks, doing nothing to them. - Note that if you've reached the end of a row, this means going on - to the next row. - */ - for (i = 0; i < 2; i++) { - *pFrame += 16; - if (++ * curXb == ( g_width >> 3 )) { - *pFrame += 7 * g_width; - *curXb = 0; - if (++ * curYb == ( g_height >> 3 )) - return; - } - } - break; - - case 0x7: - /* Ok, here's where it starts to get really...interesting. This is, - incidentally, the part where they started using self-modifying - code. So, most of the following encodings are "patterned" blocks, - where we are given a number of pixel values and then bitmapped - values to specify which pixel values belong to which squares. For - this encoding, we are given the following in the data stream: - P0 P1 - These are pixel values (i.e. 8-bit indices into the palette). If - P0 <= P1, we then get 8 more bytes from the data stream, one for - each row in the block: - B0 B1 B2 B3 B4 B5 B6 B7 - For each row, the leftmost pixel is represented by the low-order - bit, and the rightmost by the high-order bit. Use your imagination - in between. If a bit is set, the pixel value is P1 and if it is - unset, the pixel value is P0. - So, for example, if we had: - 11 22 fe 83 83 83 83 83 83 fe - This would represent the following layout: - 11 22 22 22 22 22 22 22 ; fe == 11111110 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 22 22 11 11 11 11 11 22 ; 83 == 10000011 - 11 22 22 22 22 22 22 22 ; fe == 11111110 - If, on the other hand, P0 > P1, we get two more bytes from the - data stream: - B0 B1 - Each of these bytes contains two 4-bit patterns. These patterns - work like the patterns above with 8 bytes, except each bit - represents a 2x2 pixel region. - B0 contains the pattern for the top two rows and B1 contains - the pattern for the bottom two rows. Note that the low-order - nibble of each byte contains the pattern for the upper of the - two rows that that byte controls. - So if we had: - 22 11 7e 83 - The output would be: - 11 11 22 22 22 22 22 22 ; e == 1 1 1 0 - 11 11 22 22 22 22 22 22 ; - 22 22 22 22 22 22 11 11 ; 7 == 0 1 1 1 - 22 22 22 22 22 22 11 11 ; - 11 11 11 11 11 11 22 22 ; 3 == 1 0 0 0 - 11 11 11 11 11 11 22 22 ; - 22 22 22 22 11 11 11 11 ; 8 == 0 0 1 1 - 22 22 22 22 11 11 11 11 ; - */ - p[0] = *( *pData )++; - p[1] = *( *pData )++; - if (p[0] <= p[1]) { - for (i = 0; i < 8; i++) { - patternRow2Pixels( *pFrame, *( *pData )++, p ); - *pFrame += g_width; - } - } else { - for (i = 0; i < 2; i++) { - patternRow2Pixels2( *pFrame, *( *pData ) & 0xf, p ); - *pFrame += 2 * g_width; - patternRow2Pixels2( *pFrame, *( *pData )++ >> 4, p ); - *pFrame += 2 * g_width; - } - } - *pFrame -= ( 8 * g_width - 8 ); - break; - - case 0x8: - /* Ok, this one is basically like encoding 0x7, only more - complicated. Again, we start out by getting two bytes on the data - stream: - P0 P1 - if P0 <= P1 then we get the following from the data stream: - B0 B1 - P2 P3 B2 B3 - P4 P5 B4 B5 - P6 P7 B6 B7 - P0 P1 and B0 B1 are used for the top-left corner, P2 P3 B2 B3 for - the bottom-left corner, P4 P5 B4 B5 for the top-right, P6 P7 B6 B7 - for the bottom-right. (So, each codes for a 4x4 pixel array.) - Since we have 16 bits in B0 B1, there is one bit for each pixel in - the array. The convention for the bit-mapping is, again, left to - right and top to bottom. - So, basically, the top-left quarter of the block is an arbitrary - pattern with 2 pixels, the bottom-left a different arbitrary - pattern with 2 different pixels, and so on. - For example if the next 16 bytes were: - 00 22 f9 9f 44 55 aa 55 11 33 cc 33 66 77 01 ef - We'd draw: - 22 22 22 22 | 11 11 33 33 ; f = 1111, c = 1100 - 22 00 00 22 | 11 11 33 33 ; 9 = 1001, c = 1100 - 22 00 00 22 | 33 33 11 11 ; 9 = 1001, 3 = 0011 - 22 22 22 22 | 33 33 11 11 ; f = 1111, 3 = 0011 - ------------+------------ - 44 55 44 55 | 66 66 66 66 ; a = 1010, 0 = 0000 - 44 55 44 55 | 77 66 66 66 ; a = 1010, 1 = 0001 - 55 44 55 44 | 66 77 77 77 ; 5 = 0101, e = 1110 - 55 44 55 44 | 77 77 77 77 ; 5 = 0101, f = 1111 - I've added a dividing line in the above to clearly delineate the - quadrants. - Now, if P0 > P1 then we get 10 more bytes from the data stream: - B0 B1 B2 B3 P2 P3 B4 B5 B6 B7 - Now, if P2 <= P3, then the first six bytes [P0 P1 B0 B1 B2 B3] - represent the left half of the block and the latter six bytes - [P2 P3 B4 B5 B6 B7] represent the right half. - For example: - 22 00 01 37 f7 31 11 66 8c e6 73 31 - yeilds: - 22 22 22 22 | 11 11 11 66 ; 0: 0000 | 8: 1000 - 00 22 22 22 | 11 11 66 66 ; 1: 0001 | C: 1100 - 00 00 22 22 | 11 66 66 66 ; 3: 0011 | e: 1110 - 00 00 00 22 | 11 66 11 66 ; 7: 0111 | 6: 0101 - 00 00 00 00 | 66 66 66 11 ; f: 1111 | 7: 0111 - 00 00 00 22 | 66 66 11 11 ; 7: 0111 | 3: 0011 - 00 00 22 22 | 66 66 11 11 ; 3: 0011 | 3: 0011 - 00 22 22 22 | 66 11 11 11 ; 1: 0001 | 1: 0001 - On the other hand, if P0 > P1 and P2 > P3, then - [P0 P1 B0 B1 B2 B3] represent the top half of the - block and [P2 P3 B4 B5 B6 B7] represent the bottom half. - For example: - 22 00 cc 66 33 19 66 11 18 24 42 81 - yeilds: - 22 22 00 00 22 22 00 00 ; cc: 11001100 - 22 00 00 22 22 00 00 22 ; 66: 01100110 - 00 00 22 22 00 00 22 22 ; 33: 00110011 - 00 22 22 00 00 22 22 22 ; 19: 00011001 - ----------------------- - 66 66 66 11 11 66 66 66 ; 18: 00011000 - 66 66 11 66 66 11 66 66 ; 24: 00100100 - 66 11 66 66 66 66 11 66 ; 42: 01000010 - 11 66 66 66 66 66 66 11 ; 81: 10000001 - */ - if (( *pData )[0] <= ( *pData )[1]) { - // four quadrant case - for (i = 0; i < 4; i++) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternQuadrant2Pixels( *pFrame, pat[0], pat[1], p ); - - // alternate between moving down and moving up and right - if (i & 1) - *pFrame += 4 - 4 * g_width; // up and right - else - *pFrame += 4 * g_width; // down - - } - } else if (( *pData )[6] <= ( *pData )[7]) { - // split horizontal - for (i = 0; i < 4; i++) { - if (( i & 1 ) == 0) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - } - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternQuadrant2Pixels( *pFrame, pat[0], pat[1], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - // split vertical - for (i = 0; i < 8; i++) { - if (( i & 3 ) == 0) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - } - patternRow2Pixels( *pFrame, *( *pData )++, p ); - *pFrame += g_width; - } - *pFrame -= ( 8 * g_width - 8 ); - } - break; - - case 0x9: - /* Similar to the previous 2 encodings, only more complicated. And - it will get worse before it gets better. No longer are we dealing - with patterns over two pixel values. Now we are dealing with - patterns over 4 pixel values with 2 bits assigned to each pixel - (or block of pixels). - So, first on the data stream are our 4 pixel values: - P0 P1 P2 P3 - Now, if P0 <= P1 AND P2 <= P3, we get 16 bytes of pattern, each - 2 bits representing a 1x1 pixel (00=P0, 01=P1, 10=P2, 11=P3). The - ordering is again left to right and top to bottom. The most - significant bits represent the left side at the top, and so on. - If P0 <= P1 AND P2 > P3, we get 4 bytes of pattern, each 2 bits - representing a 2x2 pixel. Ordering is left to right and top to - bottom. - if P0 > P1 AND P2 <= P3, we get 8 bytes of pattern, each 2 bits - representing a 2x1 pixel (i.e. 2 pixels wide, and 1 high). - if P0 > P1 AND P2 > P3, we get 8 bytes of pattern, each 2 bits - representing a 1x2 pixel (i.e. 1 pixel wide, and 2 high). - */ - if (( *pData )[0] <= ( *pData )[1]) { - if (( *pData )[2] <= ( *pData )[3]) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - - for (i = 0; i < 8; i++) { - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - } - - *pFrame -= ( 8 * g_width - 8 ); - } else { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - - patternRow4Pixels2( *pFrame, *( *pData )++, p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, *( *pData )++, p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, *( *pData )++, p ); - *pFrame += 2 * g_width; - patternRow4Pixels2( *pFrame, *( *pData )++, p ); - *pFrame -= ( 6 * g_width - 8 ); - } - } else { - if (( *pData )[2] <= ( *pData )[3]) { - // draw 2x1 strips - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - - for (i = 0; i < 8; i++) { - pat[0] = *( *pData )++; - patternRow4Pixels2x1( *pFrame, pat[0], p ); - *pFrame += g_width; - } - - *pFrame -= ( 8 * g_width - 8 ); - } else { - // draw 1x2 strips - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - - for (i = 0; i < 4; i++) { - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - } - - *pFrame -= ( 8 * g_width - 8 ); - } - } - break; - - case 0xa: - /* Similar to the previous, only a little more complicated. - We are still dealing with patterns over 4 pixel values with 2 bits - assigned to each pixel (or block of pixels). - So, first on the data stream are our 4 pixel values: - P0 P1 P2 P3 - Now, if P0 <= P1, the block is divided into 4 quadrants, ordered - (as with opcode 0x8) TL, BL, TR, BR. In this case the next data - in the data stream should be: - B0 B1 B2 B3 - P4 P5 P6 P7 B4 B5 B6 B7 - P8 P9 P10 P11 B8 B9 B10 B11 - P12 P13 P14 P15 B12 B13 B14 B15 - Each 2 bits represent a 1x1 pixel (00=P0, 01=P1, 10=P2, 11=P3). - The ordering is again left to right and top to bottom. The most - significant bits represent the right side at the top, and so on. - If P0 > P1 then the next data on the data stream is: - B0 B1 B2 B3 B4 B5 B6 B7 - P4 P5 P6 P7 B8 B9 B10 B11 B12 B13 B14 B15 - Now, in this case, if P4 <= P5, - [P0 P1 P2 P3 B0 B1 B2 B3 B4 B5 B6 B7] represent the left half of - the block and the other bytes represent the right half. If P4 > - P5, then [P0 P1 P2 P3 B0 B1 B2 B3 B4 B5 B6 B7] represent the top - half of the block and the other bytes represent the bottom half. - */ - if (( *pData )[0] <= ( *pData )[1]) { - for (i = 0; i < 4; i++) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - pat[2] = *( *pData )++; - pat[3] = *( *pData )++; - - patternQuadrant4Pixels( *pFrame, pat[0], pat[1], pat[2], - pat[3], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - if (( *pData )[12] <= ( *pData )[13]) { - // split vertical - for (i = 0; i < 4; i++) { - if (( i & 1 ) == 0) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - } - - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - pat[2] = *( *pData )++; - pat[3] = *( *pData )++; - - patternQuadrant4Pixels( *pFrame, pat[0], pat[1], - pat[2], pat[3], p ); - - if (i & 1) - *pFrame -= ( 4 * g_width - 4 ); - else - *pFrame += 4 * g_width; - } - } else { - // split horizontal - for (i = 0; i < 8; i++) { - if (( i & 3 ) == 0) { - p[0] = *( *pData )++; - p[1] = *( *pData )++; - p[2] = *( *pData )++; - p[3] = *( *pData )++; - } - - pat[0] = *( *pData )++; - pat[1] = *( *pData )++; - patternRow4Pixels( *pFrame, pat[0], pat[1], p ); - *pFrame += g_width; - } - - *pFrame -= ( 8 * g_width - 8 ); - } - } - break; - - case 0xb: - /* In this encoding we get raw pixel data in the data stream -- 64 - bytes of pixel data. 1 byte for each pixel, and in the standard - order (l->r, t->b). - */ - for (i = 0; i < 8; i++) { - memcpy( *pFrame, *pData, 8 ); - *pFrame += g_width; - *pData += 8; - *pDataRemain -= 8; - } - *pFrame -= ( 8 * g_width - 8 ); - break; - - case 0xc: - /* In this encoding we get raw pixel data in the data stream -- 16 - bytes of pixel data. 1 byte for each block of 2x2 pixels, and in - the standard order (l->r, t->b). - */ - for (i = 0; i < 4; i++) { - for (j = 0; j < 2; j++) { - for (k = 0; k < 4; k++) { - ( *pFrame )[2 * k] = ( *pData )[k]; - ( *pFrame )[2 * k + 1] = ( *pData )[k]; - } - *pFrame += g_width; - } - *pData += 4; - *pDataRemain -= 4; - } - *pFrame -= ( 8 * g_width - 8 ); - break; - - case 0xd: - /* In this encoding we get raw pixel data in the data stream -- 4 - bytes of pixel data. 1 byte for each block of 4x4 pixels, and in - the standard order (l->r, t->b). - */ - for (i = 0; i < 2; i++) { - for (j = 0; j < 4; j++) { - for (k = 0; k < 4; k++) { - ( *pFrame )[k * g_width + j] = ( *pData )[0]; - ( *pFrame )[k * g_width + j + 4] = ( *pData )[1]; - } - } - *pFrame += 4 * g_width; - *pData += 2; - *pDataRemain -= 2; - } - *pFrame -= ( 8 * g_width - 8 ); - break; - - case 0xe: - /* This encoding represents a solid 8x8 frame. We get 1 byte of pixel - data from the data stream. - */ - for (i = 0; i < 8; i++) { - memset( *pFrame, **pData, 8 ); - *pFrame += g_width; - } - ++ * pData; - -- * pDataRemain; - *pFrame -= ( 8 * g_width - 8 ); - break; - - case 0xf: - /* This encoding represents a "dithered" frame, which is - checkerboarded with alternate pixels of two colors. We get 2 - bytes of pixel data from the data stream, and these bytes are - alternated: - P0 P1 P0 P1 P0 P1 P0 P1 - P1 P0 P1 P0 P1 P0 P1 P0 - ... - P0 P1 P0 P1 P0 P1 P0 P1 - P1 P0 P1 P0 P1 P0 P1 P0 - */ - for (i = 0; i < 8; i++) { - for (j = 0; j < 8; j++) { - ( *pFrame )[j] = ( *pData )[( i + j ) & 1]; - } - *pFrame += g_width; - } - *pData += 2; - *pDataRemain -= 2; - *pFrame -= ( 8 * g_width - 8 ); - break; - - default: - break; - } -} Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/decoders.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/decoders.h 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/decoders.h 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,18 +0,0 @@ -/* - * - * INTERNAL header - not to be included outside of libmve - * - */ - -#ifndef _DECODERS_H -#define _DECODERS_H - -extern int g_width, g_height; -extern void* g_vBackBuf1, * g_vBackBuf2; - -extern void decodeFrame8(unsigned char* pFrame, unsigned char* pMap, - int mapRemain, unsigned char* pData, int dataRemain); -extern void decodeFrame16(unsigned char* pFrame, unsigned char* pMap, - int mapRemain, unsigned char* pData, int dataRemain); - -#endif // _DECODERS_H Added: gemrb/trunk/gemrb/plugins/MVEPlayer/gstmvedemux.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/gstmvedemux.h (rev 0) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/gstmvedemux.h 2009-05-20 19:10:20 UTC (rev 6012) @@ -0,0 +1,141 @@ +/* + * GStreamer demultiplexer plugin for Interplay MVE movie files + * + * Copyright (C) 2006 Jens Granseuer <je...@gm...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_MVE_DEMUX_H__ +#define __GST_MVE_DEMUX_H__ + +#include "../../includes/win32def.h" +#include "../../includes/globals.h" + +#define G_UNLIKELY(x) (x) +#define GST_WARNING printf +#define GST_ERROR printf + +/* Define GET function for unaligned memory */ +#define _GST_GET(__data, __idx, __size, __shift) \ + (((guint##__size) (((guint8 *) (__data))[__idx])) << __shift) + +/** + * GST_READ_UINT16_LE: + * @data: memory location + * + * Read a 16 bit unsigned integer value in little endian format from the memory buffer. + */ +#define GST_READ_UINT16_LE(data) (_GST_GET (data, 1, 16, 8) | \ + _GST_GET (data, 0, 16, 0)) + +/** + * GST_READ_UINT32_LE: + * @data: memory location + * + * Read a 32 bit unsigned integer value in little endian format from the memory buffer. + */ +#define GST_READ_UINT32_LE(data) (_GST_GET (data, 3, 32, 24) | \ + _GST_GET (data, 2, 32, 16) | \ + _GST_GET (data, 1, 32, 8) | \ + _GST_GET (data, 0, 32, 0)) + +/*#include <gst/gst.h> +#include <gst/base/gstadapter.h> + +G_BEGIN_DECLS + +#define GST_TYPE_MVE_DEMUX \ + (gst_mve_demux_get_type()) +#define GST_MVE_DEMUX(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_MVE_DEMUX,GstMveDemux)) +#define GST_MVE_DEMUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_MVE_DEMUX,GstMveDemuxClass)) +#define GST_IS_MVE_DEMUX(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_MVE_DEMUX)) +#define GST_IS_MVE_DEMUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_MVE_DEMUX))*/ + +typedef int gint; +typedef gint gboolean; +typedef ieByte guint8; +typedef ieWord guint16; +typedef ieDword guint32; + +/*typedef struct _GstMveDemux GstMveDemux; +typedef struct _GstMveDemuxClass GstMveDemuxClass;*/ +typedef struct _GstMveDemuxStream GstMveDemuxStream; + +/*struct _GstMveDemux +{ + GstElement element; + + GstPad *sinkpad; + + GstMveDemuxStream *video_stream; + GstMveDemuxStream *audio_stream; + + gint state;*/ + + /* time per frame (1/framerate) */ +/* GstClockTime frame_duration;*/ + + /* push based variables */ +/* guint16 needed_bytes; + GstAdapter *adapter;*/ + + /* size of current chunk */ +/* guint32 chunk_size;*/ + /* offset in current chunk */ +/* guint32 chunk_offset; +};*/ + +/*struct _GstMveDemuxClass +{ + GstElementClass parent_class; +};*/ + +struct _GstMveDemuxStream { + /* shared properties */ + /*GstCaps *caps; + GstPad *pad; + GstClockTime last_ts;*/ + /*gint64 offset;*/ + + /* video properties */ + guint16 width; + guint16 height; + /*guint8 bpp;*/ /* bytes per pixel */ + guint8 *code_map; + /*gboolean code_map_avail;*/ + guint8 *back_buf1; + guint8 *back_buf2; + guint32 max_block_offset; + /*GstBuffer *palette; + GstBuffer *buffer;*/ + + /* audio properties */ + /*guint16 sample_rate; + guint16 n_channels; + guint16 sample_size; + gboolean compression;*/ +}; + +/*GType gst_mve_demux_get_type (void); + +G_END_DECLS*/ + +#endif /* __GST_MVE_DEMUX_H__ */ Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/libmve.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/libmve.h 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/libmve.h 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,49 +0,0 @@ -#ifndef _LIBMVE_H -#define _LIBMVE_H - -#define MVE_ERR_EOF 1 - -typedef struct { - int screenWidth; - int screenHeight; - int width; - int height; - int truecolor; -} MVE_videoSpec; - -int MVE_rmPrepMovie(void* stream, int x, int y, int track); -int MVE_rmStepMovie(); -void MVE_rmHoldMovie(); -void MVE_rmEndMovie(); - -void MVE_getVideoSpec(MVE_videoSpec* vSpec); - -void MVE_sndInit(int x, unsigned short volume); - -typedef unsigned int (*mve_cb_Read)(void* stream, void* buffer, - unsigned int count); - -typedef void*(*mve_cb_Alloc)(size_t size); -typedef void (*mve_cb_Free)(void* ptr); - -typedef void (*mve_cb_ShowFrame)(unsigned char* buffer, unsigned int bufw, - unsigned int bufh, unsigned int sx, unsigned int sy, unsigned int w, - unsigned int h, unsigned int dstx, unsigned int dsty); - -typedef void (*mve_cb_SetPalette)(unsigned char* p, unsigned int start, - unsigned int count); - -typedef int (*mve_cb_CreateAudioStream)(); -typedef void (*mve_cb_FreeAudioStream)(int stream); -typedef void (*mve_cb_QueueBuffer)(int stream, unsigned short bits, - int channels, short* memory,int size, int samplerate); - -void MVE_ioCallbacks(mve_cb_Read io_read); -void MVE_memCallbacks(mve_cb_Alloc mem_alloc, mve_cb_Free mem_free); -void MVE_sfCallbacks(mve_cb_ShowFrame showframe); -void MVE_palCallbacks(mve_cb_SetPalette setpalette); -void MVE_audioCallbacks(mve_cb_CreateAudioStream createaudiostream, - mve_cb_FreeAudioStream freeaudiostream, - mve_cb_QueueBuffer queuebuffer); - -#endif /* _LIBMVE_H */ Added: gemrb/trunk/gemrb/plugins/MVEPlayer/mve.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/mve.h (rev 0) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/mve.h 2009-05-20 19:10:20 UTC (rev 6012) @@ -0,0 +1,64 @@ +/* + * Interplay MVE movie definitions + * + * Copyright (C) 2006 Jens Granseuer <je...@gm...> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __MVE_H__ +#define __MVE_H__ + +#define MVE_PREAMBLE "Interplay MVE File\032\000\032\000\000\001\063\021" +#define MVE_PREAMBLE_SIZE 26 + +#define MVE_PALETTE_COUNT 256 + +#define MVE_DEFAULT_AUDIO_STREAM 0x01 + +/* MVE chunk types */ +#define MVE_CHUNK_INIT_AUDIO 0x0000 +#define MVE_CHUNK_AUDIO_ONLY 0x0001 +#define MVE_CHUNK_INIT_VIDEO 0x0002 +#define MVE_CHUNK_VIDEO 0x0003 +#define MVE_CHUNK_SHUTDOWN 0x0004 +#define MVE_CHUNK_END 0x0005 + +/* MVE segment opcodes */ +#define MVE_OC_END_OF_STREAM 0x00 +#define MVE_OC_END_OF_CHUNK 0x01 +#define MVE_OC_CREATE_TIMER 0x02 +#define MVE_OC_AUDIO_BUFFERS 0x03 +#define MVE_OC_PLAY_AUDIO 0x04 +#define MVE_OC_VIDEO_BUFFERS 0x05 +#define MVE_OC_PLAY_VIDEO 0x07 +#define MVE_OC_AUDIO_DATA 0x08 +#define MVE_OC_AUDIO_SILENCE 0x09 +#define MVE_OC_VIDEO_MODE 0x0A +#define MVE_OC_PALETTE 0x0C +#define MVE_OC_PALETTE_COMPRESSED 0x0D +#define MVE_OC_CODE_MAP 0x0F +#define MVE_OC_VIDEO_DATA 0x11 + +/* audio flags */ +#define MVE_AUDIO_STEREO 0x0001 +#define MVE_AUDIO_16BIT 0x0002 +#define MVE_AUDIO_COMPRESSED 0x0004 + +/* video flags */ +#define MVE_VIDEO_DELTA_FRAME 0x0001 + +#endif /* __MVE_H__ */ Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.cpp 2009-05-20 15:55:26 UTC (rev 6011) +++ gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.cpp 2009-05-20 19:10:20 UTC (rev 6012) @@ -1,58 +0,0 @@ -static int audio_exp_table[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 47, 51, 56, 61, 66, 72, 79, 86, 94, 102, 112, 122, - 133, 145, 158, 173, 189, 206, 225, 245, 267, 292, 318, 348, 379, 414, 452, - 493, 538, 587, 640, 699, 763, 832, 908, 991, 1081, 1180, 1288, 1405, 1534, - 1673, 1826, 1993, 2175, 2373, 2590, 2826, 3084, 3365, 3672, 4008, 4373, - 4772, 5208, 5683, 6202, 6767, 7385, 8059, 8794, 9597, 10472, 11428, 12471, - 13609, 14851, 16206, 17685, 19298, 21060, 22981, 25078, 27367, 29864, - 32589, -29973, -26728, -23186, -19322, -15105, -10503, -5481, -1, 1, 1, - 5481, 10503, 15105, 19322, 23186, 26728, 29973, -32589, -29864, -27367, - -25078, -22981, -21060, -19298, -17685, -16206, -14851, -13609, -12471, - -11428, -10472, -9597, -8794, -8059, -7385, -6767, -6202, -5683, -5208, - -4772, -4373, -4008, -3672, -3365, -3084, -2826, -2590, -2373, -2175, - -1993, -1826, -1673, -1534, -1405, -1288, -1180, -1081, -991, -908, -832, - -763, -699, -640, -587, -538, -493, -452, -414, -379, -348, -318, -292, - -267, -245, -225, -206, -189, -173, -158, -145, -133, -122, -112, -102, - -94, -86, -79, -72, -66, -61, -56, -51, -47, -43, -42, -41, -40, -39, -38, - -37, -36, -35, -34, -33, -32, -31, -30, -29, -28, -27, -26, -25, -24, -23, - -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11, -10, -9, -8, - -7, -6, -5, -4, -3, -2, -1 -}; - -static int getWord(unsigned char** fin) -{ - int value = ( ( *fin )[1] << 8 ) | ( *fin )[0]; - *fin += 2; - return value; -} - -static void sendWord(short** fout, int nOffset) -{ - *( *fout )++ = nOffset; -} - -static void processSwath(short* fout, unsigned char* data, int swath, - int* offsets) -{ - int i; - for (i = 0; i < swath; i++) { - offsets[i & 1] += audio_exp_table[data[i]]; - sendWord( &fout, offsets[i & 1] ); - } -} - -void mveaudio_uncompress(short* buffer, unsigned char* data, int /*length*/) -{ - int nCurOffsets[2]; - int swath; - - data += 4; - swath = getWord( &data ) / 2; - nCurOffsets[0] = getWord( &data ); - nCurOffsets[1] = getWord( &data ); - sendWord( &buffer, nCurOffsets[0] ); - sendWord( &buffer, nCurOffsets[1] ); - processSwath( buffer, data, swath, nCurOffsets ); -} Deleted: gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.h =================================================================== --- gemrb/trunk/gemrb/plugins/MVEPlayer/mve_audio.h 2009-05-20 15:55:26 UTC (rev 6011) +++ ... [truncated message content] |
From: <ze...@us...> - 2009-05-22 08:44:55
|
Revision: 6037 http://gemrb.svn.sourceforge.net/gemrb/?rev=6037&view=rev Author: zefklop Date: 2009-05-22 08:44:47 +0000 (Fri, 22 May 2009) Log Message: ----------- Fix stance for projecxtile launchers Modified Paths: -------------- gemrb/trunk/gemrb/plugins/Core/Actor.cpp gemrb/trunk/gemrb/plugins/Core/Actor.h Added Paths: ----------- gemrb/trunk/.project gemrb/trunk/.pydevproject Added: gemrb/trunk/.project =================================================================== --- gemrb/trunk/.project (rev 0) +++ gemrb/trunk/.project 2009-05-22 08:44:47 UTC (rev 6037) @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>GemRB</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.python.pydev.PyDevBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.cdt.make.core.makeBuilder</name> + <triggers>clean,full,incremental,</triggers> + <arguments> + <dictionary> + <key>org.eclipse.cdt.core.errorOutputParser</key> + <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.append_environment</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.autoBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.arguments</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.command</key> + <value>D:/Programmes/MinGW/bin/mingw32-make.exe</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.location</key> + <value>D:\Programmation\gemrb_build</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.auto</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.clean</key> + <value>clean</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.build.target.inc</key> + <value>install</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildArguments</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.buildLocation</key> + <value>D:/Programmation/workspace/GemRB</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.cleanBuildTarget</key> + <value>clean</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.contents</key> + <value>org.eclipse.cdt.make.core.activeConfigSettings</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableAutoBuild</key> + <value>false</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableCleanBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enableFullBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.environment</key> + <value></value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.fullBuildTarget</key> + <value>all</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.stopOnError</key> + <value>true</value> + </dictionary> + <dictionary> + <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> + <value>false</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.cdt.core.ccnature</nature> + <nature>org.eclipse.cdt.make.core.makeNature</nature> + <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature> + <nature>org.eclipse.cdt.core.cnature</nature> + <nature>org.python.pydev.pythonNature</nature> + </natures> +</projectDescription> Added: gemrb/trunk/.pydevproject =================================================================== --- gemrb/trunk/.pydevproject (rev 0) +++ gemrb/trunk/.pydevproject 2009-05-22 08:44:47 UTC (rev 6037) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?eclipse-pydev version="1.0"?> + +<pydev_project> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property> +<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> +</pydev_project> Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-05-22 01:58:33 UTC (rev 6036) +++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-05-22 08:44:47 UTC (rev 6037) @@ -2680,7 +2680,8 @@ return; } - SetStance(IE_ANI_ATTACK); + SetStance(AttackStance) ; + //last chance to disable attacking // attackcount = GetStat(IE_NUMBEROFATTACKS); @@ -3480,9 +3481,10 @@ return true; } if (StanceID == IE_ANI_ATTACK || StanceID == IE_ANI_ATTACK_JAB || - StanceID == IE_ANI_ATTACK_SLASH || StanceID == IE_ANI_ATTACK_BACKSLASH) + StanceID == IE_ANI_ATTACK_SLASH || StanceID == IE_ANI_ATTACK_BACKSLASH || + StanceID == IE_ANI_SHOOT) { - SetStance( IE_ANI_ATTACK ); + SetStance( AttackStance ); return true; } return false; @@ -3869,7 +3871,7 @@ } if (!silent) { - ieByte stance = IE_ANI_ATTACK; + ieByte stance = AttackStance; for (int i=0;i<animcount;i++) { if ( strnicmp(item->ItemResRef, itemanim[i].itemname, 8) == 0) { stance = itemanim[i].animation; @@ -3953,6 +3955,13 @@ //update the paperdoll weapon animation core->SetEventFlag(EF_UPDATEANIM); } + ITMExtHeader *header ; + GetWeapon(header, NULL) ; + if(header && header->AttackType == ITEM_AT_BOW) { + AttackStance = IE_ANI_SHOOT ; + return ; + } + AttackStance = IE_ANI_ATTACK; } void Actor::SetUsedShield(const char* AnimationType, int wt) Modified: gemrb/trunk/gemrb/plugins/Core/Actor.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-05-22 01:58:33 UTC (rev 6036) +++ gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-05-22 08:44:47 UTC (rev 6037) @@ -234,7 +234,7 @@ //when the next attack is scheduled (gametime+initiative) ieDword initiative; ieDword InTrap; - + char AttackStance ; /** paint the actor itself. Called internally by Draw() */ void DrawActorSprite(Region &screen, int cx, int cy, Region& bbox, SpriteCover*& sc, Animation** anims, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-05-25 10:32:56
|
Revision: 6096 http://gemrb.svn.sourceforge.net/gemrb/?rev=6096&view=rev Author: lynxlupodian Date: 2009-05-25 10:32:31 +0000 (Mon, 25 May 2009) Log Message: ----------- [2579743] added RPM spec file by jbmetz and updated it to the imminent 0.4.0 also updated the lsm spec Modified Paths: -------------- gemrb/trunk/gemrb.lsm Added Paths: ----------- gemrb/trunk/gemrb.spec Modified: gemrb/trunk/gemrb.lsm =================================================================== --- gemrb/trunk/gemrb.lsm 2009-05-24 22:15:21 UTC (rev 6095) +++ gemrb/trunk/gemrb.lsm 2009-05-25 10:32:31 UTC (rev 6096) @@ -1,7 +1,7 @@ Begin4 Title: GemRB -Version: 0.3 -Entered-date: 2008-01-27 +Version: 0.4.0 +Entered-date: 2008-05-25 Description: OpenSource reimplementation of the InfinityEngine Keywords: Infinity Engine roleplaying game rpg Author: <ave...@us...> GemRB Developement Team Added: gemrb/trunk/gemrb.spec =================================================================== --- gemrb/trunk/gemrb.spec (rev 0) +++ gemrb/trunk/gemrb.spec 2009-05-25 10:32:31 UTC (rev 6096) @@ -0,0 +1,69 @@ +Name: gemrb +Version: 0.4.0 +Release: 1 +Summary: Port of the original Infinity (Game) Engine +Group: Applications/Games +License: GPL +Source: %{name}-%{version}.tar.gz +URL: http://gemrb.sourceforge.net/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: zlib SDL >= 1.2 openal python >= 2.3 libvorbis libpng +BuildRequires: zlib-devel SDL-devel openal-devel libvorbis-devel libpng-devel + +%description +GemRB (Game engine made with preRendered Background) is a portable open-source +implementation of Bioware's Infinity Engine which was written to support +pseudo-3D role playing games based on the Dungeons & Dragons ruleset + +%prep +%setup -q + +%build +%configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} +make %{?_smp_mflags} + +%install +rm -rf ${RPM_BUILD_ROOT} +make DESTDIR=${RPM_BUILD_ROOT} install + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(644,root,root,755) +%doc AUTHORS COPYING NEWS README +%attr(755,root,root) %{_bindir}/gemrb +%attr(755,root,root) %{_libdir}/*.so +%attr(755,root,root) %{_libdir}/*.so.* +%attr(755,root,root) %{_libdir}/gemrb/plugins/*.so +%attr(755,root,root) %{_libdir}/gemrb/plugins/*.so.* +%{_sysconfdir}/GemRB.* +%{_mandir}/man6/* +%{_datadir}/gemrb/* +%{_datadir}/doc/gemrb/* + +### Exclude files +%exclude %{_libdir}/*.la +%attr(755,root,root) %{_libdir}/gemrb/plugins/*.la + +%changelog +* Tue May 25 2009 Jaka Kranjc <lyn...@us...> 0.4.0-1 +- Update for gemrb 0.4.0 + +* Sun Mar 15 2009 Joachim Metz <jb...@us...> 0.3.2-2 +- Excluded .la files from rpm file + +* Tue Feb 17 2009 Joachim Metz <jb...@us...> 0.3.2-1 +- Update for gemrb 0.3.2 + +* Fri Feb 13 2009 Joachim Metz <jb...@us...> 0.3.1-2 +- Merged default and devel package, gemrb requires .so files +- Corrected use of legacy version of libpng + +* Sun Feb 8 2009 Joachim Metz <jb...@us...> 0.3.1-1 +- Initial version + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-05-25 11:40:43
|
Revision: 6097 http://gemrb.svn.sourceforge.net/gemrb/?rev=6097&view=rev Author: lynxlupodian Date: 2009-05-25 11:40:17 +0000 (Mon, 25 May 2009) Log Message: ----------- added missing license headers Modified Paths: -------------- gemrb/trunk/admin/setup.sh gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py gemrb/trunk/gemrb/GUIScripts/bg1/Start.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGen8.py gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py gemrb/trunk/gemrb/GUIScripts/bg2/ExportFile.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py gemrb/trunk/gemrb/GUIScripts/bg2/GUILOAD.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIMOVIE.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT10.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT12.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT6.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT7.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT8.py gemrb/trunk/gemrb/GUIScripts/bg2/GUIOPT9.py gemrb/trunk/gemrb/GUIScripts/bg2/GUISONGS.py gemrb/trunk/gemrb/GUIScripts/bg2/ImportFile.py gemrb/trunk/gemrb/GUIScripts/bg2/ImportGame.py gemrb/trunk/gemrb/GUIScripts/bg2/Start.py gemrb/trunk/gemrb/GUIScripts/bg2/Start2.py gemrb/trunk/gemrb/GUIScripts/bg2/StartOpt.py gemrb/trunk/gemrb/GUIScripts/ie_modal.py gemrb/trunk/gemrb/GUIScripts/iwd2/Abilities.py gemrb/trunk/gemrb/GUIScripts/iwd2/Alignment.py gemrb/trunk/gemrb/GUIScripts/iwd2/Appearance.py gemrb/trunk/gemrb/GUIScripts/iwd2/CSound.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen2.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen3.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen4.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen5.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen6.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen7.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen8.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharGen9.py gemrb/trunk/gemrb/GUIScripts/iwd2/CharOverview.py gemrb/trunk/gemrb/GUIScripts/iwd2/Class.py gemrb/trunk/gemrb/GUIScripts/iwd2/Enemy.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feats.py gemrb/trunk/gemrb/GUIScripts/iwd2/Feedback.py gemrb/trunk/gemrb/GUIScripts/iwd2/GamePlay.py gemrb/trunk/gemrb/GUIScripts/iwd2/Gender.py gemrb/trunk/gemrb/GUIScripts/iwd2/Graphics.py gemrb/trunk/gemrb/GUIScripts/iwd2/ImportFile.py gemrb/trunk/gemrb/GUIScripts/iwd2/Movies.py gemrb/trunk/gemrb/GUIScripts/iwd2/Name.py gemrb/trunk/gemrb/GUIScripts/iwd2/Portrait.py gemrb/trunk/gemrb/GUIScripts/iwd2/Race.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty.py gemrb/trunk/gemrb/GUIScripts/iwd2/SPParty2.py gemrb/trunk/gemrb/GUIScripts/iwd2/Skills.py gemrb/trunk/gemrb/GUIScripts/iwd2/Songs.py gemrb/trunk/gemrb/GUIScripts/iwd2/Sound.py gemrb/trunk/gemrb/GUIScripts/iwd2/SubRaces.py gemrb/trunk/gemrb/GUIScripts/test1/CharSet.py gemrb/trunk/gemrb/GUIScripts/test1/Start.py gemrb/trunk/gemrb/includes/RGBAColor.h gemrb/trunk/gemrb/includes/errors.h gemrb/trunk/gemrb/includes/ie_feats.h gemrb/trunk/gemrb/plugins/Core/GSUtils.h gemrb/trunk/gemrb/plugins/Core/GlobalTimer.h gemrb/trunk/gemrb/plugins/Core/PathFinder.h gemrb/trunk/gemrb/plugins/Core/SaveGameMgr.h gemrb/trunk/gemrb/plugins/Core/ScriptedAnimation.h gemrb/trunk/gemrb/plugins/Core/damages.h gemrb/trunk/gemrb/plugins/TLKImporter/TlkOverride.h gemrb/trunk/gemrb/plugins-prepare.sh Modified: gemrb/trunk/admin/setup.sh =================================================================== --- gemrb/trunk/admin/setup.sh 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/admin/setup.sh 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,9 +1,27 @@ #!/bin/bash +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# +# This is a quick and dirty script to pass reasonable values to the +# configure script. This script compensates for the fact that GemRB +# expects certain files to be in paths relative to GemRB. -#This is a quick and dirty script to pass reasonable values to the -#configure script. This script compensates for the fact that GemRB -#expects certain files to be in paths relative to GemRB. - if [ "$1" = "" ]; then echo "Usage: $0 [installation directory]"; echo "Example: $0 $HOME/GemRB" Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen2.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen3.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen4.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen5.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen6.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen7.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen8.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/CharGen9.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB from ie_stats import * Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG1.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, gender (GUICG1) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG10.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, multi-class (GUICG10) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG12.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, appearance (GUICG12) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG13.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, color (GUICG13) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG15.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, racial enemy (GUICG15) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG19.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, sounds (GUICG19) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG2.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, class (GUICG2) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG22.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, class kit (GUICG22) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG3.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, alignment (GUICG3) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG4.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, ability (GUICG4) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG5.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, name (GUICG5) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG6.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, skills (GUICG6) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG8.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, race (GUICG2) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUICG9.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, proficiencies (GUICG9) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMOVIE.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMOVIE.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMOVIE.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# import GemRB MovieWindow = 0 Modified: gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/GUIMP.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #Single Player Party Formation import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/ImportFile.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, import (GUICG20) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg1/Start.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg1/Start.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg1/Start.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# import GemRB StartWindow = 0 Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB from CharGenCommon import * Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGen8.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGen8.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGen8.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation (GUICG 0) import GemRB from CharGenCommon import * Modified: gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/CharGenCommon.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# # common character generation display code import GemRB from ie_stats import * Modified: gemrb/trunk/gemrb/GUIScripts/bg2/ExportFile.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/ExportFile.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/ExportFile.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, import (GUICG24) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG1.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, gender (GUICG1) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG10.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, multi-class (GUICG10) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG12.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, appearance (GUICG12) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG13.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, color (GUICG13) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG15.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, racial enemy (GUICG15) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG19.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, sounds (GUICG19) from ie_restype import * import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG2.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, class (GUICG2) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG23.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, biography (GUICG23) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG24.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, import (GUICG24) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG3.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, alignment (GUICG3) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG4.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, ability (GUICG4) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG5.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, name (GUICG5) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG6.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, (thief) skills (GUICG6) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG8.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# #character generation, race (GUICG2) import GemRB Modified: gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py =================================================================== --- gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-05-25 10:32:31 UTC (rev 6096) +++ gemrb/trunk/gemrb/GUIScripts/bg2/GUICG9.py 2009-05-25 11:40:17 UTC (rev 6097) @@ -1,3 +1,22 @@ +# GemRB - Infinity Engine Emulator +# Copyright (C) 2003 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU ... [truncated message content] |
From: <lyn...@us...> - 2009-05-25 17:35:43
|
Revision: 6102 http://gemrb.svn.sourceforge.net/gemrb/?rev=6102&view=rev Author: lynxlupodian Date: 2009-05-25 17:35:07 +0000 (Mon, 25 May 2009) Log Message: ----------- 0.4.0 Modified Paths: -------------- gemrb/trunk/configure.in gemrb/trunk/gemrb/includes/globals.h Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-05-25 17:29:40 UTC (rev 6101) +++ gemrb/trunk/configure.in 2009-05-25 17:35:07 UTC (rev 6102) @@ -28,7 +28,7 @@ dnl Initialize autoconf and automake AC_PREREQ([2.57]) -AC_INIT(gemrb, 0.3.2) +AC_INIT(gemrb, 0.4.0) AC_CONFIG_AUX_DIR([admin]) AC_CONFIG_SRCDIR([gemrb/]) AC_CANONICAL_SYSTEM Modified: gemrb/trunk/gemrb/includes/globals.h =================================================================== --- gemrb/trunk/gemrb/includes/globals.h 2009-05-25 17:29:40 UTC (rev 6101) +++ gemrb/trunk/gemrb/includes/globals.h 2009-05-25 17:35:07 UTC (rev 6102) @@ -35,7 +35,7 @@ #include "ie_types.h" -#define VERSION_GEMRB "0.3.2" +#define VERSION_GEMRB "0.4.0" #define GEMRB_STRING "GemRB v" VERSION_GEMRB This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-05-27 20:56:10
|
Revision: 6131 http://gemrb.svn.sourceforge.net/gemrb/?rev=6131&view=rev Author: lynxlupodian Date: 2009-05-27 20:54:14 +0000 (Wed, 27 May 2009) Log Message: ----------- added restart_news.sh to help with postrelease NEWS handling and ran it Modified Paths: -------------- gemrb/trunk/NEWS gemrb/trunk/gemrb/docs/en/Release.txt Added Paths: ----------- gemrb/trunk/admin/restart_news.sh Modified: gemrb/trunk/NEWS =================================================================== --- gemrb/trunk/NEWS 2009-05-27 20:00:14 UTC (rev 6130) +++ gemrb/trunk/NEWS 2009-05-27 20:54:14 UTC (rev 6131) @@ -1,3 +1,14 @@ +GemRB svn (6100): + New features: + - + + Improved features: + - + - various guiscripts + - bugfixes + + Applied patches: + GemRB V0.4.0 (2009-05-25): New features: - level up support in bg2 Added: gemrb/trunk/admin/restart_news.sh =================================================================== --- gemrb/trunk/admin/restart_news.sh (rev 0) +++ gemrb/trunk/admin/restart_news.sh 2009-05-27 20:54:14 UTC (rev 6131) @@ -0,0 +1,46 @@ +#!/bin/bash +# GemRB - Infinity Engine Emulator +# Copyright (C) 2009 The GemRB Project +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# $Id$ +# +# prepares NEWS for the restart of tracking bigger changes after release. + +if [[ ! -e NEWS ]]; then + echo 'Run me from the top gemrb dir that contains NEWS!' + exit 3 +fi + +# get the last revision that contains a change in the word svn +# that's usually the final release update +rev=$(git log -Ssvn --pretty="format:%b" NEWS | sed -n '1 s,^.*@\(\S*\) .*$,\1,p') +rev="${rev:-missing revision}" + +cat - NEWS > NEWSNEWS << LILARCOR +GemRB svn ($rev): + New features: + - + + Improved features: + - + - various guiscripts + - bugfixes + + Applied patches: + +LILARCOR +mv NEWSNEWS NEWS Property changes on: gemrb/trunk/admin/restart_news.sh ___________________________________________________________________ Added: svn:executable + * Modified: gemrb/trunk/gemrb/docs/en/Release.txt =================================================================== --- gemrb/trunk/gemrb/docs/en/Release.txt 2009-05-27 20:00:14 UTC (rev 6130) +++ gemrb/trunk/gemrb/docs/en/Release.txt 2009-05-27 20:54:14 UTC (rev 6131) @@ -75,3 +75,5 @@ * Announce on homepage, SF, #GemRB in channel and title, Gibberlings3, Happypenguin * Possibly announce on Freshmeat (only balrog has the account?) + +* Run admin/restart_news.sh to restart the NEWS cycle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lyn...@us...> - 2009-05-31 15:31:50
|
Revision: 6209 http://gemrb.svn.sourceforge.net/gemrb/?rev=6209&view=rev Author: lynxlupodian Date: 2009-05-31 15:30:19 +0000 (Sun, 31 May 2009) Log Message: ----------- silence the build system warning (some by fixing, some by stfu) Modified Paths: -------------- gemrb/trunk/autogen.sh gemrb/trunk/configure.in Modified: gemrb/trunk/autogen.sh =================================================================== --- gemrb/trunk/autogen.sh 2009-05-31 15:28:35 UTC (rev 6208) +++ gemrb/trunk/autogen.sh 2009-05-31 15:30:19 UTC (rev 6209) @@ -152,10 +152,10 @@ fi echo Running libtoolize -$my_libtoolize --force || exit 1 +$my_libtoolize --force --no-warn || exit 1 echo Running aclocal -$my_aclocal || exit 1 +$my_aclocal -W no-syntax || exit 1 echo Running autoconf $my_autoconf || exit 1 Modified: gemrb/trunk/configure.in =================================================================== --- gemrb/trunk/configure.in 2009-05-31 15:28:35 UTC (rev 6208) +++ gemrb/trunk/configure.in 2009-05-31 15:30:19 UTC (rev 6209) @@ -34,6 +34,7 @@ AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) +AC_USE_SYSTEM_EXTENSIONS for top_builddir in . .. ../.. $ac_auxdir $ac_auxdir/..; do test -f $top_builddir/configure && break This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |