mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-03 15:39:46 +01:00
Code Issues Releases Wiki Activity

A few fixes and cleanup

Browse source 
The main fix was how holding right click to remove tiles did not
commit an action.
This commit is contained in:
NyakoFox 2024-10-03 21:46:39 -03:00
parent d31c0f7c47
commit b5520bb940
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
desktop_version/src/Editor.cpp
View file

@ -2276,7 +2276,6 @@ void editorclass::add_entity(int rx, int ry, int xp, int yp, int tp, int p1, int
void editorclass::remove_entity(int t) void editorclass::remove_entity(int t)
{ {
EditorUndoInfo info; EditorUndoInfo info;
info.room_x = levx; info.room_x = levx;
info.room_y = levy; info.room_y = levy;
@ -2308,10 +2307,7 @@ static void update_old_tiles()
extern editorclass ed; extern editorclass ed;
for (int i = 0; i < SCREEN_WIDTH_TILES * SCREEN_HEIGHT_TILES; i++) for (int i = 0; i < SCREEN_WIDTH_TILES * SCREEN_HEIGHT_TILES; i++)
{ {
const int x = i % SCREEN_WIDTH_TILES; ed.old_tiles[i] = ed.get_tile(i % SCREEN_WIDTH_TILES, i / SCREEN_WIDTH_TILES);
const int y = i / SCREEN_WIDTH_TILES;
ed.old_tiles[y * SCREEN_WIDTH_TILES + x] = ed.get_tile(x, y);
} }
} }
@ -2509,6 +2505,12 @@ void editorclass::handle_tile_placement(const int tile)
void editorclass::tool_remove() void editorclass::tool_remove()
{ {
if (!placing_tiles)
{
placing_tiles = true;
update_old_tiles();
}
switch (current_tool) switch (current_tool)
{ {
case EditorTool_WALLS: case EditorTool_WALLS:
@ -3659,24 +3661,26 @@ void editorinput(void)
} }
// Mouse input // Mouse input
if (key.leftbutton && ed.lclickdelay == 0)
{
ed.tool_place();
}
else if (!key.leftbutton)
{
ed.lclickdelay = 0;
if (ed.placing_tiles)
{
commit_tiles();
ed.placing_tiles = false;
}
}
if (key.rightbutton) if (key.rightbutton)
{ {
ed.tool_remove(); ed.tool_remove();
} }
else
{
if (key.leftbutton && ed.lclickdelay == 0)
{
ed.tool_place();
}
else if (!key.leftbutton)
{
ed.lclickdelay = 0;
if (ed.placing_tiles)
{
commit_tiles();
ed.placing_tiles = false;
}
}
}
if (key.middlebutton) if (key.middlebutton)
{ {