OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added Firebrand's patch to rename 'swap' due to naming conflicts in newer MSVC compilers.

Browse source 
SVN r2449 (trunk)
This commit is contained in:
Christoph Oelckers 2010-07-23 21:19:59 +00:00
commit 545a892faa
28 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/p_acs.cpp
View file

@ -1487,7 +1487,7 @@ void FBehavior::LoadScriptsDirectory ()
// Make the closed version the first one.
if (Scripts[i+1].Type == SCRIPT_Closed)
{
swap(Scripts[i], Scripts[i+1]);
swapvalues(Scripts[i], Scripts[i+1]);
}
}
}
@ -2051,7 +2051,7 @@ int DLevelScript::Random (int min, int max)
{
if (max < min)
{
swap (max, min);
swapvalues (max, min);
}
return min + pr_acs(max - min + 1);
@ -3550,7 +3550,7 @@ int DLevelScript::RunScript ()
break;
case PCD_SWAP:
swap(Stack[sp-2], Stack[sp-1]);
swapvalues(Stack[sp-2], Stack[sp-1]);
break;
case PCD_LSPEC1: