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

- fixed some misc code bugs (incorrect assignment) and cleaned up some compiler warnings

Browse Source
This commit is contained in:
Mark Vejvoda 2010-10-21 01:07:11 +00:00
parent f5f406dfb3
commit 93e56df3d6
3 changed files with 19 additions and 17 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

@ -464,6 +464,7 @@ bool ScriptManager::getAiEnabled(int factionIndex){
if(factionIndex<GameConstants::maxPlayers){ if(factionIndex<GameConstants::maxPlayers){
return playerModifiers[factionIndex].getAiEnabled(); return playerModifiers[factionIndex].getAiEnabled();
} }
return false;
} }
void ScriptManager::disableConsume(int factionIndex){ void ScriptManager::disableConsume(int factionIndex){
@ -484,9 +485,10 @@ void ScriptManager::enableConsume(int factionIndex){
bool ScriptManager::getConsumeEnabled(int factionIndex){ bool ScriptManager::getConsumeEnabled(int factionIndex){
ScriptManager_STREFLOP_Wrapper streflopWrapper; ScriptManager_STREFLOP_Wrapper streflopWrapper;
if(factionIndex<GameConstants::maxPlayers){ if(factionIndex < GameConstants::maxPlayers){
return playerModifiers[factionIndex].getConsumeEnabled(); return playerModifiers[factionIndex].getConsumeEnabled();
} }
return false;
} }
int ScriptManager::registerCellTriggerEventForUnitToUnit(int sourceUnitId, int destUnitId) { int ScriptManager::registerCellTriggerEventForUnitToUnit(int sourceUnitId, int destUnitId) {

4
source/glest_game/world/unit_updater.cpp
View File

@ -613,7 +613,7 @@ void UnitUpdater::updateHarvest(Unit *unit) {
if (canHarvestDestPos == true) { if (canHarvestDestPos == true) {
unit->setLastHarvestResourceTarget(NULL); unit->setLastHarvestResourceTarget(NULL);
canHarvestDestPos == (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL); canHarvestDestPos = (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
if(canHarvestDestPos == true) { if(canHarvestDestPos == true) {
//if it finds resources it starts harvesting //if it finds resources it starts harvesting
unit->setCurrSkill(hct->getHarvestSkillType()); unit->setCurrSkill(hct->getHarvestSkillType());
@ -679,7 +679,7 @@ void UnitUpdater::updateHarvest(Unit *unit) {
if (canHarvestDestPos == true) { if (canHarvestDestPos == true) {
unit->setLastHarvestResourceTarget(NULL); unit->setLastHarvestResourceTarget(NULL);
canHarvestDestPos == (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL); canHarvestDestPos = (map->getSurfaceCell(Map::toSurfCoords(targetPos)) != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource() != NULL && map->getSurfaceCell(Map::toSurfCoords(targetPos))->getResource()->getType() != NULL);
if(canHarvestDestPos == true) { if(canHarvestDestPos == true) {
//if it finds resources it starts harvesting //if it finds resources it starts harvesting
unit->setCurrSkill(hct->getHarvestSkillType()); unit->setCurrSkill(hct->getHarvestSkillType());

28
source/shared_lib/sources/platform/common/platform_common.cpp
View File

@ -877,35 +877,35 @@ bool isKeyDown(int virtualKey) {
if(key >= 0) { if(key >= 0) {
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] keystate[key] = %d\n",__FILE__,__FUNCTION__,__LINE__,keystate[key]); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] keystate[key] = %d\n",__FILE__,__FUNCTION__,__LINE__,keystate[key]);
return keystate[key]; return (keystate[key] != 0);
} }
switch(key) { switch(key) {
case vkAdd: case vkAdd:
return keystate[SDLK_PLUS] | keystate[SDLK_KP_PLUS]; return (keystate[SDLK_PLUS] != 0 || keystate[SDLK_KP_PLUS] != 0);
case vkSubtract: case vkSubtract:
return keystate[SDLK_MINUS] | keystate[SDLK_KP_MINUS]; return (keystate[SDLK_MINUS] != 0 || keystate[SDLK_KP_MINUS] != 0);
case vkAlt: case vkAlt:
return keystate[SDLK_LALT] | keystate[SDLK_RALT]; return (keystate[SDLK_LALT] != 0 || keystate[SDLK_RALT] != 0);
case vkControl: case vkControl:
return keystate[SDLK_LCTRL] | keystate[SDLK_RCTRL]; return (keystate[SDLK_LCTRL] != 0 || keystate[SDLK_RCTRL] != 0);
case vkShift: case vkShift:
return keystate[SDLK_LSHIFT] | keystate[SDLK_RSHIFT]; return (keystate[SDLK_LSHIFT] != 0 || keystate[SDLK_RSHIFT] != 0);
case vkEscape: case vkEscape:
return keystate[SDLK_ESCAPE]; return (keystate[SDLK_ESCAPE] != 0);
case vkUp: case vkUp:
return keystate[SDLK_UP]; return (keystate[SDLK_UP] != 0);
case vkLeft: case vkLeft:
return keystate[SDLK_LEFT]; return (keystate[SDLK_LEFT] != 0);
case vkRight: case vkRight:
return keystate[SDLK_RIGHT]; return (keystate[SDLK_RIGHT] != 0);
case vkDown: case vkDown:
return keystate[SDLK_DOWN]; return (keystate[SDLK_DOWN] != 0);
case vkReturn: case vkReturn:
return keystate[SDLK_RETURN] | keystate[SDLK_KP_ENTER]; return (keystate[SDLK_RETURN] != 0 || keystate[SDLK_KP_ENTER] != 0);
case vkBack: case vkBack:
return keystate[SDLK_BACKSPACE]; return (keystate[SDLK_BACKSPACE] != 0);
case vkDelete: case vkDelete:
return keystate[SDLK_DELETE]; return (keystate[SDLK_DELETE] != 0);
default: default:
std::cerr << "isKeyDown called with unknown key.\n"; std::cerr << "isKeyDown called with unknown key.\n";
break; break;