From e5fe2a8ae38a8abb4c715b3f66465ef8b0b9ebff Mon Sep 17 00:00:00 2001 From: Buginator Date: Wed, 23 Jun 2010 03:11:10 +0000 Subject: [PATCH] Clean up getMultiStats() to remove unused parameter. 2.3: r11017 git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11024 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/multiint.c | 8 ++++---- src/multijoin.c | 4 ++-- src/multimenu.c | 8 ++++---- src/multiopt.c | 2 +- src/multistat.c | 22 +++++++++------------- src/multistat.h | 2 +- src/multisync.c | 4 ++-- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/src/multiint.c b/src/multiint.c index e8032ff27..68585becb 100644 --- a/src/multiint.c +++ b/src/multiint.c @@ -3395,13 +3395,13 @@ static UDWORD bestPlayer(UDWORD player) UDWORD i, myscore, score, count=1; - myscore = getMultiStats(player,false).totalScore; + myscore = getMultiStats(player).totalScore; for(i=0;i= myscore) { @@ -3540,13 +3540,13 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *p break; } - if(getMultiStats(j,false).played < 5) + if(getMultiStats(j).played < 5) { iV_DrawImage(FrontImages,IMAGE_MEDAL_DUMMY,x+37,y+13); } else { - stat = getMultiStats(j,false); + stat = getMultiStats(j); // star 1 total droid kills eval = stat.totalKills; diff --git a/src/multijoin.c b/src/multijoin.c index 68fa08324..e716918bf 100644 --- a/src/multijoin.c +++ b/src/multijoin.c @@ -295,7 +295,7 @@ BOOL MultiPlayerJoin(UDWORD playerIndex) { if (NetPlay.players[i].allocated) { - setMultiStats(i, getMultiStats(i, false), false); + setMultiStats(i, getMultiStats(i), false); } } } @@ -389,7 +389,7 @@ void setupNewPlayer(UDWORD player) resetMultiVisibility(player); // set visibility flags. - setMultiStats(player, getMultiStats(player, false), true); // get the players score from the ether. + setMultiStats(player, getMultiStats(player), true); // get the players score ssprintf(buf, _("%s is Joining the Game"), getPlayerName(player)); addConsoleMessage(buf, DEFAULT_JUSTIFY, SYSTEM_MESSAGE); diff --git a/src/multimenu.c b/src/multimenu.c index 547c47b97..e6536c4d7 100644 --- a/src/multimenu.c +++ b/src/multimenu.c @@ -872,11 +872,11 @@ static void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, if (NetPlay.bComms) { //c8:score, - sprintf(str,"%d",getMultiStats(player,true).recentScore); + sprintf(str,"%d",getMultiStats(player).recentScore); iV_DrawText(str, x+MULTIMENU_C8, y+MULTIMENU_FONT_OSET); //c9:kills, - sprintf(str,"%d",getMultiStats(player,true).recentKills); + sprintf(str,"%d",getMultiStats(player).recentKills); iV_DrawText(str, x+MULTIMENU_C9, y+MULTIMENU_FONT_OSET); } else @@ -936,11 +936,11 @@ static void displayMultiPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, if (NetPlay.bComms) { //c8:score, - sprintf(str,"%d",getMultiStats(player,true).recentScore); + sprintf(str,"%d",getMultiStats(player).recentScore); iV_DrawText(str, x+MULTIMENU_C8, y+MULTIMENU_FONT_OSET); //c9:kills, - sprintf(str,"%d",getMultiStats(player,true).recentKills); + sprintf(str,"%d",getMultiStats(player).recentKills); iV_DrawText(str, x+MULTIMENU_C9, y+MULTIMENU_FONT_OSET); } else diff --git a/src/multiopt.c b/src/multiopt.c index d17889220..3cfc4d85a 100644 --- a/src/multiopt.c +++ b/src/multiopt.c @@ -614,7 +614,7 @@ BOOL multiGameShutdown(void) sendLeavingMsg(); // say goodbye updateMultiStatsGames(); // update games played. - st = getMultiStats(selectedPlayer, true); // save stats + st = getMultiStats(selectedPlayer); // save stats saveMultiStats(getPlayerName(selectedPlayer), getPlayerName(selectedPlayer), &st); diff --git a/src/multistat.c b/src/multistat.c index 0742a701c..ee3b9339e 100644 --- a/src/multistat.c +++ b/src/multistat.c @@ -40,18 +40,14 @@ static PLAYERSTATS playerStats[MAX_PLAYERS]; // //////////////////////////////////////////////////////////////////////////// // Get Player's stats -PLAYERSTATS getMultiStats(UDWORD player, BOOL bLocal) +PLAYERSTATS getMultiStats(UDWORD player) { - static PLAYERSTATS stat; - - // Copy over the data from our local array - memcpy(&stat, &playerStats[player], sizeof(stat)); - - return stat; + return playerStats[player]; } // //////////////////////////////////////////////////////////////////////////// // Set Player's stats +// send stats to all players when bLocal is false BOOL setMultiStats(SDWORD player, PLAYERSTATS plStats, BOOL bLocal) { uint32_t playerIndex = (uint32_t)player; @@ -206,7 +202,7 @@ void updateMultiStatsDamage(UDWORD attacker, UDWORD defender, UDWORD inflicted) // Host controls self + AI, so update the scores for them as well. if(myResponsibility(attacker) && NetPlay.bComms) { - st = getMultiStats(attacker,true); // get stats + st = getMultiStats(attacker); // get stats if(NetPlay.bComms) { st.scoreToAdd += (2*inflicted); @@ -226,7 +222,7 @@ void updateMultiStatsDamage(UDWORD attacker, UDWORD defender, UDWORD inflicted) // Host controls self + AI, so update the scores for them as well. if(myResponsibility(defender) && NetPlay.bComms) { - st = getMultiStats(defender,true); // get stats + st = getMultiStats(defender); // get stats if(NetPlay.bComms) { st.scoreToAdd -= inflicted; @@ -252,7 +248,7 @@ void updateMultiStatsGames(void) { return; } - st = getMultiStats(selectedPlayer,true); + st = getMultiStats(selectedPlayer); st.played ++; setMultiStats(selectedPlayer, st, true); } @@ -265,7 +261,7 @@ void updateMultiStatsWins(void) { return; } - st = getMultiStats(selectedPlayer,true); + st = getMultiStats(selectedPlayer); st.wins ++; setMultiStats(selectedPlayer, st, true); } @@ -278,7 +274,7 @@ void updateMultiStatsLoses(void) { return; } - st = getMultiStats(selectedPlayer,true); + st = getMultiStats(selectedPlayer); ++st.losses; setMultiStats(selectedPlayer, st, true); } @@ -296,7 +292,7 @@ void updateMultiStatsKills(BASE_OBJECT *psKilled,UDWORD player) // Host controls self + AI, so update the scores for them as well. if(myResponsibility(player) && NetPlay.bComms) { - st = getMultiStats(player,true); + st = getMultiStats(player); if(NetPlay.bComms) { diff --git a/src/multistat.h b/src/multistat.h index b6cb9fbf8..55f650a66 100644 --- a/src/multistat.h +++ b/src/multistat.h @@ -47,7 +47,7 @@ typedef struct BOOL saveMultiStats(const char *sFName, const char *sPlayerName, const PLAYERSTATS *playerStats); // to disk BOOL loadMultiStats(char *sPlayerName, PLAYERSTATS *playerStats); // form disk -PLAYERSTATS getMultiStats(UDWORD player,BOOL bLocal); // get from net +PLAYERSTATS getMultiStats(UDWORD player); // get from net BOOL setMultiStats(SDWORD player, PLAYERSTATS plStats,BOOL bLocal); // send to net. void updateMultiStatsDamage(UDWORD attacker, UDWORD defender, UDWORD inflicted); void updateMultiStatsGames(void); diff --git a/src/multisync.c b/src/multisync.c index 18bb4de10..a1c1ded4d 100644 --- a/src/multisync.c +++ b/src/multisync.c @@ -998,8 +998,8 @@ BOOL sendScoreCheck(void) // Host controls AI's scores + his own... if (myResponsibility(i)) { - // Update local score - stats = getMultiStats(i, true); + // Update score + stats = getMultiStats(i); // Add recently scored points stats.recentKills += stats.killsToAdd;