Fixed Crash on Dread Presence deletion, Fixed primitives for ELD set.

This commit is contained in:
valfieri
2019-10-08 22:20:53 +02:00
parent 0f0e627cf5
commit b66674492b
4 changed files with 25 additions and 32 deletions
+2 -1
View File
@@ -6336,7 +6336,8 @@ int ATransformer::destroy()
{
for (unsigned int i = 0;i < newAbilities[_target].size(); i++)
{
if(newAbilities[_target].at(i))
// The primitives Dead Presence probabily causes a double free error and a crash in Wagic, so for now it has been exluded...
if(newAbilities[_target].at(i) && strcmp(_target->name.c_str(),"Dread Presence"))
{
newAbilities[_target].at(i)->forceDestroy = 1;
newAbilities[_target].at(i)->removeFromGame();
+4 -4
View File
@@ -259,7 +259,7 @@ void GameStateOptions::Render()
"Abrasax, Almosthumane, Daddy32, DJardin, Dr.Solomat,",
"J, Jeck, kevlahnota, Leungclj, linshier, Mootpoint,",
"Mnguyen, Ph34rbot, Psyringe, Rolzad73, Salmelo, Superhiro,",
"Wololo, Yeshua, Zethfox, Vitty85",
"Vitty85, Wololo, Yeshua, Zethfox",
"",
"Music by Celestial Aeon Project, http://www.jamendo.com",
"",
@@ -267,10 +267,10 @@ void GameStateOptions::Render()
"Abrasax, AzureKnight, colarchon, Excessum, Hehotfarv,",
"Jeremy, Jog1118, JonyAS, Lachaux, Link17, Muddobbers,",
"Nakano, Niegen, Kaioshin, Psyringe, r1c47, Superhiro,",
"Szei, Thanatos02, Whismer, Wololo",
"Szei, Thanatos02, Vitty85, Whismer, Wololo",
"",
"Thanks also go to Dr.Watson, KF1, Orine, Raphael, Sakya,",
"Tacoghandi, Tyranid for their help.",
"Thanks also go to Dr.Watson, KF1, Luruz, Orine, Raphael,",
"Sakya, Tacoghandi, Tyranid for their help.",
"",
"Thanks to everyone who contributes code/content on the forums!",
"",