diff --git a/CMakeLists.txt b/CMakeLists.txt index e51e88234..6ced12f89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1102,21 +1102,10 @@ set(EXPECTED_DATA mapres/winter_mountains.png mapres/winter_mountains2.png mapres/winter_mountains3.png - maps/Goo!.map - maps/Kobra\ 4.map - maps/ctf1.map - maps/ctf2.map - maps/ctf3.map - maps/ctf4.map - maps/ctf5.map - maps/ctf6.map - maps/ctf7.map - maps/dm1.map - maps/dm2.map - maps/dm6.map - maps/dm7.map - maps/dm8.map - maps/dm9.map + maps/Gold\ Mine.map + maps/license.txt + maps7/Gold\ Mine.map + maps7/readme.txt particles.png shader/bordertile.frag shader/bordertile.vert diff --git a/autoexec_server.cfg b/autoexec_server.cfg index 44116a011..3986fc3c0 100644 --- a/autoexec_server.cfg +++ b/autoexec_server.cfg @@ -33,7 +33,7 @@ sv_rcon_mod_password "" sv_rcon_helper_password "" # Map to start server with -sv_map "Kobra 4" +sv_map "Gold Mine" # Whether this is a test server and rcon cheats are allowed. Also indicated in # the server type, which is: @@ -127,8 +127,7 @@ sv_reset_file "reset.cfg" # # You can learn more about tunes on http://ddnet.tw/settingscommands/#tunings -add_vote "Map: Kobra 4" "change_map \"Kobra 4\"" -add_vote "Map: Goo!" "change_map Goo!" +add_vote "Map: Gold Mine" "change_map \"Gold Mine\"" add_vote " " "info" add_vote "Option: Normal gravity" "tune gravity 0.50" add_vote "Option: Moon gravity" "tune gravity 0.25" diff --git a/data/maps/Gold Mine.map b/data/maps/Gold Mine.map new file mode 100644 index 000000000..f0d9f3710 Binary files /dev/null and b/data/maps/Gold Mine.map differ diff --git a/data/maps/Goo!.map b/data/maps/Goo!.map deleted file mode 100644 index c21b9a74c..000000000 Binary files a/data/maps/Goo!.map and /dev/null differ diff --git a/data/maps/Kobra 4.map b/data/maps/Kobra 4.map deleted file mode 100644 index f6e862882..000000000 Binary files a/data/maps/Kobra 4.map and /dev/null differ diff --git a/data/maps/ctf1.map b/data/maps/ctf1.map deleted file mode 100644 index acf9835a5..000000000 Binary files a/data/maps/ctf1.map and /dev/null differ diff --git a/data/maps/ctf2.map b/data/maps/ctf2.map deleted file mode 100644 index 1e3bd323c..000000000 Binary files a/data/maps/ctf2.map and /dev/null differ diff --git a/data/maps/ctf3.map b/data/maps/ctf3.map deleted file mode 100644 index b0ec2d65f..000000000 Binary files a/data/maps/ctf3.map and /dev/null differ diff --git a/data/maps/ctf4.map b/data/maps/ctf4.map deleted file mode 100644 index 9e04fad5a..000000000 Binary files a/data/maps/ctf4.map and /dev/null differ diff --git a/data/maps/ctf5.map b/data/maps/ctf5.map deleted file mode 100644 index f2e64a919..000000000 Binary files a/data/maps/ctf5.map and /dev/null differ diff --git a/data/maps/ctf6.map b/data/maps/ctf6.map deleted file mode 100644 index 5bc111129..000000000 Binary files a/data/maps/ctf6.map and /dev/null differ diff --git a/data/maps/ctf7.map b/data/maps/ctf7.map deleted file mode 100644 index e5211aeaf..000000000 Binary files a/data/maps/ctf7.map and /dev/null differ diff --git a/data/maps/dm1.map b/data/maps/dm1.map deleted file mode 100644 index 515582e95..000000000 Binary files a/data/maps/dm1.map and /dev/null differ diff --git a/data/maps/dm2.map b/data/maps/dm2.map deleted file mode 100644 index c279f7ee7..000000000 Binary files a/data/maps/dm2.map and /dev/null differ diff --git a/data/maps/dm6.map b/data/maps/dm6.map deleted file mode 100644 index 3e9ce8858..000000000 Binary files a/data/maps/dm6.map and /dev/null differ diff --git a/data/maps/dm7.map b/data/maps/dm7.map deleted file mode 100644 index 1a2e602c2..000000000 Binary files a/data/maps/dm7.map and /dev/null differ diff --git a/data/maps/dm8.map b/data/maps/dm8.map deleted file mode 100644 index 0aa29109a..000000000 Binary files a/data/maps/dm8.map and /dev/null differ diff --git a/data/maps/dm9.map b/data/maps/dm9.map deleted file mode 100644 index 918c41e1b..000000000 Binary files a/data/maps/dm9.map and /dev/null differ diff --git a/data/maps/license.txt b/data/maps/license.txt new file mode 100644 index 000000000..e2428ca7c --- /dev/null +++ b/data/maps/license.txt @@ -0,0 +1,3 @@ +Gold Mine: +Copyright +CC-BY-SA license diff --git a/data/maps7/Gold Mine.map b/data/maps7/Gold Mine.map new file mode 100644 index 000000000..e2d5269fe Binary files /dev/null and b/data/maps7/Gold Mine.map differ diff --git a/data/maps7/readme.txt b/data/maps7/readme.txt new file mode 100644 index 000000000..de2f8dcc7 --- /dev/null +++ b/data/maps7/readme.txt @@ -0,0 +1,2 @@ +Maps in this directory are created using the map_convert_07 tool for +server compatibility with Teeworlds 0.7 clients diff --git a/src/engine/shared/config_variables.h b/src/engine/shared/config_variables.h index 3d27fccb6..aaf01c5d1 100644 --- a/src/engine/shared/config_variables.h +++ b/src/engine/shared/config_variables.h @@ -120,7 +120,7 @@ MACRO_CONFIG_INT(SvIpv4Only, sv_ipv4only, 0, 0, 1, CFGFLAG_SERVER, "Whether to b MACRO_CONFIG_INT(SvPort, sv_port, 0, 0, 0, CFGFLAG_SERVER, "Port to use for the server (Only ports 8303-8310 work in LAN server browser, 0 to automatically find a free port in 8303-8310)") MACRO_CONFIG_INT(SvExternalPort, sv_external_port, 0, 0, 0, CFGFLAG_SERVER, "External port to report to the master servers") MACRO_CONFIG_STR(SvHostname, sv_hostname, 128, "", CFGFLAG_SAVE|CFGFLAG_SERVER, "Server hostname (0.7 only)") -MACRO_CONFIG_STR(SvMap, sv_map, 128, "Kobra 4", CFGFLAG_SERVER, "Map to use on the server") +MACRO_CONFIG_STR(SvMap, sv_map, 128, "Gold Mine", CFGFLAG_SERVER, "Map to use on the server") MACRO_CONFIG_INT(SvMaxClients, sv_max_clients, MAX_CLIENTS, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients that are allowed on a server") MACRO_CONFIG_INT(SvMaxClientsPerIP, sv_max_clients_per_ip, 4, 1, MAX_CLIENTS, CFGFLAG_SERVER, "Maximum number of clients with the same IP that can connect to the server") MACRO_CONFIG_INT(SvHighBandwidth, sv_high_bandwidth, 0, 0, 1, CFGFLAG_SERVER, "Use high bandwidth mode. Doubles the bandwidth required for the server. LAN use only")