mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-15 04:43:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Glest/glest-source into develop

Browse Source
This commit is contained in:
mathusummut
2019-03-08 11:45:49 +01:00
parent e17cf9588e de171fea6d
commit d0b017111d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/game/game/script_manager.cpp
View File

@@ -1757,8 +1757,6 @@ namespace Game {
Unit * Unit *
unit = world->findUnitById(unitId); unit = world->findUnitById(unitId);
if (unit != NULL) { if (unit != NULL) {
// Make sure they die
bool unit_dead = unit->decHp(unit->getHp() * unit->getHp());
unit->kill(); unit->kill();
// If called from an existing die event we get a stack overflow // If called from an existing die event we get a stack overflow
//onUnitDied(unit); //onUnitDied(unit);

2
source/game/world/world.cpp
View File

@@ -1465,6 +1465,8 @@ namespace Game {
} else { } else {
if (throwOnError) if (throwOnError)
throw game_runtime_error("Invalid position command: " + commandName, true); throw game_runtime_error("Invalid position command: " + commandName, true);
else
return;
} }
if (unit->getType()->getFirstCtOfClass(cc) == NULL) { if (unit->getType()->getFirstCtOfClass(cc) == NULL) {