about summary refs log tree commit diff
path: root/src/game/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/client')
-rw-r--r--src/game/client/clienthooks.cpp34
-rw-r--r--src/game/client/gameclient.cpp70
-rw-r--r--src/game/client/gc_hooks.cpp138
3 files changed, 104 insertions, 138 deletions
diff --git a/src/game/client/clienthooks.cpp b/src/game/client/clienthooks.cpp
new file mode 100644
index 00000000..3787b489
--- /dev/null
+++ b/src/game/client/clienthooks.cpp
@@ -0,0 +1,34 @@
+#include <string.h>
+#include <engine/e_client_interface.h>
+#include <game/version.hpp>
+
+#include "gameclient.hpp"
+#include "components/console.hpp"
+
+extern "C" void modc_console_init()
+{
+	//client_console_init();
+}
+
+
+extern "C" void modc_save_config()
+{
+	//binds_save();
+}
+
+// clean hooks
+extern "C" void modc_entergame() {}
+extern "C" void modc_shutdown() {}
+extern "C" void modc_init() { gameclient.on_init(); }
+extern "C" void modc_connected() { gameclient.on_connected(); }
+extern "C" void modc_predict() { gameclient.on_predict(); }
+extern "C" void modc_newsnapshot() { gameclient.on_snapshot(); }
+extern "C" int modc_snap_input(int *data) { return gameclient.on_snapinput(data); }
+extern "C" void modc_statechange(int state, int old) { gameclient.on_statechange(state, old); }
+extern "C" void modc_render() { gameclient.on_render(); }
+extern "C" void modc_message(int msgtype) { gameclient.on_message(msgtype); }
+extern "C" void modc_rcon_line(const char *line) { gameclient.console->print_line(1, line); }
+
+extern "C" const char *modc_net_version() { return GAME_NETVERSION; }
+extern "C" const char *modc_getitemname(int type) { return netobj_get_name(type); }
+
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index 1ff4225f..e808b4be 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -1,5 +1,11 @@
 #include <engine/e_client_interface.h>
+
 #include <game/generated/g_protocol.hpp>
+#include <game/generated/gc_data.hpp>
+
+#include <game/layers.hpp>
+#include "gc_render.hpp"
+#include "gc_map_image.hpp"
 
 #include "gameclient.hpp"
 #include "components/killmessages.hpp"
@@ -55,8 +61,67 @@ static MAPLAYERS maplayers_foreground(MAPLAYERS::TYPE_FOREGROUND);
 GAMECLIENT::STACK::STACK() { num = 0; }
 void GAMECLIENT::STACK::add(class COMPONENT *component) { components[num++] = component; }
 
+
+static void load_sounds_thread(void *do_render)
+{
+	// load sounds
+	for(int s = 0; s < data->num_sounds; s++)
+	{
+		//if(do_render) // TODO: repair me
+			//render_loading(load_current/load_total);
+		for(int i = 0; i < data->sounds[s].num_sounds; i++)
+		{
+			int id = snd_load_wv(data->sounds[s].sounds[i].filename);
+			data->sounds[s].sounds[i].id = id;
+		}
+
+		//if(do_render)
+		//	load_current++;
+	}
+}
+
 void GAMECLIENT::on_init()
 {
+	// setup item sizes
+	for(int i = 0; i < NUM_NETOBJTYPES; i++)
+		snap_set_staticsize(i, netobj_get_size(i));
+	
+	// load default font	
+	static FONT_SET default_font;
+	int64 start = time_get();
+	
+	int before = gfx_memory_usage();
+	font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
+	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
+	
+	gfx_text_set_default_font(&default_font);
+
+	// setup load amount
+	/*
+	load_total = data->num_images;
+	load_current = 0;
+	if(!config.cl_threadsoundloading)
+		load_total += data->num_sounds;*/
+	
+	// load textures
+	for(int i = 0; i < data->num_images; i++)
+	{
+		// TODO: repair me
+		//render_loading(load_current/load_total);
+		data->images[i].id = gfx_load_texture(data->images[i].filename, IMG_AUTO, 0);
+		//load_current++;
+	}
+
+	gameclient.skins->init();
+	
+	if(config.cl_threadsoundloading)
+		thread_create(load_sounds_thread, 0);
+	else
+		load_sounds_thread((void*)1);
+	
+	int64 end = time_get();
+	dbg_msg("", "%f.2ms", ((end-start)*1000)/(float)time_freq());
+	
 	// setup pointers
 	binds = &::binds;
 	console = &::console;
@@ -153,6 +218,11 @@ int GAMECLIENT::on_snapinput(int *data)
 
 void GAMECLIENT::on_connected()
 {
+	layers_init();
+	col_init();
+	img_init();
+	render_tilemap_generate_skip();
+		
 	on_reset();	
 	
 	// send the inital info
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
deleted file mode 100644
index cd027ff2..00000000
--- a/src/game/client/gc_hooks.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include <string.h>
-
-#include <engine/e_client_interface.h>
-
-extern "C" {
-	#include <engine/client/ec_font.h>
-};
-
-#include <game/generated/gc_data.hpp>
-#include <game/gamecore.hpp>
-#include <game/version.hpp>
-
-#include <game/layers.hpp>
-
-#include "gameclient.hpp"
-#include "components/skins.hpp"
-#include "components/console.hpp"
-
-#include "gc_render.hpp"
-#include "gc_map_image.hpp"
-
-extern unsigned char internal_data[];
-
-static float load_total;
-static float load_current;
-
-extern "C" void modc_console_init()
-{
-	//client_console_init();
-}
-
-static void load_sounds_thread(void *do_render)
-{
-	// load sounds
-	for(int s = 0; s < data->num_sounds; s++)
-	{
-		//if(do_render) // TODO: repair me
-			//render_loading(load_current/load_total);
-		for(int i = 0; i < data->sounds[s].num_sounds; i++)
-		{
-			int id = snd_load_wv(data->sounds[s].sounds[i].filename);
-			data->sounds[s].sounds[i].id = id;
-		}
-
-		if(do_render)
-			load_current++;
-	}
-}
-
-extern "C" void modc_init()
-{
-	for(int i = 0; i < NUM_NETOBJTYPES; i++)
-		snap_set_staticsize(i, netobj_get_size(i));
-		
-	gameclient.on_init();
-	
-	static FONT_SET default_font;
-	int64 start = time_get();
-	
-	int before = gfx_memory_usage();
-	font_set_load(&default_font, "data/fonts/default_font%d.tfnt", "data/fonts/default_font%d.png", "data/fonts/default_font%d_b.png", 14, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 36);
-	dbg_msg("font", "gfx memory used for font textures: %d", gfx_memory_usage()-before);
-	
-	gfx_text_set_default_font(&default_font);
-
-	// load the data container
-	//data = load_data_from_memory(internal_data);
-
-	// setup load amount
-	load_total = data->num_images;
-	load_current = 0;
-	if(!config.cl_threadsoundloading)
-		load_total += data->num_sounds;
-	
-	// load textures
-	for(int i = 0; i < data->num_images; i++)
-	{
-		// TODO: repair me
-		//render_loading(load_current/load_total);
-		data->images[i].id = gfx_load_texture(data->images[i].filename, IMG_AUTO, 0);
-		load_current++;
-	}
-
-	gameclient.skins->init();
-	
-	if(config.cl_threadsoundloading)
-		thread_create(load_sounds_thread, 0);
-	else
-		load_sounds_thread((void*)1);
-	
-	int64 end = time_get();
-	dbg_msg("", "%f.2ms", ((end-start)*1000)/(float)time_freq());
-}
-
-extern "C" void modc_save_config()
-{
-	//binds_save();
-}
-
-CHARACTER_CORE predicted_prev_char;
-CHARACTER_CORE predicted_char;
-
-
-/*
-NETOBJ_PROJECTILE extraproj_projectiles[MAX_EXTRA_PROJECTILES];
-int extraproj_num;
-
-void extraproj_reset()
-{
-	extraproj_num = 0;
-}*/
-
-
-extern "C" void modc_connected()
-{
-	layers_init();
-	col_init();
-	img_init();
-	
-	render_tilemap_generate_skip();
-	
-	gameclient.on_connected();
-}
-
-// clean hooks
-extern "C" void modc_entergame() {}
-extern "C" void modc_shutdown() {}
-extern "C" void modc_predict() { gameclient.on_predict(); }
-extern "C" void modc_newsnapshot() { gameclient.on_snapshot(); }
-extern "C" int modc_snap_input(int *data) { return gameclient.on_snapinput(data); }
-extern "C" void modc_statechange(int state, int old) { gameclient.on_statechange(state, old); }
-extern "C" void modc_render() { gameclient.on_render(); }
-extern "C" void modc_message(int msgtype) { gameclient.on_message(msgtype); }
-extern "C" void modc_rcon_line(const char *line) { gameclient.console->print_line(1, line); }
-
-extern "C" const char *modc_net_version() { return GAME_NETVERSION; }
-extern "C" const char *modc_getitemname(int type) { return netobj_get_name(type); }
-
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-12-09 19:12:01 +0000