Skip to content

Commit 518f1ac

Browse files
SupSuperSupSuper
committed
Spellchecking
1 parent 2fb71c1 commit 518f1ac

47 files changed

Lines changed: 230 additions & 230 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Bugfixes:
3535
- Geoscape sidebar didn't show up on first start on some languages.
3636
- Bug with line of sight inside UFOs along diagonal walls.
3737
- Bug with pathfinding inside UFOs along diagonal walls.
38-
- Aliens not black when in undiscoverd terrain.
38+
- Aliens not black when in undiscovered terrain.
3939
- Issue with turn and shoot.
4040
- Too many reaction fires from autoshot (each shot had a chance of a reaction shot which is wrong).
4141
- Unit selection arrow showed up during alien turn.
@@ -95,12 +95,12 @@ Bugfixes:
9595
- Various UI issues.
9696
- Various translation issues.
9797
- Bug in craft rearming.
98-
- FPS Counter didn�t always show up properly.
99-
- Crash sites didn�t vanish properly.
98+
- FPS Counter didn't always show up properly.
99+
- Crash sites didn't vanish properly.
100100
- Failing to load a game could crash the Geoscape.
101-
- Games weren�t always saved properly.
102-
- Monthly report didn�t show correct date.
103-
- Crafts in base view weren�t positioned correctly.
101+
- Games weren't always saved properly.
102+
- Monthly report didn't show correct date.
103+
- Crafts in base view weren't positioned correctly.
104104
- Music loading issues.
105105
- Various battlescape fixes.
106106
- Various performance improvements.
@@ -169,4 +169,4 @@ First release!
169169
-- Soldier stats (with randomly generated soldiers).
170170
-- Craft info and equipping.
171171
-- Facility building/removal.
172-
-- Scroll-wheel support.
172+
-- Scroll-wheel support.

‎CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ project ( OpenXcom )
33
cmake_minimum_required ( VERSION 2.8 )
44
set ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
55

6-
option ( DEV_BUILD "Developement Build. Turn off for release" ON )
7-
option ( BUILD_PACKAGE "Add need rules to build packages" ON )
8-
option ( ENABLE_WARNING "Always show warnings(even for release build" OFF )
9-
option ( FATAL_WARNING "Treats warnings as errors" OFF )
6+
option ( DEV_BUILD "Development Build. Disable this for release builds" ON )
7+
option ( BUILD_PACKAGE "Prepares build for creation of a package with CPack" ON )
8+
option ( ENABLE_WARNING "Always show warnings (even for release builds)" OFF )
9+
option ( FATAL_WARNING "Treat warnings as errors" OFF )
1010
set ( MSVC_WARNING_LEVEL 3 CACHE STRING "Visual Studio warning levels" )
1111

1212
if ( WIN32 )
@@ -15,13 +15,13 @@ endif ()
1515

1616
if ( APPLE )
1717
set ( MACOS_SDLMAIN_M_PATH "${CMAKE_SOURCE_DIR}" CACHE STRING "Path to SDLMain.m file" )
18-
option ( CREATE_BUNDLE "Create a MACOS bundle application" ON )
18+
option ( CREATE_BUNDLE "Create a Mac OS application bundle" ON )
1919
if ( NOT EXISTS "${MACOS_SDLMAIN_M_PATH}" )
20-
message ( FATAL_ERROR "On MacOS, SDLMain.m is needed. please set the MACOS_SDLMAIN_M_PATH variable" )
20+
message ( FATAL_ERROR "On Mac OS, SDLMain.m is required. Please set the MACOS_SDLMAIN_M_PATH variable" )
2121
endif ()
2222
endif ()
2323

24-
set ( DEPS_DIR "${default_deps_dir}" CACHE STRING "Deps directory" )
24+
set ( DEPS_DIR "${default_deps_dir}" CACHE STRING "Dependencies directory" )
2525

2626
# Add check for library (SDL_gfx, yaml-cpp )
2727
if ( IS_DIRECTORY ${DEPS_DIR} )
@@ -40,28 +40,28 @@ else ( )
4040
find_package ( Yaml_cpp )
4141

4242
if ( NOT SDL_FOUND )
43-
message ( FATAL_ERROR "SDL is needed" )
43+
message ( FATAL_ERROR "Can't find SDL which is required" )
4444
else ()
4545
include_directories ( ${SDL_INCLUDE_DIR} )
4646
message ( "found SDL ${SDL_MAJOR}.${SDL_MINOR}.${SDL_MICRO} (${SDL_LIBRARY_DIRS}:${SDL_INCLUDE_DIR})" )
4747
endif ()
4848

4949
if ( NOT SDLMIXER_FOUND )
50-
message ( FATAL_ERROR "SDL_mixer is needed" )
50+
message ( FATAL_ERROR "Can't find SDL_mixer which is required" )
5151
else ()
5252
include_directories ( ${SDLMIXER_INCLUDE_DIR} )
5353
message ( "found SDL_mixer ${SDL_MIXER_MAJOR}.${SDL_MIXER_MINOR}.${SDL_MIXER_MICRO} (${SDL_MIXER_LIBRARY_DIRS}:${SDLMIXER_INCLUDE_DIR})" )
5454
endif ()
5555

5656
if ( NOT SDLGFX_FOUND )
57-
message ( FATAL_ERROR "SDL_gfx is needed" )
57+
message ( FATAL_ERROR "Can't find SDL_gfx which is required" )
5858
else ()
5959
include_directories ( ${SDLGFX_INCLUDE_DIR} )
6060
message ( "found SDL_gfx ${SDL_GFX_MAJOR}.${SDL_GFX_MINOR}.${SDL_GFX_MICRO} (${SDL_GFX_LIBRARY_DIRS}:${SDLGFX_INCLUDE_DIR})" )
6161
endif ()
6262

6363
if ( NOT YAMLCPP_FOUND )
64-
message ( FATAL_ERROR "yaml-cpp is needed" )
64+
message ( FATAL_ERROR "Can't find yaml-cpp which is required" )
6565
else ()
6666
include_directories ( ${YAMLCPP_INCLUDE_DIR} )
6767
message ( "found yaml-cpp(${YAMLCPP_LIBRARY_DIRS}:${YAMLCPP_INCLUDE_DIR})" )
@@ -104,18 +104,18 @@ if ( BUILD_PACKAGE )
104104
if ( NOT DEV_BUILD )
105105
string ( LENGTH "${git_dirty}" is_dirty )
106106
if ( ${is_dirty} GREATER 0 )
107-
message ( FATAL_ERROR "Released package should be built from a clean tree" )
107+
message ( FATAL_ERROR "Release package must be built from a clean tree" )
108108
endif ()
109109
if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
110-
message ( FATAL_ERROR "Released package should not be built from a debug build" )
110+
message ( FATAL_ERROR "Release package can't be built from a debug build" )
111111
endif ()
112112
endif ( )
113113
set ( CPACK_PACKAGE_VENDOR "The OpenXcom project" )
114114
set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt" )
115115
if ( NOT APPLE )
116116
set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING" )
117117
endif ()
118-
set ( CPACK_PACKAGE_CONTACT "The OpenXcom project(http://www.openxcom.org)" )
118+
set ( CPACK_PACKAGE_CONTACT "The OpenXcom project (http://www.openxcom.org)" )
119119
include ( deb )
120120
include ( rpm )
121121
include ( nsis )
@@ -126,4 +126,4 @@ if ( BUILD_PACKAGE )
126126
endif()
127127

128128
add_subdirectory ( docs )
129-
add_subdirectory ( src )
129+
add_subdirectory ( src )

‎README.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,11 @@ The source code includes files for the following tools:
150150
- Microsoft Visual C++ 2010.
151151
- Microsoft Visual C++ 2008.
152152
- XCode (check the forum).
153+
- Makefile.
153154
- CMake.
154155
- Autotools.
155156

156157
It's also been tested on a variety of other tools on
157158
Windows/Mac/Linux. More detailed compiling instructions
158159
and pre-compiled dependencies are available at:
159-
http://ufopaedia.org/index.php?title=Compiling_(OpenXcom)
160+
http://ufopaedia.org/index.php?title=Compiling_(OpenXcom)

‎cmake/modules/NSIS.template.in‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -610,24 +610,24 @@ Section "-Core installation"
610610
${DirState} $UFODIR $R1
611611
IntCmp $R1 -1 ufo_no
612612

613-
CreateDirectory "$INSTDIR\bin\DATA\GEODATA"
614-
CopyFiles /SILENT "$UFODIR\GEODATA\*.*" "$INSTDIR\bin\DATA\GEODATA"
615-
CreateDirectory "$INSTDIR\bin\DATA\GEOGRAPH"
616-
CopyFiles /SILENT "$UFODIR\GEOGRAPH\*.*" "$INSTDIR\bin\DATA\GEOGRAPH"
617-
CreateDirectory "$INSTDIR\bin\DATA\MAPS"
618-
CopyFiles /SILENT "$UFODIR\MAPS\*.*" "$INSTDIR\bin\DATA\MAPS"
619-
CreateDirectory "$INSTDIR\bin\DATA\ROUTES"
620-
CopyFiles /SILENT "$UFODIR\ROUTES\*.*" "$INSTDIR\bin\DATA\ROUTES"
621-
CreateDirectory "$INSTDIR\bin\DATA\SOUND"
622-
CopyFiles /SILENT "$UFODIR\SOUND\*.*" "$INSTDIR\bin\DATA\SOUND"
623-
CreateDirectory "$INSTDIR\bin\DATA\TERRAIN"
624-
CopyFiles /SILENT "$UFODIR\TERRAIN\*.*" "$INSTDIR\bin\DATA\TERRAIN"
625-
CreateDirectory "$INSTDIR\bin\DATA\UFOGRAPH"
626-
CopyFiles /SILENT "$UFODIR\UFOGRAPH\*.*" "$INSTDIR\bin\DATA\UFOGRAPH"
627-
CreateDirectory "$INSTDIR\bin\DATA\UFOINTRO"
628-
CopyFiles /SILENT "$UFODIR\UFOINTRO\*.*" "$INSTDIR\bin\DATA\UFOINTRO"
629-
CreateDirectory "$INSTDIR\bin\DATA\UNITS"
630-
CopyFiles /SILENT "$UFODIR\UNITS\*.*" "$INSTDIR\bin\DATA\UNITS"
613+
CreateDirectory "$INSTDIR\bin\data\GEODATA"
614+
CopyFiles /SILENT "$UFODIR\GEODATA\*.*" "$INSTDIR\bin\data\GEODATA"
615+
CreateDirectory "$INSTDIR\bin\data\GEOGRAPH"
616+
CopyFiles /SILENT "$UFODIR\GEOGRAPH\*.*" "$INSTDIR\bin\data\GEOGRAPH"
617+
CreateDirectory "$INSTDIR\bin\data\MAPS"
618+
CopyFiles /SILENT "$UFODIR\MAPS\*.*" "$INSTDIR\bin\data\MAPS"
619+
CreateDirectory "$INSTDIR\bin\data\ROUTES"
620+
CopyFiles /SILENT "$UFODIR\ROUTES\*.*" "$INSTDIR\bin\data\ROUTES"
621+
CreateDirectory "$INSTDIR\bin\data\SOUND"
622+
CopyFiles /SILENT "$UFODIR\SOUND\*.*" "$INSTDIR\bin\data\SOUND"
623+
CreateDirectory "$INSTDIR\bin\data\TERRAIN"
624+
CopyFiles /SILENT "$UFODIR\TERRAIN\*.*" "$INSTDIR\bin\data\TERRAIN"
625+
CreateDirectory "$INSTDIR\bin\data\UFOGRAPH"
626+
CopyFiles /SILENT "$UFODIR\UFOGRAPH\*.*" "$INSTDIR\bin\data\UFOGRAPH"
627+
CreateDirectory "$INSTDIR\bin\data\UFOINTRO"
628+
CopyFiles /SILENT "$UFODIR\UFOINTRO\*.*" "$INSTDIR\bin\data\UFOINTRO"
629+
CreateDirectory "$INSTDIR\bin\data\UNITS"
630+
CopyFiles /SILENT "$UFODIR\UNITS\*.*" "$INSTDIR\bin\data\UNITS"
631631

632632
ufo_no:
633633

@@ -811,15 +811,15 @@ Section "Uninstall"
811811

812812
@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
813813

814-
RMDir /r "$INSTDIR\bin\DATA\GEODATA"
815-
RMDir /r "$INSTDIR\bin\DATA\GEOGRAPH"
816-
RMDir /r "$INSTDIR\bin\DATA\MAPS"
817-
RMDir /r "$INSTDIR\bin\DATA\ROUTES"
818-
RMDir /r "$INSTDIR\bin\DATA\SOUND"
819-
RMDir /r "$INSTDIR\bin\DATA\TERRAIN"
820-
RMDir /r "$INSTDIR\bin\DATA\UFOGRAPH"
821-
RMDir /r "$INSTDIR\bin\DATA\UFOINTRO"
822-
RMDir /r "$INSTDIR\bin\DATA\UNITS"
814+
RMDir /r "$INSTDIR\bin\data\GEODATA"
815+
RMDir /r "$INSTDIR\bin\data\GEOGRAPH"
816+
RMDir /r "$INSTDIR\bin\data\MAPS"
817+
RMDir /r "$INSTDIR\bin\data\ROUTES"
818+
RMDir /r "$INSTDIR\bin\data\SOUND"
819+
RMDir /r "$INSTDIR\bin\data\TERRAIN"
820+
RMDir /r "$INSTDIR\bin\data\UFOGRAPH"
821+
RMDir /r "$INSTDIR\bin\data\UFOINTRO"
822+
RMDir /r "$INSTDIR\bin\data\UNITS"
823823

824824
;Remove files we installed.
825825
;Keep the list of directories here in sync with the File commands above.

‎cmake/modules/deb.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option ( DEBIAN_DEPENDENCYS "Create RPM with dependencies rules for Debian" OFF )
1+
option ( DEBIAN_DEPENDENCYS "Create RPM with dependency rules for Debian" OFF )
22
set ( CPACK_DEBIAN_PACKAGE_MAINTAINER "The OpenXcom project" )
33
if ( DEBIAN_DEPENDENCYS )
44
set ( CPACK_DEBIAN_PACKAGE_DEPENDS "libsdl1.2 (>= 1.2.14-6.1), libsdl-gfx1.2 (>= 2.0.20), libsdl-mixer1.2 (>= 1.2.8)")

‎cmake/modules/nsis.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
# NSIS specific option for CPack
22
set ( CPACK_NSIS_MODIFY_PATH OFF )
33
set ( CPACK_NSIS_DISPLAY_NAME "OpenXcom" )
4-
set ( CPACK_NSIS_MODIFY_PATH OFF )

‎cmake/modules/rpm.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option ( FEDORA_DEPENDENCYS "Create RPM with dependencies rules for Fedora" OFF )
1+
option ( FEDORA_DEPENDENCYS "Create RPM with dependency rules for Fedora" OFF )
22
if ( FEDORA_DEPENDENCYS )
33
set ( CPACK_RPM_PACKAGE_REQUIRES "SDL >= 1.2.14, SDL_gfx >= 2.0.22, SDL_mixer >= 1.2.11" )
44
endif ()

0 commit comments

Comments
 (0)