@@ -73,8 +73,7 @@ |
||
73 | 73 | __DIR__.'/maps/'.$map, |
74 | 74 | __DIR__.'/../public/tiles/'.$mapdir |
75 | 75 | ); |
76 | - } |
|
77 | - catch(ImagetilerException $e){ |
|
76 | + } catch(ImagetilerException $e){ |
|
78 | 77 | echo $e->getMessage(); |
79 | 78 | echo $e->getTraceAsString(); |
80 | 79 | } |
@@ -183,8 +183,7 @@ discard block |
||
183 | 183 | # $this->errors[$file->Hash] = $file; |
184 | 184 | $this->logger->error('error writing '.$dest); |
185 | 185 | |
186 | - } |
|
187 | - elseif($bytesWritten !== $file->SizeUncompressed){ |
|
186 | + } elseif($bytesWritten !== $file->SizeUncompressed){ |
|
188 | 187 | # $this->warnings[$file->Hash] = $file; |
189 | 188 | // throw new WSDBException |
190 | 189 | $this->logger->warning( |
@@ -220,11 +219,9 @@ discard block |
||
220 | 219 | // $Flags is supposed to be a bitmask |
221 | 220 | if($file->Flags === 1){ // no compression |
222 | 221 | return $content; |
223 | - } |
|
224 | - elseif($file->Flags === 3){ // deflate (probably unsed) |
|
222 | + } elseif($file->Flags === 3){ // deflate (probably unsed) |
|
225 | 223 | return gzinflate($content); |
226 | - } |
|
227 | - elseif($file->Flags === 5){ // lzma (requires ext-xz) |
|
224 | + } elseif($file->Flags === 5){ // lzma (requires ext-xz) |
|
228 | 225 | // https://bitbucket.org/mugadr_m/wildstar-studio/issues/23 |
229 | 226 | return xzdecode(substr($content, 0, 5).pack('Q', $file->SizeUncompressed).substr($content, 5)); |
230 | 227 | } |