mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
fixed restart command
This commit is contained in:
parent
018abbdd0a
commit
f7b5cfc672
|
@ -21,10 +21,12 @@ 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(restart, 0, 0, 120)
|
||||
|
||||
MACRO_CONFIG_INT(dbg_bots, 0, 0, 7)
|
||||
MACRO_CONFIG_INT(cl_predict, 1, 0, 1)
|
||||
|
||||
|
||||
MACRO_CONFIG_STR(sv_maprotation, 512, "")
|
||||
|
||||
MACRO_CONFIG_INT(dynamic_camera, 1, 0, 1)
|
||||
|
|
|
@ -308,40 +308,6 @@ void gameobject::startround()
|
|||
{
|
||||
resetgame();
|
||||
|
||||
if(strlen(config.sv_maprotation))
|
||||
{
|
||||
char buf[512];
|
||||
const char *s = strstr(config.sv_maprotation, config.sv_map);
|
||||
if(s == 0)
|
||||
s = config.sv_maprotation; // restart rotation
|
||||
else
|
||||
{
|
||||
s += strlen(config.sv_map); // skip this map
|
||||
while(is_separator(s[0]))
|
||||
s++;
|
||||
if(s[0] == 0)
|
||||
s = config.sv_maprotation; // restart rotation
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
for(; i < 512; i++)
|
||||
{
|
||||
buf[i] = s[i];
|
||||
if(is_separator(s[i]) || s[i] == 0)
|
||||
{
|
||||
buf[i] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
i = 0; // skip spaces
|
||||
while(is_separator(buf[i]))
|
||||
i++;
|
||||
|
||||
dbg_msg("game", "rotating map to %s", &buf[i]);
|
||||
strcpy(config.sv_map, &buf[i]);
|
||||
}
|
||||
|
||||
round_start_tick = server_tick();
|
||||
sudden_death = 0;
|
||||
game_over_tick = -1;
|
||||
|
@ -351,6 +317,43 @@ void gameobject::startround()
|
|||
round_count++;
|
||||
}
|
||||
|
||||
void gameobject::cyclemap()
|
||||
{
|
||||
if(!strlen(config.sv_maprotation))
|
||||
return;
|
||||
// handle maprotation
|
||||
char buf[512];
|
||||
const char *s = strstr(config.sv_maprotation, config.sv_map);
|
||||
if(s == 0)
|
||||
s = config.sv_maprotation; // restart rotation
|
||||
else
|
||||
{
|
||||
s += strlen(config.sv_map); // skip this map
|
||||
while(is_separator(s[0]))
|
||||
s++;
|
||||
if(s[0] == 0)
|
||||
s = config.sv_maprotation; // restart rotation
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
for(; i < 512; i++)
|
||||
{
|
||||
buf[i] = s[i];
|
||||
if(is_separator(s[i]) || s[i] == 0)
|
||||
{
|
||||
buf[i] = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
i = 0; // skip spaces
|
||||
while(is_separator(buf[i]))
|
||||
i++;
|
||||
|
||||
dbg_msg("game", "rotating map to %s", &buf[i]);
|
||||
strcpy(config.sv_map, &buf[i]);
|
||||
}
|
||||
|
||||
void gameobject::post_reset()
|
||||
{
|
||||
for(int i = 0; i < MAX_CLIENTS; i++)
|
||||
|
@ -374,6 +377,15 @@ void gameobject::on_player_death(class player *victim, class player *killer, int
|
|||
|
||||
void gameobject::tick()
|
||||
{
|
||||
if(game_over_tick != -1)
|
||||
{
|
||||
// game over.. wait for restart
|
||||
if(server_tick() > game_over_tick+server_tickspeed()*10)
|
||||
{
|
||||
cyclemap();
|
||||
startround();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void gameobject::snap(int snapping_client)
|
||||
|
@ -810,7 +822,7 @@ int player::handle_weapons()
|
|||
break;
|
||||
|
||||
case WEAPON_GUN:
|
||||
new projectile(projectile::WEAPON_PROJECTILETYPE_GUN,
|
||||
new projectile(WEAPON_GUN,
|
||||
client_id,
|
||||
pos+vec2(0,0),
|
||||
direction*30.0f,
|
||||
|
@ -821,7 +833,7 @@ int player::handle_weapons()
|
|||
break;
|
||||
case WEAPON_ROCKET:
|
||||
{
|
||||
new projectile(projectile::WEAPON_PROJECTILETYPE_ROCKET,
|
||||
new projectile(WEAPON_ROCKET,
|
||||
client_id,
|
||||
pos+vec2(0,0),
|
||||
direction*15.0f,
|
||||
|
@ -838,7 +850,7 @@ int player::handle_weapons()
|
|||
{
|
||||
float a = get_angle(direction);
|
||||
a += i*0.08f;
|
||||
new projectile(projectile::WEAPON_PROJECTILETYPE_SHOTGUN,
|
||||
new projectile(WEAPON_SHOTGUN,
|
||||
client_id,
|
||||
pos+vec2(0,0),
|
||||
vec2(cosf(a), sinf(a))*25.0f,
|
||||
|
@ -1457,6 +1469,12 @@ void mods_tick()
|
|||
|
||||
if(world->paused) // make sure that the game object always updates
|
||||
gameobj->tick();
|
||||
|
||||
if(config.restart)
|
||||
{
|
||||
gameobj->startround();
|
||||
config.restart = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void mods_snap(int client_id)
|
||||
|
|
|
@ -109,9 +109,8 @@ extern game_world *world;
|
|||
class gameobject : public entity
|
||||
{
|
||||
protected:
|
||||
void cyclemap();
|
||||
void resetgame();
|
||||
void startround();
|
||||
void endround();
|
||||
|
||||
int round_start_tick;
|
||||
int game_over_tick;
|
||||
|
@ -124,6 +123,10 @@ protected:
|
|||
public:
|
||||
int gametype;
|
||||
gameobject();
|
||||
|
||||
void startround();
|
||||
void endround();
|
||||
|
||||
virtual void post_reset();
|
||||
virtual void tick();
|
||||
|
||||
|
@ -160,10 +163,6 @@ public:
|
|||
enum
|
||||
{
|
||||
PROJECTILE_FLAGS_EXPLODE = 1 << 0,
|
||||
|
||||
WEAPON_PROJECTILETYPE_GUN = 0,
|
||||
WEAPON_PROJECTILETYPE_ROCKET = 1,
|
||||
WEAPON_PROJECTILETYPE_SHOTGUN = 2,
|
||||
};
|
||||
|
||||
vec2 vel;
|
||||
|
|
|
@ -35,11 +35,7 @@ void gameobject_dm::tick()
|
|||
sudden_death = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// game over.. wait for restart
|
||||
if(server_tick() > game_over_tick+server_tickspeed()*10)
|
||||
startround();
|
||||
}
|
||||
|
||||
gameobject::tick();
|
||||
}
|
||||
|
||||
|
|
|
@ -32,10 +32,6 @@ void gameobject_tdm::tick()
|
|||
sudden_death = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// game over.. wait for restart
|
||||
if(server_tick() > game_over_tick+server_tickspeed()*10)
|
||||
startround();
|
||||
}
|
||||
|
||||
gameobject::tick();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue