← Back to branch summary

~timfelgentreff/stratagus/ButtonCheckUnitsNot

~timfelgentreff/stratagus/ButtonCheckUnitsNot

« back to all changes in this revision

Viewing changes to src/map/map_draw.cpp

Committer: Tim Felgentreff
Date: 2013-04-30 18:36:53 UTC
mfrom: (8696.1.23 stratagus)
Revision ID: timfelgentreff@gmail.com-20130430183653-067czvt3h0x94x6x

merge lp:stratagus

files modified:
metaserver/main.cpp

src/action/action_attack.cpp

src/action/action_board.cpp

src/action/action_build.cpp

src/action/action_built.cpp

src/action/action_defend.cpp

src/action/action_follow.cpp

src/action/action_move.cpp

src/action/action_patrol.cpp

src/action/action_repair.cpp

src/action/action_research.cpp

src/action/action_resource.cpp

src/action/action_spellcast.cpp

src/action/action_still.cpp

src/action/action_train.cpp

src/action/action_unload.cpp

src/action/action_upgradeto.cpp

src/action/actions.cpp

src/ai/ai_building.cpp

src/ai/ai_force.cpp

src/ai/ai_plan.cpp

src/ai/ai_resource.cpp

src/ai/script_ai.cpp

src/animation/animation.cpp

src/editor/editloop.cpp

src/editor/edmap.cpp

src/game/game.cpp

src/game/replay.cpp

src/include/map.h

src/include/net_message.h

src/include/particle.h

src/include/script.h

src/include/spell/spell_spawnportal.h

src/include/stratagus.h

src/include/tile.h

src/include/tileset.h

src/map/map.cpp

src/map/map_draw.cpp

src/map/map_wall.cpp

src/map/mapfield.cpp

src/map/minimap.cpp

src/map/script_map.cpp

src/map/script_tileset.cpp

src/map/tileset.cpp

src/missile/script_missile.cpp

src/network/net_message.cpp

src/network/netconnect.cpp

src/particle/chunkparticle.cpp

src/particle/graphicanimation.cpp

src/particle/particlemanager.cpp

src/particle/radialparticle.cpp

src/particle/smokeparticle.cpp

src/particle/staticparticle.cpp

src/pathfinder/astar.cpp

src/sound/script_sound.cpp

src/spell/script_spell.cpp

src/spell/spell_adjustvital.cpp

src/spell/spell_areaadjustvital.cpp

src/spell/spell_areabombardment.cpp

src/spell/spell_capture.cpp

src/spell/spell_demolish.cpp

src/spell/spell_polymorph.cpp

src/spell/spell_spawnmissile.cpp

src/spell/spell_spawnportal.cpp

src/spell/spell_summon.cpp

src/spell/spell_teleport.cpp

src/stratagus/groups.cpp

src/stratagus/mainloop.cpp

src/stratagus/script.cpp

src/stratagus/script_player.cpp

src/stratagus/selection.cpp

src/stratagus/stratagus.cpp

src/stratagus/util.cpp

src/tolua/network.pkg

src/tolua/particle.pkg

src/ui/mouse.cpp

src/ui/popup.cpp

src/ui/script_ui.cpp

src/ui/widgets.cpp

src/unit/build.cpp

src/unit/depend.cpp

src/unit/script_unit.cpp

src/unit/script_unittype.cpp

src/unit/unit.cpp

src/unit/unit_find.cpp

src/unit/unittype.cpp

src/unit/upgrade.cpp

src/video/color.cpp

src/video/cursor.cpp

Show diffs side-by-side

added added

removed removed

src/map/map_draw.cpp

262

262

const CMapField &mf = Map.Fields[sx];

263

263

unsigned short int tile;

264

264

if (ReplayRevealMap) {

265

tile = mf.Tile;

265

tile = mf.getGraphicTile();

266

266

} else {

267

267

tile = mf.playerInfo.SeenTile;

268

268

}

Older »