diff -r openArenaEliminationB14/code/botlib/be_ai_goal.c openArenaEliminationB15/code/botlib/be_ai_goal.c 106c106 < GT_ELIMINATION, --- > GT_ELIMINATION = 8, diff -r openArenaEliminationB14/code/cgame/cg_event.c openArenaEliminationB15/code/cgame/cg_event.c 121,149c121,152 < switch( mod ) { < case MOD_SUICIDE: < message = "suicides"; < break; < case MOD_FALLING: < message = "cratered"; < break; < case MOD_CRUSH: < message = "was squished"; < break; < case MOD_WATER: < message = "sank like a rock"; < break; < case MOD_SLIME: < message = "melted"; < break; < case MOD_LAVA: < message = "does a back flip into the lava"; < break; < case MOD_TARGET_LASER: < message = "saw the light"; < break; < case MOD_TRIGGER_HURT: < message = "was in the wrong place"; < break; < default: < message = NULL; < break; < } --- > if(attacker != ENTITYNUM_WORLD) > message = NULL; > else > switch( mod ) { > case MOD_SUICIDE: > message = "suicides"; > break; > case MOD_FALLING: > message = "cratered"; > break; > case MOD_CRUSH: > message = "was squished"; > break; > case MOD_WATER: > message = "sank like a rock"; > break; > case MOD_SLIME: > message = "melted"; > break; > case MOD_LAVA: > message = "does a back flip into the lava"; > break; > case MOD_TARGET_LASER: > message = "saw the light"; > break; > case MOD_TRIGGER_HURT: > message = "was in the wrong place"; > break; > default: > message = NULL; > break; > } 211a215 > 320a325,336 > case MOD_LAVA: > message = "was given a hot bath by"; > break; > case MOD_SLIME: > message = "was given a acid bath by"; > break; > case MOD_FALLING: > message = "was given a small push by"; > break; > case MOD_TRIGGER_HURT: > message = "was helped on the way by"; > break; diff -r openArenaEliminationB14/code/game/g_client.c openArenaEliminationB15/code/game/g_client.c 1551a1552,1554 > > //Sago: No one has hit the client yet! > client->lastSentFlying = -1; diff -r openArenaEliminationB14/code/game/g_combat.c openArenaEliminationB15/code/game/g_combat.c 844a845,846 > > 867a870,883 > //Sago: This was moved up > client = targ->client; > > //Sago: See if the client was sent flying > //Check if damage is by somebody who is not a player! > if( (!attacker || attacker->s.eType != ET_PLAYER) && client->lastSentFlying>-1 && ( mod==MOD_FALLING || mod==MOD_LAVA || mod==MOD_SLIME || mod==MOD_TRIGGER_HURT ) ) { > if(client->lastSentFlyingTime+4000 client->lastSentFlying = -1; //More than 4 seconds, not a kill! > } else { > //G_Printf("LastSentFlying %i\n",client->lastSentFlying); > attacker = &g_entities[client->lastSentFlying]; > } > } > 899c915,916 < client = targ->client; --- > //Sago: I have moved this up > //client = targ->client; 948a966,972 > //Remeber the last person to hurt the player > if(targ==attacker || OnSameTeam (targ, attacker)) { > targ->client->lastSentFlying = -1; > } else { > targ->client->lastSentFlying = attacker->s.number; > targ->client->lastSentFlyingTime = level.time; > } 1044c1068,1070 < } else { --- > } else if(client->lastSentFlying) { > client->ps.persistant[PERS_ATTACKER] = client->lastSentFlying; > } else { 1098c1124 < --- > diff -r openArenaEliminationB14/code/game/g_local.h openArenaEliminationB15/code/game/g_local.h 44a45 > //Domination how many seconds between awarded a point 332a334,336 > > int lastSentFlying; //The last client that sent the player flying > int lastSentFlyingTime; //So we can time out diff -r openArenaEliminationB14/code/game/match.h openArenaEliminationB15/code/game/match.h 71a72,76 > > //Double Domination messages > #define MSG_TAKEA 90 > #define MSG_TAKEB 91 > // 89,91c94 < //Double Domination messages < #define MSG_TAKEA 400 < #define MSG_TAKEB 401 --- > diff -r openArenaEliminationB14/code/q3_ui/ui_team.c openArenaEliminationB15/code/q3_ui/ui_team.c 183,184c183,184 < s_teammain.joingame.generic.flags |= QMF_GRAYED; < --- > //s_teammain.joingame.generic.flags |= QMF_GRAYED; > s_teammain.joingame.string = "AUTO JOIN GAME"; diff -r openArenaEliminationB14/code/tools/lcc/build-linux-i386/rcc/dagcheck.c openArenaEliminationB15/code/tools/lcc/build-linux-i386/rcc/dagcheck.c 9c9 < generated at Sun Jun 24 10:53:22 2007 --- > generated at Mon Mar 17 22:21:50 2008