yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

some minor error suppresants

Browse Source
This commit is contained in:
Sarjuuk
2015-05-26 23:10:16 +02:00
parent ebc7a9bee8
commit 03b90c438f
9 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/tools/filegen/simpleImg.func.php
View File

@@ -21,7 +21,7 @@ if (!CLI)
{
$result = null;
if (in_array(substr($path, -4, 4), ['.png', '.blp']))
if (in_array(substr($path, -4, 4), ['.png', '.blp', '.BLP', '.PNG']))
$path = substr($path, 0, strlen($path) - 4);
$file = $path.'.png';
@@ -44,11 +44,11 @@ if (!CLI)
if (isset(FileGen::$cliOpts['help']))
{
echo "\n";
echo "available Options for subScript 'simpleImg':\n";
echo "available options for subScript 'simpleImg':\n";
echo " --icons (generates square icons that are used for basicly everything)\n";
echo " --glyphs (decorative tidbit displayed on Infobox for Glyph Spells)\n";
echo " --pagetexts (imagery contained in PageTexts on readable GameObjects or Items)\n";
echo " --loadingscreens (loadingscreens (not used, skipped by default))\n";
echo " --loadingscreens (loading screens (not used, skipped by default))\n";
return true;
}
@@ -269,9 +269,9 @@ if (!CLI)
if (isset($paths[0]) || isset($paths[1])) // generates icons or glyphs
{
if (isset($paths[0]) && !isset($paths[1]))
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "glyph-rune"');
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath NOT LIKE "%glyph-rune%"');
else if (!isset($paths[0]) && isset($paths[1]))
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "glyph-rune"');
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon WHERE iconPath LIKE "%glyph-rune%"');
else
$siRows = DB::Aowow()->selectCol('SELECT iconPath FROM dbc_spellicon');

20
setup/tools/imagecreatefromblp.func.php
View File

@@ -33,7 +33,7 @@
{
if (!CLISetup::fileExists($fileName))
{
CLISetup::log('file '.$fileName.' could not be found', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' could not be found', CLISetup::LOG_ERROR);
return;
}
@@ -41,14 +41,14 @@
if (!$file)
{
CLISetup::log('could not open file '.$fileName, MSG_LVL_ERROR);
CLISetup::log('could not open file '.$fileName, CLISetup::LOG_ERROR);
return;
}
$fileSize = fileSize($fileName);
if ($fileSize < 16)
{
CLISetup::log('file '.$fileName.' is too small for a BLP file', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is too small for a BLP file', CLISetup::LOG_ERROR);
return;
}
@@ -64,14 +64,14 @@
$data = substr($data, 0x44);
else
{
CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is an incremental patch file and cannot be used by this script.', CLISetup::LOG_ERROR);
return;
}
}
if (substr($data, 0, 4) != "BLP2")
{
CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has incorrect/unsupported magic bytes', CLISetup::LOG_ERROR);
return;
}
@@ -83,7 +83,7 @@
if ($header['format'] != 1)
{
CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has unsupported format'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -99,12 +99,12 @@
if ($size == 0)
{
CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' contains zeroes in a mips table'.$debugStr, CLISetup::LOG_ERROR);
return;
}
if ($offs + $size > $fileSize)
{
CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' is corrupted/incomplete'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -116,7 +116,7 @@
$img = icfb3($header['width'], $header['height'], substr($data, $offs, $size));
else
{
CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, MSG_LVL_ERROR);
CLISetup::log('file '.$fileName.' has unsupported type'.$debugStr, CLISetup::LOG_ERROR);
return;
}
@@ -152,7 +152,7 @@
{
if (!in_array($alphaBits * 10 + $alphaType, [0, 10, 41, 81, 87, 88]))
{
CLISetup::log('unsupported compression type', MSG_LVL_ERROR);
CLISetup::log('unsupported compression type', CLISetup::LOG_ERROR);
return;
}