API tools faq
paste
Advertisement
slatenails

medals.diff

slatenails
Sep 29th, 2013
71
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 19.00 KB | None | 0 0
raw download clone embed print report
  1. diff -r 814095fc3091 src/medal.cpp
  2. --- a/src/medal.cpp Sun Sep 15 23:42:35 2013 +0300
  3. +++ b/src/medal.cpp Sun Sep 29 22:42:03 2013 +0300
  4. @@ -76,35 +76,35 @@
  5.  // VARIABLES
  6.  
  7.  static MEDAL_t g_Medals[NUM_MEDALS] =
  8. -{ 
  9. -   { "EXCLA0", S_EXCELLENT, "Excellent!", CR_GRAY, "Excellent", NUM_MEDALS, {NULL},    },
  10. -   { "INCRA0", S_INCREDIBLE, "Incredible!", CR_RED, "Incredible", MEDAL_EXCELLENT, {NULL}, }, 
  11. +{
  12. +   { "EXCLA0", S_EXCELLENT, "Excellent!", CR_GRAY, "Excellent", NUM_MEDALS, "",    },
  13. +   { "INCRA0", S_INCREDIBLE, "Incredible!", CR_RED, "Incredible", MEDAL_EXCELLENT, "", },
  14.  
  15. -   { "IMPRA0", S_IMPRESSIVE, "Impressive!", CR_GRAY, "Impressive", NUM_MEDALS, {NULL}, },
  16. -   { "MIMPA0", S_MOST_IMPRESSIVE, "Most impressive!", CR_RED, "MostImpressive", MEDAL_IMPRESSIVE, {NULL}, },
  17. -  
  18. -   { "DOMNA0", S_DOMINATION, "Domination!", CR_GRAY, "Domination", NUM_MEDALS, {NULL}, }, 
  19. -   { "TDOMA0", S_TOTAL_DOMINATION, "Total domination!", CR_RED, "TotalDomination", MEDAL_DOMINATION, {NULL}, },   
  20. -  
  21. -   { "ACCUA0", S_ACCURACY, "Accuracy!", CR_GRAY, "Accuracy", NUM_MEDALS, {NULL}, },
  22. -   { "PRECA0", S_PRECISION, "Precision!", CR_RED, "Precision", MEDAL_ACCURACY, {NULL}, },
  23. +   { "IMPRA0", S_IMPRESSIVE, "Impressive!", CR_GRAY, "Impressive", NUM_MEDALS, "", },
  24. +   { "MIMPA0", S_MOST_IMPRESSIVE, "Most impressive!", CR_RED, "MostImpressive", MEDAL_IMPRESSIVE, "", },
  25.  
  26. -   { "FAILA0", S_YOUFAILIT, "You fail it!", CR_GREEN, "YouFailIt", NUM_MEDALS, {NULL}, }, 
  27. -   { "SKILA0", S_YOURSKILLISNOTENOUGH, "Your skill is not enough!", CR_ORANGE, "YourSkillIsNotEnough", MEDAL_YOUFAILIT, {NULL}, },
  28. +   { "DOMNA0", S_DOMINATION, "Domination!", CR_GRAY, "Domination", NUM_MEDALS, "", },
  29. +   { "TDOMA0", S_TOTAL_DOMINATION, "Total domination!", CR_RED, "TotalDomination", MEDAL_DOMINATION, "", },
  30. +
  31. +   { "ACCUA0", S_ACCURACY, "Accuracy!", CR_GRAY, "Accuracy", NUM_MEDALS, "", },
  32. +   { "PRECA0", S_PRECISION, "Precision!", CR_RED, "Precision", MEDAL_ACCURACY, "", },
  33. +
  34. +   { "FAILA0", S_YOUFAILIT, "You fail it!", CR_GREEN, "YouFailIt", NUM_MEDALS, "", },
  35. +   { "SKILA0", S_YOURSKILLISNOTENOUGH, "Your skill is not enough!", CR_ORANGE, "YourSkillIsNotEnough", MEDAL_YOUFAILIT, "", },
  36.  
  37.     { "LLAMA0", S_LLAMA, "Llama!", CR_GREEN, "Llama", NUM_MEDALS, "misc/llama", },
  38. -   { "SPAMA0", S_SPAM, "Spam!", CR_GREEN, "Spam", MEDAL_LLAMA, "misc/spam", },
  39. +   { "SPAMA0", S_SPAM, "Spam!", CR_GREEN, "Spam", MEDAL_LLAMA, "misc/spam", },
  40.  
  41. -   { "VICTA0", S_VICTORY, "Victory!", CR_GRAY, "Victory", NUM_MEDALS, {NULL}, },
  42. -   { "PFCTA0", S_PERFECT, "Perfect!", CR_RED, "Perfect", MEDAL_VICTORY, {NULL}, },
  43. +   { "VICTA0", S_VICTORY, "Victory!", CR_GRAY, "Victory", NUM_MEDALS, "", },
  44. +   { "PFCTA0", S_PERFECT, "Perfect!", CR_RED, "Perfect", MEDAL_VICTORY, "", },
  45.  
  46. -   { "TRMAA0", S_TERMINATION, "Termination!", CR_GRAY, "Termination", NUM_MEDALS, {NULL}, },  
  47. -   { "FFRGA0", S_FIRSTFRAG, "First frag!", CR_GRAY, "FirstFrag", NUM_MEDALS, {NULL}, },   
  48. -   { "CAPTA0", S_CAPTURE, "Capture!", CR_GRAY, "Capture", NUM_MEDALS, {NULL}, },  
  49. -   { "STAGA0", S_TAG, "Tag!", CR_GRAY, "Tag", NUM_MEDALS, {NULL}, },  
  50. -   { "ASSTA0", S_ASSIST, "Assist!", CR_GRAY, "Assist", NUM_MEDALS, {NULL}, }, 
  51. -   { "DFNSA0", S_DEFENSE, "Defense!", CR_GRAY, "Defense", NUM_MEDALS, {NULL}, },  
  52. -   { "FISTA0", S_FISTING, "Fisting!", CR_GRAY, "Fisting", NUM_MEDALS, {NULL}, },
  53. +   { "TRMAA0", S_TERMINATION, "Termination!", CR_GRAY, "Termination", NUM_MEDALS, "", },
  54. +   { "FFRGA0", S_FIRSTFRAG, "First frag!", CR_GRAY, "FirstFrag", NUM_MEDALS, "", },
  55. +   { "CAPTA0", S_CAPTURE, "Capture!", CR_GRAY, "Capture", NUM_MEDALS, "", },
  56. +   { "STAGA0", S_TAG, "Tag!", CR_GRAY, "Tag", NUM_MEDALS, "", },
  57. +   { "ASSTA0", S_ASSIST, "Assist!", CR_GRAY, "Assist", NUM_MEDALS, "", },
  58. +   { "DFNSA0", S_DEFENSE, "Defense!", CR_GRAY, "Defense", NUM_MEDALS, "", },
  59. +   { "FISTA0", S_FISTING, "Fisting!", CR_GRAY, "Fisting", NUM_MEDALS, "", },
  60.  };
  61.  
  62.  enum
  63. @@ -229,8 +229,9 @@
  64.     ULONG       ulPlayer;
  65.     ULONG       ulMedal;
  66.     ULONG       ulTick;
  67. -   char        szString[64];
  68. -   char        szPatchName[32];
  69. +   FString     string;
  70. +   FString     patchName;
  71. +   long        lAlpha = OPAQUE;
  72.  
  73.     if ( players[consoleplayer].camera == NULL )
  74.         return;
  75. @@ -248,9 +249,12 @@
  76.     ulMedal = g_MedalQueue[ulPlayer][0].ulMedal;
  77.     ulTick  = g_MedalQueue[ulPlayer][0].ulTick;
  78.  
  79. +   if ( ulTick > ( 1 * TICRATE ))
  80. +       lAlpha = OPAQUE * ((float) ulTick / TICRATE );
  81. +
  82.     // Get the graphic from the global array.
  83. -   sprintf( szPatchName, "%s", g_Medals[ulMedal].szLumpName );
  84. -   if ( szPatchName[0] )
  85. +   patchName = g_Medals[ulMedal].szLumpName;
  86. +   if ( patchName.IsNotEmpty() )
  87.     {
  88.         ULONG   ulCurXPos;
  89.         ULONG   ulCurYPos;
  90. @@ -259,7 +263,7 @@
  91.  
  92.         // Determine how much actual screen space it will take to render the amount of
  93.         // medals the player has received up until this point.
  94. -       ulLength = ulNumMedals * TexMan[szPatchName]->GetWidth( );
  95. +       ulLength = ulNumMedals * TexMan[patchName]->GetWidth( );
  96.  
  97.         if ( viewheight <= ST_Y )
  98.             ulCurYPos = ((int)( ST_Y - 11 * CleanYfac ));
  99. @@ -271,24 +275,30 @@
  100.         {
  101.             ulCurXPos = 160;
  102.  
  103. +           const char* szColor1 = TEXTCOLOR_WHITE,
  104. +               *szColor2 = TEXTCOLOR_RED;
  105. +
  106.             if ( g_Medals[ulMedal].ulTextColor == CR_RED )
  107. -               sprintf( szString, TEXTCOLOR_RED "%s " TEXTCOLOR_WHITE "X %d", g_Medals[ulMedal].szStr, static_cast<unsigned int> (ulNumMedals) );
  108. +           {
  109. +               szColor1 = TEXTCOLOR_RED;
  110. +               szColor2 = TEXTCOLOR_WHITE;
  111. +           }
  112.             else if ( g_Medals[ulMedal].ulTextColor == CR_GREEN )
  113. -               sprintf( szString, TEXTCOLOR_GREEN "%s " TEXTCOLOR_RED "X %d", g_Medals[ulMedal].szStr, static_cast<unsigned int> (ulNumMedals) );
  114. -           else
  115. -               sprintf( szString, TEXTCOLOR_WHITE "%s " TEXTCOLOR_RED "X %d", g_Medals[ulMedal].szStr, static_cast<unsigned int> (ulNumMedals) );
  116. +               szColor1 = TEXTCOLOR_GREEN;
  117.  
  118. -           if ( ulTick > ( 1 * TICRATE ))
  119. -               screen->DrawTexture( TexMan[szPatchName], ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), DTA_Clean, true, TAG_DONE );
  120. -           else
  121. -               screen->DrawTexture( TexMan[szPatchName], ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), DTA_Clean, true, DTA_Alpha, (LONG)( OPAQUE * (float)( (float)ulTick / (float)TICRATE )), TAG_DONE );
  122. +           string.Format( "%s%s%s X %lu", szColor1, g_Medals[ulMedal].szStr, szColor2, ulNumMedals );
  123.  
  124. -           ulCurXPos = 160 - ( SmallFont->StringWidth( szString ) / 2 );
  125. +           screen->DrawTexture( TexMan[patchName], ulCurXPos, (LONG)( ulCurYPos / CleanYfac ),
  126. +               DTA_Clean, true,
  127. +               DTA_Alpha, lAlpha,
  128. +               TAG_DONE );
  129.  
  130. -           if ( ulTick > ( 1 * TICRATE ))
  131. -               screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), szString, DTA_Clean, true, TAG_DONE );
  132. -           else
  133. -               screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), szString, DTA_Clean, true, DTA_Alpha, (LONG)( OPAQUE * (float)( (float)ulTick / (float)TICRATE )), TAG_DONE );
  134. +           ulCurXPos = 160 - ( SmallFont->StringWidth( string ) / 2 );
  135. +
  136. +           screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), string,
  137. +               DTA_Clean, true,
  138. +               DTA_Alpha, lAlpha,
  139. +               TAG_DONE );
  140.         }
  141.         // Display the medal icon <usNumMedals> times centered on the screen.
  142.         else
  143. @@ -296,24 +306,26 @@
  144.             ULONG   ulIdx;
  145.  
  146.             ulCurXPos = 160 - ( ulLength / 2 );
  147. -           sprintf( szString, "%s", g_Medals[ulMedal].szStr );
  148. +           string = g_Medals[ulMedal].szStr;
  149.  
  150.             for ( ulIdx = 0; ulIdx < ulNumMedals; ulIdx++ )
  151.             {
  152. -               if ( ulTick > ( 1 * TICRATE ))
  153. -                   screen->DrawTexture( TexMan[szPatchName], ulCurXPos + ( TexMan[szPatchName]->GetWidth( ) / 2 ), (LONG)( ulCurYPos / CleanYfac ), DTA_Clean, true, TAG_DONE );
  154. -               else
  155. -                   screen->DrawTexture( TexMan[szPatchName], ulCurXPos + ( TexMan[szPatchName]->GetWidth( ) / 2 ), (LONG)( ulCurYPos / CleanYfac ), DTA_Clean, true, DTA_Alpha, (LONG)( OPAQUE * (float)( (float)ulTick / (float)TICRATE )), TAG_DONE );
  156. +               screen->DrawTexture( TexMan[patchName],
  157. +                   ulCurXPos + ( TexMan[patchName]->GetWidth( ) / 2 ),
  158. +                   (long)( ulCurYPos / CleanYfac ),
  159. +                   DTA_Clean, true,
  160. +                   DTA_Alpha, lAlpha,
  161. +                   TAG_DONE );
  162.  
  163. -               ulCurXPos += TexMan[szPatchName]->GetWidth( );
  164. +               ulCurXPos += TexMan[patchName]->GetWidth( );
  165.             }
  166. -              
  167. -           ulCurXPos = 160 - ( SmallFont->StringWidth( szString ) / 2 );
  168.  
  169. -           if ( ulTick >  ( 1 * TICRATE ))
  170. -               screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), szString, DTA_Clean, true, TAG_DONE );
  171. -           else
  172. -               screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), szString, DTA_Clean, true, DTA_Alpha, (LONG)( OPAQUE * (float)( (float)ulTick / (float)TICRATE )), TAG_DONE );
  173. +           ulCurXPos = 160 - ( SmallFont->StringWidth( string ) / 2 );
  174. +
  175. +           screen->DrawText( SmallFont, g_Medals[ulMedal].ulTextColor, ulCurXPos, (LONG)( ulCurYPos / CleanYfac ), string,
  176. +               DTA_Clean, true,
  177. +               DTA_Alpha, lAlpha,
  178. +               TAG_DONE );
  179.         }
  180.     }
  181.  }
  182. @@ -324,7 +336,7 @@
  183.  void MEDAL_GiveMedal( ULONG ulPlayer, ULONG ulMedal )
  184.  {
  185.     player_t    *pPlayer;
  186. -   ULONG       ulWhereToInsertMedal = static_cast<unsigned int> (-1);
  187. +   ULONG       ulWhereToInsertMedal = UINT_MAX;
  188.  
  189.     // Make sure all inputs are valid first.
  190.     if (( ulPlayer >= MAXPLAYERS ) ||
  191. @@ -336,11 +348,11 @@
  192.     {
  193.         return;
  194.     }
  195. -  
  196. +
  197.     pPlayer = &players[ulPlayer];
  198.  
  199.     // Increase the player's count of this type of medal.
  200. -   pPlayer->ulMedalCount[ulMedal]++;  
  201. +   pPlayer->ulMedalCount[ulMedal]++;
  202.  
  203.     // The queue is empty, so put this medal first.
  204.     if ( !g_MedalQueue[ulPlayer][0].ulTick )
  205. @@ -356,7 +368,7 @@
  206.                  g_MedalQueue[ulPlayer][ulQueueIdx].ulMedal == ulMedal )
  207.             {
  208.                 // Commandeer its slot!
  209. -               if ( ulWhereToInsertMedal == static_cast<unsigned int> (-1) )
  210. +               if ( ulWhereToInsertMedal == UINT_MAX )
  211.                 {
  212.                     ulWhereToInsertMedal = ulQueueIdx;
  213.                     ulQueueIdx++;
  214. @@ -380,7 +392,7 @@
  215.     }
  216.  
  217.     // [RC] No special place for the medal, so just queue it.
  218. -   if ( ulWhereToInsertMedal == static_cast<unsigned int> (-1) )
  219. +   if ( ulWhereToInsertMedal == UINT_MAX )
  220.         medal_AddToQueue( ulPlayer, ulMedal );
  221.     else
  222.     {
  223. @@ -413,7 +425,7 @@
  224.     ULONG       ulCurYPos;
  225.     ULONG       ulLength;
  226.     ULONG       ulIdx;
  227. -   char        szPatchName[32];
  228. +   FString     patchName;
  229.  
  230.     if ( players[consoleplayer].camera == NULL )
  231.         return;
  232. @@ -424,10 +436,10 @@
  233.  
  234.     ulPlayer = ULONG( pPlayer - players );
  235.  
  236. -   if ( viewheight <= ST_Y )
  237. -       ulCurYPos = (LONG)((( ST_Y - 11 * CleanYfac ) + lYOffset ) / CleanYfac );
  238. -   else
  239. -       ulCurYPos = (LONG)((( SCREENHEIGHT - 11 * CleanYfac ) + lYOffset ) / CleanYfac );
  240. +   {
  241. +       int y0 = ( viewheight <= ST_Y ) ? ST_Y : SCREENHEIGHT;
  242. +       ulCurYPos = (LONG)((( y0 - 11 * CleanYfac ) + lYOffset ) / CleanYfac );
  243. +   }
  244.  
  245.     // Determine length of all medals strung together.
  246.     ulLength = 0;
  247. @@ -435,9 +447,9 @@
  248.     {
  249.         if ( pPlayer->ulMedalCount[ulIdx] )
  250.         {
  251. -           sprintf( szPatchName, "%s", g_Medals[ulIdx].szLumpName );
  252. -           if ( szPatchName[0] )
  253. -               ulLength += ( TexMan[szPatchName]->GetWidth( ) * pPlayer->ulMedalCount[ulIdx] );
  254. +           patchName = g_Medals[ulIdx].szLumpName;
  255. +           if ( patchName.IsNotEmpty() )
  256. +               ulLength += ( TexMan[patchName]->GetWidth( ) * pPlayer->ulMedalCount[ulIdx] );
  257.         }
  258.     }
  259.  
  260. @@ -445,7 +457,7 @@
  261.     if ( ulLength >= 320 )
  262.     {
  263.         bool    bScale;
  264. -       char    szString[8];
  265. +       FString string;
  266.  
  267.         // Recalculate the length of all the medals strung together.
  268.         ulLength = 0;
  269. @@ -454,9 +466,9 @@
  270.             if ( pPlayer->ulMedalCount[ulIdx] == 0 )
  271.                 continue;
  272.  
  273. -           sprintf( szPatchName, "%s", g_Medals[ulIdx].szLumpName );
  274. -           if ( szPatchName[0] )
  275. -               ulLength += TexMan[szPatchName]->GetWidth( );
  276. +           patchName = g_Medals[ulIdx].szLumpName;
  277. +           if ( patchName.IsNotEmpty() )
  278. +               ulLength += TexMan[patchName]->GetWidth( );
  279.         }
  280.  
  281.         // If the length of all our medals goes beyond 320, we cannot scale them.
  282. @@ -474,21 +486,23 @@
  283.             if ( pPlayer->ulMedalCount[ulIdx] == 0 )
  284.                 continue;
  285.  
  286. -           sprintf( szPatchName, "%s", g_Medals[ulIdx].szLumpName );
  287. -           if ( szPatchName[0] )
  288. +           patchName = g_Medals[ulIdx].szLumpName;
  289. +           if ( patchName.IsNotEmpty() )
  290.             {
  291. -               screen->DrawTexture( TexMan[szPatchName],
  292. -                   ulCurXPos + ( TexMan[szPatchName]->GetWidth( ) / 2 ),
  293. +               screen->DrawTexture( TexMan[patchName],
  294. +                   ulCurXPos + ( TexMan[patchName]->GetWidth( ) / 2 ),
  295.                     ulCurYPos,
  296. -                   DTA_Clean, bScale, TAG_DONE );
  297. -  
  298. -               sprintf( szString, "%d", static_cast<unsigned int> (pPlayer->ulMedalCount[ulIdx]) );
  299. +                   DTA_Clean, bScale,
  300. +                   TAG_DONE );
  301. +
  302. +               string.Format( "%lu", pPlayer->ulMedalCount[ulIdx] );
  303.                 screen->DrawText( SmallFont, CR_RED,
  304. -                   ulCurXPos - ( SmallFont->StringWidth( szString ) / 2 ) + TexMan[szPatchName]->GetWidth( ) / 2,
  305. +                   ulCurXPos - ( SmallFont->StringWidth( string ) / 2 ) + TexMan[patchName]->GetWidth( ) / 2,
  306.                     ulCurYPos,
  307. -                   szString,
  308. -                   DTA_Clean, bScale, TAG_DONE );
  309. -               ulCurXPos += TexMan[szPatchName]->GetWidth( );
  310. +                   string,
  311. +                   DTA_Clean, bScale,
  312. +                   TAG_DONE );
  313. +               ulCurXPos += TexMan[patchName]->GetWidth( );
  314.             }
  315.         }
  316.     }
  317. @@ -497,15 +511,19 @@
  318.         ulCurXPos = 160 - ( ulLength / 2 );
  319.         for ( ulIdx = 0; ulIdx < NUM_MEDALS; ulIdx++ )
  320.         {
  321. -           sprintf( szPatchName, "%s", g_Medals[ulIdx].szLumpName );
  322. -           if ( szPatchName[0] )
  323. +           patchName = g_Medals[ulIdx].szLumpName;
  324. +           if ( patchName.IsNotEmpty() )
  325.             {
  326.                 ULONG   ulMedalIdx;
  327.  
  328.                 for ( ulMedalIdx = 0; ulMedalIdx < pPlayer->ulMedalCount[ulIdx]; ulMedalIdx++ )
  329.                 {
  330. -                   screen->DrawTexture( TexMan[szPatchName], ulCurXPos + ( TexMan[szPatchName]->GetWidth( ) / 2 ), ulCurYPos, DTA_Clean, true, TAG_DONE );
  331. -                   ulCurXPos += TexMan[szPatchName]->GetWidth( );
  332. +                   screen->DrawTexture( TexMan[patchName],
  333. +                       ulCurXPos + ( TexMan[patchName]->GetWidth( ) / 2 ),
  334. +                       ulCurYPos,
  335. +                       DTA_Clean, true,
  336. +                       TAG_DONE );
  337. +                   ulCurXPos += TexMan[patchName]->GetWidth( );
  338.                 }
  339.             }
  340.         }
  341. @@ -520,7 +538,7 @@
  342.     ULONG       ulCurXPos;
  343.     ULONG       ulCurYPos;
  344.     ULONG       ulIdx;
  345. -   char        szString[8];
  346. +   FString     string;
  347.     UCVarValue  ValWidth;
  348.     UCVarValue  ValHeight;
  349.     float       fXScale = 0.0f;
  350. @@ -627,13 +645,13 @@
  351.                 TAG_DONE );
  352.         }
  353.  
  354. -       sprintf( szString, "%d", static_cast<unsigned int> (pPlayer->ulMedalCount[ulIdx]) );
  355. +       string.Format( "%lu", pPlayer->ulMedalCount[ulIdx] );
  356.         if ( bScale )
  357.         {
  358.             screen->DrawText( BigFont, CR_RED,
  359.                 ulCurXPos + 64,
  360.                 ulCurYPos + ( TexMan[g_Medals[ulIdx].szLumpName]->GetHeight( )) / 2 - BigFont->GetHeight( ) / 2,
  361. -               szString,
  362. +               string,
  363.                 DTA_VirtualWidth, ValWidth.Int,
  364.                 DTA_VirtualHeight, ValHeight.Int,
  365.                 TAG_DONE );
  366. @@ -643,7 +661,7 @@
  367.             screen->DrawText( BigFont, CR_RED,
  368.                 ulCurXPos + 64,
  369.                 ulCurYPos + ( TexMan[g_Medals[ulIdx].szLumpName]->GetHeight( )) / 2 - BigFont->GetHeight( ) / 2,
  370. -               szString,
  371. +               string,
  372.                 TAG_DONE );
  373.         }
  374.  
  375. @@ -960,7 +978,7 @@
  376.         if ( pPlayer->mo->CheckLocalView( consoleplayer ) )
  377.         {
  378.             if ( g_Medals[ulMedal].szAnnouncerEntry[0] )
  379. -               ANNOUNCER_PlayEntry( cl_announcer, (const char *)g_Medals[ulMedal].szAnnouncerEntry );
  380. +               ANNOUNCER_PlayEntry( cl_announcer, g_Medals[ulMedal].szAnnouncerEntry );
  381.         }
  382.         // If a player besides the console player got the medal, play the remote sound.
  383.         else
  384. @@ -983,7 +1001,7 @@
  385.         return NUM_SPRITES;
  386.  
  387.     // Draw an ally icon if this person is on our team. Would this be useful for co-op, too?
  388. -   // [BB] In free spectate mode, we don't have allies (and SCOREBOARD_GetViewPlayer doesn't return a useful value).
  389. +   // [BB] In free spectate mode, we don't have allies (and SCOREBOARD_GetViewPlayer doesn't return a useful value).
  390.     if ( ( GAMEMODE_GetFlags( GAMEMODE_GetCurrentMode( )) & GMF_PLAYERSONTEAMS ) && ( CLIENTDEMO_IsInFreeSpectateMode() == false ) )
  391.     {
  392.         // [BB] Dead spectators shall see the icon for their teammates.
  393. @@ -1204,7 +1222,7 @@
  394.             }
  395.         }
  396.  
  397. -       ULONG   ulFrame = 65535;
  398. +       ULONG   ulFrame = UINT_MAX;
  399.         const ULONG ulDesiredSprite = medal_GetDesiredIcon ( pPlayer, pTeamItem );
  400.  
  401.         // [BB] Determine the frame based on the desired sprite.
  402. @@ -1247,7 +1265,7 @@
  403.         }
  404.  
  405.         // We have an icon that needs to be spawned.
  406. -       if ((( ulFrame != 65535 ) && ( ulDesiredSprite != NUM_SPRITES )))
  407. +       if ((( ulFrame != UINT_MAX ) && ( ulDesiredSprite != NUM_SPRITES )))
  408.         {
  409.             // [BB] If a TeamItem icon replaces an existing non-team icon, we have to delete the old icon first.
  410.             if ( pPlayer->pIcon && ( pPlayer->pIcon->bTeamItemFloatyIcon == false ) && pTeamItem )
  411. diff -r 814095fc3091 src/medal.h
  412. --- a/src/medal.h   Sun Sep 15 23:42:35 2013 +0300
  413. +++ b/src/medal.h   Sun Sep 29 22:42:03 2013 +0300
  414. @@ -59,59 +59,63 @@
  415.  #define    MEDAL_ICON_DURATION         ( 3 * TICRATE )
  416.  
  417.  // Same values as defined in AFloatyIcon::States[].
  418. -#define    S_TERMINATORARTIFACT            0
  419. -#define S_CHAT                 ( S_TERMINATORARTIFACT + 4 )
  420. -#define S_INCONSOLE                ( S_CHAT + 1 )
  421. -#define S_ALLY                 ( S_INCONSOLE + 2 )
  422. -#define    S_WHITEFLAG             ( S_ALLY + 1 )
  423. -#define    S_EXCELLENT             ( S_WHITEFLAG + 6 )
  424. -#define    S_INCREDIBLE            ( S_EXCELLENT + 1 )
  425. -#define    S_IMPRESSIVE            ( S_INCREDIBLE + 1 )
  426. -#define    S_MOST_IMPRESSIVE       ( S_IMPRESSIVE + 1 )
  427. -#define    S_DOMINATION            ( S_MOST_IMPRESSIVE + 1 )
  428. -#define    S_TOTAL_DOMINATION      ( S_DOMINATION + 1 )
  429. -#define    S_ACCURACY              ( S_TOTAL_DOMINATION + 1 )
  430. -#define    S_PRECISION             ( S_ACCURACY + 1 )
  431. -#define    S_VICTORY               ( S_PRECISION + 1 )
  432. -#define    S_PERFECT               ( S_VICTORY + 1 )
  433. -#define    S_FIRSTFRAG             ( S_PERFECT + 1 )
  434. -#define    S_TERMINATION           ( S_FIRSTFRAG + 1 )
  435. -#define    S_CAPTURE               ( S_TERMINATION + 1 )
  436. -#define    S_TAG                   ( S_CAPTURE + 1 )
  437. -#define    S_ASSIST                ( S_TAG + 1 )
  438. -#define    S_DEFENSE               ( S_ASSIST + 1 )
  439. -#define    S_LLAMA                 ( S_DEFENSE + 1 )
  440. -#define    S_YOUFAILIT             ( S_LLAMA + 1 )
  441. -#define    S_YOURSKILLISNOTENOUGH  ( S_YOUFAILIT + 1 )
  442. -#define    S_LAG                   ( S_YOURSKILLISNOTENOUGH + 1 )
  443. -#define    S_FISTING               ( S_LAG + 1 )
  444. -#define    S_SPAM                  ( S_FISTING + 1 )
  445. -#define    S_POSSESSIONARTIFACT        ( S_SPAM + 1 )
  446. +// [Dusk] Now an enumeration.
  447. +enum
  448. +{
  449. +   S_TERMINATORARTIFACT        = 0,
  450. +   S_CHAT                      = ( S_TERMINATORARTIFACT + 4 ),
  451. +   S_INCONSOLE                 = ( S_CHAT + 1 ),
  452. +   S_ALLY                      = ( S_INCONSOLE + 2 ),
  453. +   S_WHITEFLAG                 = ( S_ALLY + 1 ),
  454. +   S_EXCELLENT                 = ( S_WHITEFLAG + 6 ),
  455. +   S_INCREDIBLE                = ( S_EXCELLENT + 1 ),
  456. +   S_IMPRESSIVE                = ( S_INCREDIBLE + 1 ),
  457. +   S_MOST_IMPRESSIVE           = ( S_IMPRESSIVE + 1 ),
  458. +   S_DOMINATION                = ( S_MOST_IMPRESSIVE + 1 ),
  459. +   S_TOTAL_DOMINATION          = ( S_DOMINATION + 1 ),
  460. +   S_ACCURACY                  = ( S_TOTAL_DOMINATION + 1 ),
  461. +   S_PRECISION                 = ( S_ACCURACY + 1 ),
  462. +   S_VICTORY                   = ( S_PRECISION + 1 ),
  463. +   S_PERFECT                   = ( S_VICTORY + 1 ),
  464. +   S_FIRSTFRAG                 = ( S_PERFECT + 1 ),
  465. +   S_TERMINATION               = ( S_FIRSTFRAG + 1 ),
  466. +   S_CAPTURE                   = ( S_TERMINATION + 1 ),
  467. +   S_TAG                       = ( S_CAPTURE + 1 ),
  468. +   S_ASSIST                    = ( S_TAG + 1 ),
  469. +   S_DEFENSE                   = ( S_ASSIST + 1 ),
  470. +   S_LLAMA                     = ( S_DEFENSE + 1 ),
  471. +   S_YOUFAILIT                 = ( S_LLAMA + 1 ),
  472. +   S_YOURSKILLISNOTENOUGH      = ( S_YOUFAILIT + 1 ),
  473. +   S_LAG                       = ( S_YOURSKILLISNOTENOUGH + 1 ),
  474. +   S_FISTING                   = ( S_LAG + 1 ),
  475. +   S_SPAM                      = ( S_FISTING + 1 ),
  476. +   S_POSSESSIONARTIFACT        = ( S_SPAM + 1 ),
  477. +};
  478.  
  479.  //*****************************************************************************
  480.  enum
  481. -{ 
  482. +{
  483.     MEDAL_EXCELLENT,
  484.     MEDAL_INCREDIBLE,
  485.  
  486.     MEDAL_IMPRESSIVE,
  487.     MEDAL_MOSTIMPRESSIVE,
  488. -  
  489. +
  490.     MEDAL_DOMINATION,
  491.     MEDAL_TOTALDOMINATION,
  492. -  
  493. +
  494.     MEDAL_ACCURACY,
  495.     MEDAL_PRECISION,
  496. -  
  497. +
  498.     MEDAL_YOUFAILIT,
  499.     MEDAL_YOURSKILLISNOTENOUGH,
  500.  
  501.     MEDAL_LLAMA,
  502. -   MEDAL_SPAM,
  503. +   MEDAL_SPAM,
  504.  
  505.     MEDAL_VICTORY,
  506.     MEDAL_PERFECT,
  507. -  
  508. +
  509.     MEDAL_TERMINATION,
  510.     MEDAL_FIRSTFRAG,
  511.     MEDAL_CAPTURE,
  512. @@ -151,9 +155,7 @@
  513.     ULONG       ulLowerMedal;
  514.  
  515.     // Name of sound to play when this medal type is triggered.
  516. -   const char  szSoundName[64];
  517. -
  518. -  
  519. +   const char  *szSoundName;
  520.  
  521.  } MEDAL_t;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!