diff options
| author | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
|---|---|---|
| committer | Neeraj Kumar | 2010-08-06 20:13:41 +0000 |
| commit | 7e126ed299cb789340cb2f8d409338dbdd6c8235 (patch) | |
| tree | 91f6e4be633fd579922ddf270443011582b8f9ec /engines/tinsel/strres.cpp | |
| parent | 6c0855f3d3efc52478ba9ce019fbd4c9287f4691 (diff) | |
| parent | 4ae7427eed781613e2cda096d0f61c77883bca05 (diff) | |
| download | scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.gz scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.tar.bz2 scummvm-rg350-7e126ed299cb789340cb2f8d409338dbdd6c8235.zip | |
TESTBED: Merged changes from trunk to my branch
svn-id: r51798
Diffstat (limited to 'engines/tinsel/strres.cpp')
| -rw-r--r-- | engines/tinsel/strres.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp index 8f9f72f446..2416d6a8fa 100644 --- a/engines/tinsel/strres.cpp +++ b/engines/tinsel/strres.cpp @@ -88,11 +88,9 @@ void ChangeLanguage(LANGUAGE newLang) { textLanguage = newLang; sampleLanguage = newLang; - if (textBuffer) { - // free the previous buffer - free(textBuffer); - textBuffer = NULL; - } + // free the previous buffer + free(textBuffer); + textBuffer = NULL; // Try and open the specified language file. If it fails, and the language // isn't English, try falling back on opening 'english.txt' - some foreign @@ -355,10 +353,8 @@ int SubStringCount(int id) { void FreeTextBuffer() { - if (textBuffer) { - free(textBuffer); - textBuffer = NULL; - } + free(textBuffer); + textBuffer = NULL; } /** |