aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/scicore
diff options
context:
space:
mode:
authorMax Horn2009-03-08 08:15:56 +0000
committerMax Horn2009-03-08 08:15:56 +0000
commitaad0ad3fa69979754ef2be0fa17766314b507aa4 (patch)
treedad4b7f719559781ef804a16571261edc42f24aa /engines/sci/scicore
parentedc18a22994cbbe5b497d847440d0fc3cb776ac5 (diff)
downloadscummvm-rg350-aad0ad3fa69979754ef2be0fa17766314b507aa4.tar.gz
scummvm-rg350-aad0ad3fa69979754ef2be0fa17766314b507aa4.tar.bz2
scummvm-rg350-aad0ad3fa69979754ef2be0fa17766314b507aa4.zip
SCI: Added new header gfx/font.h and removed some dead code
svn-id: r39211
Diffstat (limited to 'engines/sci/scicore')
-rw-r--r--engines/sci/scicore/vocab.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/scicore/vocab.cpp b/engines/sci/scicore/vocab.cpp
index 885a393a14..3955952b98 100644
--- a/engines/sci/scicore/vocab.cpp
+++ b/engines/sci/scicore/vocab.cpp
@@ -47,9 +47,6 @@ int _vocab_cmp_words(const void *word1, const void *word2) {
}
word_t **vocab_get_words(ResourceManager *resmgr, int *word_counter) {
- int counter = 0;
- unsigned int seeker;
- word_t **words;
char currentword[256] = ""; // They're not going to use words longer than 255 ;-)
int currentwordpos = 0;
@@ -71,6 +68,7 @@ word_t **vocab_get_words(ResourceManager *resmgr, int *word_counter) {
return NULL; // NOT critical: SCI1 games and some demos don't have one!
}
+ unsigned int seeker;
if (vocab_version == 1)
seeker = 255 * 2; // vocab.900 starts with 255 16-bit pointers which we don't use
else
@@ -82,6 +80,8 @@ word_t **vocab_get_words(ResourceManager *resmgr, int *word_counter) {
// Now this ought to be critical, but it'll just cause parse() and said() not to work
}
+ int counter = 0;
+ word_t **words;
words = (word_t **)sci_malloc(sizeof(word_t *));
while (seeker < resource->size) {