q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-25 15:14:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Elemental.es/Computer.cpp changes according to @SLAwww's suggestions

Browse Source
This commit is contained in:
Daniel Gibson 2016-05-11 19:04:01 +02:00
parent 7e7ab3e70e
commit 7b470d30ab
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Entities/Elemental.es
View File

@ -1324,7 +1324,7 @@ procedures:
autocall FallOnFloor() EReturn;
}
if (m_EecChar==ELC_LARGE || (m_EecChar==ELC_BIG && m_EetType==ELT_LAVA))
if ((m_EecChar==ELC_LARGE || m_EecChar==ELC_BIG) && m_EetType==ELT_LAVA)
{
PlaySound(m_soBackground, SOUND_LAVA_LAVABURN, SOF_3D|SOF_LOOP);
}

2
Sources/EntitiesMP/Elemental.es
View File

@ -1373,7 +1373,7 @@ procedures:
autocall FallOnFloor() EReturn;
}
if (m_EecChar==ELC_LARGE || (m_EecChar==ELC_BIG && m_EetType==ELT_LAVA))
if ((m_EecChar==ELC_LARGE || m_EecChar==ELC_BIG) && m_EetType==ELT_LAVA)
{
PlaySound(m_soBackground, SOUND_LAVA_LAVABURN, SOF_3D|SOF_LOOP);
}

10
Sources/GameMP/Computer.cpp
View File

@ -177,7 +177,7 @@ static PIXaabbox2D GetMsgSliderSpace(void)
static PIXaabbox2D GetTextSliderBox(void)
{
if (_iActiveMessage>=_acmMessages.Count()) {
if ((_iActiveMessage >= _acmMessages.Count()) || (_iActiveMessage < 0)) {
return PIXaabbox2D();
}
INDEX ctTextLines = _acmMessages[_iActiveMessage].cm_ctFormattedLines;
@ -246,7 +246,7 @@ void LastUnreadMessage(void)
// go to next/previous message
void PrevMessage(void)
{
if (_iActiveMessage >= _acmMessages.Count()) {
if ((_iActiveMessage >= _acmMessages.Count()) || (_iActiveMessage < 0)) {
return;
}
_iActiveMessage--;
@ -258,7 +258,7 @@ void PrevMessage(void)
void NextMessage(void)
{
if (_iActiveMessage >= _acmMessages.Count()) {
if ((_iActiveMessage >= _acmMessages.Count()) || (_iActiveMessage < 0)) {
return;
}
_iActiveMessage++;
@ -305,7 +305,7 @@ void MessageTextUp(INDEX ctLines)
void MessageTextDn(INDEX ctLines)
{
// if no message do nothing
if (_iActiveMessage >= _acmMessages.Count()) {
if ((_iActiveMessage >= _acmMessages.Count()) || (_iActiveMessage < 0)) {
return;
}
// find text lines count
@ -336,7 +336,7 @@ void MessageTextUpDn(INDEX ctLines)
// mark current message as read
void MarkCurrentRead(void)
{
if (_iActiveMessage>=_acmMessages.Count()) {
if ((_iActiveMessage >= _acmMessages.Count()) || (_iActiveMessage < 0)) {
return;
}
// if running in background