From bc108df382b5ac4ca637bf97ba9b2d8b2d83e58f Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 22 Mar 2008 18:40:27 +0000 Subject: renamed everything. added the new license --- datasrc/data.ds | 699 +++++++++++++++++++++++++++++++++++++++++ datasrc/teewars.ds | 699 ----------------------------------------- default.bam | 14 +- license.txt | 38 ++- other/icons/Teewars.icns | Bin 67389 -> 0 bytes other/icons/Teewars.ico | Bin 25214 -> 0 bytes other/icons/Teeworlds.icns | Bin 0 -> 67389 bytes other/icons/Teeworlds.ico | Bin 0 -> 25214 bytes other/icons/teewars.rc | 1 - other/icons/teeworlds.rc | 1 + scripts/build.py | 32 +- scripts/cmd5.py | 2 +- scripts/font_converter.py | 2 +- scripts/make_release.py | 20 +- scripts/make_src.py | 10 +- src/engine/client/ec_client.c | 2 +- src/engine/client/ec_gfx.c | 2 +- src/engine/e_engine.c | 2 +- src/engine/server/es_server.c | 2 +- src/game/client/gc_console.cpp | 2 +- src/game/client/gc_hooks.cpp | 2 +- src/game/client/gc_menu.cpp | 6 +- src/game/g_version.h | 4 +- src/game/server/gs_server.cpp | 4 +- src/tools/fake_server.c | 2 +- 25 files changed, 777 insertions(+), 769 deletions(-) create mode 100644 datasrc/data.ds delete mode 100644 datasrc/teewars.ds delete mode 100644 other/icons/Teewars.icns delete mode 100644 other/icons/Teewars.ico create mode 100644 other/icons/Teeworlds.icns create mode 100644 other/icons/Teeworlds.ico delete mode 100644 other/icons/teewars.rc create mode 100644 other/icons/teeworlds.rc diff --git a/datasrc/data.ds b/datasrc/data.ds new file mode 100644 index 00000000..897a440e --- /dev/null +++ b/datasrc/data.ds @@ -0,0 +1,699 @@ +sounds { + gun_fire { + "data/audio/wp_gun_fire-01.wv" + "data/audio/wp_gun_fire-02.wv" + "data/audio/wp_gun_fire-03.wv" + } + + shotgun_fire { + "data/audio/wp_shotty_fire-01.wv" + "data/audio/wp_shotty_fire-02.wv" + "data/audio/wp_shotty_fire-03.wv" + } + + grenade_fire { + "data/audio/wp_flump_launch-01.wv" + "data/audio/wp_flump_launch-02.wv" + "data/audio/wp_flump_launch-03.wv" + } + + hammer_fire { + "data/audio/wp_hammer_swing-01.wv" + "data/audio/wp_hammer_swing-02.wv" + "data/audio/wp_hammer_swing-03.wv" + } + + hammer_hit { + "data/audio/wp_hammer_hit-01.wv" + "data/audio/wp_hammer_hit-02.wv" + "data/audio/wp_hammer_hit-03.wv" + } + + ninja_fire { + "data/audio/wp_ninja_attack-01.wv" + "data/audio/wp_ninja_attack-02.wv" + "data/audio/wp_ninja_attack-03.wv" + } + + grenade_explode { + "data/audio/wp_flump_explo-01.wv" + "data/audio/wp_flump_explo-02.wv" + "data/audio/wp_flump_explo-03.wv" + } + + ninja_hit { + "data/audio/wp_ninja_hit-01.wv" + "data/audio/wp_ninja_hit-02.wv" + "data/audio/wp_ninja_hit-03.wv" + } + + rifle_fire { + "data/audio/wp_rifle_fire-01.wv" + "data/audio/wp_rifle_fire-02.wv" + "data/audio/wp_rifle_fire-03.wv" + } + + rifle_bounce { + "data/audio/wp_rifle_bnce-01.wv" + "data/audio/wp_rifle_bnce-02.wv" + "data/audio/wp_rifle_bnce-03.wv" + } + + weapon_switch { + "data/audio/wp_switch-01.wv" + "data/audio/wp_switch-02.wv" + "data/audio/wp_switch-03.wv" + } + + player_pain_short { + "data/audio/vo_teefault_pain_short-01.wv" + "data/audio/vo_teefault_pain_short-02.wv" + "data/audio/vo_teefault_pain_short-03.wv" + "data/audio/vo_teefault_pain_short-04.wv" + "data/audio/vo_teefault_pain_short-05.wv" + "data/audio/vo_teefault_pain_short-06.wv" + "data/audio/vo_teefault_pain_short-07.wv" + "data/audio/vo_teefault_pain_short-08.wv" + "data/audio/vo_teefault_pain_short-09.wv" + "data/audio/vo_teefault_pain_short-10.wv" + "data/audio/vo_teefault_pain_short-11.wv" + "data/audio/vo_teefault_pain_short-12.wv" + } + + player_pain_long { + "data/audio/vo_teefault_pain_long-01.wv" + "data/audio/vo_teefault_pain_long-02.wv" + } + + body_land { + "data/audio/foley_land-01.wv" + "data/audio/foley_land-02.wv" + "data/audio/foley_land-03.wv" + "data/audio/foley_land-04.wv" + } + + player_airjump { + "data/audio/foley_dbljump-01.wv" + "data/audio/foley_dbljump-02.wv" + "data/audio/foley_dbljump-03.wv" + } + + player_jump { + "data/audio/foley_foot_left-01.wv" + "data/audio/foley_foot_left-02.wv" + "data/audio/foley_foot_left-03.wv" + "data/audio/foley_foot_left-04.wv" + "data/audio/foley_foot_right-01.wv" + "data/audio/foley_foot_right-02.wv" + "data/audio/foley_foot_right-03.wv" + "data/audio/foley_foot_right-04.wv" + } + + player_die { + "data/audio/foley_body_splat-02.wv" + "data/audio/foley_body_splat-03.wv" + "data/audio/foley_body_splat-04.wv" + } + + player_spawn { + "data/audio/vo_teefault_spawn-01.wv" + "data/audio/vo_teefault_spawn-02.wv" + "data/audio/vo_teefault_spawn-03.wv" + "data/audio/vo_teefault_spawn-04.wv" + "data/audio/vo_teefault_spawn-05.wv" + "data/audio/vo_teefault_spawn-06.wv" + "data/audio/vo_teefault_spawn-07.wv" + } + + player_skid { + "data/audio/sfx_skid-01.wv" + "data/audio/sfx_skid-02.wv" + "data/audio/sfx_skid-03.wv" + "data/audio/sfx_skid-04.wv" + } + + tee_cry { + "data/audio/vo_teefault_cry-01.wv" + "data/audio/vo_teefault_cry-02.wv" + } + + hook_loop { + "data/audio/hook_loop-01.wv" + "data/audio/hook_loop-02.wv" + } + + hook_attach_ground { + "data/audio/hook_attach-01.wv" + "data/audio/hook_attach-02.wv" + "data/audio/hook_attach-03.wv" + } + + hook_attach_player { + "data/audio/foley_body_impact-01.wv" + "data/audio/foley_body_impact-02.wv" + "data/audio/foley_body_impact-03.wv" + } + + pickup_health { + "data/audio/sfx_pickup_hrt-01.wv" + "data/audio/sfx_pickup_hrt-02.wv" + } + + pickup_armor { + "data/audio/sfx_pickup_arm-01.wv" + "data/audio/sfx_pickup_arm-02.wv" + "data/audio/sfx_pickup_arm-03.wv" + "data/audio/sfx_pickup_arm-04.wv" + } + + pickup_grenade { + "data/audio/sfx_pickup_launcher.wv" + } + + pickup_shotgun { + "data/audio/sfx_pickup_sg.wv" + } + + pickup_ninja { + "data/audio/sfx_pickup_ninja.wv" + } + + weapon_spawn { + "data/audio/sfx_spawn_wpn-01.wv" + "data/audio/sfx_spawn_wpn-02.wv" + "data/audio/sfx_spawn_wpn-03.wv" + } + + weapon_noammo { + "data/audio/wp_noammo-01.wv" + "data/audio/wp_noammo-02.wv" + "data/audio/wp_noammo-03.wv" + "data/audio/wp_noammo-04.wv" + "data/audio/wp_noammo-05.wv" + } + + hit { + "data/audio/sfx_hit_weak-01.wv" + "data/audio/sfx_hit_weak-02.wv" + } + + chat_server { + "data/audio/sfx_msg-server.wv" + } + + chat_client { + "data/audio/sfx_msg-client.wv" + } + + ctf_drop { + "data/audio/sfx_ctf_drop.wv" + } + + ctf_return { + "data/audio/sfx_ctf_rtn.wv" + } + + ctf_grab_pl { + "data/audio/sfx_ctf_grab_pl.wv" + } + + ctf_grab_en { + "data/audio/sfx_ctf_grab_en.wv" + } + + ctf_capture { + "data/audio/sfx_ctf_cap_pl.wv" + } +} + + +images { + null { + filename "" + } + + game { + filename "data/game.png" + } + + particles { + filename "data/particles.png" + } + + cursor { + filename "data/gui_cursor.png" + } + + banner { + filename "data/gui_logo.png" + } + + emoticons { + filename "data/emoticons.png" + } + + browseicons { + filename "data/browse_icons.png" + } + + console_bg { + filename "data/console.png" + } + console_bar { + filename "data/console_bar.png" + } +} + +powerups { + health { + amount 1 + respawntime 15 + startspawntime 0 + } + armor { + amount 1 + respawntime 15 + startspawntime 0 + } + weapon { + amount 10 + respawntime 15 + startspawntime 0 + } + ninja { + amount 1 + respawntime 90 + startspawntime 90 + } +} + +weapons { + hammer { + sprite_body sprites.game.weapon_hammer_body + sprite_cursor sprites.game.weapon_hammer_cursor + sprite_proj sprites.game.weapon_hammer_proj + sprite_muzzles { + } + + nummuzzlesprites 0 + muzzleoffsetx 0.0 + muzzleoffsety 0.0 + maxammo 10 + recoil 10 + firedelay 150 + muzzleduration 0 + visual_size 96 + offsetx 4.0 + offsety -20.0 + meleedamage 4 + meleereach 40 + ammoregentime 0 + duration -1 + movetime 0 + velocity 0 + } + + gun { + sprite_body sprites.game.weapon_gun_body + sprite_cursor sprites.game.weapon_gun_cursor + sprite_proj sprites.game.weapon_gun_proj + sprite_muzzles { + sprites.game.weapon_gun_muzzle1 + sprites.game.weapon_gun_muzzle2 + sprites.game.weapon_gun_muzzle3 + } + + nummuzzlesprites 3 + muzzleoffsetx 50.0 + muzzleoffsety 6.0 + maxammo 10 + recoil 10 + firedelay 100 + muzzleduration 5 + visual_size 64 + offsetx 32.0 + offsety 4.0 + meleedamage 0 + meleereach 0 + ammoregentime 500 + duration -1 + movetime 0 + velocity 0 + } + + shotgun { + sprite_body sprites.game.weapon_shotgun_body + sprite_cursor sprites.game.weapon_shotgun_cursor + sprite_proj sprites.game.weapon_shotgun_proj + sprite_muzzles { + sprites.game.weapon_shotgun_muzzle1 + sprites.game.weapon_shotgun_muzzle2 + sprites.game.weapon_shotgun_muzzle3 + } + + nummuzzlesprites 3 + muzzleoffsetx 70.0 + muzzleoffsety 6.0 + maxammo 10 + recoil 10 + firedelay 500 + muzzleduration 5 + visual_size 96 + offsetx 24.0 + offsety -2.0 + meleedamage 0 + meleereach 0 + ammoregentime 0 + duration -1 + movetime 0 + velocity 0 + } + + grenade { + sprite_body sprites.game.weapon_grenade_body + sprite_cursor sprites.game.weapon_grenade_cursor + sprite_proj sprites.game.weapon_grenade_proj + sprite_muzzles { + } + + nummuzzlesprites 0 + muzzleoffsetx 0.0 + muzzleoffsety 0.0 + maxammo 10 + recoil 10 + firedelay 600 + muzzleduration 0 + visual_size 96 + offsetx 24.0 + offsety -2.0 + meleedamage 0 + meleereach 0 + ammoregentime 0 + duration -1 + movetime 0 + velocity 0 + } + + rifle { + sprite_body sprites.game.weapon_rifle_body + sprite_cursor sprites.game.weapon_rifle_cursor + sprite_proj sprites.game.weapon_rifle_proj + sprite_muzzles { + } + + nummuzzlesprites 3 + muzzleoffsetx 0.0 + muzzleoffsety 0.0 + maxammo 10 + recoil 10 + firedelay 800 + muzzleduration 0 + visual_size 92 + offsetx 24.0 + offsety -2.0 + meleedamage 0 + meleereach 0 + ammoregentime 0 + duration -1 + movetime 0 + velocity 0 + } + + ninja { + sprite_body sprites.game.weapon_ninja_body + sprite_cursor sprites.game.weapon_ninja_cursor + sprite_proj sprites.game.weapon_ninja_proj + sprite_muzzles { + sprites.game.hadoken1 + sprites.game.hadoken2 + sprites.game.hadoken3 + } + + nummuzzlesprites 3 + muzzleoffsetx 40.0 + muzzleoffsety -4.0 + maxammo 0 + recoil 0 + firedelay 800 + muzzleduration 0 + visual_size 96 + offsetx 0.0 + offsety 0.0 + meleedamage 9 + meleereach 0 + ammoregentime 0 + duration 15000 + movetime 200 + velocity 50 + } + +} + +sprites { + + particles images.particles 8 8 { + part_slice 0 0 1 1 + part_ball 1 0 1 1 + part_splat01 2 0 1 1 + part_splat02 3 0 1 1 + part_splat03 4 0 1 1 + + part_smoke 0 1 1 1 + part_shell 0 2 2 2 + part_expl01 0 4 4 4 + part_airjump 2 2 2 2 + } + + game images.game 32 16 { + + health_full 21 0 2 2 + health_empty 23 0 2 2 + armor_full 21 2 2 2 + armor_empty 23 2 2 2 + + star1 15 0 2 2 + star2 17 0 2 2 + star3 19 0 2 2 + + part1 6 0 1 1 + part2 6 1 1 1 + part3 7 0 1 1 + part4 7 1 1 1 + part5 8 0 1 1 + part6 8 1 1 1 + part7 9 0 2 2 + part8 11 0 2 2 + part9 13 0 2 2 + + weapon_gun_body 2 4 4 2 + weapon_gun_cursor 0 4 2 2 + weapon_gun_proj 6 4 2 2 + weapon_gun_muzzle1 8 4 3 2 + weapon_gun_muzzle2 12 4 3 2 + weapon_gun_muzzle3 16 4 3 2 + + weapon_shotgun_body 2 6 8 2 + weapon_shotgun_cursor 0 6 2 2 + weapon_shotgun_proj 10 6 2 2 + weapon_shotgun_muzzle1 12 6 3 2 + weapon_shotgun_muzzle2 16 6 3 2 + weapon_shotgun_muzzle3 20 6 3 2 + + weapon_grenade_body 2 8 7 2 + weapon_grenade_cursor 0 8 2 2 + weapon_grenade_proj 10 8 2 2 + + weapon_hammer_body 2 1 4 3 + weapon_hammer_cursor 0 0 2 2 + weapon_hammer_proj 0 0 0 0 + + weapon_ninja_body 2 10 7 2 + weapon_ninja_cursor 0 10 2 2 + weapon_ninja_proj 0 0 0 0 + + weapon_rifle_body 2 12 7 3 + weapon_rifle_cursor 0 12 2 2 + weapon_rifle_proj 10 12 2 2 + + hook_chain 2 0 1 1 + hook_head 3 0 2 1 + + hadoken1 25 0 7 4 + hadoken2 25 4 7 4 + hadoken3 25 8 7 4 + + powerup_health 10 2 2 2 + powerup_armor 12 2 2 2 + powerup_weapon 3 0 6 2 + powerup_ninja 3 10 7 2 + powerup_timefield 3 0 6 2 + + flag_blue 12 8 4 8 + flag_red 16 8 4 8 + + } + + tees images.null 8 4 { + tee_body 0 0 3 3 + tee_body_outline 3 0 3 3 + tee_foot 6 1 2 1 + tee_foot_outline 6 2 2 1 + tee_hand 6 0 1 1 + tee_hand_outline 7 0 1 1 + + tee_eye_normal 2 3 1 1 + tee_eye_angry 3 3 1 1 + tee_eye_pain 4 3 1 1 + tee_eye_happy 5 3 1 1 + tee_eye_dead 6 3 1 1 + tee_eye_surprise 7 3 1 1 + } + + emoticons images.emoticons 4 4 { + oop 0 0 1 1 + exclamation 1 0 1 1 + hearts 2 0 1 1 + drop 3 0 1 1 + dotdot 0 1 1 1 + music1 1 1 1 1 + music2 2 1 1 1 + ghost 3 1 1 1 + sushi 0 2 1 1 + splattee 1 2 1 1 + deviltee 2 2 1 1 + zomg 3 2 1 1 + zzz 0 3 1 1 + blank1 1 3 1 1 + deadtee 2 3 1 1 + blank2 3 3 1 1 + } + + browseicons images.browseicons 4 1 { + browse_lock 0 0 1 1 + browse_progress1 1 0 1 1 + browse_progress2 2 0 1 1 + browse_progress3 3 0 1 1 + } +} + +animations { + base { + body { + 0.0 0 -4 0 + } + + back_foot { + 0.0 0 10 0 + } + + front_foot { + 0.0 0 10 0 + } + + attach { + } + } + + idle { + body { + } + + back_foot { + 0.0 -7 0 0 + } + + front_foot { + 0.0 7 0 0 + } + + attach { + 0.0 0 0 0 + } + } + + inair { + body { + } + + back_foot { + 0.0 -3 0 -0.1 + } + + front_foot { + 0.0 3 0 -0.1 + } + + attach { + } + } + + walk { + body { + 0.0 0 0 0 + 0.2 0 -1 0 + 0.4 0 0 0 + 0.6 0 0 0 + 0.8 0 -1 0 + 1.0 0 0 0 + } + + front_foot { + 0.0 8 0 0 + 0.2 -8 0 0 + 0.4 -10 -4 0.2 + 0.6 -8 -8 0.3 + 0.8 4 -4 -0.2 + 1.0 8 0 0 + } + + back_foot { + 0.0 -10 -4 0.2 + 0.2 -8 -8 0.3 + 0.4 -4 -4 -0.2 + 0.6 0 0 0 + 0.8 -8 0 0 + 1.0 -10 -4 0.2 + } + + attach { + } + } + + hammer_swing { + body { + } + + front_foot { + } + + back_foot { + } + + attach { + 0.0 0 0 -0.10 + 0.3 0 0 0.25 + 0.4 0 0 0.30 + 0.5 0 0 0.25 + 1.0 0 0 -0.10 + } + } + ninja_swing { + body { + } + + front_foot { + } + + back_foot { + } + + attach { + 0.0 0 0 -0.25 + 0.1 0 0 -0.05 + 0.15 0 0 0.35 + 0.42 0 0 0.4 + 0.5 0 0 0.35 + 1.0 0 0 -0.25 + } + } +} diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds deleted file mode 100644 index 897a440e..00000000 --- a/datasrc/teewars.ds +++ /dev/null @@ -1,699 +0,0 @@ -sounds { - gun_fire { - "data/audio/wp_gun_fire-01.wv" - "data/audio/wp_gun_fire-02.wv" - "data/audio/wp_gun_fire-03.wv" - } - - shotgun_fire { - "data/audio/wp_shotty_fire-01.wv" - "data/audio/wp_shotty_fire-02.wv" - "data/audio/wp_shotty_fire-03.wv" - } - - grenade_fire { - "data/audio/wp_flump_launch-01.wv" - "data/audio/wp_flump_launch-02.wv" - "data/audio/wp_flump_launch-03.wv" - } - - hammer_fire { - "data/audio/wp_hammer_swing-01.wv" - "data/audio/wp_hammer_swing-02.wv" - "data/audio/wp_hammer_swing-03.wv" - } - - hammer_hit { - "data/audio/wp_hammer_hit-01.wv" - "data/audio/wp_hammer_hit-02.wv" - "data/audio/wp_hammer_hit-03.wv" - } - - ninja_fire { - "data/audio/wp_ninja_attack-01.wv" - "data/audio/wp_ninja_attack-02.wv" - "data/audio/wp_ninja_attack-03.wv" - } - - grenade_explode { - "data/audio/wp_flump_explo-01.wv" - "data/audio/wp_flump_explo-02.wv" - "data/audio/wp_flump_explo-03.wv" - } - - ninja_hit { - "data/audio/wp_ninja_hit-01.wv" - "data/audio/wp_ninja_hit-02.wv" - "data/audio/wp_ninja_hit-03.wv" - } - - rifle_fire { - "data/audio/wp_rifle_fire-01.wv" - "data/audio/wp_rifle_fire-02.wv" - "data/audio/wp_rifle_fire-03.wv" - } - - rifle_bounce { - "data/audio/wp_rifle_bnce-01.wv" - "data/audio/wp_rifle_bnce-02.wv" - "data/audio/wp_rifle_bnce-03.wv" - } - - weapon_switch { - "data/audio/wp_switch-01.wv" - "data/audio/wp_switch-02.wv" - "data/audio/wp_switch-03.wv" - } - - player_pain_short { - "data/audio/vo_teefault_pain_short-01.wv" - "data/audio/vo_teefault_pain_short-02.wv" - "data/audio/vo_teefault_pain_short-03.wv" - "data/audio/vo_teefault_pain_short-04.wv" - "data/audio/vo_teefault_pain_short-05.wv" - "data/audio/vo_teefault_pain_short-06.wv" - "data/audio/vo_teefault_pain_short-07.wv" - "data/audio/vo_teefault_pain_short-08.wv" - "data/audio/vo_teefault_pain_short-09.wv" - "data/audio/vo_teefault_pain_short-10.wv" - "data/audio/vo_teefault_pain_short-11.wv" - "data/audio/vo_teefault_pain_short-12.wv" - } - - player_pain_long { - "data/audio/vo_teefault_pain_long-01.wv" - "data/audio/vo_teefault_pain_long-02.wv" - } - - body_land { - "data/audio/foley_land-01.wv" - "data/audio/foley_land-02.wv" - "data/audio/foley_land-03.wv" - "data/audio/foley_land-04.wv" - } - - player_airjump { - "data/audio/foley_dbljump-01.wv" - "data/audio/foley_dbljump-02.wv" - "data/audio/foley_dbljump-03.wv" - } - - player_jump { - "data/audio/foley_foot_left-01.wv" - "data/audio/foley_foot_left-02.wv" - "data/audio/foley_foot_left-03.wv" - "data/audio/foley_foot_left-04.wv" - "data/audio/foley_foot_right-01.wv" - "data/audio/foley_foot_right-02.wv" - "data/audio/foley_foot_right-03.wv" - "data/audio/foley_foot_right-04.wv" - } - - player_die { - "data/audio/foley_body_splat-02.wv" - "data/audio/foley_body_splat-03.wv" - "data/audio/foley_body_splat-04.wv" - } - - player_spawn { - "data/audio/vo_teefault_spawn-01.wv" - "data/audio/vo_teefault_spawn-02.wv" - "data/audio/vo_teefault_spawn-03.wv" - "data/audio/vo_teefault_spawn-04.wv" - "data/audio/vo_teefault_spawn-05.wv" - "data/audio/vo_teefault_spawn-06.wv" - "data/audio/vo_teefault_spawn-07.wv" - } - - player_skid { - "data/audio/sfx_skid-01.wv" - "data/audio/sfx_skid-02.wv" - "data/audio/sfx_skid-03.wv" - "data/audio/sfx_skid-04.wv" - } - - tee_cry { - "data/audio/vo_teefault_cry-01.wv" - "data/audio/vo_teefault_cry-02.wv" - } - - hook_loop { - "data/audio/hook_loop-01.wv" - "data/audio/hook_loop-02.wv" - } - - hook_attach_ground { - "data/audio/hook_attach-01.wv" - "data/audio/hook_attach-02.wv" - "data/audio/hook_attach-03.wv" - } - - hook_attach_player { - "data/audio/foley_body_impact-01.wv" - "data/audio/foley_body_impact-02.wv" - "data/audio/foley_body_impact-03.wv" - } - - pickup_health { - "data/audio/sfx_pickup_hrt-01.wv" - "data/audio/sfx_pickup_hrt-02.wv" - } - - pickup_armor { - "data/audio/sfx_pickup_arm-01.wv" - "data/audio/sfx_pickup_arm-02.wv" - "data/audio/sfx_pickup_arm-03.wv" - "data/audio/sfx_pickup_arm-04.wv" - } - - pickup_grenade { - "data/audio/sfx_pickup_launcher.wv" - } - - pickup_shotgun { - "data/audio/sfx_pickup_sg.wv" - } - - pickup_ninja { - "data/audio/sfx_pickup_ninja.wv" - } - - weapon_spawn { - "data/audio/sfx_spawn_wpn-01.wv" - "data/audio/sfx_spawn_wpn-02.wv" - "data/audio/sfx_spawn_wpn-03.wv" - } - - weapon_noammo { - "data/audio/wp_noammo-01.wv" - "data/audio/wp_noammo-02.wv" - "data/audio/wp_noammo-03.wv" - "data/audio/wp_noammo-04.wv" - "data/audio/wp_noammo-05.wv" - } - - hit { - "data/audio/sfx_hit_weak-01.wv" - "data/audio/sfx_hit_weak-02.wv" - } - - chat_server { - "data/audio/sfx_msg-server.wv" - } - - chat_client { - "data/audio/sfx_msg-client.wv" - } - - ctf_drop { - "data/audio/sfx_ctf_drop.wv" - } - - ctf_return { - "data/audio/sfx_ctf_rtn.wv" - } - - ctf_grab_pl { - "data/audio/sfx_ctf_grab_pl.wv" - } - - ctf_grab_en { - "data/audio/sfx_ctf_grab_en.wv" - } - - ctf_capture { - "data/audio/sfx_ctf_cap_pl.wv" - } -} - - -images { - null { - filename "" - } - - game { - filename "data/game.png" - } - - particles { - filename "data/particles.png" - } - - cursor { - filename "data/gui_cursor.png" - } - - banner { - filename "data/gui_logo.png" - } - - emoticons { - filename "data/emoticons.png" - } - - browseicons { - filename "data/browse_icons.png" - } - - console_bg { - filename "data/console.png" - } - console_bar { - filename "data/console_bar.png" - } -} - -powerups { - health { - amount 1 - respawntime 15 - startspawntime 0 - } - armor { - amount 1 - respawntime 15 - startspawntime 0 - } - weapon { - amount 10 - respawntime 15 - startspawntime 0 - } - ninja { - amount 1 - respawntime 90 - startspawntime 90 - } -} - -weapons { - hammer { - sprite_body sprites.game.weapon_hammer_body - sprite_cursor sprites.game.weapon_hammer_cursor - sprite_proj sprites.game.weapon_hammer_proj - sprite_muzzles { - } - - nummuzzlesprites 0 - muzzleoffsetx 0.0 - muzzleoffsety 0.0 - maxammo 10 - recoil 10 - firedelay 150 - muzzleduration 0 - visual_size 96 - offsetx 4.0 - offsety -20.0 - meleedamage 4 - meleereach 40 - ammoregentime 0 - duration -1 - movetime 0 - velocity 0 - } - - gun { - sprite_body sprites.game.weapon_gun_body - sprite_cursor sprites.game.weapon_gun_cursor - sprite_proj sprites.game.weapon_gun_proj - sprite_muzzles { - sprites.game.weapon_gun_muzzle1 - sprites.game.weapon_gun_muzzle2 - sprites.game.weapon_gun_muzzle3 - } - - nummuzzlesprites 3 - muzzleoffsetx 50.0 - muzzleoffsety 6.0 - maxammo 10 - recoil 10 - firedelay 100 - muzzleduration 5 - visual_size 64 - offsetx 32.0 - offsety 4.0 - meleedamage 0 - meleereach 0 - ammoregentime 500 - duration -1 - movetime 0 - velocity 0 - } - - shotgun { - sprite_body sprites.game.weapon_shotgun_body - sprite_cursor sprites.game.weapon_shotgun_cursor - sprite_proj sprites.game.weapon_shotgun_proj - sprite_muzzles { - sprites.game.weapon_shotgun_muzzle1 - sprites.game.weapon_shotgun_muzzle2 - sprites.game.weapon_shotgun_muzzle3 - } - - nummuzzlesprites 3 - muzzleoffsetx 70.0 - muzzleoffsety 6.0 - maxammo 10 - recoil 10 - firedelay 500 - muzzleduration 5 - visual_size 96 - offsetx 24.0 - offsety -2.0 - meleedamage 0 - meleereach 0 - ammoregentime 0 - duration -1 - movetime 0 - velocity 0 - } - - grenade { - sprite_body sprites.game.weapon_grenade_body - sprite_cursor sprites.game.weapon_grenade_cursor - sprite_proj sprites.game.weapon_grenade_proj - sprite_muzzles { - } - - nummuzzlesprites 0 - muzzleoffsetx 0.0 - muzzleoffsety 0.0 - maxammo 10 - recoil 10 - firedelay 600 - muzzleduration 0 - visual_size 96 - offsetx 24.0 - offsety -2.0 - meleedamage 0 - meleereach 0 - ammoregentime 0 - duration -1 - movetime 0 - velocity 0 - } - - rifle { - sprite_body sprites.game.weapon_rifle_body - sprite_cursor sprites.game.weapon_rifle_cursor - sprite_proj sprites.game.weapon_rifle_proj - sprite_muzzles { - } - - nummuzzlesprites 3 - muzzleoffsetx 0.0 - muzzleoffsety 0.0 - maxammo 10 - recoil 10 - firedelay 800 - muzzleduration 0 - visual_size 92 - offsetx 24.0 - offsety -2.0 - meleedamage 0 - meleereach 0 - ammoregentime 0 - duration -1 - movetime 0 - velocity 0 - } - - ninja { - sprite_body sprites.game.weapon_ninja_body - sprite_cursor sprites.game.weapon_ninja_cursor - sprite_proj sprites.game.weapon_ninja_proj - sprite_muzzles { - sprites.game.hadoken1 - sprites.game.hadoken2 - sprites.game.hadoken3 - } - - nummuzzlesprites 3 - muzzleoffsetx 40.0 - muzzleoffsety -4.0 - maxammo 0 - recoil 0 - firedelay 800 - muzzleduration 0 - visual_size 96 - offsetx 0.0 - offsety 0.0 - meleedamage 9 - meleereach 0 - ammoregentime 0 - duration 15000 - movetime 200 - velocity 50 - } - -} - -sprites { - - particles images.particles 8 8 { - part_slice 0 0 1 1 - part_ball 1 0 1 1 - part_splat01 2 0 1 1 - part_splat02 3 0 1 1 - part_splat03 4 0 1 1 - - part_smoke 0 1 1 1 - part_shell 0 2 2 2 - part_expl01 0 4 4 4 - part_airjump 2 2 2 2 - } - - game images.game 32 16 { - - health_full 21 0 2 2 - health_empty 23 0 2 2 - armor_full 21 2 2 2 - armor_empty 23 2 2 2 - - star1 15 0 2 2 - star2 17 0 2 2 - star3 19 0 2 2 - - part1 6 0 1 1 - part2 6 1 1 1 - part3 7 0 1 1 - part4 7 1 1 1 - part5 8 0 1 1 - part6 8 1 1 1 - part7 9 0 2 2 - part8 11 0 2 2 - part9 13 0 2 2 - - weapon_gun_body 2 4 4 2 - weapon_gun_cursor 0 4 2 2 - weapon_gun_proj 6 4 2 2 - weapon_gun_muzzle1 8 4 3 2 - weapon_gun_muzzle2 12 4 3 2 - weapon_gun_muzzle3 16 4 3 2 - - weapon_shotgun_body 2 6 8 2 - weapon_shotgun_cursor 0 6 2 2 - weapon_shotgun_proj 10 6 2 2 - weapon_shotgun_muzzle1 12 6 3 2 - weapon_shotgun_muzzle2 16 6 3 2 - weapon_shotgun_muzzle3 20 6 3 2 - - weapon_grenade_body 2 8 7 2 - weapon_grenade_cursor 0 8 2 2 - weapon_grenade_proj 10 8 2 2 - - weapon_hammer_body 2 1 4 3 - weapon_hammer_cursor 0 0 2 2 - weapon_hammer_proj 0 0 0 0 - - weapon_ninja_body 2 10 7 2 - weapon_ninja_cursor 0 10 2 2 - weapon_ninja_proj 0 0 0 0 - - weapon_rifle_body 2 12 7 3 - weapon_rifle_cursor 0 12 2 2 - weapon_rifle_proj 10 12 2 2 - - hook_chain 2 0 1 1 - hook_head 3 0 2 1 - - hadoken1 25 0 7 4 - hadoken2 25 4 7 4 - hadoken3 25 8 7 4 - - powerup_health 10 2 2 2 - powerup_armor 12 2 2 2 - powerup_weapon 3 0 6 2 - powerup_ninja 3 10 7 2 - powerup_timefield 3 0 6 2 - - flag_blue 12 8 4 8 - flag_red 16 8 4 8 - - } - - tees images.null 8 4 { - tee_body 0 0 3 3 - tee_body_outline 3 0 3 3 - tee_foot 6 1 2 1 - tee_foot_outline 6 2 2 1 - tee_hand 6 0 1 1 - tee_hand_outline 7 0 1 1 - - tee_eye_normal 2 3 1 1 - tee_eye_angry 3 3 1 1 - tee_eye_pain 4 3 1 1 - tee_eye_happy 5 3 1 1 - tee_eye_dead 6 3 1 1 - tee_eye_surprise 7 3 1 1 - } - - emoticons images.emoticons 4 4 { - oop 0 0 1 1 - exclamation 1 0 1 1 - hearts 2 0 1 1 - drop 3 0 1 1 - dotdot 0 1 1 1 - music1 1 1 1 1 - music2 2 1 1 1 - ghost 3 1 1 1 - sushi 0 2 1 1 - splattee 1 2 1 1 - deviltee 2 2 1 1 - zomg 3 2 1 1 - zzz 0 3 1 1 - blank1 1 3 1 1 - deadtee 2 3 1 1 - blank2 3 3 1 1 - } - - browseicons images.browseicons 4 1 { - browse_lock 0 0 1 1 - browse_progress1 1 0 1 1 - browse_progress2 2 0 1 1 - browse_progress3 3 0 1 1 - } -} - -animations { - base { - body { - 0.0 0 -4 0 - } - - back_foot { - 0.0 0 10 0 - } - - front_foot { - 0.0 0 10 0 - } - - attach { - } - } - - idle { - body { - } - - back_foot { - 0.0 -7 0 0 - } - - front_foot { - 0.0 7 0 0 - } - - attach { - 0.0 0 0 0 - } - } - - inair { - body { - } - - back_foot { - 0.0 -3 0 -0.1 - } - - front_foot { - 0.0 3 0 -0.1 - } - - attach { - } - } - - walk { - body { - 0.0 0 0 0 - 0.2 0 -1 0 - 0.4 0 0 0 - 0.6 0 0 0 - 0.8 0 -1 0 - 1.0 0 0 0 - } - - front_foot { - 0.0 8 0 0 - 0.2 -8 0 0 - 0.4 -10 -4 0.2 - 0.6 -8 -8 0.3 - 0.8 4 -4 -0.2 - 1.0 8 0 0 - } - - back_foot { - 0.0 -10 -4 0.2 - 0.2 -8 -8 0.3 - 0.4 -4 -4 -0.2 - 0.6 0 0 0 - 0.8 -8 0 0 - 1.0 -10 -4 0.2 - } - - attach { - } - } - - hammer_swing { - body { - } - - front_foot { - } - - back_foot { - } - - attach { - 0.0 0 0 -0.10 - 0.3 0 0 0.25 - 0.4 0 0 0.30 - 0.5 0 0 0.25 - 1.0 0 0 -0.10 - } - } - ninja_swing { - body { - } - - front_foot { - } - - back_foot { - } - - attach { - 0.0 0 0 -0.25 - 0.1 0 0 -0.05 - 0.15 0 0 0.35 - 0.42 0 0 0.4 - 0.5 0 0 0.35 - 1.0 0 0 -0.25 - } - } -} diff --git a/default.bam b/default.bam index ae008924..e6f1ddc0 100644 --- a/default.bam +++ b/default.bam @@ -145,21 +145,21 @@ function DataCompile(datafile, scriptfile, headerfile, sourcefile, outputdatafil end serverdata = DataCompile( - "datasrc/teewars.ds", + "datasrc/data.ds", "datasrc/server.dts", "src/game/generated/gs_data.h", "src/game/generated/gs_data.cpp", "src/game/generated/gs_internaldata.cpp") clientdata = DataCompile( - "datasrc/teewars.ds", + "datasrc/data.ds", "datasrc/client.dts", "src/game/generated/gc_data.h", "src/game/generated/gc_data.cpp", "src/game/generated/gc_internaldata.cpp") networkdata = DataCompile( - "datasrc/teewars.ds", + "datasrc/data.ds", "datasrc/network.dts", "src/game/generated/g_protocol_ids.h", "src/game/generated/g_protocol_ids.cpp") @@ -178,7 +178,7 @@ nethash = CHash( client_link_other = {} if family == "windows" then - client_link_other = {ResCompile("other/icons/teewars.rc")} + client_link_other = {ResCompile("other/icons/teeworlds.rc")} end @@ -264,7 +264,7 @@ function build(settings) Collect("src/engine/external/portaudio/src/os/" .. pa_platform .. "/*.c"), Collect("src/engine/external/portaudio/src/hostapi/" .. pa_hostapi .. "/*.c")) - -- build teewars components + -- build game components engine_settings = settings:copy() if family == "windows" then @@ -332,11 +332,11 @@ function build(settings) end -- build client, server and master server - client_exe = Link(client_settings, "teewars", game_shared, game_client, + client_exe = Link(client_settings, "teeworlds", game_shared, game_client, engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack, client_link_other) - server_exe = Link(server_settings, "teewars_srv", engine, server, + server_exe = Link(server_settings, "teeworlds_srv", engine, server, game_shared, game_server, zlib) masterserver_exe = Link(server_settings, "mastersrv", masterserver, diff --git a/license.txt b/license.txt index 7515188e..5d83d6a3 100644 --- a/license.txt +++ b/license.txt @@ -1,26 +1,30 @@ -Copyright (c) 2007, Magnus Auvinen - -All rights reserved. - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Redistribution and use in source and binary forms, without modification, -are permitted. +Copyright (C) 2007-2008 Magnus Auvinen + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. +4. Neither this software nor any of its individual components, in original + or modified versions, may be sold by itself. ------------------------------------------------------------------------ IMPORTANT NOTE! The source under src/engine/external are stripped -libraries with their own licenses. Mostly BSD or zlib/libpng license. +libraries with their own licenses. Mostly BSD or zlib/libpng license but +check the individual libraries. ------------------------------------------------------------------------ With that being said, contact us if there is anything you want to do that the license does not premit. - -Why we have choosen this licens is because we want people to be able to -send in patches, bug-fixes and compile the game for their platform. We -don't want to have several diffrent versions floating around the net -with their own little features etc. There should only be one Teewars -and that one should be the very best it can be. diff --git a/other/icons/Teewars.icns b/other/icons/Teewars.icns deleted file mode 100644 index f48e7b90..00000000 Binary files a/other/icons/Teewars.icns and /dev/null differ diff --git a/other/icons/Teewars.ico b/other/icons/Teewars.ico deleted file mode 100644 index bf683b9c..00000000 Binary files a/other/icons/Teewars.ico and /dev/null differ diff --git a/other/icons/Teeworlds.icns b/other/icons/Teeworlds.icns new file mode 100644 index 00000000..f48e7b90 Binary files /dev/null and b/other/icons/Teeworlds.icns differ diff --git a/other/icons/Teeworlds.ico b/other/icons/Teeworlds.ico new file mode 100644 index 00000000..bf683b9c Binary files /dev/null and b/other/icons/Teeworlds.ico differ diff --git a/other/icons/teewars.rc b/other/icons/teewars.rc deleted file mode 100644 index 46c2f62a..00000000 --- a/other/icons/teewars.rc +++ /dev/null @@ -1 +0,0 @@ -50h ICON "teewars.ico" \ No newline at end of file diff --git a/other/icons/teeworlds.rc b/other/icons/teeworlds.rc new file mode 100644 index 00000000..46c2f62a --- /dev/null +++ b/other/icons/teeworlds.rc @@ -0,0 +1 @@ +50h ICON "teewars.ico" \ No newline at end of file diff --git a/scripts/build.py b/scripts/build.py index 4dd413b0..c1f81efe 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -1,7 +1,11 @@ import os, sys, shutil, httplib, zipfile +name = "teeworlds" +domain = "www.%s.com" % name version = sys.argv[1] + + flag_download = True flag_clean = True @@ -26,9 +30,9 @@ else: platform = name + "_" + arch -print "teewars-%s-%s" % (version, platform) +print "%s-%s-%s" % (name,version, platform) -src_package = "teewars-%s-src.zip" % version +src_package = "%s-%s-src.zip" % (name,version) root_dir = os.getcwd() + "/work" src_dir = "" @@ -87,20 +91,20 @@ os.chdir(root_dir) # download if flag_download: print "*** downloading bam source package ***" - if not fetch_file("www.teewars.com", "/files/bam.zip", "bam.zip"): - if not fetch_file("www.teewars.com", "/files/beta/bam.zip", "bam.zip"): + if not fetch_file(domain, "/files/bam.zip", "bam.zip"): + if not fetch_file(domain, "/files/beta/bam.zip", "bam.zip"): bail("couldn't find source package and couldn't download it") - print "*** downloading teewars source package ***" - if not fetch_file("www.teewars.com", "/files/%s" % src_package, src_package): - if not fetch_file("www.teewars.com", "/files/beta/%s" % src_package, src_package): + print "*** downloading %s source package ***" % name + if not fetch_file(domain, "/files/%s" % src_package, src_package): + if not fetch_file(domain, "/files/beta/%s" % src_package, src_package): bail("couldn't find source package and couldn't download it") # unpack print "*** unpacking source ***" unzip("bam.zip", ".") -unzip(src_package, "teewars") -src_dir = "teewars/"+ os.listdir("teewars/")[0] +unzip(src_package, name) +src_dir = name+"/"+ os.listdir(name+"/")[0] # build bam if 1: @@ -119,12 +123,12 @@ if 1: os.chdir(root_dir) shutil.copy("bam/src/"+output, src_dir+"/"+output) -# build teewars +# build the game if 1: - print "*** building teewars ***" + print "*** building %s ***" % name os.chdir(src_dir) if os.system("%s server_release client_release" % bam_cmd) != 0: - bail("failed to build teewars") + bail("failed to build %s" % name) os.chdir(root_dir) # make release @@ -132,10 +136,10 @@ if 1: print "*** making release ***" os.chdir(src_dir) if os.system("python scripts/make_release.py %s %s" % (version, platform)) != 0: - bail("failed to make a relase of teewars") + bail("failed to make a relase of %s"%name) final_output = "FAIL" for f in os.listdir("."): - if version in f and platform in f and "teewars" in f and (".zip" in f or ".tar.gz" in f): + if version in f and platform in f and name in f and (".zip" in f or ".tar.gz" in f): final_output = f os.chdir(root_dir) shutil.copy("%s/%s" % (src_dir, final_output), "../"+final_output) diff --git a/scripts/cmd5.py b/scripts/cmd5.py index 2e20ff5b..fe1f9d2a 100644 --- a/scripts/cmd5.py +++ b/scripts/cmd5.py @@ -29,4 +29,4 @@ f = "" for filename in sys.argv[1:]: f += cstrip([l.strip() for l in file(filename)]) -print '#define TEEWARS_NETVERSION_HASH "%s"' % md5.new(f).hexdigest().lower()[16:] +print '#define GAME_NETVERSION_HASH "%s"' % md5.new(f).hexdigest().lower()[16:] diff --git a/scripts/font_converter.py b/scripts/font_converter.py index d8ba5d39..09d22172 100644 --- a/scripts/font_converter.py +++ b/scripts/font_converter.py @@ -144,5 +144,5 @@ if len(sys.argv) >= 2: convert(input, output) print "done!" else: - print "font converter! converts .fnt files to teewars .tfnt" + print "font converter! converts .fnt files to teeworlds .tfnt" print "usage: font_converter " diff --git a/scripts/make_release.py b/scripts/make_release.py index e8146e66..4bcff6cb 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -7,7 +7,7 @@ if len(sys.argv) != 3: print sys.argv[0], "VERSION PLATFORM" sys.exit(-1) -name = "teewars" +name = "teeworlds" version = sys.argv[1] platform = sys.argv[2] exe_ext = "" @@ -68,8 +68,8 @@ if include_data and not use_bundle: shutil.copy("other/config_directory.bat", package_dir) if include_exe and not use_bundle: - shutil.copy("teewars"+exe_ext, package_dir) - shutil.copy("teewars_srv"+exe_ext, package_dir) + shutil.copy(name+exe_ext, package_dir) + shutil.copy(name+"_srv"+exe_ext, package_dir) if include_src: for p in ["src", "scripts", "datasrc", "other", "objs"]: @@ -78,18 +78,18 @@ if include_src: shutil.copy("default.bam", package_dir) if use_bundle: - bundle_content_dir = os.path.join(package_dir, "Teewars.app/Contents") + bundle_content_dir = os.path.join(package_dir, "Teeworlds.app/Contents") bundle_bin_dir = os.path.join(bundle_content_dir, "MacOS") bundle_resource_dir = os.path.join(bundle_content_dir, "Resources") - os.mkdir(os.path.join(package_dir, "Teewars.app")) + os.mkdir(os.path.join(package_dir, "Teeworlds.app")) os.mkdir(bundle_content_dir) os.mkdir(bundle_bin_dir) os.mkdir(bundle_resource_dir) os.mkdir(os.path.join(bundle_resource_dir, "data")) copydir("data", bundle_resource_dir) - shutil.copy("other/icons/Teewars.icns", bundle_resource_dir) - shutil.copy("teewars"+exe_ext, bundle_bin_dir) - shutil.copy("teewars_srv"+exe_ext, bundle_bin_dir) + shutil.copy("other/icons/Teeworlds.icns", bundle_resource_dir) + shutil.copy(name+exe_ext, bundle_bin_dir) + shutil.copy(name+"_srv"+exe_ext, bundle_bin_dir) shutil.copy("TeeLaunch"+exe_ext, bundle_bin_dir) file(os.path.join(bundle_content_dir, "Info.plist"), "w").write(""" @@ -99,9 +99,9 @@ if use_bundle: CFBundleDevelopmentRegion English CFBundleExecutable - teewars + teeworlds CFBundleIconFile - Teewars + Teeworlds CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/scripts/make_src.py b/scripts/make_src.py index 58a1e1a7..fd769b99 100644 --- a/scripts/make_src.py +++ b/scripts/make_src.py @@ -28,10 +28,10 @@ if 1: z.close() if 1: - os.system("svn export svn://svn.teewars.com/teewars/%s teewars" % svn_tree) - os.chdir("teewars") + os.system("svn export svn://svn.teeworlds.com/teeworlds/%s teeworlds" % svn_tree) + os.chdir("teeworlds") os.system("python scripts/make_release.py %s src" % version) os.chdir(root_dir) - for f in os.listdir("teewars"): - if "teewars" in f and "src" in f and (".zip" in f or ".tar.gz" in f): - shutil.copy("teewars/"+f, "../" + f) + for f in os.listdir("teeworlds"): + if "teeworlds" in f and "src" in f and (".zip" in f or ".tar.gz" in f): + shutil.copy("teeworlds/"+f, "../" + f) 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; -- cgit 1.4.1