made a switch for gametype

This commit is contained in:
Magnus Auvinen 2007-08-25 08:54:14 +00:00
parent 89ccbd4f7b
commit 0e7054a24a
4 changed files with 13 additions and 12 deletions

View file

@ -305,17 +305,6 @@ powerups {
}
}
playerstats {
dm {
maxhealth 10
maxarmor 10
}
tdm {
maxhealth 10
maxarmor 10
}
}
projectileparticles {
gun {
particlespersecond 200

View file

@ -47,6 +47,10 @@ enum
STATE_PLAYING,
STATE_IN_MENU,
STATE_CHATTING,
GAMETYPE_DM=0,
GAMETYPE_TDM,
GAMETYPE_CTF,
};
struct player_input

View file

@ -12,5 +12,8 @@ MACRO_CONFIG_INT(scroll_weapon, 1, 0, 1)
MACRO_CONFIG_INT(scorelimit, 20, 0, 1000)
MACRO_CONFIG_INT(timelimit, 0, 0, 1000)
MACRO_CONFIG_STR(gametype, 32, "dm")
MACRO_CONFIG_INT(dynamic_camera, 1, 0, 1)

View file

@ -409,7 +409,12 @@ game_world world;
gameobject::gameobject()
: entity(OBJTYPE_GAME)
{
gametype = GAMETYPE_TDM;
gametype = GAMETYPE_DM;
if(strcmp(config.gametype, "ctf") == 0)
gametype = GAMETYPE_CTF;
else if(strcmp(config.gametype, "tdm") == 0)
gametype = GAMETYPE_TDM;
game_over_tick = -1;
sudden_death = 0;
round_start_tick = server_tick();