OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom into zscript

Browse source 
# Conflicts:
#	src/scripting/codegeneration/codegen.cpp
This commit is contained in:
Christoph Oelckers 2016-10-18 00:55:56 +02:00
commit 646f9b21c7
12 changed files with 64 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/p_acs.cpp
View file

@ -1617,7 +1617,7 @@ void FBehavior::StaticSerializeModuleStates (FSerializer &arc)
{
if (arc.isReading())
{
int modnum = arc.ArraySize();
auto modnum = arc.ArraySize();
if (modnum != StaticModules.Size())
{
I_Error("Level was saved with a different number of ACS modules. (Have %d, save has %d)", StaticModules.Size(), modnum);
@ -2934,7 +2934,7 @@ void DACSThinker::Serialize(FSerializer &arc)
if (arc.BeginArray("runningscripts"))
{
auto cnt = arc.ArraySize();
for (int i = 0; i < cnt; i++)
for (unsigned i = 0; i < cnt; i++)
{
SavingRunningscript srs;
arc(nullptr, srs);