zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-26 05:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: All FNames inside actor classes need to be FNameNoInit or their constructor will overwrite them after copying the defaults.

Browse source
This commit is contained in:
Christoph Oelckers 2017-02-15 12:16:24 +01:00
parent d8ebbcfc08
commit c8db1f151e
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_player.h
View file

@ -155,12 +155,12 @@ public:
double ViewBob; double ViewBob;
// Former class properties that were moved into the object to get rid of the meta class. // Former class properties that were moved into the object to get rid of the meta class.
FName SoundClass; // Sound class FNameNoInit SoundClass; // Sound class
FName Face; // Doom status bar face (when used) FNameNoInit Face; // Doom status bar face (when used)
FName Portrait; FNameNoInit Portrait;
FName Slot[10]; FNameNoInit Slot[10];
FName InvulMode; FNameNoInit InvulMode;
FName HealingRadiusType; FNameNoInit HealingRadiusType;
double HexenArmor[5]; double HexenArmor[5];
BYTE ColorRangeStart; // Skin color range BYTE ColorRangeStart; // Skin color range
BYTE ColorRangeEnd; BYTE ColorRangeEnd;

2
src/p_user.cpp
View file

@ -1232,8 +1232,6 @@ const char *APlayerPawn::GetSoundClass() const
return skins[player->userinfo.GetSkin()].name; return skins[player->userinfo.GetSkin()].name;
} }
// [GRB]
auto pclass = GetClass();
return SoundClass != NAME_None? SoundClass.GetChars() : "player"; return SoundClass != NAME_None? SoundClass.GetChars() : "player";
} }

2
src/win32/i_main.cpp
View file

@ -1337,7 +1337,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE nothing, LPSTR cmdline, int n
_CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF); _CrtSetDbgFlag (_CrtSetDbgFlag(0) | _CRTDBG_LEAK_CHECK_DF);
// Use this to break at a specific allocation number. // Use this to break at a specific allocation number.
_crtBreakAlloc = 165966; //_crtBreakAlloc = 53039;
#endif #endif
DoMain (hInstance); DoMain (hInstance);