moved alot of stuff to their own cpp/hpp files

6 files changed, 295 insertions, 0 deletions

diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp
new file mode 100644
index 00000000..4733ae82
--- /dev/null
+++ b/src/game/server/gamemodes/ctf.cpp
@@ -0,0 +1,200 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include <engine/e_server_interface.h>
+#include <game/g_mapitems.hpp>
+#include <game/server/entities/character.hpp>
+#include <game/server/player.hpp>
+#include <game/server/gamecontext.hpp>
+#include "ctf.hpp"
+
+GAMECONTROLLER_CTF::GAMECONTROLLER_CTF()
+{
+	flags[0] = 0;
+	flags[1] = 0;
+	is_teamplay = true;
+}
+
+bool GAMECONTROLLER_CTF::on_entity(int index, vec2 pos)
+{
+	if(GAMECONTROLLER::on_entity(index, pos))
+		return true;
+	
+	int team = -1;
+	if(index == ENTITY_FLAGSTAND_RED) team = 0;
+	if(index == ENTITY_FLAGSTAND_BLUE) team = 1;
+	if(team == -1)
+		return false;
+		
+	FLAG *f = new FLAG(team);
+	f->stand_pos = pos;
+	f->pos = pos;
+	flags[team] = f;
+	return true;
+}
+
+int GAMECONTROLLER_CTF::on_character_death(class CHARACTER *victim, class PLAYER *killer, int weaponid)
+{
+	GAMECONTROLLER::on_character_death(victim, killer, weaponid);
+	int had_flag = 0;
+	
+	// drop flags
+	for(int fi = 0; fi < 2; fi++)
+	{
+		FLAG *f = flags[fi];
+		if(f && f->carrying_character == &killer->character)
+			had_flag |= 2;
+		if(f && f->carrying_character == victim)
+		{
+			game.create_sound_global(SOUND_CTF_DROP);
+			f->drop_tick = server_tick();
+			f->carrying_character = 0;
+			f->vel = vec2(0,0);
+			
+			if(killer && killer->team != victim->team)
+				killer->score++;
+				
+			had_flag |= 1;
+		}
+	}
+	
+	return had_flag;
+}
+
+void GAMECONTROLLER_CTF::tick()
+{
+	GAMECONTROLLER::tick();
+
+	do_team_score_wincheck();
+	
+	for(int fi = 0; fi < 2; fi++)
+	{
+		FLAG *f = flags[fi];
+		
+		if(!f)
+			continue;
+		
+		//
+		if(f->carrying_character)
+		{
+			// update flag position
+			f->pos = f->carrying_character->pos;
+			
+			if(flags[fi^1] && flags[fi^1]->at_stand)
+			{
+				if(distance(f->pos, flags[fi^1]->pos) < 32)
+				{
+					// CAPTURE! \o/
+					teamscore[fi^1] += 100;
+					f->carrying_character->player->score += 5;
+
+					dbg_msg("game", "flag_capture player='%d:%s'",
+						f->carrying_character->player->client_id,
+						server_clientname(f->carrying_character->player->client_id));
+
+					for(int i = 0; i < 2; i++)
+						flags[i]->reset();
+					
+					game.create_sound_global(SOUND_CTF_CAPTURE);
+				}
+			}			
+		}
+		else
+		{
+			CHARACTER *close_characters[MAX_CLIENTS];
+			int num = game.world.find_entities(f->pos, 32.0f, (ENTITY**)close_characters, MAX_CLIENTS, NETOBJTYPE_CHARACTER);
+			for(int i = 0; i < num; i++)
+			{
+				if(close_characters[i]->team == f->team)
+				{
+					// return the flag
+					if(!f->at_stand)
+					{
+						CHARACTER *chr = close_characters[i];
+						chr->player->score += 1;
+
+						dbg_msg("game", "flag_return player='%d:%s'",
+							chr->player->client_id,
+							server_clientname(chr->player->client_id));
+
+						game.create_sound_global(SOUND_CTF_RETURN);
+						f->reset();
+					}
+				}
+				else
+				{
+					// take the flag
+					if(f->at_stand)
+						teamscore[fi^1]++;
+					f->at_stand = 0;
+					f->carrying_character = close_characters[i];
+					f->carrying_character->player->score += 1;
+
+					dbg_msg("game", "flag_grab player='%d:%s'",
+						f->carrying_character->player->client_id,
+						server_clientname(f->carrying_character->player->client_id));
+					
+					for(int c = 0; c < MAX_CLIENTS; c++)
+					{
+						if(game.players[c].client_id == -1)
+							continue;
+							
+						if(game.players[c].team == fi)
+							game.create_sound_global(SOUND_CTF_GRAB_EN, game.players[c].client_id);
+						else
+							game.create_sound_global(SOUND_CTF_GRAB_PL, game.players[c].client_id);
+					}
+					break;
+				}
+			}
+			
+			if(!f->carrying_character && !f->at_stand)
+			{
+				if(server_tick() > f->drop_tick + server_tickspeed()*30)
+				{
+					game.create_sound_global(SOUND_CTF_RETURN);
+					f->reset();
+				}
+				else
+				{
+					f->vel.y += game.world.core.tuning.gravity;
+					move_box(&f->pos, &f->vel, vec2(f->phys_size, f->phys_size), 0.5f);
+				}
+			}
+		}
+	}
+}
+
+// Flag
+FLAG::FLAG(int _team)
+: ENTITY(NETOBJTYPE_FLAG)
+{
+	team = _team;
+	proximity_radius = phys_size;
+	carrying_character = 0x0;
+	
+	reset();
+	
+	// TODO: should this be done here?
+	game.world.insert_entity(this);
+}
+
+void FLAG::reset()
+{
+	carrying_character = 0;
+	at_stand = 1;
+	pos = stand_pos;
+	vel = vec2(0,0);
+}
+
+void FLAG::snap(int snapping_client)
+{
+	NETOBJ_FLAG *flag = (NETOBJ_FLAG *)snap_new_item(NETOBJTYPE_FLAG, team, sizeof(NETOBJ_FLAG));
+	flag->x = (int)pos.x;
+	flag->y = (int)pos.y;
+	flag->team = team;
+	flag->carried_by = -1;
+	
+	if(at_stand)
+		flag->carried_by = -2;
+	else if(carrying_character)
+		flag->carried_by = carrying_character->player->client_id;
+}
diff --git a/src/game/server/gamemodes/ctf.hpp b/src/game/server/gamemodes/ctf.hpp
new file mode 100644
index 00000000..636f9f38
--- /dev/null
+++ b/src/game/server/gamemodes/ctf.hpp
@@ -0,0 +1,35 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+#include <game/server/gamecontroller.hpp>
+#include <game/server/entity.hpp>
+
+class GAMECONTROLLER_CTF : public GAMECONTROLLER
+{
+public:
+	class FLAG *flags[2];
+	
+	GAMECONTROLLER_CTF();
+	virtual void tick();
+	
+	virtual bool on_entity(int index, vec2 pos);
+	virtual int on_character_death(class CHARACTER *victim, class PLAYER *killer, int weapon);
+};
+
+// TODO: move to seperate file
+class FLAG : public ENTITY
+{
+public:
+	static const int phys_size = 14;
+	CHARACTER *carrying_character;
+	vec2 vel;
+	vec2 stand_pos;
+	
+	int team;
+	int at_stand;
+	int drop_tick;
+	
+	FLAG(int _team);
+
+	virtual void reset();
+	virtual void snap(int snapping_client);
+};
diff --git a/src/game/server/gamemodes/dm.cpp b/src/game/server/gamemodes/dm.cpp
new file mode 100644
index 00000000..b38d18f6
--- /dev/null
+++ b/src/game/server/gamemodes/dm.cpp
@@ -0,0 +1,8 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include "dm.hpp"
+
+void GAMECONTROLLER_DM::tick()
+{
+	do_player_score_wincheck();
+	GAMECONTROLLER::tick();
+}
diff --git a/src/game/server/gamemodes/dm.hpp b/src/game/server/gamemodes/dm.hpp
new file mode 100644
index 00000000..f57fe06d
--- /dev/null
+++ b/src/game/server/gamemodes/dm.hpp
@@ -0,0 +1,9 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+#include <game/server/gamecontroller.hpp>
+
+class GAMECONTROLLER_DM : public GAMECONTROLLER
+{
+public:
+	virtual void tick();
+};
diff --git a/src/game/server/gamemodes/tdm.cpp b/src/game/server/gamemodes/tdm.cpp
new file mode 100644
index 00000000..26441c9f
--- /dev/null
+++ b/src/game/server/gamemodes/tdm.cpp
@@ -0,0 +1,31 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+#include <engine/e_server_interface.h>
+#include <game/server/entities/character.hpp>
+#include <game/server/player.hpp>
+#include "tdm.hpp"
+
+GAMECONTROLLER_TDM::GAMECONTROLLER_TDM()
+{
+	is_teamplay = true;
+}
+
+int GAMECONTROLLER_TDM::on_character_death(class CHARACTER *victim, class PLAYER *killer, int weapon)
+{
+	GAMECONTROLLER::on_character_death(victim, killer, weapon);
+	
+	if(weapon >= 0)
+	{
+		// do team scoring
+		if(killer == victim->player)
+			teamscore[killer->team&1]--; // klant arschel
+		else
+			teamscore[killer->team&1]++; // good shit
+	}
+	return 0;
+}
+
+void GAMECONTROLLER_TDM::tick()
+{
+	do_team_score_wincheck();
+	GAMECONTROLLER::tick();
+}
diff --git a/src/game/server/gamemodes/tdm.hpp b/src/game/server/gamemodes/tdm.hpp
new file mode 100644
index 00000000..51c47ca5
--- /dev/null
+++ b/src/game/server/gamemodes/tdm.hpp
@@ -0,0 +1,12 @@
+/* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+#include <game/server/gamecontroller.hpp>
+
+class GAMECONTROLLER_TDM : public GAMECONTROLLER
+{
+public:
+	GAMECONTROLLER_TDM();
+	
+	int on_character_death(class CHARACTER *victim, class PLAYER *killer, int weapon);
+	virtual void tick();
+};