mirror of
https://github.com/isledecomp/isle.git
synced 2025-10-25 17:34:05 +00:00
Refactor LegoOmni into LegoMain/Scripts (#883)
* Refactor LegoOmni into LegoMain/Scripts * Fix guard
This commit is contained in:
committed by
GitHub
parent
6382347f73
commit
1b1d2ecde6
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "define.h"
|
||||
#include "extra.h"
|
||||
#include "legoomni.h"
|
||||
#include "legomain.h"
|
||||
#include "legoutils.h"
|
||||
#include "mxcompositepresenter.h"
|
||||
#include "mxdssubscriber.h"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "legoendanimnotificationparam.h"
|
||||
#include "legoextraactor.h"
|
||||
#include "legogamestate.h"
|
||||
#include "legoomni.h"
|
||||
#include "legomain.h"
|
||||
#include "legoroilist.h"
|
||||
#include "legovideomanager.h"
|
||||
#include "legoworld.h"
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
#include "legobuildingmanager.h"
|
||||
#include "legocharactermanager.h"
|
||||
#include "legofullscreenmovie.h"
|
||||
#include "legomain.h"
|
||||
#include "legonavcontroller.h"
|
||||
#include "legoomni.h"
|
||||
#include "legoplantmanager.h"
|
||||
#include "legostate.h"
|
||||
#include "legoutils.h"
|
||||
@@ -54,6 +54,7 @@
|
||||
#include "racecar_actions.h"
|
||||
#include "regbook_actions.h"
|
||||
#include "roi/legoroi.h"
|
||||
#include "scripts.h"
|
||||
#include "sndanim_actions.h"
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#include "legoanimpresenter.h"
|
||||
#include "legogamestate.h"
|
||||
#include "legoinputmanager.h"
|
||||
#include "legomain.h"
|
||||
#include "legonamedtexture.h"
|
||||
#include "legoomni.h"
|
||||
#include "legosoundmanager.h"
|
||||
#include "legovideomanager.h"
|
||||
#include "legoworld.h"
|
||||
@@ -23,11 +23,25 @@
|
||||
#include "mxutilities.h"
|
||||
#include "mxvariabletable.h"
|
||||
#include "realtime/realtime.h"
|
||||
#include "scripts.h"
|
||||
|
||||
#include <process.h>
|
||||
#include <string.h>
|
||||
#include <vec.h>
|
||||
|
||||
// FUNCTION: LEGO1 0x1003dd70
|
||||
LegoROI* PickROI(MxLong p_a, MxLong p_b)
|
||||
{
|
||||
return (LegoROI*) VideoManager()->Get3DManager()->GetLego3DView()->Pick(p_a, p_b);
|
||||
}
|
||||
|
||||
// STUB: LEGO1 0x1003ddc0
|
||||
LegoEntity* PickEntity(MxLong, MxLong)
|
||||
{
|
||||
// TODO
|
||||
return NULL;
|
||||
}
|
||||
|
||||
// FUNCTION: LEGO1 0x1003df90
|
||||
MxS16 CountTotalTreeNodes(LegoTreeNode* p_node)
|
||||
{
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
|
||||
#include "3dmanager/lego3dmanager.h"
|
||||
#include "legoinputmanager.h"
|
||||
#include "legoomni.h"
|
||||
#include "legomain.h"
|
||||
#include "legovideomanager.h"
|
||||
#include "mxbackgroundaudiomanager.h"
|
||||
#include "mxmisc.h"
|
||||
#include "roi/legoroi.h"
|
||||
#include "scripts.h"
|
||||
|
||||
// GLOBAL: LEGO1 0x100f4c58
|
||||
MxBool g_isWorldActive = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user