Fix IB_LAUNCHER bitflag

Author: fkaa

include/common.h

@@ -34,10 +34,10 @@
 
 #define IB_CLIENT       (0x1 << 0)
 #define IB_SERVER       (0x1 << 1)
-#define IB_LAUNCHER     (IB_CLIENT | IB_SERVER)
-#define IB_MAIN_LOADED  (0x1 << 2)
-#define IB_MAIN_LOADING (0x1 << 3)
-#define IB_ENET         (0x1 << 4)
+#define IB_LAUNCHER     (0x1 << 2)
+#define IB_MAIN_LOADED  (0x1 << 3)
+#define IB_MAIN_LOADING (0x1 << 4)
+#define IB_ENET         (0x1 << 5)
 
 #define IB_QUIT_SHUTDOWN (0x1 << 0)
 #define IB_QUIT_RESTART  (0x1 << 1)
@@ -621,6 +621,7 @@ int error_sdl(char *msg);
 int error_perror(char *msg);
 
 #ifndef DEDI
+void ib_create_launcher(int port, const char *pkg);
 void ib_create_server(int port, const char *pkg);
 void ib_join_server(const char *address, int port);
 #endif

pkg/iceball/launch/main_client.lua

@@ -96,7 +96,7 @@ function client.hook_key(key, state, modif, uni)
 			client.create_server(20737, "pkg/base")
 			-- client.mk_sys_execv("-s", "20737", "pkg/base", arg_closure(argv))
 		elseif key == SDLK_c then
-			client.create_server(0, "pkg/iceball/config")
+			client.create_launcher(0, "pkg/iceball/config")
 			-- client.mk_sys_execv("-l", "pkg/iceball/config")
 		elseif key == SDLK_ESCAPE then
 			client.hook_tick = nil

src/lua.c

@@ -99,7 +99,7 @@ int icelua_fn_client_join_server(lua_State *L)
 int icelua_fn_client_create_server(lua_State *L)
 {
 	if (!(boot_mode & IB_LAUNCHER))
-		return luaL_error(L, "join_server called when not in -l mode");
+		return luaL_error(L, "create_server called when not in -l mode");
 
 	int top = lua_gettop(L);
 
@@ -111,6 +111,21 @@ int icelua_fn_client_create_server(lua_State *L)
 	return 2;
 }
 
+int icelua_fn_client_create_launcher(lua_State *L)
+{
+	if (!(boot_mode & IB_LAUNCHER))
+		return luaL_error(L, "create_launcher called when not in -l mode");
+
+	int top = lua_gettop(L);
+
+	int port = lua_tonumber(L, -2);
+	const char *pkg = lua_tostring(L, -1);
+
+	ib_create_launcher(port, pkg);
+
+	return 2;
+}
+
 int icelua_fn_client_mk_sys_execv(lua_State *L)
 {
 	if(!(boot_mode & IB_LAUNCHER))
@@ -238,6 +253,7 @@ int icelua_fn_client_mk_set_title(lua_State *L)
 
 #ifndef DEDI
 struct icelua_entry icelua_client[] = {
+	{icelua_fn_client_create_launcher, "create_launcher"},
 	{icelua_fn_client_create_server, "create_server"},
 	{icelua_fn_client_join_server, "join_server"},
 	{icelua_fn_client_mk_set_title, "mk_set_title"},

src/main.c

@@ -409,6 +409,26 @@ int64_t platform_get_time_usec(void)
 }
 
 #ifndef DEDI
+void ib_create_launcher(int port, const char *pkg)
+{
+	if (net_address) {
+		free(net_address);
+	}
+
+	net_address = NULL;
+	net_port = port;
+
+	if (mod_basedir) {
+		free(mod_basedir);
+	}
+
+	mod_basedir = malloc(PATH_LEN_MAX);
+	mod_basedir = strncpy(mod_basedir, pkg, PATH_LEN_MAX);
+
+	restart_boot_mode = IB_LAUNCHER | IB_CLIENT | IB_SERVER;
+	quitflag |= IB_QUIT_RESTART;
+}
+
 void ib_create_server(int port, const char *pkg)
 {
 	if (net_address) {
@@ -425,7 +445,7 @@ void ib_create_server(int port, const char *pkg)
 	mod_basedir = malloc(PATH_LEN_MAX);
 	mod_basedir = strncpy(mod_basedir, pkg, PATH_LEN_MAX);
 
-	restart_boot_mode = IB_LAUNCHER;
+	restart_boot_mode = IB_CLIENT | IB_SERVER;
 	quitflag |= IB_QUIT_RESTART;
 }
 
@@ -986,7 +1006,7 @@ static int parse_args(int argc, char *argv[], struct cli_args *args) {
 	if (argc <= 1) {
 		args->net_port = 0;
 		args->basedir = strncpy(args->basedir, "pkg/iceball/launch", PATH_LEN_MAX);
-		args->boot_mode = IB_LAUNCHER;
+		args->boot_mode = IB_CLIENT | IB_SERVER | IB_LAUNCHER;
 		args->used_args = 4;
 	} else
 #endif
@@ -997,7 +1017,7 @@ static int parse_args(int argc, char *argv[], struct cli_args *args) {
 	} else if (!strcmp(argv[1], "-l")) {
 		// TODO: Merge this with the argc <= 1 thing above
 		args->net_port = 0;
-		args->boot_mode = IB_LAUNCHER;
+		args->boot_mode = IB_CLIENT | IB_SERVER | IB_LAUNCHER;
 		// TODO: Ensure used_args values are correct
 		args->used_args = 2;
 		if (argc >= 3) {