commit be9c2644532a1355861f7595b88b99d013a304f3 Author: devhc Date: Thu Jul 21 03:02:59 2011 +0200 refactoring amendments diff --git a/code/botlib/be_ai_gen.c b/code/botlib/be_ai_gen.c index 42a5481..5839f8a 100644 --- a/code/botlib/be_ai_gen.c +++ b/code/botlib/be_ai_gen.c @@ -52,7 +52,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA int GeneticSelection(int numranks, float *rankings) { float sum; - //float select; int i, index; sum = 0; @@ -65,7 +64,7 @@ int GeneticSelection(int numranks, float *rankings) { //select a bot where the ones with the higest rankings have //the highest chance of being selected - //select = random() * sum; + //sum *= random(); for (i = 0; i < numranks; i++) { if (rankings[i] < 0) continue; diff --git a/code/botlib/be_ai_move.c b/code/botlib/be_ai_move.c index d3ad5ee..43e9a33 100644 --- a/code/botlib/be_ai_move.c +++ b/code/botlib/be_ai_move.c @@ -1030,7 +1030,7 @@ float BotGapDistance(vec3_t origin, vec3_t hordir, int entnum) end[2] -= 20; if (AAS_PointContents(end) & CONTENTS_WATER) break; //if a gap is found slow down - //botimport.Print(PRT_MESSAGE, "gap at %f\n", dist); + //botimport.Print(PRT_MESSAGE, "gap at %i\n", dist); return dist; } //end if startz = trace.endpos[2]; @@ -1735,8 +1735,7 @@ bot_moveresult_t BotFinishTravel_WalkOffLedge(bot_movestate_t *ms, aas_reachabil bot_moveresult_t BotTravel_Jump(bot_movestate_t *ms, aas_reachability_t *reach) { vec3_t hordir; - int gapdist; - float dist, speed, horspeed, sv_jumpvel; + float dist, gapdist, speed, horspeed, sv_jumpvel; bot_moveresult_t_cleared( result ); // @@ -1812,8 +1811,8 @@ bot_moveresult_t BotTravel_Jump(bot_movestate_t *ms, aas_reachability_t *reach) if (AAS_PointAreaNum(end) != ms->reachareanum) break; } //end for if (gapdist < 80) VectorMA(reach->start, gapdist, hordir, trace.endpos); -// gapdist = BotGapDistance(start, hordir, ms->entitynum); -// if (gapdist && gapdist <= trace.fraction * 80) VectorMA(reach->start, gapdist-20, hordir, trace.endpos); +// dist1 = BotGapDistance(start, hordir, ms->entitynum); +// if (dist1 && dist1 <= trace.fraction * 80) VectorMA(reach->start, dist1-20, hordir, trace.endpos); // VectorSubtract(ms->origin, reach->start, dir1); dir1[2] = 0; diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h index c7e2659..fd59b8e 100644 --- a/code/cgame/cg_local.h +++ b/code/cgame/cg_local.h @@ -857,7 +857,6 @@ typedef struct { sfxHandle_t obeliskRespawnSound; sfxHandle_t winnerSound; sfxHandle_t loserSound; - //sfxHandle_t youSuckSound; #endif sfxHandle_t gibSound; sfxHandle_t gibBounce1Sound; diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 52ff617..af6b998 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -742,7 +742,6 @@ static void CG_RegisterSounds( void ) { cgs.media.kamikazeFarSound = trap_S_RegisterSound( "sound/items/kam_explode_far.wav", qfalse ); cgs.media.winnerSound = trap_S_RegisterSound( "sound/feedback/voc_youwin.wav", qfalse ); cgs.media.loserSound = trap_S_RegisterSound( "sound/feedback/voc_youlose.wav", qfalse ); - //cgs.media.youSuckSound = trap_S_RegisterSound( "sound/misc/yousuck.wav", qfalse ); cgs.media.wstbimplSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpl.wav", qfalse); cgs.media.wstbimpmSound = trap_S_RegisterSound("sound/weapons/proxmine/wstbimpm.wav", qfalse); diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c index ad61b6d..d0028d6 100644 --- a/code/cgame/cg_newdraw.c +++ b/code/cgame/cg_newdraw.c @@ -175,7 +175,6 @@ static void CG_DrawPlayerArmorIcon( rectDef_t *rect, qboolean draw2D ) { origin[1] = 0; origin[2] = -10; angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0f; - CG_Draw3DModel( rect->x, rect->y, rect->w, rect->h, cgs.media.armorModel, 0, origin, angles ); } } diff --git a/code/cgame/cg_weapons.c b/code/cgame/cg_weapons.c index f5ac146..44a130b 100644 --- a/code/cgame/cg_weapons.c +++ b/code/cgame/cg_weapons.c @@ -1842,6 +1842,7 @@ void CG_MissileHitWall( int weapon, int clientNum, vec3_t origin, vec3_t dir, im case WP_RAILGUN: mod = cgs.media.ringFlashModel; shader = cgs.media.railExplosionShader; + //sfx = cgs.media.sfx_railg; sfx = cgs.media.sfx_plasmaexp; mark = cgs.media.energyMarkShader; radius = 24; diff --git a/code/client/cl_scrn.c b/code/client/cl_scrn.c index c0aaf50..11c7db8 100644 --- a/code/client/cl_scrn.c +++ b/code/client/cl_scrn.c @@ -395,13 +395,8 @@ DEBUG GRAPH =============================================================================== */ -typedef struct -{ - float value; -} graphsamp_t; - static int current; -static graphsamp_t values[1024]; +static float values[1024]; /* ============== @@ -410,8 +405,8 @@ SCR_DebugGraph */ void SCR_DebugGraph (float value) { - values[current&1023].value = value; - current++; + values[current] = value; + current = (current + 1) % ARRAY_LEN(values); } /* @@ -437,8 +432,8 @@ void SCR_DrawDebugGraph (void) for (a=0 ; ainteger + cl_graphshift->integer; if (v < 0) diff --git a/code/q3_ui/ui_splevel.c b/code/q3_ui/ui_splevel.c index ddd44d5..17c9456 100644 --- a/code/q3_ui/ui_splevel.c +++ b/code/q3_ui/ui_splevel.c @@ -725,7 +725,6 @@ static void UI_SPLevelMenu_Init( void ) { skill = (int)trap_Cvar_VariableValue( "g_spSkill" ); if( skill < 1 || skill > 5 ) { trap_Cvar_Set( "g_spSkill", "2" ); - //skill = 2; } memset( &levelMenuInfo, 0, sizeof(levelMenuInfo) ); diff --git a/code/renderer/tr_curve.c b/code/renderer/tr_curve.c index b743045..40537ea 100644 --- a/code/renderer/tr_curve.c +++ b/code/renderer/tr_curve.c @@ -204,10 +204,9 @@ static int neighbors[8][2] = { VectorAdd( normal, sum, sum ); count++; } -// if ( count == 0 ) { -//printf("bad normal\n"); -// count = 1; -// } + //if ( count == 0 ) { + // printf("bad normal\n"); + //} VectorNormalize2( sum, dv->normal ); } } diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c index c8176c3..b89d6dc 100644 --- a/code/renderer/tr_shade.c +++ b/code/renderer/tr_shade.c @@ -1174,8 +1174,10 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input ) void RB_StageIteratorGeneric( void ) { shaderCommands_t *input; + shader_t *shader; input = &tess; + shader = input->shader; RB_DeformTessGeometry(); @@ -1192,10 +1194,10 @@ void RB_StageIteratorGeneric( void ) // // set face culling appropriately // - GL_Cull( input->shader->cullType ); + GL_Cull( shader->cullType ); // set polygon offset if necessary - if ( input->shader->polygonOffset ) + if ( shader->polygonOffset ) { qglEnable( GL_POLYGON_OFFSET_FILL ); qglPolygonOffset( r_offsetFactor->value, r_offsetUnits->value ); @@ -1207,7 +1209,7 @@ void RB_StageIteratorGeneric( void ) // to avoid compiling those arrays since they will change // during multipass rendering // - if ( tess.numPasses > 1 || input->shader->multitextureEnv ) + if ( tess.numPasses > 1 || shader->multitextureEnv ) { setArraysOnce = qfalse; qglDisableClientState (GL_COLOR_ARRAY); @@ -1275,7 +1277,7 @@ void RB_StageIteratorGeneric( void ) // // reset polygon offset // - if ( input->shader->polygonOffset ) + if ( shader->polygonOffset ) { qglDisable( GL_POLYGON_OFFSET_FILL ); } @@ -1288,8 +1290,10 @@ void RB_StageIteratorGeneric( void ) void RB_StageIteratorVertexLitTexture( void ) { shaderCommands_t *input; + shader_t *shader; input = &tess; + shader = input->shader; // // compute colors @@ -1309,7 +1313,7 @@ void RB_StageIteratorVertexLitTexture( void ) // // set face culling appropriately // - GL_Cull( input->shader->cullType ); + GL_Cull( shader->cullType ); // // set arrays and lock @@ -1362,8 +1366,10 @@ void RB_StageIteratorVertexLitTexture( void ) void RB_StageIteratorLightmappedMultitexture( void ) { shaderCommands_t *input; + shader_t *shader; input = &tess; + shader = input->shader; // // log this call @@ -1377,7 +1383,7 @@ void RB_StageIteratorLightmappedMultitexture( void ) { // // set face culling appropriately // - GL_Cull( input->shader->cullType ); + GL_Cull( shader->cullType ); // // set color, pointers, and lock diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c index 228ba4c..15d8ac4 100644 --- a/code/ui/ui_shared.c +++ b/code/ui/ui_shared.c @@ -3010,7 +3010,7 @@ void Item_TextField_Paint(itemDef_t *item) { char buff[1024]; vec4_t newColor, lowLight; int offset; - menuDef_t *parent; + menuDef_t *parent = (menuDef_t*)item->parent; editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData; Item_Text_Paint(item); @@ -3021,8 +3021,6 @@ void Item_TextField_Paint(itemDef_t *item) { DC->getCVarString(item->cvar, buff, sizeof(buff)); } - parent = (menuDef_t*)item->parent; - if (item->window.flags & WINDOW_HASFOCUS) { lowLight[0] = 0.8 * parent->focusColor[0]; lowLight[1] = 0.8 * parent->focusColor[1]; @@ -3389,7 +3387,6 @@ void Item_Slider_Paint(itemDef_t *item) { void Item_Bind_Paint(itemDef_t *item) { vec4_t newColor, lowLight; - float value; int maxChars = 0; menuDef_t *parent = (menuDef_t*)item->parent; editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData; @@ -3397,8 +3394,6 @@ void Item_Bind_Paint(itemDef_t *item) { maxChars = editPtr->maxPaintChars; } - value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0; - if (item->window.flags & WINDOW_HASFOCUS) { if (g_bindItem == item) { lowLight[0] = 0.8f * 1.0f; @@ -3421,7 +3416,7 @@ void Item_Bind_Paint(itemDef_t *item) { BindingFromName(item->cvar); DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, g_nameBind1, 0, maxChars, item->textStyle); } else { - DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "FIXME" : "FIXME", 0, maxChars, item->textStyle); + DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, "FIXME", 0, maxChars, item->textStyle); } }