lachrymal/NouVeL
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

what

Browse source
This commit is contained in:
lachrymaL 2023-04-06 20:05:18 -04:00
parent 5391c47b88
commit 1248defb9b
No known key found for this signature in database
GPG key ID: F3640ACFA174B1C1
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ADVect/ADVect.cpp
View file

@ -293,9 +293,6 @@ int main(int argc, char* argv[]) {
{
u"Show",
NVL::Environment::Variable([](std::vector<NVL::Environment::Variable> args) {
<<<<<<< HEAD
std::get<std::function<NVL::Environment::Variable(std::vector<NVL::Environment::Variable>)>>(args[0].value)({args[1]});
=======
std::string name = NVL::to_std_string(std::get<NVL::String>(NVL::Environment::Variable(args[0]).value));
/* NamedImageTrack* t = find_image_track(name);
if (t == nullptr) {
@ -316,7 +313,6 @@ int main(int argc, char* argv[]) {
dialogue_bg.current = ADVect::Graphics::GetImageTextureFromFile(NVL::to_std_string(std::get<NVL::String>(NVL::Environment::Variable(args[1]).value)));
else
std::cerr << "ADV: Cannot find ImageTrack " << name << std::endl;
>>>>>>> 93b8864834b77391f0c1ea7fc0007f6110d69a5a
return NVL::Environment::Type::Nil;
}, 2)
}

9
ADVect/runtime/dante_ch.nvl
View file

@ -1,9 +1,4 @@
<<<<<<< HEAD
BEGIN Inferno
=======
BEGIN Inferno
//ImageTrack BG
>>>>>>> 93b8864834b77391f0c1ea7fc0007f6110d69a5a
Show BG "image.png"
Show BGDialogue "grad.png"
<<-
@ -12,11 +7,7 @@ Show BGDialogue "grad.png"
由我这里，直通[b]{无尽之苦}。
由我这里，直通[b]{堕落众生}。
圣裁于高天激发造我的君主；
<<<<<<< HEAD
造我的大能是[b, rb("C")]{神}的力量，是无上的[b, rb("L L V M")]{智慧与众爱}所自出。
=======
造我的大能是[b, rb("C")]{神}的力量，是无上的[b, rb("LLVM")]{智慧与众爱}所自出。
>>>>>>> 93b8864834b77391f0c1ea7fc0007f6110d69a5a
我永远不朽；在我之前，万象 未形，只有永恒的事物存在。
来者呀，快把一切希望弃扬。
我所见到的文字，毫无光彩， 用暗色刻在地狱之门的高处。