OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed some places where FStrings were incorrectly used.

Browse source 
- replace all implicit conversions from FString to const char * in the header files (so that it can be test compiled with the implicit type conversion turned off without throwing thousands of identical errors.)
This commit is contained in:
Christoph Oelckers 2016-02-05 10:40:45 +01:00
commit 8da6483223
10 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/s_sound.cpp
View file

@ -415,7 +415,7 @@ void S_Start ()
// Parse the global SNDINFO
S_ParseSndInfo(true);
if (*LocalSndInfo)
if (LocalSndInfo.IsNotEmpty())
{
// Now parse the local SNDINFO
int j = Wads.CheckNumForFullName(LocalSndInfo, true);
@ -432,7 +432,7 @@ void S_Start ()
if (parse_ss)
{
S_ParseSndSeq(*LocalSndSeq? Wads.CheckNumForFullName(LocalSndSeq, true) : -1);
S_ParseSndSeq(LocalSndSeq.IsNotEmpty()? Wads.CheckNumForFullName(LocalSndSeq, true) : -1);
}
LastLocalSndInfo = LocalSndInfo;
@ -2553,7 +2553,7 @@ int S_GetMusic (char **name)
{
int order;
if (mus_playing.name)
if (mus_playing.name.IsNotEmpty())
{
*name = copystring (mus_playing.name);
order = mus_playing.baseorder;