edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed so that maps are downloaded to maps/. fixed so that you can't select non-existing envelopes in the editor

Browse source
This commit is contained in:
Magnus Auvinen 2008-03-23 12:51:14 +00:00
parent 72446f49e9
commit 119bb8a5f8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/client/ec_client.c
View file

@ -635,7 +635,7 @@ static const char *client_load_map_search(const char *mapname, int wanted_crc)
return error;
/* try the downloaded maps */
str_format(buf2, sizeof(buf2), "%s_%8x.map", mapname, wanted_crc);
str_format(buf2, sizeof(buf2), "maps/%s_%8x.map", mapname, wanted_crc);
engine_savepath(buf2, buf, sizeof(buf));
error = client_load_map(buf, wanted_crc);
return error;
@ -768,7 +768,7 @@ static void client_process_packet(NETPACKET *packet)
else
{
char buf[512];
str_format(buf, sizeof(buf), "%s_%8x.map", map, map_crc);
str_format(buf, sizeof(buf), "maps/%s_%8x.map", map, map_crc);
engine_savepath(buf, mapdownload_filename, sizeof(mapdownload_filename));
dbg_msg("client/network", "starting to download map to '%s'", mapdownload_filename);

4
src/game/editor/ed_popups.cpp
View file

@ -284,9 +284,9 @@ int popup_quad(RECT view)
int new_val = 0;
int prop = editor.do_properties(&view, props, ids, &new_val);
if(prop == PROP_POS_ENV) quad->pos_env = new_val;
if(prop == PROP_POS_ENV) quad->pos_env = clamp(new_val, -1, editor.map.envelopes.len()-1);
if(prop == PROP_POS_ENV_OFFSET) quad->pos_env_offset = new_val;
if(prop == PROP_COLOR_ENV) quad->color_env = new_val;
if(prop == PROP_COLOR_ENV) quad->color_env = clamp(new_val, -1, editor.map.envelopes.len()-1);
if(prop == PROP_COLOR_ENV_OFFSET) quad->color_env_offset = new_val;
return 0;