diff options
Diffstat (limited to 'engines/sci/scicore')
-rw-r--r-- | engines/sci/scicore/decompress0.cpp | 2 | ||||
-rw-r--r-- | engines/sci/scicore/resource.cpp | 2 | ||||
-rw-r--r-- | engines/sci/scicore/resource_map.cpp | 48 | ||||
-rw-r--r-- | engines/sci/scicore/resource_patch.cpp | 2 | ||||
-rw-r--r-- | engines/sci/scicore/vocab.cpp | 6 |
5 files changed, 30 insertions, 30 deletions
diff --git a/engines/sci/scicore/decompress0.cpp b/engines/sci/scicore/decompress0.cpp index b7d9e4780a..3863bfa508 100644 --- a/engines/sci/scicore/decompress0.cpp +++ b/engines/sci/scicore/decompress0.cpp @@ -88,7 +88,7 @@ int decrypt1(uint8 *dest, uint8 *src, int length, int complength) { bytectr++; } - if (token == 0x101) + if (token == 0x101) return 0; // terminator if (token == 0x100) { // reset command maxtoken = 0x200; diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index d2305422c6..b1523f66b6 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -233,7 +233,7 @@ static void _scir_load_resource(ResourceManager *mgr, resource_t *res, bool prot // Get patch file name patch_sprintfers[mgr->sci_version](filename, res); - + // FIXME: Instead of using SearchMan, maybe we should only search // a single dir specified by this RESSOURCE_TYPE_DIRECTORY ResourceSource? } else diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp index 93129f193d..6406c60c98 100644 --- a/engines/sci/scicore/resource_map.cpp +++ b/engines/sci/scicore/resource_map.cpp @@ -46,46 +46,46 @@ namespace Sci { #define SCI01V_B3_RESFILE_SHIFT 4 #define SCI0_RESID_GET_TYPE(bytes) \ - (((bytes)[1] & SCI0_B1_RESTYPE_MASK) >> SCI0_B1_RESTYPE_SHIFT) + (((bytes)[1] & SCI0_B1_RESTYPE_MASK) >> SCI0_B1_RESTYPE_SHIFT) #define SCI0_RESID_GET_NUMBER(bytes) \ - ((((bytes)[1] & ~SCI0_B1_RESTYPE_MASK) << 8) | ((bytes)[0])) + ((((bytes)[1] & ~SCI0_B1_RESTYPE_MASK) << 8) | ((bytes)[0])) #define SCI0_RESFILE_GET_FILE(bytes) \ - (((bytes)[3] & SCI0_B3_RESFILE_MASK) >> SCI0_B3_RESFILE_SHIFT) + (((bytes)[3] & SCI0_B3_RESFILE_MASK) >> SCI0_B3_RESFILE_SHIFT) #define SCI0_RESFILE_GET_OFFSET(bytes) \ - ((((bytes)[3] & ~SCI0_B3_RESFILE_MASK) << 24) \ - | (((bytes)[2]) << 16) \ - | (((bytes)[1]) << 8) \ - | (((bytes)[0]) << 0)) + ((((bytes)[3] & ~SCI0_B3_RESFILE_MASK) << 24) \ + | (((bytes)[2]) << 16) \ + | (((bytes)[1]) << 8) \ + | (((bytes)[0]) << 0)) #define SCI01V_RESFILE_GET_FILE(bytes) \ - (((bytes)[3] & SCI01V_B3_RESFILE_MASK) >> SCI01V_B3_RESFILE_SHIFT) + (((bytes)[3] & SCI01V_B3_RESFILE_MASK) >> SCI01V_B3_RESFILE_SHIFT) #define SCI01V_RESFILE_GET_OFFSET(bytes) \ - ((((bytes)[3] & ~SCI01V_B3_RESFILE_MASK) << 24) \ - | (((bytes)[2]) << 16) \ - | (((bytes)[1]) << 8) \ - | (((bytes)[0]) << 0)) + ((((bytes)[3] & ~SCI01V_B3_RESFILE_MASK) << 24) \ + | (((bytes)[2]) << 16) \ + | (((bytes)[1]) << 8) \ + | (((bytes)[0]) << 0)) #define SCI1_B5_RESFILE_MASK 0xf0 #define SCI1_B5_RESFILE_SHIFT 4 #define SCI1_RESFILE_GET_FILE(bytes) \ - (((bytes)[5] & SCI1_B5_RESFILE_MASK) >> SCI1_B5_RESFILE_SHIFT) + (((bytes)[5] & SCI1_B5_RESFILE_MASK) >> SCI1_B5_RESFILE_SHIFT) #define SCI1_RESFILE_GET_OFFSET(bytes) \ - ((((bytes)[5] & ~SCI1_B5_RESFILE_MASK) << 24) \ - | (((bytes)[4]) << 16) \ - | (((bytes)[3]) << 8) \ - | (((bytes)[2]) << 0)) + ((((bytes)[5] & ~SCI1_B5_RESFILE_MASK) << 24) \ + | (((bytes)[4]) << 16) \ + | (((bytes)[3]) << 8) \ + | (((bytes)[2]) << 0)) #define SCI1_RESFILE_GET_NUMBER(bytes) \ - ((((bytes)[1]) << 8) \ - | (((bytes)[0]) << 0)) + ((((bytes)[1]) << 8) \ + | (((bytes)[0]) << 0)) #define SCI11_RESFILE_GET_OFFSET(bytes) \ - ((((bytes)[4]) << 17) \ - | (((bytes)[3]) << 9) \ - | (((bytes)[2]) << 1)) + ((((bytes)[4]) << 17) \ + | (((bytes)[3]) << 9) \ + | (((bytes)[2]) << 1)) static int detect_odd_sci01(Common::File &file) { byte buf[6]; @@ -119,7 +119,7 @@ static int detect_odd_sci01(Common::File &file) { } static int sci_res_read_entry(ResourceManager *mgr, ResourceSource *map, - byte *buf, resource_t *res, int sci_version) { + byte *buf, resource_t *res, int sci_version) { res->id = buf[0] | (buf[1] << 8); res->type = SCI0_RESID_GET_TYPE(buf); res->number = SCI0_RESID_GET_NUMBER(buf); @@ -372,7 +372,7 @@ static int sci10_or_11(int *types) { } int sci1_read_resource_map(ResourceManager *mgr, ResourceSource *map, ResourceSource *vol, - resource_t **resource_p, int *resource_nr_p, int *sci_version) { + resource_t **resource_p, int *resource_nr_p, int *sci_version) { int fsize; Common::File file; resource_t *resources, *resource_start; diff --git a/engines/sci/scicore/resource_patch.cpp b/engines/sci/scicore/resource_patch.cpp index 7681d009c7..8545987d8f 100644 --- a/engines/sci/scicore/resource_patch.cpp +++ b/engines/sci/scicore/resource_patch.cpp @@ -41,7 +41,7 @@ void sci1_sprintf_patch_file_name(char *string, resource_t *res) { // version-agnostic patch application static void process_patch(ResourceSource *source, - Common::ArchiveMember &member, int restype, int resnumber, resource_t **resource_p, int *resource_nr_p) { + Common::ArchiveMember &member, int restype, int resnumber, resource_t **resource_p, int *resource_nr_p) { Common::File file; if (restype == sci_invalid_resource) diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp index b8de863161..6318c5922f 100644 --- a/engines/sci/scicore/vocab.cpp +++ b/engines/sci/scicore/vocab.cpp @@ -279,7 +279,7 @@ parse_tree_branch_t *vocab_get_branches(ResourceManager * resmgr, int *branches_ result_word_t *vocab_lookup_word(char *word, int word_len, word_t **words, int words_nr, - suffix_t **suffices, int suffices_nr) { + suffix_t **suffices, int suffices_nr) { word_t *tempword = (word_t*)sci_malloc(sizeof(word_t) + word_len + 256); // 256: For suffices. Should suffice. word_t **dict_word; @@ -518,8 +518,8 @@ int vocab_build_simple_parse_tree(parse_tree_node_t *nodes, result_word_t *words } #endif -result_word_t *vocab_tokenize_string(char *sentence, int *result_nr, word_t **words, int words_nr, - suffix_t **suffices, int suffices_nr, char **error) { +result_word_t *vocab_tokenize_string(char *sentence, int *result_nr, word_t **words, int words_nr, + suffix_t **suffices, int suffices_nr, char **error) { char *lastword = sentence; int pos_in_sentence = 0; char c; |