OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/ZDoom/gzdoom into gzdoom-update-4-12-1

Browse source
This commit is contained in:
Rachael Alexanderson 2024-04-21 11:05:59 -04:00
commit 112c6cbccf
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
90 changed files with 1227 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/playsim/p_mobj.cpp
View file

@ -100,8 +100,8 @@
#include "a_dynlight.h"
#include "fragglescript/t_fs.h"
#include "shadowinlines.h"
#include "d_net.h"
#include "model.h"
#include "d_net.h"
// MACROS ------------------------------------------------------------------
@ -7702,7 +7702,7 @@ const char *AActor::GetTag(const char *def) const
const char *tag = Tag->GetChars();
if (tag[0] == '$')
{
return GStrings(tag + 1);
return GStrings.GetString(tag + 1);
}
else
{
@ -7732,7 +7732,7 @@ const char *AActor::GetCharacterName() const
const char *cname = Conversation->SpeakerName.GetChars();
if (cname[0] == '$')
{
return GStrings(cname + 1);
return GStrings.GetString(cname + 1);
}
else return cname;
}