mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-14 18:39:51 +00:00
Code Issues Releases Wiki Activity

Major include refactor; changes to pretty much everything

Browse source 
This untangles some of the gigantic kitchen sink headers
in an attempt to split things into smaller files.
Also don't include gl.h, glext.h, windows.h,
and other such nonsense *everywhere*.

Lots of cleanups on the way too. More dead/unused code removal.

Remove incrFlag(), decrFlag() Lua functions.
This commit is contained in:
fgenesis 2016-07-09 04:18:40 +02:00
parent d1778a97b8
commit 8472718fb7
141 changed files with 2993 additions and 3708 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Aquaria/SceneEditor.cpp
View file

@ -27,12 +27,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "DSQ.h"
#include "Avatar.h"
#include "GridRender.h"
#include "Shot.h"
#ifdef AQUARIA_BUILD_SCENEEDITOR // Through end of file
#ifdef BBGE_BUILD_WINDOWS
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <shellapi.h>
#endif
@ -404,7 +407,7 @@ void SceneEditor::openMainMenu()
while (core->mouse.buttons.left)
{
core->main(FRAME_TIME);
core->run(FRAME_TIME);
}
addMainMenuItem("LOAD LEVEL... (SHIFT-F1)", 100);
@ -432,7 +435,7 @@ void SceneEditor::openMainMenu()
while (1 && !core->getKeyState(KEY_TAB))
{
core->main(FRAME_TIME);
core->run(FRAME_TIME);
if (execID != -1)
break;
}
@ -2244,7 +2247,7 @@ void SceneEditor::selectEntityFromGroups()
prevEntityPage();
}
core->main(FRAME_TIME);
core->run(FRAME_TIME);
}
destroyEntityPage();