OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved all code related to global ACS variables to p_acs.cpp where it belongs.

Browse source 
- fixed: The nextmap and nextsecret CCMDs need to call G_DeferedInitNew instead of G_InitNew.
- merged MAPINFO branch back into trunk.

SVN r1393 (trunk)
This commit is contained in:
Christoph Oelckers 2009-02-03 19:11:43 +00:00
commit 4bcd3faef8
51 changed files with 3021 additions and 2197 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/g_hub.cpp
View file

@ -127,17 +127,16 @@ void G_LeavingHub(int mode, cluster_info_t * cluster, wbstartstruct_t * wbs)
wbs->plyr[j].ssecret += hubdata[i].plyr[j].ssecret;
}
}
if (cluster->clustername)
if (cluster->ClusterName.IsNotEmpty())
{
if (cluster->flags & CLUSTER_LOOKUPNAME)
{
strncpy(level.level_name, GStrings(cluster->clustername), 64);
level.LevelName = GStrings(cluster->ClusterName);
}
else
{
strncpy(level.level_name, cluster->clustername, 64);
level.LevelName = cluster->ClusterName;
}
level.level_name[63]=0;
}
}
}