Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for scripted scenario function registerCellTriggerEventForFactionToLocation not working properly

Browse Source
This commit is contained in:
Mark Vejvoda 2011-09-13 23:20:26 +00:00
parent cd321c0c77
commit 470fac5136
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/game/script_manager.cpp
View File

@ -322,7 +322,9 @@ void ScriptManager::onCellTriggerEvent(Unit *movingUnit) {
case ctet_FactionPos:
{
if(movingUnit->getFactionIndex() == event.sourceId) {
bool srcInDst = world->getMap()->isInUnitTypeCells(0, event.destPos,movingUnit->getPos());
//printf("ctet_FactionPos event.destPos = [%s], movingUnit->getPos() [%s]\n",event.destPos.getString().c_str(),movingUnit->getPos().getString().c_str());
bool srcInDst = world->getMap()->isInUnitTypeCells(movingUnit->getType(), event.destPos,movingUnit->getPos());
if(srcInDst == true) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
}

6
source/glest_game/world/map.cpp
View File

@ -195,7 +195,11 @@ Cell *Map::getCell(int x, int y) const {
Vec2i Map::getStartLocation(int locationIndex) const {
if(locationIndex >= maxPlayers) {
throw runtime_error("locationIndex >= maxPlayers");
char szBuf[4096]="";
sprintf(szBuf,"locationIndex >= maxPlayers [%d] [%d]",locationIndex, maxPlayers);
printf("%s\n",szBuf);
//throw runtime_error(szBuf);
assert(locationIndex < maxPlayers);
}
else if(startLocations == NULL) {
throw runtime_error("startLocations == NULL");