diff -r openArenaEliminationB12/code/cgame/cg_draw.c openArenaEliminationB13/code/cgame/cg_draw.c
564c564,567
< 	CG_DrawTeamBackground( 0, 420, 640, 60, 0.33f, cg.snap->ps.persistant[PERS_TEAM] );
---
> 	if ( !(cg.snap->ps.pm_flags & PMF_FOLLOW) ) //If not following anybody:
> 		CG_DrawTeamBackground( 0, 420, 640, 60, 0.33f, cg.snap->ps.persistant[PERS_TEAM] );
> 	else //Sago: If we follow find the teamcolor of the guy we follow. It might not be our own team!
> 		CG_DrawTeamBackground( 0, 420, 640, 60, 0.33f, cgs.clientinfo[ cg.snap->ps.clientNum ].team );
979c982
< static float CG_DrawEliminationDeathMessage( float y ) {
---
> /*static float CG_DrawEliminationDeathMessage( float y ) {
988c991
< }
---
> }*/
1364,1365c1367,1368
< 		if (cgs.clientinfo[ cg.clientNum ].isDead)
< 			y = CG_DrawEliminationDeathMessage( y);
---
> 		/*if (cgs.clientinfo[ cg.clientNum ].isDead)
> 			y = CG_DrawEliminationDeathMessage( y);*/
diff -r openArenaEliminationB12/code/cgame/cg_local.h openArenaEliminationB13/code/cgame/cg_local.h
304c304
< 	qboolean			isDead;
---
> 	int			isDead;
379c379
< 	qboolean		isDead;
---
> 	int		isDead;
diff -r openArenaEliminationB12/code/cgame/cg_scoreboard.c openArenaEliminationB13/code/cgame/cg_scoreboard.c
178a179,182
> 		if(cgs.gametype == GT_LMS)
> 			Com_sprintf(string, sizeof(string),
> 				"%5i %4i %4i %s *%i*", score->score, score->ping, score->time, ci->name, ci->isDead);
> 		else
diff -r openArenaEliminationB12/code/cgame/cg_view.c openArenaEliminationB13/code/cgame/cg_view.c
343c343
< 	if ( cg.damageTime ) {
---
> 	if ( cg.damageTime && cgs.gametype!=GT_ELIMINATION && cgs.gametype!=GT_CTF_ELIMINATION && cgs.gametype!=GT_LMS) {
Kun i openArenaEliminationB13/code/cgame: .svn
diff -r openArenaEliminationB12/code/game/g_cmds.c openArenaEliminationB13/code/game/g_cmds.c
67,79c67,94
< 
< 		Com_sprintf (entry, sizeof(entry),
< 			" %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i", level.sortedClients[i],
< 			cl->ps.persistant[PERS_SCORE], ping, (level.time - cl->pers.enterTime)/60000,
< 			scoreFlags, g_entities[level.sortedClients[i]].s.powerups, accuracy, 
< 			cl->ps.persistant[PERS_IMPRESSIVE_COUNT],
< 			cl->ps.persistant[PERS_EXCELLENT_COUNT],
< 			cl->ps.persistant[PERS_GAUNTLET_FRAG_COUNT], 
< 			cl->ps.persistant[PERS_DEFEND_COUNT], 
< 			cl->ps.persistant[PERS_ASSIST_COUNT], 
< 			perfect,
< 			cl->ps.persistant[PERS_CAPTURES],
< 			cl->isEliminated);
---
> 		if(g_gametype.integer == GT_LMS) {
> 			Com_sprintf (entry, sizeof(entry),
> 				" %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i", level.sortedClients[i],
> 				cl->ps.persistant[PERS_SCORE], ping, (level.time - cl->pers.enterTime)/60000,
> 				scoreFlags, g_entities[level.sortedClients[i]].s.powerups, accuracy, 
> 				cl->ps.persistant[PERS_IMPRESSIVE_COUNT],
> 				cl->ps.persistant[PERS_EXCELLENT_COUNT],
> 				cl->ps.persistant[PERS_GAUNTLET_FRAG_COUNT], 
> 				cl->ps.persistant[PERS_DEFEND_COUNT], 
> 				cl->ps.persistant[PERS_ASSIST_COUNT], 
> 				perfect,
> 				cl->ps.persistant[PERS_CAPTURES],
> 				cl->pers.livesLeft + (cl->isEliminated?0:1));
> 		}
> 		else {
> 			Com_sprintf (entry, sizeof(entry),
> 				" %i %i %i %i %i %i %i %i %i %i %i %i %i %i %i", level.sortedClients[i],
> 				cl->ps.persistant[PERS_SCORE], ping, (level.time - cl->pers.enterTime)/60000,
> 				scoreFlags, g_entities[level.sortedClients[i]].s.powerups, accuracy, 
> 				cl->ps.persistant[PERS_IMPRESSIVE_COUNT],
> 				cl->ps.persistant[PERS_EXCELLENT_COUNT],
> 				cl->ps.persistant[PERS_GAUNTLET_FRAG_COUNT], 
> 				cl->ps.persistant[PERS_DEFEND_COUNT], 
> 				cl->ps.persistant[PERS_ASSIST_COUNT], 
> 				perfect,
> 				cl->ps.persistant[PERS_CAPTURES],
> 				cl->isEliminated);
> 		}
1320c1335,1336
< 	"Double Domination"
---
> 	"Double Domination",
> 	"Domination"
diff -r openArenaEliminationB12/code/game/g_main.c openArenaEliminationB13/code/game/g_main.c
985a986
> 			EliminationMessage( g_entities + i );
1735c1736
< 		if(g_elimination_activewarmup.integer > g_elimination_warmup.integer) //This must not be true
---
> 		if(g_elimination_activewarmup.integer >= g_elimination_warmup.integer) //This must not be true
1873c1874
< 		if(g_elimination_activewarmup.integer > g_elimination_warmup.integer) //This must not be true
---
> 		if(g_elimination_activewarmup.integer >= g_elimination_warmup.integer) //This must not be true
diff -r openArenaEliminationB12/code/game/inv.h openArenaEliminationB13/code/game/inv.h
74a75,79
> //Elimination mod: Domination inventory
> #define INVENTORY_POINTWHITE			50
> #define INVENTORY_POINTRED			51
> #define INVENTORY_POINTBLUE			52
> 
151a157,169
> //Elimination mod: Double Domination and Standard Domination
> 
> #define MODELINDEX_POINTABLUE			52
> #define MODELINDEX_POINTBBLUE			53
> #define MODELINDEX_POINTARED			54
> #define MODELINDEX_POINTBRED			55
> #define MODELINDEX_POINTAWHITE			56
> #define MODELINDEX_POINTBWHITE			57
> #define MODELINDEX_POINTWHITE			58
> #define MODELINDEX_POINTRED			59
> #define MODELINDEX_POINTBLUE			60
> 
>