about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/editor/editor.cpp18
-rw-r--r--src/engine/config_variables.h2
-rw-r--r--src/engine/interface.h2
-rw-r--r--src/game/client/game_client.cpp17
-rw-r--r--src/game/server/game_server.cpp4
5 files changed, 25 insertions, 18 deletions
diff --git a/src/editor/editor.cpp b/src/editor/editor.cpp
index aa5a493d..784b54e1 100644
--- a/src/editor/editor.cpp
+++ b/src/editor/editor.cpp
@@ -453,7 +453,7 @@ static tilemap brush = {0};
 static tilemap chooser = {0};
 static float world_offset_x = 0, world_offset_y = 0;
 static int world_zoom = 3;
-static const char *editor_filename = 0;
+static char editor_filename[128] = {0};
 static int editor_mode = 0; // 0 == tiles, 1 == ents
 static int editor_selected_ent = -1;
 
@@ -785,7 +785,8 @@ int editor_load(const char *filename)
 			ents_new(type, e->x, e->y);
 		}
 	}
-
+	
+	datafile_unload(df);
 	return 1;
 }
 
@@ -925,6 +926,7 @@ static void editor_listdir_map_callback(const char *name, int is_dir, void *user
 		sprintf(buf, "data/maps/%s", name);
 		
 		editor_load(buf);
+		strcpy(editor_filename, buf);
 		editor_loadmap = -1;
 	}
 	*y += 1;
@@ -1267,16 +1269,16 @@ extern "C" void editor_update_and_render()
 	if(inp_key_down(KEY_KP_ADD))
 	{
 		world_zoom--;
-		if(world_zoom < 3)
-			world_zoom = 3;
+		if(world_zoom < 1)
+			world_zoom = 1;
 	}
 	
 	// zoom out
 	if(inp_key_down(KEY_KP_SUBTRACT))
 	{
 		world_zoom++;
-		if(world_zoom > 8)
-			world_zoom = 8;
+		if(world_zoom > 16)
+			world_zoom = 16;
 	}
 	
 	if(inp_key_pressed(KEY_LCTRL) || inp_key_pressed(KEY_RCTRL))
@@ -1305,6 +1307,7 @@ extern "C" void editor_update_and_render()
 		{
 			dbg_msg("editor", "save");
 			editor_save(editor_filename);
+			client_rcon("sv_map_reload=1");
 		}
 
 	}
@@ -1334,6 +1337,9 @@ extern "C" void editor_init()
 	font_texture = gfx_load_texture("data/debug_font.png");
 	checker_texture = gfx_load_texture("data/checker.png");
 	editor_reset();
+	
+	layer *l = layers_get(layers_new(50, 50));
+	l->main_layer = 1;
 }
 
 /*
diff --git a/src/engine/config_variables.h b/src/engine/config_variables.h
index d62529ec..d6225bf1 100644
--- a/src/engine/config_variables.h
+++ b/src/engine/config_variables.h
@@ -51,7 +51,7 @@ MACRO_CONFIG_INT(sv_sendheartbeats, 1, 0, 1)
 MACRO_CONFIG_STR(sv_map, 128, "dm1")
 MACRO_CONFIG_INT(sv_map_reload, 0, 0, 1)
 
-MACRO_CONFIG_INT(sv_max_clients, 8, 1, 16)
+MACRO_CONFIG_INT(sv_max_clients, 8, 1, 12)
 
 MACRO_CONFIG_INT(sv_bandwidth_mode, 0, 0, 2)
 
diff --git a/src/engine/interface.h b/src/engine/interface.h
index cb975fed..684e7987 100644
--- a/src/engine/interface.h
+++ b/src/engine/interface.h
@@ -14,7 +14,7 @@ extern "C" {
 
 enum 
 {
-	MAX_CLIENTS=16,
+	MAX_CLIENTS=12,
 	SERVER_TICK_SPEED=50, /* TODO: this should be removed */
 	SNAP_CURRENT=0,
 	SNAP_PREV=1,
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index 29a4cbe9..25a9fdc4 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -696,25 +696,26 @@ static void process_events(int s)
 		{
 			ev_explosion *ev = (ev_explosion *)data;
 			vec2 p(ev->x, ev->y);
+			vec4 c(0.5f, 0.1f, 0.1f, 1.0f);
 
 			// center explosion
 			vec2 v = normalize(vec2(frandom()-0.5f, -frandom()))*(32.0f+frandom()*32.0f);
-			temp_system.new_particle(p, v, 1.2f, 64.0f, 0, 0.95f);
+			temp_system.new_particle(p, v, 1.2f, 64.0f, 0, 0.95f, c);
 			v = normalize(vec2(frandom()-0.5f, -frandom()))*(128.0f+frandom()*128.0f);
-			temp_system.new_particle(p, v, 1.2f, 32.0f, 0, 0.95f);
+			temp_system.new_particle(p, v, 1.2f, 32.0f, 0, 0.95f, c);
 			v = normalize(vec2(frandom()-0.5f, -frandom()))*(128.0f+frandom()*128.0f);
-			temp_system.new_particle(p, v, 1.2f, 16.0f, 0, 0.95f);
+			temp_system.new_particle(p, v, 1.2f, 16.0f, 0, 0.95f, c);
 
 			for(int i = 0; i < 8; i++)
 			{
 				vec2 v = normalize(vec2(frandom()-0.5f, frandom()-0.5f))*(64.0f+frandom()*64.0f);
-				temp_system.new_particle(p, v, 0.5f+0.5f*frandom(), 16.0f, 0, 0.985f);
+				temp_system.new_particle(p, v, 0.5f+0.5f*frandom(), 16.0f, 0, 0.985f, c);
 			}
 
 			for(int i = 0; i < 8; i++)
 			{
 				vec2 v = normalize(vec2(frandom()-0.5f, frandom()-0.5f))*(128.0f+frandom()*256.0f);
-				temp_system.new_particle(p, v, 0.5f+0.5f*frandom(), 16.0f, 128.0f, 0.985f);
+				temp_system.new_particle(p, v, 0.5f+0.5f*frandom(), 16.0f, 128.0f, 0.985f, c);
 			}
 		}
 		else if(item.type == EVENT_SOUND_WORLD)
@@ -823,8 +824,8 @@ extern "C" void modc_predict()
 					snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos);
 				}
 				//if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos);
-				if(events&COREEVENT_HOOK_ATTACH_PLAYER) snd_play_random(CHN_WORLD, SOUND_HOOK_ATTACH, 1.0f, pos);
-				if(events&COREEVENT_HOOK_ATTACH_GROUND) snd_play_random(CHN_WORLD, SOUND_HOOK_ATTACH, 1.0f, pos);
+				if(events&COREEVENT_HOOK_ATTACH_PLAYER) snd_play_random(CHN_WORLD, SOUND_HOOK_ATTACH_PLAYER, 1.0f, pos);
+				if(events&COREEVENT_HOOK_ATTACH_GROUND) snd_play_random(CHN_WORLD, SOUND_HOOK_ATTACH_GROUND, 1.0f, pos);
 				//if(events&COREEVENT_HOOK_RETRACT) snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos);
 			}
 
@@ -1499,7 +1500,7 @@ static void render_player(
 		if (player.weapon == WEAPON_GUN || player.weapon == WEAPON_SHOTGUN)
 		{
 			// check if we're firing stuff
-			if (true)///prev.attackticks)
+			if (true)//prev.attackticks)
 			{
 				float alpha = 0.0f;
 				int phase1tick = (client_tick() - player.attacktick);
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 9b893357..02e58c88 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -981,8 +981,8 @@ void player::tick_defered()
 		if(events&COREEVENT_GROUND_JUMP) create_sound(pos, SOUND_PLAYER_JUMP, mask);
 		if(events&COREEVENT_AIR_JUMP) create_sound(pos, SOUND_PLAYER_JUMP, mask);
 		//if(events&COREEVENT_HOOK_LAUNCH) snd_play_random(CHN_WORLD, SOUND_HOOK_LOOP, 1.0f, pos);
-		if(events&COREEVENT_HOOK_ATTACH_PLAYER) create_sound(pos, SOUND_HOOK_ATTACH, mask);
-		if(events&COREEVENT_HOOK_ATTACH_GROUND) create_sound(pos, SOUND_HOOK_ATTACH, mask);
+		if(events&COREEVENT_HOOK_ATTACH_PLAYER) create_sound(pos, SOUND_HOOK_ATTACH_PLAYER, mask);
+		if(events&COREEVENT_HOOK_ATTACH_GROUND) create_sound(pos, SOUND_HOOK_ATTACH_GROUND, mask);
 		//if(events&COREEVENT_HOOK_RETRACT) snd_play_random(CHN_WORLD, SOUND_PLAYER_JUMP, 1.0f, pos);
generated by cgit-pink 1.4.1 (git 2.36.1) at 2025-12-10 14:18:49 +0000