diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-17 18:05:17 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:53 +0000 |
| commit | f9683711bedc6c22889d151fe27313cb724bfbe2 (patch) | |
| tree | a747c421aab6c95132b74764235769f717ed6249 /src | |
| parent | ed3a2a6da386c887ff721dfd3b559cb7b12f383d (diff) | |
* Fix wonky say text field behavior when you press insert (Rezyn)
* Properly prevent deconstructing the last spawn when it's markdeconstruct with no power (Rezyn)
* Fix typo on nextmap votes (Byron Johnson)
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_cmds.c | 7 | ||||
| -rw-r--r-- | src/ui/ui_shared.c | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index f95dab1e..cdb81765 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1184,7 +1184,7 @@ void Cmd_CallVote_f( gentity_t *ent ) "set g_nextMap \"%s\"", arg ); Com_sprintf( level.voteDisplayString[ team ], sizeof( level.voteDisplayString[ team ] ), - "Set the next map go '%s'", arg ); + "Set the next map to '%s'", arg ); } else if( !Q_stricmp( vote, "draw" ) ) { @@ -1672,7 +1672,8 @@ void Cmd_Destroy_f( gentity_t *ent ) } // Prevent destruction of the last spawn - if( !g_markDeconstruct.integer && !g_cheats.integer ) + if( !g_cheats.integer && + ( !g_markDeconstruct.integer || !G_FindPower( traceEnt ) ) ) { if( ent->client->pers.teamSelection == TEAM_ALIENS && traceEnt->s.modelindex == BA_A_SPAWN ) @@ -1732,7 +1733,7 @@ void Cmd_Destroy_f( gentity_t *ent ) if( !g_cheats.integer ) // add a bit to the build timer { ent->client->ps.stats[ STAT_MISC ] += - BG_Buildable( traceEnt->s.modelindex )->buildTime / 4; + BG_Buildable( traceEnt->s.modelindex )->buildTime / 4; } G_LogDestruction( traceEnt, ent, MOD_DECONSTRUCT ); G_FreeEntity( traceEnt ); diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c index bcb694ce..dd862c09 100644 --- a/src/ui/ui_shared.c +++ b/src/ui/ui_shared.c @@ -3628,11 +3628,11 @@ qboolean Item_TextField_HandleKey( itemDef_t *item, int key ) else { // Reached maximum field length - if( editPtr->maxChars && item->cursorPos >= editPtr->maxChars ) + { releaseFocus = qfalse; - - goto exit; + goto exit; + } } buff[ item->cursorPos ] = key; |