Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix intro

Browse Source
This commit is contained in:
momo5502 2016-06-27 19:30:58 +02:00
parent 967cfff5ec
commit 705ab362f0
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Components/Modules/QuickPatch.cpp
View File

@ -238,6 +238,7 @@ namespace Components
// intro stuff // intro stuff
Utils::Hook::Nop(0x60BEE9, 5); // Don't show legals Utils::Hook::Nop(0x60BEE9, 5); // Don't show legals
Utils::Hook::Nop(0x60BEF6, 5); // Don't reset the intro dvar
Utils::Hook::Set<char*>(0x60BED2, "unskippablecinematic IW_logo\n"); Utils::Hook::Set<char*>(0x60BED2, "unskippablecinematic IW_logo\n");
// Redirect logs // Redirect logs

17
src/Components/Modules/Toast.cpp
View File

@ -37,14 +37,14 @@ namespace Components
Game::vec4_t color = { 0, 0, 0, 0.7f }; Game::vec4_t color = { 0, 0, 0, 0.7f };
Game::vec4_t wColor = { 1.0f, 1.0f, 1.0f, 1.0f }; Game::vec4_t wColor = { 1.0f, 1.0f, 1.0f, 1.0f };
height /= 5;
height *= 4;
if (Game::Com_Milliseconds() < startTime || (startTime + duration) < Game::Com_Milliseconds()) return; if (Game::Com_Milliseconds() < startTime || (startTime + duration) < Game::Com_Milliseconds()) return;
// Fadein stuff // Fadein stuff
else if (Game::Com_Milliseconds() - startTime < slideTime) else if (Game::Com_Milliseconds() - startTime < slideTime)
{ {
height /= 5;
height *= 4;
int diffH = Renderer::Height() / 5; int diffH = Renderer::Height() / 5;
int diff = Game::Com_Milliseconds() - startTime; int diff = Game::Com_Milliseconds() - startTime;
double scale = 1.0 - ((1.0 * diff) / (1.0 * slideTime)); double scale = 1.0 - ((1.0 * diff) / (1.0 * slideTime));
@ -55,9 +55,6 @@ namespace Components
// Fadeout stuff // Fadeout stuff
else if (Game::Com_Milliseconds() - startTime > (duration - slideTime)) else if (Game::Com_Milliseconds() - startTime > (duration - slideTime))
{ {
height /= 5;
height *= 4;
int diffH = Renderer::Height() / 5; int diffH = Renderer::Height() / 5;
int diff = (startTime + duration) - Game::Com_Milliseconds(); int diff = (startTime + duration) - Game::Com_Milliseconds();
double scale = 1.0 - ((1.0 * diff) / (1.0 * slideTime)); double scale = 1.0 - ((1.0 * diff) / (1.0 * slideTime));
@ -65,12 +62,6 @@ namespace Components
height += diffH; height += diffH;
} }
else
{
height /= 5;
height *= 4;
}
height += bHeight / 2 + aCorners - cornerSize; height += bHeight / 2 + aCorners - cornerSize;
// Calculate width data // Calculate width data
@ -98,7 +89,7 @@ namespace Components
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2 + aCorners), static_cast<float>(height - bHeight / 2 + cornerSize), static_cast<float>(cornerSize - aCorners), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white); // Left Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2 + aCorners), static_cast<float>(height - bHeight / 2 + cornerSize), static_cast<float>(cornerSize - aCorners), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white); // Left
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 + bWidth / 2 - cornerSize), static_cast<float>(height - bHeight / 2 + cornerSize), static_cast<float>(cornerSize - aCorners), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white); // Right Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 + bWidth / 2 - cornerSize), static_cast<float>(height - bHeight / 2 + cornerSize), static_cast<float>(cornerSize - aCorners), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white); // Right
// Center // Center
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - (bWidth - cornerSize * 2) / 2), static_cast<float>(height - (bHeight - cornerSize * 2) / 2), static_cast<float>(bWidth - cornerSize * 2), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white); Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - (bWidth - cornerSize * 2) / 2), static_cast<float>(height - (bHeight - cornerSize * 2) / 2), static_cast<float>(bWidth - cornerSize * 2), static_cast<float>(bHeight - cornerSize * 2), 0, 0, 1.0f, 1.0f, color, white);
// Image // Image