Pass lua source directly into event_init
This commit is contained in:
@@ -444,8 +444,7 @@ void DrivenEngine::drv_get_animation_queues(uint32_t count, const int64_t *ids,
|
|||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
void DrivenEngine::drv_initialize(uint32_t srcpklen, const char *srcpk, int argc, char **argv) {
|
void DrivenEngine::drv_initialize(uint32_t srcpklen, const char *srcpk, int argc, char **argv) {
|
||||||
drv_set_lua_source_pack(srcpklen, srcpk);
|
event_init(std::string_view(srcpk, srcpklen), argc, argv);
|
||||||
event_init(argc, argv);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrivenEngine::drv_clear_new_outgoing() {
|
void DrivenEngine::drv_clear_new_outgoing() {
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ public:
|
|||||||
// The init callback. You may override this in a subclass.
|
// The init callback. You may override this in a subclass.
|
||||||
// This will be called once at program initialization.
|
// This will be called once at program initialization.
|
||||||
//
|
//
|
||||||
virtual void event_init(int argc, char *argv[]) {}
|
virtual void event_init(std::string_view srcpk, int argc, char *argv[]) {}
|
||||||
|
|
||||||
// The update callback. You may override this in a subclass.
|
// The update callback. You may override this in a subclass.
|
||||||
// This will be called whenever anything changes.
|
// This will be called whenever anything changes.
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ public:
|
|||||||
channel_.reset();
|
channel_.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void event_init(int argc, char *argv[]) {
|
virtual void event_init(std::string_view srcpk, int argc, char *argv[]) {
|
||||||
// Put the world into the starting state.
|
// Put the world into the starting state.
|
||||||
set_initial_state();
|
set_initial_state();
|
||||||
|
|
||||||
@@ -78,10 +78,6 @@ public:
|
|||||||
|
|
||||||
// Set the console prompt
|
// Set the console prompt
|
||||||
set_console_prompt(console_.get_prompt());
|
set_console_prompt(console_.get_prompt());
|
||||||
|
|
||||||
// The driver loads the lua source automatically.
|
|
||||||
// However, we don't need it. Throw it out.
|
|
||||||
get_lua_source_pack();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void send_invocation(const Invocation &inv) {
|
void send_invocation(const Invocation &inv) {
|
||||||
|
|||||||
@@ -31,12 +31,12 @@ public:
|
|||||||
Gui gui_;
|
Gui gui_;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual void event_init(int argc, char *argv[]) {
|
virtual void event_init(std::string_view srcpk, int argc, char *argv[]) {
|
||||||
// Create the master world model.
|
// Create the master world model.
|
||||||
master_.reset(new World(WORLD_TYPE_MASTER));
|
master_.reset(new World(WORLD_TYPE_MASTER));
|
||||||
|
|
||||||
// Update the source code of the master model.
|
// Update the source code of the master model.
|
||||||
master_->update_source(get_lua_source_pack());
|
master_->update_source(srcpk);
|
||||||
|
|
||||||
// Create an actor for administrative commands.
|
// Create an actor for administrative commands.
|
||||||
admin_id_ = master_->create_login_actor();
|
admin_id_ = master_->create_login_actor();
|
||||||
|
|||||||
Reference in New Issue
Block a user