diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /devtools | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'devtools')
89 files changed, 84 insertions, 349 deletions
diff --git a/devtools/construct-pred-dict.pl b/devtools/construct-pred-dict.pl index a092429ff6..73feeba893 100755 --- a/devtools/construct-pred-dict.pl +++ b/devtools/construct-pred-dict.pl @@ -20,9 +20,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ -# # This script constructs dictionary for use with predictive input # diff --git a/devtools/convbdf.c b/devtools/convbdf.c index fc13cff6ce..4b1640dba7 100644 --- a/devtools/convbdf.c +++ b/devtools/convbdf.c @@ -27,9 +27,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include <stdarg.h> #include <stdio.h> diff --git a/devtools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp index 9ea2da380a..20b60ab05f 100644 --- a/devtools/create_drascula/create_drascula.cpp +++ b/devtools/create_drascula/create_drascula.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Drascula in a separate * data file, used by the game engine */ diff --git a/devtools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h index 13903e9564..754050c172 100644 --- a/devtools/create_drascula/create_drascula.h +++ b/devtools/create_drascula/create_drascula.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_DRASCULA_H diff --git a/devtools/create_drascula/module.mk b/devtools/create_drascula/module.mk index b5a32d8d00..bbc2f7bce0 100644 --- a/devtools/create_drascula/module.mk +++ b/devtools/create_drascula/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_drascula diff --git a/devtools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h index f45af487b1..21b9a82622 100644 --- a/devtools/create_drascula/staticdata.h +++ b/devtools/create_drascula/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICDATA_H diff --git a/devtools/create_hugo/create_hugo.cpp b/devtools/create_hugo/create_hugo.cpp index 1dffa0edf1..e54ade2b28 100644 --- a/devtools/create_hugo/create_hugo.cpp +++ b/devtools/create_hugo/create_hugo.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Hugo in a separate * data file, used by the game engine */ diff --git a/devtools/create_hugo/create_hugo.h b/devtools/create_hugo/create_hugo.h index f30c186877..e176dbb195 100644 --- a/devtools/create_hugo/create_hugo.h +++ b/devtools/create_hugo/create_hugo.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_HUGO_H @@ -147,7 +144,7 @@ struct act1 { // Type 1 - Start an object cycle_t cycle; // Direction to start cycling }; -struct act2 { // Type 2 - Initialise an object coords +struct act2 { // Type 2 - Initialize an object coords byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number @@ -171,21 +168,21 @@ struct act4 { // Type 4 - Set new backgrou long newBkgColor; // New color }; -struct act5 { // Type 5 - Initialise an object velocity +struct act5 { // Type 5 - Initialize an object velocity byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number int vx, vy; // velocity }; -struct act6 { // Type 6 - Initialise an object carrying +struct act6 { // Type 6 - Initialize an object carrying byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number bool carriedFl; // carrying }; -struct act7 { // Type 7 - Initialise an object to hero's coords +struct act7 { // Type 7 - Initialize an object to hero's coords byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number @@ -197,14 +194,14 @@ struct act8 { // Type 8 - switch to new sc int screenIndex; // The new screen number }; -struct act9 { // Type 9 - Initialise an object state +struct act9 { // Type 9 - Initialize an object state byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number byte newState; // New state }; -struct act10 { // Type 10 - Initialise an object path type +struct act10 { // Type 10 - Initialize an object path type byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number @@ -293,7 +290,7 @@ struct act21 { // Type 21 - Gameover. Disa int timer; // Time to set off the action }; -struct act22 { // Type 22 - Initialise an object to hero's coords +struct act22 { // Type 22 - Initialize an object to hero's coords byte actType; // The type of action int timer; // Time to set off the action int objNumb; // The object number diff --git a/devtools/create_hugo/enums.h b/devtools/create_hugo/enums.h index 90cb1d54f3..f721c3d4f5 100644 --- a/devtools/create_hugo/enums.h +++ b/devtools/create_hugo/enums.h @@ -1376,7 +1376,7 @@ enum action_t { // Parameters: INIT_MAZE = 30, // 30 - Start special maze hotspot processing EXIT_MAZE = 31, // 31 - Exit special maze processing INIT_PRIORITY = 32, // 32 - Initialize fbg field - INIT_SCREEN = 33, // 33 - Initialise screen field of object + INIT_SCREEN = 33, // 33 - Initialize screen field of object AGSCHEDULE = 34, // 34 - Global schedule - lasts over new screen REMAPPAL = 35, // 35 - Remappe palette - palette index, color COND_NOUN = 36, // 36 - Conditional on noun appearing in line diff --git a/devtools/create_hugo/staticdata.h b/devtools/create_hugo/staticdata.h index c12191c11d..582d5aaa8e 100644 --- a/devtools/create_hugo/staticdata.h +++ b/devtools/create_hugo/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticdisplay.h b/devtools/create_hugo/staticdisplay.h index 790bf74d3b..03800017b5 100644 --- a/devtools/create_hugo/staticdisplay.h +++ b/devtools/create_hugo/staticdisplay.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticengine.h b/devtools/create_hugo/staticengine.h index 362100b8f0..0091182c3c 100644 --- a/devtools/create_hugo/staticengine.h +++ b/devtools/create_hugo/staticengine.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticfont.h b/devtools/create_hugo/staticfont.h index c5700cdf58..9fa87d194a 100644 --- a/devtools/create_hugo/staticfont.h +++ b/devtools/create_hugo/staticfont.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICFONT_H diff --git a/devtools/create_hugo/staticintro.h b/devtools/create_hugo/staticintro.h index 2fe18b8231..d9880b707c 100644 --- a/devtools/create_hugo/staticintro.h +++ b/devtools/create_hugo/staticintro.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticmouse.h b/devtools/create_hugo/staticmouse.h index 2d4987a30c..b4d784210b 100644 --- a/devtools/create_hugo/staticmouse.h +++ b/devtools/create_hugo/staticmouse.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticparser.h b/devtools/create_hugo/staticparser.h index 9e67e98c26..a2e28c1790 100644 --- a/devtools/create_hugo/staticparser.h +++ b/devtools/create_hugo/staticparser.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_hugo/staticutil.h b/devtools/create_hugo/staticutil.h index 050655a4de..9003788ec9 100644 --- a/devtools/create_hugo/staticutil.h +++ b/devtools/create_hugo/staticutil.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ /* diff --git a/devtools/create_kyradat/create_kyradat.cpp b/devtools/create_kyradat/create_kyradat.cpp index 7a4b8d73a1..6a8e6a0fbe 100644 --- a/devtools/create_kyradat/create_kyradat.cpp +++ b/devtools/create_kyradat/create_kyradat.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/create_kyradat.h b/devtools/create_kyradat/create_kyradat.h index d82e16fed0..22a6db4b39 100644 --- a/devtools/create_kyradat/create_kyradat.h +++ b/devtools/create_kyradat/create_kyradat.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_CREATE_KYRADAT_H diff --git a/devtools/create_kyradat/extract.cpp b/devtools/create_kyradat/extract.cpp index 6b801d14f9..2b6499d3fb 100644 --- a/devtools/create_kyradat/extract.cpp +++ b/devtools/create_kyradat/extract.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/extract.h b/devtools/create_kyradat/extract.h index 0903852dd2..fc473b33d1 100644 --- a/devtools/create_kyradat/extract.h +++ b/devtools/create_kyradat/extract.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_EXTRACT_H diff --git a/devtools/create_kyradat/games.cpp b/devtools/create_kyradat/games.cpp index 75a956cab0..f65ff14e1e 100644 --- a/devtools/create_kyradat/games.cpp +++ b/devtools/create_kyradat/games.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/md5.cpp b/devtools/create_kyradat/md5.cpp index 214b5ef7ed..9f90122981 100644 --- a/devtools/create_kyradat/md5.cpp +++ b/devtools/create_kyradat/md5.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/md5.h b/devtools/create_kyradat/md5.h index dd50efece8..3746521002 100644 --- a/devtools/create_kyradat/md5.h +++ b/devtools/create_kyradat/md5.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef COMMON_MD5_H diff --git a/devtools/create_kyradat/module.mk b/devtools/create_kyradat/module.mk index 60cd1f8578..fb458b43ff 100644 --- a/devtools/create_kyradat/module.mk +++ b/devtools/create_kyradat/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_kyradat diff --git a/devtools/create_kyradat/pak.cpp b/devtools/create_kyradat/pak.cpp index 4179f42df0..0203285a8f 100644 --- a/devtools/create_kyradat/pak.cpp +++ b/devtools/create_kyradat/pak.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/pak.h b/devtools/create_kyradat/pak.h index ee6dabb672..cf415676dd 100644 --- a/devtools/create_kyradat/pak.h +++ b/devtools/create_kyradat/pak.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef KYRA_PAK_H diff --git a/devtools/create_kyradat/search.cpp b/devtools/create_kyradat/search.cpp index 28631fa652..36b59d948c 100644 --- a/devtools/create_kyradat/search.cpp +++ b/devtools/create_kyradat/search.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/search.h b/devtools/create_kyradat/search.h index 6459606ef8..bd6aa0355b 100644 --- a/devtools/create_kyradat/search.h +++ b/devtools/create_kyradat/search.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SEARCH_H diff --git a/devtools/create_kyradat/tables.cpp b/devtools/create_kyradat/tables.cpp index 777f237650..090b32debc 100644 --- a/devtools/create_kyradat/tables.cpp +++ b/devtools/create_kyradat/tables.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/tables.h b/devtools/create_kyradat/tables.h index c990043f5d..b9687a5949 100644 --- a/devtools/create_kyradat/tables.h +++ b/devtools/create_kyradat/tables.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_KYRADAT_TABLES_H diff --git a/devtools/create_kyradat/util.cpp b/devtools/create_kyradat/util.cpp index 702a36bc0e..3b9f621949 100644 --- a/devtools/create_kyradat/util.cpp +++ b/devtools/create_kyradat/util.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_kyradat/util.h b/devtools/create_kyradat/util.h index 077597ac07..0d8e15cc37 100644 --- a/devtools/create_kyradat/util.h +++ b/devtools/create_kyradat/util.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef UTIL_H diff --git a/devtools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp index 4964b26903..c53a6bf81d 100644 --- a/devtools/create_lure/create_lure_dat.cpp +++ b/devtools/create_lure/create_lure_dat.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for extracting needed resource data from different language * version of the Lure of the Temptress lure.exe executable files into a new file * lure.dat - this file is required for the ScummVM Lure of the Temptress module @@ -1923,7 +1920,7 @@ bool validate_executable() { dataSegment = 0xAD20; printf("Detected Spanish version\n"); } else { - printf("Lure executable version not recognised. Checksum = %xh\n", sumTotal); + printf("Lure executable version not recognized. Checksum = %xh\n", sumTotal); return false; } diff --git a/devtools/create_lure/create_lure_dat.h b/devtools/create_lure/create_lure_dat.h index 23090072bd..9259a8dcc8 100644 --- a/devtools/create_lure/create_lure_dat.h +++ b/devtools/create_lure/create_lure_dat.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_LURE_DAT_H diff --git a/devtools/create_lure/module.mk b/devtools/create_lure/module.mk index 5d8192cb7a..410cd26ba3 100644 --- a/devtools/create_lure/module.mk +++ b/devtools/create_lure/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_lure diff --git a/devtools/create_lure/process_actions.cpp b/devtools/create_lure/process_actions.cpp index 30e7eed9e4..8539391d57 100644 --- a/devtools/create_lure/process_actions.cpp +++ b/devtools/create_lure/process_actions.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_mads/main.cpp b/devtools/create_mads/main.cpp index 26ae2a7558..c5cd6d5b2e 100644 --- a/devtools/create_mads/main.cpp +++ b/devtools/create_mads/main.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW diff --git a/devtools/create_mads/module.mk b/devtools/create_mads/module.mk index c773da8366..20d8deb8af 100644 --- a/devtools/create_mads/module.mk +++ b/devtools/create_mads/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_mads diff --git a/devtools/create_mads/parser.cpp b/devtools/create_mads/parser.cpp index c37b3a7a80..0c6df43046 100644 --- a/devtools/create_mads/parser.cpp +++ b/devtools/create_mads/parser.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include <stdio.h> @@ -240,10 +237,10 @@ void close_source_file() { } /** - * Initialises the scanner + * Initializes the scanner */ void init_scanner(const char *name) { - // Initialise character table + // Initialize character table for (int i = 0; i < 256; ++i) char_table[i] = SPECIAL; for (int i = '0'; i <= '9'; ++i) char_table[i] = DIGIT; for (int i = 'A'; i <= 'Z'; ++i) char_table[i] = LETTER; @@ -268,7 +265,7 @@ void quit_scanner() { /** - * Initialises the output + * Initializes the output */ void init_output(const char *destFilename) { dest_file = fopen(destFilename, "wb"); diff --git a/devtools/create_mads/parser.h b/devtools/create_mads/parser.h index d404e8395f..a7141c497a 100644 --- a/devtools/create_mads/parser.h +++ b/devtools/create_mads/parser.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_MADS_PARSER diff --git a/devtools/create_project/codeblocks.cpp b/devtools/create_project/codeblocks.cpp index 8ca139e515..e73dc11089 100644 --- a/devtools/create_project/codeblocks.cpp +++ b/devtools/create_project/codeblocks.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/codeblocks.h b/devtools/create_project/codeblocks.h index ba75daeafd..8d35eb068e 100644 --- a/devtools/create_project/codeblocks.h +++ b/devtools/create_project/codeblocks.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_CODEBLOCKS_H diff --git a/devtools/create_project/config.h b/devtools/create_project/config.h index 1609e9e99a..fecd95691e 100644 --- a/devtools/create_project/config.h +++ b/devtools/create_project/config.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_CONFIG_H diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index de82dd1698..17b3d29d0b 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW @@ -639,7 +636,7 @@ bool setEngineBuildState(const std::string &name, EngineDescList &engines, bool if (engine != engines.end()) { engine->enable = enable; - // When we disable an einge, we also need to disable all the sub engines. + // When we disable an engine, we also need to disable all the sub engines. if (!enable && !engine->subEngines.empty()) { for (StringList::const_iterator j = engine->subEngines.begin(); j != engine->subEngines.end(); ++j) { EngineDescList::iterator subEngine = std::find(engines.begin(), engines.end(), *j); @@ -741,7 +738,6 @@ const Feature s_features[] = { { "mt32emu", "USE_MT32EMU", "", true, "integrated MT-32 emulator" }, { "nasm", "USE_NASM", "", true, "IA-32 assembly support" }, // This feature is special in the regard, that it needs additional handling. { "opengl", "USE_OPENGL", "opengl32", true, "OpenGL support" }, - { "indeo3", "USE_INDEO3", "", true, "Indeo3 codec support"}, { "translation", "USE_TRANSLATION", "", true, "Translation support" }, { "vkeybd", "ENABLE_VKEYBD", "", false, "Virtual keyboard support"}, { "langdetect", "USE_DETECTLANG", "", true, "System language detection support" } // This feature actually depends on "translation", there diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index e4ccd7313a..9b9e4cfd1b 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_H diff --git a/devtools/create_project/module.mk b/devtools/create_project/module.mk index 4382fe176c..4238452c5d 100644 --- a/devtools/create_project/module.mk +++ b/devtools/create_project/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_project diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index f9a2e936f0..f8ce80acfd 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/msbuild.h b/devtools/create_project/msbuild.h index 98bb65e19b..681c893d95 100644 --- a/devtools/create_project/msbuild.h +++ b/devtools/create_project/msbuild.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_MSBUILD_H diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp index af3aa4a519..aa347b1081 100644 --- a/devtools/create_project/msvc.cpp +++ b/devtools/create_project/msvc.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/msvc.h b/devtools/create_project/msvc.h index 6c8ac33a76..ead4bf949a 100644 --- a/devtools/create_project/msvc.h +++ b/devtools/create_project/msvc.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_MSVC_H diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs index 6bcd794bef..d752355acd 100644 --- a/devtools/create_project/scripts/installer.vbs +++ b/devtools/create_project/scripts/installer.vbs @@ -73,7 +73,7 @@ Sub CreateInstaller() Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _ " /Dtop_srcdir=""" & rootFolder & """" & _ " /Dbuild_dir=""" & targetFolder & """" & _ - " /Dtext_dir=""" & targetFolder & """" & _ + " /Dtext_dir=""" & rootFolder & """" & _ " /DARCH=""" & arch & """" & _ " """ & rootFolder & "\dists\nsis\scummvm.nsi""" diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index e78861463a..a5051d8228 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -23,29 +23,30 @@ if "%~5"=="" goto error_installer echo Copying data files
echo.
-xcopy /F /Y "%~1/AUTHORS" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING.GPL" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYING.LGPL" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/COPYRIGHT" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/NEWS" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/README" %~2 > NUL 2>&1
-
-xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/gui/themes/*.zip" %~2 > NUL 2>&1
-xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 > NUL 2>&1
-xcopy /F /Y "%~4/lib/%~3/SDL.dll" %~2 > NUL 2>&1
-xcopy /F /Y "%~4/README-SDL" %~2 > NUL 2>&1
-
-xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" %~2 > NUL 2>&1
+REM xcopy /F /Y "%~1/AUTHORS" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING.GPL" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYING.LGPL" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/COPYRIGHT" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/NEWS" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/README" %~2 1>NUL 2>&1
+
+REM xcopy /F /Y "%~1/dists/engine-data/*.dat" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/dists/engine-data/*.tbl" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/dists/engine-data/*.cpt" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/gui/themes/*.zip" %~2 1>NUL 2>&1
+REM xcopy /F /Y "%~1/gui/themes/translations.dat" %~2 1>NUL 2>&1
+
+xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1
+xcopy /F /Y "%~4/README-SDL" "%~2" 1>NUL 2>&1
+
+xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1
if "%~5"=="0" goto done
echo Running installer script
echo.
-@call cscript "%~1/devtools/create_project/scripts/installer.vbs" %~1 %~2 %~3 1>NUL
+@call cscript "%~1/devtools/create_project/scripts/installer.vbs" "%~1" "%~2" "%~3" 1>NUL
if not %errorlevel% == 0 goto error_script
goto done
diff --git a/devtools/create_project/scripts/prebuild.cmd b/devtools/create_project/scripts/prebuild.cmd index dd4d12a851..fbab426137 100644 --- a/devtools/create_project/scripts/prebuild.cmd +++ b/devtools/create_project/scripts/prebuild.cmd @@ -14,7 +14,7 @@ if "%~1"=="" goto error_root if "%~2"=="" goto error_target
REM Run the revision script
-@call cscript "%~1/devtools/create_project/scripts/revision.vbs" %~1 %~2 1>NUL
+@call cscript "%~1/devtools/create_project/scripts/revision.vbs" "%~1" "%~2" 1>NUL
if not %errorlevel% == 0 goto error_script
goto done
diff --git a/devtools/create_project/scripts/revision.vbs b/devtools/create_project/scripts/revision.vbs index 3e1212521c..e6fef57030 100644 --- a/devtools/create_project/scripts/revision.vbs +++ b/devtools/create_project/scripts/revision.vbs @@ -80,6 +80,7 @@ Sub DetermineRevision() If Not DetermineGitVersion() Then If Not DetermineHgVersion() Then Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..." + OutputRevisionHeader "" Exit Sub End If End If @@ -91,6 +92,7 @@ Sub DetermineRevision() If Not DetermineTortoiseSVNVersion() Then If Not DetermineSVNVersion() Then Wscript.StdErr.WriteLine "Could not determine the current revision, skipping..." + OutputRevisionHeader "" Exit Sub End If End If @@ -121,9 +123,13 @@ Sub DetermineRevision() Wscript.StdErr.WriteLine outputInfo & vbCrLf - ' Output revision header file + OutputRevisionHeader revisionString +End Sub + +' Output revision header file +Sub OutputRevisionHeader(str) FSO.CopyFile rootFolder & "\\base\\internal_revision.h.in", targetFolder & "\\internal_revision.h" - FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", revisionString + FindReplaceInFile targetFolder & "\\internal_revision.h", "@REVISION@", str End Sub Function DetermineTortoiseSVNVersion() diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 8642f071ff..4fadfd2509 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "config.h" diff --git a/devtools/create_project/visualstudio.h b/devtools/create_project/visualstudio.h index 0e4b441e63..dad923e49c 100644 --- a/devtools/create_project/visualstudio.h +++ b/devtools/create_project/visualstudio.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef TOOLS_CREATE_PROJECT_VISUALSTUDIO_H diff --git a/devtools/create_teenagent/create_teenagent.cpp b/devtools/create_teenagent/create_teenagent.cpp index 9a9c00d4b4..9551acbaea 100644 --- a/devtools/create_teenagent/create_teenagent.cpp +++ b/devtools/create_teenagent/create_teenagent.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_teenagent/md5.cpp b/devtools/create_teenagent/md5.cpp index 214b5ef7ed..9f90122981 100644 --- a/devtools/create_teenagent/md5.cpp +++ b/devtools/create_teenagent/md5.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // Disable symbol overrides so that we can use system headers. diff --git a/devtools/create_teenagent/md5.h b/devtools/create_teenagent/md5.h index dd50efece8..3746521002 100644 --- a/devtools/create_teenagent/md5.h +++ b/devtools/create_teenagent/md5.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef COMMON_MD5_H diff --git a/devtools/create_teenagent/module.mk b/devtools/create_teenagent/module.mk index 5c9b876140..a9d102addb 100644 --- a/devtools/create_teenagent/module.mk +++ b/devtools/create_teenagent/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_teenagent diff --git a/devtools/create_teenagent/util.h b/devtools/create_teenagent/util.h index 077597ac07..0d8e15cc37 100644 --- a/devtools/create_teenagent/util.h +++ b/devtools/create_teenagent/util.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef UTIL_H diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp index 3cf252cbcd..bdd57be7df 100644 --- a/devtools/create_toon/create_toon.cpp +++ b/devtools/create_toon/create_toon.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * * This is a utility for storing all the hardcoded data of Toonstruck in a separate * data file, used by the game engine */ diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h index 0695944b17..60b33013f4 100644 --- a/devtools/create_toon/create_toon.h +++ b/devtools/create_toon/create_toon.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef CREATE_TOON_H diff --git a/devtools/create_toon/staticdata.h b/devtools/create_toon/staticdata.h index efcb893024..2164512337 100644 --- a/devtools/create_toon/staticdata.h +++ b/devtools/create_toon/staticdata.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef STATICDATA_H diff --git a/devtools/credits.pl b/devtools/credits.pl index c45f16eec9..b0f40cbe6e 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -5,10 +5,9 @@ # of the credits in other places from this source. In particular: # - The AUTHORS file # - The gui/credits.h header file +# - The Credits.rtf file used by the Mac OS X port # - The credits.xml file, part of the DocBook manual # - Finally, credits.xml, for use on the website (different format than the DocBook one) -# And maybe in the future, also "doc/10.tex", the LaTeX version of the README. -# Although that might soon be obsolete, if the manual evolves enough. # # Initial version written by Fingolfin in December 2004. # @@ -37,7 +36,6 @@ if ($#ARGV >= 0) { $mode = "CPP" if ($ARGV[0] eq "--cpp"); # credits.h (for use by about.cpp) $mode = "XML-DOC" if ($ARGV[0] eq "--xml-docbook"); # credits.xml (DocBook) $mode = "RTF" if ($ARGV[0] eq "--rtf"); # Credits.rtf (Mac OS X About box) - $mode = "TEX" if ($ARGV[0] eq "--tex"); # 10.tex (LaTeX) } if ($mode eq "") { @@ -184,10 +182,6 @@ sub begin_credits { if ($mode eq "TEXT") { #print html_entities_to_ascii($title)."\n"; - } elsif ($mode eq "TEX") { - print "% This file was generated by credits.pl. Do not edit by hand!\n"; - print '\section{Credits}' . "\n"; - print '\begin{trivlist}' . "\n"; } elsif ($mode eq "RTF") { print '{\rtf1\mac\ansicpg10000' . "\n"; print '{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}' . "\n"; @@ -219,9 +213,6 @@ sub begin_credits { sub end_credits { if ($mode eq "TEXT") { - } elsif ($mode eq "TEX") { - print '\end{trivlist}' . "\n"; - print "\n"; } elsif ($mode eq "RTF") { print "}\n"; } elsif ($mode eq "CPP") { @@ -252,15 +243,6 @@ sub begin_section { } elsif ($section_level eq 1) { print " " x $section_level . "-" x (length $title)."\n"; } - } elsif ($mode eq "TEX") { - print '\item \textbf{'; - if ($section_level eq 0) { - print '\LARGE'; - } elsif ($section_level eq 1) { - print '\large'; - } - print " " . html_entities_to_tex($title) . "}\n"; - print '\begin{list}{}{\setlength{\leftmargin}{0.2cm}}' . "\n"; } elsif ($mode eq "RTF") { $title = html_entities_to_rtf($title); @@ -327,8 +309,6 @@ sub end_section { if ($mode eq "TEXT") { # nothing - } elsif ($mode eq "TEX") { - print '\end{list}' . "\n"; } elsif ($mode eq "RTF") { # nothing } elsif ($mode eq "CPP") { @@ -352,16 +332,12 @@ sub begin_persons { print "\t\t\t<group>\n"; print "\t\t\t\t<name>" . $title . "</name>\n"; #print "\t\t\t\t<persons>\n"; - } elsif ($mode eq "TEX") { - print '\item \begin{tabular}[h]{p{0.3\linewidth}p{0.6\linewidth}}' . "\n"; } } sub end_persons { if ($mode eq "TEXT") { print "\n"; - } elsif ($mode eq "TEX") { - print ' \end{tabular}' . "\n"; } elsif ($mode eq "RTF") { # nothing } elsif ($mode eq "XML-WEB") { @@ -392,12 +368,6 @@ sub add_person { print " - " . substr(wrap($multitab, $multitab, $desc), $inner_indent); } print "\n"; - } elsif ($mode eq "TEX") { - $name = $nick if $name eq ""; - $name = html_entities_to_tex($name); - $desc = html_entities_to_tex($desc); - - print " $name & \\textit{$desc}\\\\\n"; } elsif ($mode eq "RTF") { $name = $nick if $name eq ""; $name = html_entities_to_rtf($name); @@ -447,11 +417,6 @@ sub add_paragraph { $tab = " " x ($section_level * 2 + 1); print wrap($tab, $tab, html_entities_to_ascii($text))."\n"; print "\n"; - } elsif ($mode eq "TEX") { - $text = html_entities_to_tex($text); - print '\item' . "\n"; - print $text; - print "\n"; } elsif ($mode eq "RTF") { $text = html_entities_to_rtf($text); # Center text @@ -502,7 +467,7 @@ begin_credits("Credits"); add_person("Jonathan Gray", "khalek", "(retired)"); add_person("Vincent Hamm", "yaz0r", "(retired)"); add_person("Max Horn", "Fingolfin", ""); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Paweł Kołodziejski", "aquadran", "Codecs, iMUSE, Smush, etc."); add_person("Gregory Montoir", "cyx", ""); add_person("Eugene Sandulenko", "sev", "FT INSANE, MM NES, MM C64, game detection, Herc/CGA"); @@ -511,7 +476,7 @@ begin_credits("Credits"); begin_section("HE"); add_person("Jonathan Gray", "khalek", "(retired)"); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Gregory Montoir", "cyx", ""); add_person("Eugene Sandulenko", "sev", ""); end_section(); @@ -530,38 +495,12 @@ begin_credits("Credits"); begin_section("AGOS"); add_person("Torbjörn Andersson", "eriktorbjorn", ""); add_person("Paul Gilbert", "dreammaster", ""); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); add_person("Oliver Kiehl", "olki", "(retired)"); add_person("Ludvig Strigeus", "ludde", "(retired)"); end_section(); - begin_section("BASS"); # Beneath a Steel Sky - add_person("Robert Göffringmann", "lavosspawn", "(retired)"); - add_person("Oliver Kiehl", "olki", "(retired)"); - add_person("Joost Peters", "joostp", ""); - end_section(); - - begin_section("Broken Sword"); - add_person("Fabio Battaglia", "Hkz", "PSX version support"); - add_person("Thierry Crozat", "criezy", "Mac version support"); - add_person("Robert Göffringmann", "lavosspawn", "(retired)"); - end_section(); - - begin_section("Broken Sword II"); - add_person("Torbjörn Andersson", "eriktorbjorn", ""); - add_person("Fabio Battaglia", "Hkz", "PSX version support"); - add_person("Jonathan Gray", "khalek", "(retired)"); - end_section(); - - begin_section("Broken Sword 2.5"); - add_person("Eugene Sandulenko", "sev", ""); - add_person("Filippos Karapetis", "[md5]", ""); - add_person("Max Horn", "Fingolfin", ""); - add_person("Paul Gilbert", "dreammaster", ""); - add_person("Torbjörn Andersson", "eriktorbjorn", ""); - end_section(); - - begin_section("Cinematique evo 1"); + begin_section("Cine"); add_person("Vincent Hamm", "yaz0r", "(retired)"); add_person("Paweł Kołodziejski", "aquadran", ""); add_person("Gregory Montoir", "cyx", ""); @@ -569,7 +508,7 @@ begin_credits("Credits"); add_person("Eugene Sandulenko", "sev", ""); end_section(); - begin_section("Cinematique evo 2"); + begin_section("CruisE"); add_person("Paul Gilbert", "dreammaster", ""); add_person("Vincent Hamm", "yaz0r", "(retired)"); end_section(); @@ -584,12 +523,6 @@ begin_credits("Credits"); add_person("Paweł Kołodziejski", "aquadran", ""); end_section(); - begin_section("FOTAQ"); # Flight of the Amazon Queen - add_person("David Eriksson", "twogood", "(retired)"); - add_person("Gregory Montoir", "cyx", ""); - add_person("Joost Peters", "joostp", ""); - end_section(); - begin_section("Gob"); add_person("Torbjörn Andersson", "eriktorbjorn", ""); add_person("Arnaud Boutonné", "Strangerke", ""); @@ -617,7 +550,7 @@ begin_credits("Credits"); add_person("Johannes Schickel", "LordHoto", ""); end_section(); - begin_section("Last Express"); + begin_section("Lastexpress"); add_person("Matthew Hoops", "clone2727", ""); add_person("Jordi Vilalta Prat", "jvprat", ""); add_person("Julien Templier", "littleboy", ""); @@ -652,6 +585,12 @@ begin_credits("Credits"); add_person("", "peres", ""); end_section(); + begin_section("Queen"); + add_person("David Eriksson", "twogood", "(retired)"); + add_person("Gregory Montoir", "cyx", ""); + add_person("Joost Peters", "joostp", ""); + end_section(); + begin_section("SAGA"); add_person("Torbjörn Andersson", "eriktorbjorn", ""); add_person("Filippos Karapetis", "[md5]", ""); @@ -671,6 +610,32 @@ begin_credits("Credits"); add_person("Lars Skovlund", "lskovlun", ""); end_section(); + begin_section("Sky"); + add_person("Robert Göffringmann", "lavosspawn", "(retired)"); + add_person("Oliver Kiehl", "olki", "(retired)"); + add_person("Joost Peters", "joostp", ""); + end_section(); + + begin_section("Sword1"); + add_person("Fabio Battaglia", "Hkz", "PSX version support"); + add_person("Thierry Crozat", "criezy", "Mac version support"); + add_person("Robert Göffringmann", "lavosspawn", "(retired)"); + end_section(); + + begin_section("Sword2"); + add_person("Torbjörn Andersson", "eriktorbjorn", ""); + add_person("Fabio Battaglia", "Hkz", "PSX version support"); + add_person("Jonathan Gray", "khalek", "(retired)"); + end_section(); + + begin_section("Sword25"); + add_person("Eugene Sandulenko", "sev", ""); + add_person("Filippos Karapetis", "[md5]", ""); + add_person("Max Horn", "Fingolfin", ""); + add_person("Paul Gilbert", "dreammaster", ""); + add_person("Torbjörn Andersson", "eriktorbjorn", ""); + end_section(); + begin_section("TeenAgent"); add_person("Robert Megone", "sanguine", "Help with callback rewriting"); add_person("Vladimir Menshakov", "whoozle", ""); @@ -747,7 +712,8 @@ begin_credits("Credits"); begin_section("PocketPC / WinCE"); add_person("Nicolas Bacca", "arisme", "(retired)"); - add_person("Kostas Nakos", "Jubanka", ""); + add_person("Ismail Khatib", "CeRiAl", ""); + add_person("Kostas Nakos", "Jubanka", "(retired)"); end_section(); begin_section("PlayStation 2"); @@ -908,7 +874,7 @@ begin_credits("Credits"); end_section(); begin_section("Win32"); - add_person("Travis Howell", "Kirben", ""); + add_person("Travis Howell", "Kirben", "(retired)"); end_section(); begin_section("Win64"); diff --git a/devtools/dist-scummvm.sh b/devtools/dist-scummvm.sh index de76c9f6a9..ac411c55a3 100755 --- a/devtools/dist-scummvm.sh +++ b/devtools/dist-scummvm.sh @@ -23,8 +23,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ ### configuration diff --git a/devtools/extract-words-tok.pl b/devtools/extract-words-tok.pl index 9209d49eb5..1157ef557f 100755 --- a/devtools/extract-words-tok.pl +++ b/devtools/extract-words-tok.pl @@ -20,9 +20,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# $URL$ -# $Id$ -# # This script extracts AGI words.tok file # diff --git a/devtools/make-scumm-fontdata.c b/devtools/make-scumm-fontdata.c index 991d49831a..73b21846ec 100644 --- a/devtools/make-scumm-fontdata.c +++ b/devtools/make-scumm-fontdata.c @@ -18,8 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ */ #include <stdio.h> diff --git a/devtools/md5table.c b/devtools/md5table.c index 7d76b7541d..9e57edbc35 100644 --- a/devtools/md5table.c +++ b/devtools/md5table.c @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include <assert.h> diff --git a/devtools/module.mk b/devtools/module.mk index fdbc13f645..1ff5ba6da9 100644 --- a/devtools/module.mk +++ b/devtools/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools diff --git a/devtools/qtable/module.mk b/devtools/qtable/module.mk index 5aab9ad0c7..fbc18f2fe3 100644 --- a/devtools/qtable/module.mk +++ b/devtools/qtable/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/qtable diff --git a/devtools/sci/musicplayer.cpp b/devtools/sci/musicplayer.cpp index 139ce451ef..e4d0779848 100644 --- a/devtools/sci/musicplayer.cpp +++ b/devtools/sci/musicplayer.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifdef HAVE_CONFIG_H diff --git a/devtools/sci/scidisasm.cpp b/devtools/sci/scidisasm.cpp index 39ea7f9c41..9b212c208d 100644 --- a/devtools/sci/scidisasm.cpp +++ b/devtools/sci/scidisasm.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifdef HAVE_CONFIG_H diff --git a/devtools/sci/scipack.cpp b/devtools/sci/scipack.cpp index f70d91fabc..ff52e25061 100644 --- a/devtools/sci/scipack.cpp +++ b/devtools/sci/scipack.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include <stdio.h> diff --git a/devtools/sci/scitrace.asm b/devtools/sci/scitrace.asm index 360e0b7ffc..2e541326f2 100644 --- a/devtools/sci/scitrace.asm +++ b/devtools/sci/scitrace.asm @@ -18,9 +18,6 @@ ; along with this program; if not, write to the Free Software ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; -; $URL$ -; $Id$ -; ;--------------------------------------------------------------------------- ; ; SCITRACE diff --git a/devtools/skycpt/AsciiCptCompile.cpp b/devtools/skycpt/AsciiCptCompile.cpp index 1169de5aea..154c13b8cd 100644 --- a/devtools/skycpt/AsciiCptCompile.cpp +++ b/devtools/skycpt/AsciiCptCompile.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // HACK to allow building with the SDL backend on MinGW diff --git a/devtools/skycpt/KmpSearch.cpp b/devtools/skycpt/KmpSearch.cpp index b0512a8d3e..9551156295 100644 --- a/devtools/skycpt/KmpSearch.cpp +++ b/devtools/skycpt/KmpSearch.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/KmpSearch.h b/devtools/skycpt/KmpSearch.h index 6f13ace4a5..f39b993bd2 100644 --- a/devtools/skycpt/KmpSearch.h +++ b/devtools/skycpt/KmpSearch.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKYCPT_KMPSEARCH_H diff --git a/devtools/skycpt/TextFile.cpp b/devtools/skycpt/TextFile.cpp index ee64d22f5f..e9887dc87b 100644 --- a/devtools/skycpt/TextFile.cpp +++ b/devtools/skycpt/TextFile.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/TextFile.h b/devtools/skycpt/TextFile.h index a9ad65417c..6c390c050d 100644 --- a/devtools/skycpt/TextFile.h +++ b/devtools/skycpt/TextFile.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef SKYCPT_TEXTFILE_H diff --git a/devtools/skycpt/cptcompiler.cpp b/devtools/skycpt/cptcompiler.cpp index 7453b383b6..264646816c 100644 --- a/devtools/skycpt/cptcompiler.cpp +++ b/devtools/skycpt/cptcompiler.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/cpthelp.cpp b/devtools/skycpt/cpthelp.cpp index 134e440fd7..0780888097 100644 --- a/devtools/skycpt/cpthelp.cpp +++ b/devtools/skycpt/cpthelp.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/cpthelp.h b/devtools/skycpt/cpthelp.h index 722e756edf..71d760af3f 100644 --- a/devtools/skycpt/cpthelp.h +++ b/devtools/skycpt/cpthelp.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/idFinder.cpp b/devtools/skycpt/idFinder.cpp index 53c9f1f1a0..99e4378867 100644 --- a/devtools/skycpt/idFinder.cpp +++ b/devtools/skycpt/idFinder.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/module.mk b/devtools/skycpt/module.mk index 84a59cee9f..eaf1679ba8 100644 --- a/devtools/skycpt/module.mk +++ b/devtools/skycpt/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/skycpt diff --git a/devtools/skycpt/stdafx.cpp b/devtools/skycpt/stdafx.cpp index 8a5c78bc36..e91ca09470 100644 --- a/devtools/skycpt/stdafx.cpp +++ b/devtools/skycpt/stdafx.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "stdafx.h" diff --git a/devtools/skycpt/stdafx.h b/devtools/skycpt/stdafx.h index 3e5c6042eb..d4d389a2b6 100644 --- a/devtools/skycpt/stdafx.h +++ b/devtools/skycpt/stdafx.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ // stdafx.h : Includedatei für Standardsystem-Includedateien, diff --git a/devtools/themeparser.py b/devtools/themeparser.py index 993f7c79bc..a3524461a0 100644 --- a/devtools/themeparser.py +++ b/devtools/themeparser.py @@ -22,8 +22,6 @@ " along with this program; if not, write to the Free Software " Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. " - " $URL$ - " $Id$ """ from __future__ import with_statement |