zdoom/gzdoom-last-svn
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-last-svn.git synced 2025-05-30 17:00:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Updated to ZDoom r3627:

Browse source 
- Fixed: ARaiseAlarm::TryPickup() had never had the call to A_WakeOracleSpectre() uncommented.
- Fixed: 3D floors were impervious to earthquakes; CopyStackedViewParameters() needs to be among the last things called in R_SetupFrame().
- Fixed: strbin ate the character following a \x sequence and placed one-digit sequences into the high nibble of the output character.

git-svn-id: http://mancubus.net/svn/hosted/gzdoom/trunk@1384 b0f79afe-0144-0410-b225-9a4edf0717df
This commit is contained in:
gez 2012-05-06 09:26:40 +00:00
parent 68124898cd
commit 983a38e9de
4 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/cmdlib.cpp
View file

@ -600,18 +600,20 @@ int strbin (char *str)
case 'x':
case 'X':
c = 0;
p++;
for (i = 0; i < 2; i++) {
c <<= 4;
if (*p >= '0' && *p <= '9')
c += *p-'0';
else if (*p >= 'a' && *p <= 'f')
c += 10 + *p-'a';
else if (*p >= 'A' && *p <= 'F')
c += 10 + *p-'A';
else
break;
for (i = 0; i < 2; i++)
{
p++;
if (*p >= '0' && *p <= '9')
c = (c << 4) + *p-'0';
else if (*p >= 'a' && *p <= 'f')
c = (c << 4) + 10 + *p-'a';
else if (*p >= 'A' && *p <= 'F')
c = (c << 4) + 10 + *p-'A';
else
{
p--;
break;
}
}
*str++ = c;
break;
@ -698,18 +700,20 @@ FString strbin1 (const char *start)
case 'x':
case 'X':
c = 0;
p++;
for (i = 0; i < 2; i++) {
c <<= 4;
if (*p >= '0' && *p <= '9')
c += *p-'0';
else if (*p >= 'a' && *p <= 'f')
c += 10 + *p-'a';
else if (*p >= 'A' && *p <= 'F')
c += 10 + *p-'A';
else
break;
for (i = 0; i < 2; i++)
{
p++;
if (*p >= '0' && *p <= '9')
c = (c << 4) + *p-'0';
else if (*p >= 'a' && *p <= 'f')
c = (c << 4) + 10 + *p-'a';
else if (*p >= 'A' && *p <= 'F')
c = (c << 4) + 10 + *p-'A';
else
{
p--;
break;
}
}
result << c;
break;

2
src/g_strife/a_strifeitems.cpp
View file

@ -177,7 +177,7 @@ IMPLEMENT_CLASS (ARaiseAlarm)
bool ARaiseAlarm::TryPickup (AActor *&toucher)
{
P_NoiseAlert (toucher, toucher);
// A_WakeOracleSpectre (dword312F4);
CALL_ACTION(A_WakeOracleSpectre, toucher);
GoAwayAndDie ();
return true;
}

2
src/r_utility.cpp
View file

@ -815,7 +815,6 @@ void R_SetupFrame (AActor *actor)
viewangle = TEST_ANGLE;
#endif
Renderer->CopyStackedViewParameters();
R_SetViewAngle ();
interpolator.DoInterpolations (r_TicFrac);
@ -911,6 +910,7 @@ void R_SetupFrame (AActor *actor)
}
}
Renderer->CopyStackedViewParameters();
Renderer->SetupFrame(player);
validcount++;

4
src/svnrevision.h
View file

@ -3,5 +3,5 @@
// This file was automatically generated by the
// updaterevision tool. Do not edit by hand.
#define ZD_SVN_REVISION_STRING "3624"
#define ZD_SVN_REVISION_NUMBER 3624
#define ZD_SVN_REVISION_STRING "3627"
#define ZD_SVN_REVISION_NUMBER 3627