diff options
| -rw-r--r-- | src/game/g_buildable.c | 4 | ||||
| -rw-r--r-- | src/game/g_combat.c | 36 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 6 | ||||
| -rw-r--r-- | src/ui/ui_public.h | 13 |
4 files changed, 34 insertions, 25 deletions
diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index c10df521..a0cc8c02 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -382,7 +382,7 @@ void ASpawn_Melt( gentity_t *self ) { //FIXME: this line crashes the QVM (but not binary when MOD is set to MOD_[H/D]SPAWN G_SelectiveRadiusDamage( self->s.pos.trBase, self->parent, self->splashDamage, - self->splashRadius, self, MOD_SHOTGUN, PTE_ALIENS ); + self->splashRadius, self, MOD_ASPAWN, PTE_ALIENS ); //start creep recession if( !( self->s.eFlags & EF_DEAD ) ) @@ -555,7 +555,7 @@ void AOvermind_Think( gentity_t *self ) { self->timestamp = level.time; G_SelectiveRadiusDamage( self->s.pos.trBase, self, self->splashDamage, - self->splashRadius, self, MOD_SHOTGUN, PTE_ALIENS ); + self->splashRadius, self, MOD_OVERMIND, PTE_ALIENS ); G_setBuildableAnim( self, BANIM_ATTACK1, qfalse ); } } diff --git a/src/game/g_combat.c b/src/game/g_combat.c index 579cec2f..8c82dd2e 100644 --- a/src/game/g_combat.c +++ b/src/game/g_combat.c @@ -113,19 +113,15 @@ char *modNames[ ] = { "MOD_UNKNOWN", "MOD_SHOTGUN", - "MOD_GAUNTLET", + "MOD_BLASTER", + "MOD_PAINSAW", "MOD_MACHINEGUN", "MOD_CHAINGUN", - "MOD_GRENADE", - "MOD_GRENADE_SPLASH", - "MOD_ROCKET", - "MOD_ROCKET_SPLASH", + "MOD_PRIFLE", + "MOD_LCANNON", + "MOD_LCANNON_SPLASH", "MOD_FLAMER", "MOD_FLAMER_SPLASH", - "MOD_RAILGUN", - "MOD_LIGHTNING", - "MOD_BFG", - "MOD_BFG_SPLASH", "MOD_WATER", "MOD_SLIME", "MOD_LAVA", @@ -135,10 +131,26 @@ char *modNames[ ] = "MOD_SUICIDE", "MOD_TARGET_LASER", "MOD_TRIGGER_HURT", - "MOD_GRAPPLE", - "MOD_VENOM", + + "MOD_ABUILDER_CLAW", + "MOD_SOLDIER_BITE", + "MOD_HYDRA_CLAW", + "MOD_HYDRA_PCLOUD", + "MOD_DRAGOON_CLAW", + "MOD_DRAGOON_POUNCE", + "MOD_CHIMERA_CLAW", + "MOD_CHIMERA_ZAP", + "MOD_BMOFO_CLAW", + "MOD_BMOFO_CHARGE", + + "MOD_SLOWBLOB", + "MOD_POISON", + "MOD_HSPAWN", - "MOD_DSPAWN" + "MOD_TESLAGEN", + "MOD_ASPAWN", + "MOD_ATUBE", + "MOD_OVERMIND" }; /* diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 21281f87..7a289e10 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -2909,8 +2909,6 @@ static qboolean UI_TeamMember_HandleKey(int flags, float *special, int key, qboo static qboolean UI_NetSource_HandleKey(int flags, float *special, int key) { if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_ENTER || key == K_KP_ENTER) { - Com_Printf( "pre1 ui_netSource: %d\n", ui_netSource.integer ); - if (key == K_MOUSE2) { ui_netSource.integer--; if (ui_netSource.integer == AS_MPLAYER) @@ -2921,16 +2919,12 @@ static qboolean UI_NetSource_HandleKey(int flags, float *special, int key) { ui_netSource.integer++; } - Com_Printf( "pre ui_netSource: %d\n", ui_netSource.integer ); - if (ui_netSource.integer >= numNetSources) { ui_netSource.integer = 0; } else if (ui_netSource.integer < 0) { ui_netSource.integer = numNetSources - 1; } - Com_Printf( "post ui_netSource: %d\n", ui_netSource.integer ); - UI_BuildServerDisplayList(qtrue); if (ui_netSource.integer != AS_GLOBAL) { UI_StartServerRefresh(qtrue); diff --git a/src/ui/ui_public.h b/src/ui/ui_public.h index 6e9e261f..9cf36d66 100644 --- a/src/ui/ui_public.h +++ b/src/ui/ui_public.h @@ -140,11 +140,14 @@ typedef enum { UIMENU_POSTGAME } uiMenuCommand_t; -#define SORT_HOST 0 -#define SORT_MAP 1 -#define SORT_CLIENTS 2 -#define SORT_PING 3 -#define SORT_PUNKBUSTER 4 +typedef enum +{ + SORT_HOST, + SORT_MAP, + SORT_CLIENTS, + SORT_PUNKBUSTER, + SORT_PING +} serverSortField_t; typedef enum { UI_GETAPIVERSION = 0, // system reserved |