renamed everything. added the new license

10 files changed, 14 insertions, 14 deletions

diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index e83975b1..210d9b28 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -1484,7 +1484,7 @@ int main(int argc, char **argv)
 
 	/* init the engine */
 	dbg_msg("client", "starting...");
-	engine_init("Teewars");
+	engine_init("Teeworlds");
 
 /*	test_parser();
 	return 0;*/
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c
index e3a4453b..53fe1790 100644
--- a/src/engine/client/ec_gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -190,7 +190,7 @@ int gfx_init()
 	glGetIntegerv(GL_STENCIL_BITS, &i);
 	dbg_msg("gfx", "stencilbits = %d", i);
 	
-	glfwSetWindowTitle("Teewars");
+	glfwSetWindowTitle("Teeworlds");
 	
 	/* We don't want to see the window when we run the stress testing */
 	if(config.dbg_stress)
diff --git a/src/engine/e_engine.c b/src/engine/e_engine.c
index 5ef6617e..22cf0acc 100644
--- a/src/engine/e_engine.c
+++ b/src/engine/e_engine.c
@@ -345,7 +345,7 @@ void mastersrv_default()
 	int i;
 	mem_zero(master_servers, sizeof(master_servers));
 	for(i = 0; i < MAX_MASTERSERVERS; i++)
-		sprintf(master_servers[i].hostname, "master%d.teewars.com", i+1);
+		sprintf(master_servers[i].hostname, "master%d.teeworlds.com", i+1);
 }
 
 int mastersrv_load()
diff --git a/src/engine/server/es_server.c b/src/engine/server/es_server.c
index adb09cb2..91c3d758 100644
--- a/src/engine/server/es_server.c
+++ b/src/engine/server/es_server.c
@@ -1133,7 +1133,7 @@ int main(int argc, char **argv)
 
 	/* init the engine */
 	dbg_msg("server", "starting...");
-	engine_init("Teewars");
+	engine_init("Teeworlds");
 	
 	/* register all console commands */
 	server_register_commands();
diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp
index 4c518711..c471d717 100644
--- a/src/game/client/gc_console.cpp
+++ b/src/game/client/gc_console.cpp
@@ -570,7 +570,7 @@ void console_render()
 		
 		// render version
 		char buf[128];
-		str_format(buf, sizeof(buf), "Teewars v%s", TEEWARS_VERSION);
+		str_format(buf, sizeof(buf), "v%s", GAME_VERSION);
 		float version_width = gfx_text_width(0, font_size, buf, -1);
 		gfx_text(0, screen.w-version_width-5, y, font_size, buf, -1);
 
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
index a4ac0e74..5dadb558 100644
--- a/src/game/client/gc_hooks.cpp
+++ b/src/game/client/gc_hooks.cpp
@@ -681,4 +681,4 @@ extern "C" void modc_connected()
 	send_info(true);
 }
 
-extern "C" const char *modc_net_version() { return TEEWARS_NETVERSION; }
+extern "C" const char *modc_net_version() { return GAME_NETVERSION; }
diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp
index 2708c374..446d42a6 100644
--- a/src/game/client/gc_menu.cpp
+++ b/src/game/client/gc_menu.cpp
@@ -1678,7 +1678,7 @@ static void menu2_render_settings(RECT main_view)
 	{
 		RECT restart_warning;
 		ui_hsplit_b(&main_view, 40, &main_view, &restart_warning);
-		ui_do_label(&restart_warning, "You must restart Teewars for all settings to take effect.", 15.0f, -1, 220);
+		ui_do_label(&restart_warning, "You must restart the game for all settings to take effect.", 15.0f, -1, 220);
 	}
 }
 
@@ -1941,9 +1941,9 @@ int menu2_render()
 		}
 		else if(popup == POPUP_FIRST_LAUNCH)
 		{
-			title = "Welcome to Teewars";
+			title = "Welcome to Teeworlds";
 			extra_text =
-			"As this is the first time you launch Teewars, please enter your nick name below. "
+			"As this is the first time you launch the game, please enter your nick name below. "
 			"It's recommended that you check the settings to adjust them to your liking "
 			"before joining a server.";
 			button_text = "Ok";
diff --git a/src/game/g_version.h b/src/game/g_version.h
index c10af7af..516d63f5 100644
--- a/src/game/g_version.h
+++ b/src/game/g_version.h
@@ -1,4 +1,4 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "generated/nethash.c"
-#define TEEWARS_VERSION "0.4.0-dev"
-#define TEEWARS_NETVERSION "0.4 " TEEWARS_NETVERSION_HASH
+#define GAME_VERSION "0.4.0-dev"
+#define GAME_NETVERSION "0.4 " GAME_NETVERSION_HASH
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 8b046610..93cd0695 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -2313,5 +2313,5 @@ void mods_postsnap()
 	events.clear();
 }
 
-extern "C" const char *mods_net_version() { return TEEWARS_NETVERSION; }
-extern "C" const char *mods_version() { return TEEWARS_VERSION; }
+extern "C" const char *mods_net_version() { return GAME_NETVERSION; }
+extern "C" const char *mods_version() { return GAME_VERSION; }
diff --git a/src/tools/fake_server.c b/src/tools/fake_server.c
index a2af1a0a..00fe20f8 100644
--- a/src/tools/fake_server.c
+++ b/src/tools/fake_server.c
@@ -25,7 +25,7 @@
 123456789012345678901234567890123456789012345678
 0.3 2d82e361de24cb25
 my own private little server
-magnus.auvinen@teewars.somehost-strage-host.com
+magnus.auvinen@teeworlds.somehost-strage-host.com
 */
 
 NETSERVER *net;