Skip to content

Commit f4da5c8

Browse files
authored
Merge pull request #160 from hgh32/master
Implement CheckE3Mode::doQuery
2 parents 5151dfa + 007bdc9 commit f4da5c8

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

data/uking_functions.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40718,7 +40718,7 @@ Address,Quality,Size,Name
4071840718
0x0000007100689ec8,O,000048,_ZN5uking5query11CheckE3ModeC1ERKN4ksys3act2ai5Query7InitArgE
4071940719
0x0000007100689ef8,O,000020,_ZN5uking5query11CheckE3ModeD1Ev
4072040720
0x0000007100689f0c,O,000052,_ZN5uking5query11CheckE3ModeD0Ev
40721-
0x0000007100689f40,U,000104,AI_Query_CheckE3Mode::doQuery
40721+
0x0000007100689f40,O,000104,_ZN5uking5query11CheckE3Mode7doQueryEv
4072240722
0x0000007100689fa8,O,000004,_ZN5uking5query11CheckE3Mode10loadParamsERKN4evfl8QueryArgE
4072340723
0x0000007100689fac,O,000004,_ZN5uking5query11CheckE3Mode10loadParamsEv
4072440724
0x0000007100689fb0,O,000204,_ZNK5uking5query11CheckE3Mode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE

src/Game/AI/Query/queryCheckE3Mode.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
#include "Game/AI/Query/queryCheckE3Mode.h"
22
#include <evfl/Query.h>
3+
#include "Game/E3Mgr.h"
34

45
namespace uking::query {
56

67
CheckE3Mode::CheckE3Mode(const InitArg& arg) : ksys::act::ai::Query(arg) {}
78

89
CheckE3Mode::~CheckE3Mode() = default;
910

10-
// FIXME: implement
1111
int CheckE3Mode::doQuery() {
12-
return -1;
12+
auto* e3m = E3Mgr::instance();
13+
if (e3m != nullptr) {
14+
if (e3m->isDemoMode0AndNotStageSelect()) {
15+
return 1;
16+
}
17+
if (e3m->isDemoMode1AndNotStageSelect()) {
18+
return 2;
19+
}
20+
if (e3m->isDemoMode2AndNotStageSelect()) {
21+
return 3;
22+
}
23+
}
24+
return 0;
1325
}
1426

1527
void CheckE3Mode::loadParams(const evfl::QueryArg& arg) {}

0 commit comments

Comments
 (0)