-reverted the changes of r858 for now because of some problems
fix94.1
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
data/images/wait_01.jpg
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 7.4 KiB |
BIN
data/images/wait_02.jpg
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 8.5 KiB |
BIN
data/images/wait_03.jpg
Normal file
|
After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 8.5 KiB |
BIN
data/images/wait_04.jpg
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 8.6 KiB |
BIN
data/images/wait_05.jpg
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 8.9 KiB |
BIN
data/images/wait_06.jpg
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
BIN
data/images/wait_07.jpg
Normal file
|
After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 9.0 KiB |
BIN
data/images/wait_08.jpg
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.9 KiB |
BIN
resources/theme_pngs/wait_01.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
resources/theme_pngs/wait_02.png
Normal file
|
After Width: | Height: | Size: 7.9 KiB |
BIN
resources/theme_pngs/wait_03.png
Normal file
|
After Width: | Height: | Size: 8.0 KiB |
BIN
resources/theme_pngs/wait_04.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
resources/theme_pngs/wait_05.png
Normal file
|
After Width: | Height: | Size: 8.6 KiB |
BIN
resources/theme_pngs/wait_06.png
Normal file
|
After Width: | Height: | Size: 8.8 KiB |
BIN
resources/theme_pngs/wait_07.png
Normal file
|
After Width: | Height: | Size: 9.1 KiB |
BIN
resources/theme_pngs/wait_08.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
@ -11,16 +11,22 @@
|
|||||||
|
|
||||||
#define DEFAULT_FIFO_SIZE (256 * 1024)
|
#define DEFAULT_FIFO_SIZE (256 * 1024)
|
||||||
|
|
||||||
extern const u8 wait_01_png[];
|
extern const u8 wait_01_jpg[];
|
||||||
extern const u8 wait_02_png[];
|
extern const u32 wait_01_jpg_size;
|
||||||
extern const u8 wait_03_png[];
|
extern const u8 wait_02_jpg[];
|
||||||
extern const u8 wait_04_png[];
|
extern const u32 wait_02_jpg_size;
|
||||||
extern const u8 wait_05_png[];
|
extern const u8 wait_03_jpg[];
|
||||||
extern const u8 wait_06_png[];
|
extern const u32 wait_03_jpg_size;
|
||||||
extern const u8 wait_07_png[];
|
extern const u8 wait_04_jpg[];
|
||||||
extern const u8 wait_08_png[];
|
extern const u32 wait_04_jpg_size;
|
||||||
extern const u8 wait_09_png[];
|
extern const u8 wait_05_jpg[];
|
||||||
extern const u8 wait_10_png[];
|
extern const u32 wait_05_jpg_size;
|
||||||
|
extern const u8 wait_06_jpg[];
|
||||||
|
extern const u32 wait_06_jpg_size;
|
||||||
|
extern const u8 wait_07_jpg[];
|
||||||
|
extern const u32 wait_07_jpg_size;
|
||||||
|
extern const u8 wait_08_jpg[];
|
||||||
|
extern const u32 wait_08_jpg_size;
|
||||||
|
|
||||||
vector<TexData> m_defaultWaitMessages;
|
vector<TexData> m_defaultWaitMessages;
|
||||||
|
|
||||||
@ -565,18 +571,16 @@ void CVideo::waitMessage(float delay)
|
|||||||
{
|
{
|
||||||
if(m_defaultWaitMessages.size() == 0)
|
if(m_defaultWaitMessages.size() == 0)
|
||||||
{
|
{
|
||||||
TexData m_wTextures[10];
|
TexData m_wTextures[8];
|
||||||
TexHandle.fromPNG(m_wTextures[0], wait_01_png);
|
TexHandle.fromJPG(m_wTextures[0], wait_01_jpg, wait_01_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[1], wait_02_png);
|
TexHandle.fromJPG(m_wTextures[1], wait_02_jpg, wait_02_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[2], wait_03_png);
|
TexHandle.fromJPG(m_wTextures[2], wait_03_jpg, wait_03_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[3], wait_04_png);
|
TexHandle.fromJPG(m_wTextures[3], wait_04_jpg, wait_04_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[4], wait_05_png);
|
TexHandle.fromJPG(m_wTextures[4], wait_05_jpg, wait_05_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[5], wait_06_png);
|
TexHandle.fromJPG(m_wTextures[5], wait_06_jpg, wait_06_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[6], wait_07_png);
|
TexHandle.fromJPG(m_wTextures[6], wait_07_jpg, wait_07_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[7], wait_08_png);
|
TexHandle.fromJPG(m_wTextures[7], wait_08_jpg, wait_08_jpg_size);
|
||||||
TexHandle.fromPNG(m_wTextures[8], wait_09_png);
|
for(int i = 0; i < 8; i++)
|
||||||
TexHandle.fromPNG(m_wTextures[9], wait_10_png);
|
|
||||||
for(int i = 0; i < 10; i++)
|
|
||||||
m_defaultWaitMessages.push_back(m_wTextures[i]);
|
m_defaultWaitMessages.push_back(m_wTextures[i]);
|
||||||
}
|
}
|
||||||
waitMessage(vector<TexData>(), delay);
|
waitMessage(vector<TexData>(), delay);
|
||||||
@ -588,7 +592,7 @@ void CVideo::waitMessage(const vector<TexData> &tex, float delay)
|
|||||||
if(tex.size() == 0)
|
if(tex.size() == 0)
|
||||||
{
|
{
|
||||||
m_waitMessages = m_defaultWaitMessages;
|
m_waitMessages = m_defaultWaitMessages;
|
||||||
m_waitMessageDelay = 0.12f;
|
m_waitMessageDelay = 0.15f;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||